Acked-by: Jeff Guo <jia....@intel.com>
> -----Original Message-----
> From: Steve Yang <stevex.y...@intel.com>
> Sent: Thursday, December 17, 2020 5:23 PM
> To: dev@dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo...@intel.com>; Xing, Beilei
> <beilei.x...@intel.com>; Iremonger, Bernard
> <bernard.iremon...@intel.com>; asoma...@amd.com;
> rahul.lakkire...@chelsio.com; hemant.agra...@nxp.com;
> sachin.sax...@oss.nxp.com; Guo, Jia <jia....@intel.com>; Wang, Haiyue
> <haiyue.w...@intel.com>; g.si...@nxp.com; xuanziya...@huawei.com;
> cloud.wangxiao...@huawei.com; zhouguoy...@huawei.com;
> xavier.hu...@huawei.com; humi...@huawei.com;
> yisen.zhu...@huawei.com; ouli...@huawei.com; Wu, Jingjing
> <jingjing...@intel.com>; Yang, Qiming <qiming.y...@intel.com>; Zhang, Qi
> Z <qi.z.zh...@intel.com>; Xu, Rosen <rosen...@intel.com>;
> sthot...@marvell.com; sriniva...@marvell.com;
> heinrich.k...@netronome.com; hka...@marvell.com; jer...@marvell.com;
> ndabilpu...@marvell.com; kirankum...@marvell.com;
> rm...@marvell.com; shsha...@marvell.com;
> andrew.rybche...@oktetlabs.ru; mcze...@marvell.com;
> tho...@monjalon.net; Yigit, Ferruh <ferruh.yi...@intel.com>;
> ivan.bo...@6wind.com; Ananyev, Konstantin
> <konstantin.anan...@intel.com>; samuel.gauth...@6wind.com;
> david.march...@6wind.com; shah...@mellanox.com;
> step...@networkplumber.org; maxime.coque...@redhat.com;
> olivier.m...@6wind.com; lihuis...@huawei.com; shreyansh.j...@nxp.com;
> wei....@intel.com; fengchuns...@huawei.com; chenhao...@huawei.com;
> tangchengch...@hisilicon.com; Zhang, Helin <helin.zh...@intel.com>;
> yanglong...@intel.com; xiaolong...@intel.com; Xu, Ting
> <ting...@intel.com>; Li, Xiaoyun <xiaoyun...@intel.com>; Wei, Dan
> <dan....@intel.com>; Pei, Andy <andy....@intel.com>;
> vattun...@marvell.com; sk...@marvell.com; sony.cha...@qlogic.com;
> Richardson, Bruce <bruce.richard...@intel.com>; ivan.ma...@oktetlabs.ru;
> r...@semihalf.com; slawomir.ro...@semihalf.com;
> kamil.rytarow...@caviumnetworks.com; Zhao1, Wei <wei.zh...@intel.com>;
> Jiang, JunyuX <junyux.ji...@intel.com>; kuma...@chelsio.com;
> girish.nandibasa...@amd.com; rolf.neugeba...@netronome.com;
> alejandro.luc...@netronome.com; Yang, SteveX <stevex.y...@intel.com>
> Subject: [PATCH v2 05/22] net/e1000: fix the jumbo frame flag condition for
> mtu set
>
> The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition,
> but the Ether overhead is larger than 18 when it supports VLAN tag. That will
> cause the jumbo flag rx offload is wrong when MTU size is 'RTE_ETHER_MTU'.
>
> This fix will change the boundary condition with 'RTE_ETHER_MTU' and
> overhead.
>
> Fixes: ef990fb56e55 ("net/e1000: convert to new Rx offloads API")
>
> Signed-off-by: Steve Yang <stevex.y...@intel.com>
> ---
> drivers/net/e1000/e1000_ethdev.h | 2 +-
> drivers/net/e1000/em_ethdev.c | 5 ++---
> drivers/net/e1000/igb_ethdev.c | 2 +-
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/e1000/e1000_ethdev.h
> b/drivers/net/e1000/e1000_ethdev.h
> index 4755a5f333..3b4d9c3ee6 100644
> --- a/drivers/net/e1000/e1000_ethdev.h
> +++ b/drivers/net/e1000/e1000_ethdev.h
> @@ -97,7 +97,7 @@
> */
> #define E1000_ETH_OVERHEAD (RTE_ETHER_HDR_LEN +
> RTE_ETHER_CRC_LEN + \
> VLAN_TAG_SIZE)
> -
> +#define E1000_ETH_MAX_LEN (RTE_ETHER_MTU + E1000_ETH_OVERHEAD)
> /*
> * Maximum number of Ring Descriptors.
> *
> diff --git a/drivers/net/e1000/em_ethdev.c
> b/drivers/net/e1000/em_ethdev.c index 8ee9422bf4..2036c6e917 100644
> --- a/drivers/net/e1000/em_ethdev.c
> +++ b/drivers/net/e1000/em_ethdev.c
> @@ -1799,8 +1799,7 @@ eth_em_mtu_set(struct rte_eth_dev *dev,
> uint16_t mtu)
> if (ret != 0)
> return ret;
>
> - frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN +
> - VLAN_TAG_SIZE;
> + frame_size = mtu + E1000_ETH_OVERHEAD;
>
> /* check that mtu is within the allowed range */
> if (mtu < RTE_ETHER_MIN_MTU || frame_size >
> dev_info.max_rx_pktlen) @@ -1816,7 +1815,7 @@ eth_em_mtu_set(struct
> rte_eth_dev *dev, uint16_t mtu)
> rctl = E1000_READ_REG(hw, E1000_RCTL);
>
> /* switch to jumbo mode if needed */
> - if (frame_size > RTE_ETHER_MAX_LEN) {
> + if (frame_size > E1000_ETH_MAX_LEN) {
> dev->data->dev_conf.rxmode.offloads |=
> DEV_RX_OFFLOAD_JUMBO_FRAME;
> rctl |= E1000_RCTL_LPE;
> diff --git a/drivers/net/e1000/igb_ethdev.c
> b/drivers/net/e1000/igb_ethdev.c index 647aa8d995..dfe87508c2 100644
> --- a/drivers/net/e1000/igb_ethdev.c
> +++ b/drivers/net/e1000/igb_ethdev.c
> @@ -4369,7 +4369,7 @@ eth_igb_mtu_set(struct rte_eth_dev *dev,
> uint16_t mtu)
> rctl = E1000_READ_REG(hw, E1000_RCTL);
>
> /* switch to jumbo mode if needed */
> - if (frame_size > RTE_ETHER_MAX_LEN) {
> + if (frame_size > E1000_ETH_MAX_LEN) {
> dev->data->dev_conf.rxmode.offloads |=
> DEV_RX_OFFLOAD_JUMBO_FRAME;
> rctl |= E1000_RCTL_LPE;
> --
> 2.17.1
