Acked-by: Jeff Guo <[email protected]>
> -----Original Message-----
> From: Steve Yang <[email protected]>
> Sent: Thursday, December 17, 2020 5:23 PM
> To: [email protected]
> Cc: Lu, Wenzhuo <[email protected]>; Xing, Beilei
> <[email protected]>; Iremonger, Bernard
> <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]; Guo, Jia <[email protected]>; Wang, Haiyue
> <[email protected]>; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; Wu, Jingjing
> <[email protected]>; Yang, Qiming <[email protected]>; Zhang, Qi
> Z <[email protected]>; Xu, Rosen <[email protected]>;
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; Yigit, Ferruh <[email protected]>;
> [email protected]; Ananyev, Konstantin
> <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; [email protected]; [email protected];
> [email protected]; Zhang, Helin <[email protected]>;
> [email protected]; [email protected]; Xu, Ting
> <[email protected]>; Li, Xiaoyun <[email protected]>; Wei, Dan
> <[email protected]>; Pei, Andy <[email protected]>;
> [email protected]; [email protected]; [email protected];
> Richardson, Bruce <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]; Zhao1, Wei <[email protected]>;
> Jiang, JunyuX <[email protected]>; [email protected];
> [email protected]; [email protected];
> [email protected]; Yang, SteveX <[email protected]>
> 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 <[email protected]>
> ---
> 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
