[dpdk-dev] [PATCH v2 16/22] net/ixgbe: fix the jumbo frame flag condition

[Guo, Jia]

Acked-by: Jeff Guo <jia.guo at intel.com>

> -----Original Message-----
> From: Steve Yang <stevex.yang at intel.com>
> Sent: Thursday, December 17, 2020 5:23 PM
> To: dev at dpdk.org
> Cc: Lu, Wenzhuo <wenzhuo.lu at intel.com>; Xing, Beilei
> <beilei.xing at intel.com>; Iremonger, Bernard
> <bernard.iremonger at intel.com>; asomalap at amd.com;
> rahul.lakkireddy at chelsio.com; hemant.agrawal at nxp.com;
> sachin.saxena at oss.nxp.com; Guo, Jia <jia.guo at intel.com>; Wang, Haiyue
> <haiyue.wang at intel.com>; g.singh at nxp.com; xuanziyang2 at huawei.com;
> cloud.wangxiaoyun at huawei.com; zhouguoyang at huawei.com;
> xavier.huwei at huawei.com; humin29 at huawei.com;
> yisen.zhuang at huawei.com; oulijun at huawei.com; Wu, Jingjing
> <jingjing.wu at intel.com>; Yang, Qiming <qiming.yang at intel.com>; Zhang, Qi
> Z <qi.z.zhang at intel.com>; Xu, Rosen <rosen.xu at intel.com>;
> sthotton at marvell.com; srinivasan at marvell.com;
> heinrich.kuhn at netronome.com; hkalra at marvell.com; jerinj at marvell.com;
> ndabilpuram at marvell.com; kirankumark at marvell.com;
> rmody at marvell.com; shshaikh at marvell.com;
> andrew.rybchenko at oktetlabs.ru; mczekaj at marvell.com;
> thomas at monjalon.net; Yigit, Ferruh <ferruh.yigit at intel.com>;
> ivan.boule at 6wind.com; Ananyev, Konstantin
> <konstantin.ananyev at intel.com>; samuel.gauthier at 6wind.com;
> david.marchand at 6wind.com; shahafs at mellanox.com;
> stephen at networkplumber.org; maxime.coquelin at redhat.com;
> olivier.matz at 6wind.com; lihuisong at huawei.com; shreyansh.jain at nxp.com;
> wei.dai at intel.com; fengchunsong at huawei.com; chenhao164 at huawei.com;
> tangchengchang at hisilicon.com; Zhang, Helin <helin.zhang at intel.com>;
> yanglong.wu at intel.com; xiaolong.ye at intel.com; Xu, Ting
> <ting.xu at intel.com>; Li, Xiaoyun <xiaoyun.li at intel.com>; Wei, Dan
> <dan.wei at intel.com>; Pei, Andy <andy.pei at intel.com>;
> vattunuru at marvell.com; skori at marvell.com; sony.chacko at qlogic.com;
> Richardson, Bruce <bruce.richardson at intel.com>; ivan.malov at oktetlabs.ru;
> rad at semihalf.com; slawomir.rosek at semihalf.com;
> kamil.rytarowski at caviumnetworks.com; Zhao1, Wei <wei.zhao1 at intel.com>;
> Jiang, JunyuX <junyux.jiang at intel.com>; kumaras at chelsio.com;
> girish.nandibasappa at amd.com; rolf.neugebauer at netronome.com;
> alejandro.lucero at netronome.com; Yang, SteveX <stevex.yang at intel.com>
> Subject: [PATCH v2 16/22] net/ixgbe: fix the jumbo frame flag condition
> 
> The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition.
> If 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 normalize the boundary condition with 'RTE_ETHER_MTU'
> and overhead even though current overhead is 18.
> 
> Fixes: 59d0ecdbf0e1 ("ethdev: MTU accessors")
> Fixes: 95a27b3ba5f5 ("net/ixgbe: enable jumbo frame for VF")
> 
> Signed-off-by: Steve Yang <stevex.yang at intel.com>
> ---
>  drivers/net/ixgbe/ixgbe_ethdev.c | 2 +-  drivers/net/ixgbe/ixgbe_ethdev.h
> | 3 +++
>  drivers/net/ixgbe/ixgbe_pf.c     | 2 +-
>  3 files changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c
> b/drivers/net/ixgbe/ixgbe_ethdev.c
> index d7a1806ab8..fa0f5afd03 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.c
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.c
> @@ -5173,7 +5173,7 @@ ixgbe_dev_mtu_set(struct rte_eth_dev *dev,
> uint16_t mtu)
>  	hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
> 
>  	/* switch to jumbo mode if needed */
> -	if (frame_size > RTE_ETHER_MAX_LEN) {
> +	if (frame_size > IXGBE_ETH_MAX_LEN) {
>  		dev->data->dev_conf.rxmode.offloads |=
>  			DEV_RX_OFFLOAD_JUMBO_FRAME;
>  		hlreg0 |= IXGBE_HLREG0_JUMBOEN;
> diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h
> b/drivers/net/ixgbe/ixgbe_ethdev.h
> index 3d35ea791b..a0ce18ca24 100644
> --- a/drivers/net/ixgbe/ixgbe_ethdev.h
> +++ b/drivers/net/ixgbe/ixgbe_ethdev.h
> @@ -104,6 +104,9 @@
>  /* The overhead from MTU to max frame size. */  #define
> IXGBE_ETH_OVERHEAD (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN)
> 
> +/* The max frame size with default MTU */ #define IXGBE_ETH_MAX_LEN
> +(RTE_ETHER_MTU + IXGBE_ETH_OVERHEAD)
> +
>  /* bit of VXLAN tunnel type | 7 bits of zeros  | 8 bits of zeros*/
>  #define IXGBE_FDIR_VXLAN_TUNNEL_TYPE    0x8000
>  /* bit of NVGRE tunnel type | 7 bits of zeros  | 8 bits of zeros*/ diff --git
> a/drivers/net/ixgbe/ixgbe_pf.c b/drivers/net/ixgbe/ixgbe_pf.c index
> 833863af5a..89698e8470 100644
> --- a/drivers/net/ixgbe/ixgbe_pf.c
> +++ b/drivers/net/ixgbe/ixgbe_pf.c
> @@ -575,7 +575,7 @@ ixgbe_set_vf_lpe(struct rte_eth_dev *dev,
> __rte_unused uint32_t vf, uint32_t *ms
>  		   IXGBE_MHADD_MFS_MASK) >>
> IXGBE_MHADD_MFS_SHIFT;
>  	if (max_frs < new_mtu) {
>  		hlreg0 = IXGBE_READ_REG(hw, IXGBE_HLREG0);
> -		if (new_mtu > RTE_ETHER_MAX_LEN) {
> +		if (new_mtu > IXGBE_ETH_MAX_LEN) {
>  			dev->data->dev_conf.rxmode.offloads |=
>  				DEV_RX_OFFLOAD_JUMBO_FRAME;
>  			hlreg0 |= IXGBE_HLREG0_JUMBOEN;
> --
> 2.17.1