[v2,12/22] net/octeontx2: fix the jumbo frame flag condition for mtu
Checks
Commit Message
The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but
the Ether overhead is larger than 18 when it supports dual VLAN tags.
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: 0e2efd02db58 ("net/octeontx2: add MTU set operation")
Signed-off-by: Steve Yang <stevex.yang@intel.com>
---
drivers/net/octeontx2/otx2_ethdev.h | 2 ++
drivers/net/octeontx2/otx2_ethdev_ops.c | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
Comments
On Thu, Dec 17, 2020 at 09:23:02AM +0000, Steve Yang wrote:
> The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but
> the Ether overhead is larger than 18 when it supports dual VLAN tags.
> 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: 0e2efd02db58 ("net/octeontx2: add MTU set operation")
>
> Signed-off-by: Steve Yang <stevex.yang@intel.com>
> ---
> drivers/net/octeontx2/otx2_ethdev.h | 2 ++
> drivers/net/octeontx2/otx2_ethdev_ops.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/octeontx2/otx2_ethdev.h b/drivers/net/octeontx2/otx2_ethdev.h
> index 3b9871f4dc..99f0469d89 100644
> --- a/drivers/net/octeontx2/otx2_ethdev.h
> +++ b/drivers/net/octeontx2/otx2_ethdev.h
> @@ -51,6 +51,8 @@
> /* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */
> #define NIX_L2_OVERHEAD \
> (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 8)
> +#define NIX_L2_MAX_LEN \
> + (RTE_ETHER_MTU + NIX_L2_OVERHEAD)
>
> /* HW config of frame size doesn't include FCS */
> #define NIX_MAX_HW_FRS 9212
> diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c b/drivers/net/octeontx2/otx2_ethdev_ops.c
> index b36d37b9f7..963cc285ed 100644
> --- a/drivers/net/octeontx2/otx2_ethdev_ops.c
> +++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
> @@ -58,7 +58,7 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
> if (rc)
> return rc;
>
> - if (frame_size > RTE_ETHER_MAX_LEN)
> + if (frame_size > NIX_L2_MAX_LEN)
> dev->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
> else
> dev->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
> --
> 2.17.1
>
Acked-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
>-----Original Message-----
>From: Steve Yang <stevex.yang@intel.com>
>Sent: Thursday, December 17, 2020 2:53 PM
>To: dev@dpdk.org
>Cc: wenzhuo.lu@intel.com; beilei.xing@intel.com;
>bernard.iremonger@intel.com; asomalap@amd.com;
>rahul.lakkireddy@chelsio.com; hemant.agrawal@nxp.com;
>sachin.saxena@oss.nxp.com; jia.guo@intel.com; haiyue.wang@intel.com;
>g.singh@nxp.com; xuanziyang2@huawei.com;
>cloud.wangxiaoyun@huawei.com; zhouguoyang@huawei.com;
>xavier.huwei@huawei.com; humin29@huawei.com;
>yisen.zhuang@huawei.com; oulijun@huawei.com; jingjing.wu@intel.com;
>qiming.yang@intel.com; qi.z.zhang@intel.com; rosen.xu@intel.com; Shijith
>Thotton <sthotton@marvell.com>; Srisivasubramanian Srinivasan
><srinivasan@marvell.com>; heinrich.kuhn@netronome.com; Harman Kalra
><hkalra@marvell.com>; Jerin Jacob Kollanukkaran <jerinj@marvell.com>;
>Nithin Kumar Dabilpuram <ndabilpuram@marvell.com>; Kiran Kumar
>Kokkilagadda <kirankumark@marvell.com>; Rasesh Mody
><rmody@marvell.com>; Shahed Shaikh <shshaikh@marvell.com>;
>andrew.rybchenko@oktetlabs.ru; Maciej Czekaj [C] <mczekaj@marvell.com>;
>thomas@monjalon.net; ferruh.yigit@intel.com; ivan.boule@6wind.com;
>konstantin.ananyev@intel.com; samuel.gauthier@6wind.com;
>david.marchand@6wind.com; shahafs@mellanox.com;
>stephen@networkplumber.org; maxime.coquelin@redhat.com;
>olivier.matz@6wind.com; lihuisong@huawei.com; shreyansh.jain@nxp.com;
>wei.dai@intel.com; fengchunsong@huawei.com; chenhao164@huawei.com;
>tangchengchang@hisilicon.com; helin.zhang@intel.com;
>yanglong.wu@intel.com; xiaolong.ye@intel.com; ting.xu@intel.com;
>xiaoyun.li@intel.com; dan.wei@intel.com; andy.pei@intel.com; Vamsi
>Krishna Attunuru <vattunuru@marvell.com>; Sunil Kumar Kori
><skori@marvell.com>; sony.chacko@qlogic.com;
>bruce.richardson@intel.com; ivan.malov@oktetlabs.ru; rad@semihalf.com;
>slawomir.rosek@semihalf.com; kamil.rytarowski@caviumnetworks.com;
>wei.zhao1@intel.com; junyux.jiang@intel.com; kumaras@chelsio.com;
>girish.nandibasappa@amd.com; rolf.neugebauer@netronome.com;
>alejandro.lucero@netronome.com; Steve Yang <stevex.yang@intel.com>
>Subject: [EXT] [PATCH v2 12/22] net/octeontx2: fix the jumbo frame flag
>condition for mtu
>
>External Email
>
>----------------------------------------------------------------------
>The jumbo frame uses the 'RTE_ETHER_MAX_LEN' as boundary condition, but
>the Ether overhead is larger than 18 when it supports dual VLAN tags.
>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: 0e2efd02db58 ("net/octeontx2: add MTU set operation")
>
>Signed-off-by: Steve Yang <stevex.yang@intel.com>
>---
> drivers/net/octeontx2/otx2_ethdev.h | 2 ++
> drivers/net/octeontx2/otx2_ethdev_ops.c | 2 +-
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/net/octeontx2/otx2_ethdev.h
>b/drivers/net/octeontx2/otx2_ethdev.h
>index 3b9871f4dc..99f0469d89 100644
>--- a/drivers/net/octeontx2/otx2_ethdev.h
>+++ b/drivers/net/octeontx2/otx2_ethdev.h
>@@ -51,6 +51,8 @@
> /* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */
> #define NIX_L2_OVERHEAD \
> (RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 8)
>+#define NIX_L2_MAX_LEN \
>+ (RTE_ETHER_MTU + NIX_L2_OVERHEAD)
>
> /* HW config of frame size doesn't include FCS */
> #define NIX_MAX_HW_FRS 9212
>diff --git a/drivers/net/octeontx2/otx2_ethdev_ops.c
>b/drivers/net/octeontx2/otx2_ethdev_ops.c
>index b36d37b9f7..963cc285ed 100644
>--- a/drivers/net/octeontx2/otx2_ethdev_ops.c
>+++ b/drivers/net/octeontx2/otx2_ethdev_ops.c
>@@ -58,7 +58,7 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t
>mtu)
> if (rc)
> return rc;
>
>- if (frame_size > RTE_ETHER_MAX_LEN)
>+ if (frame_size > NIX_L2_MAX_LEN)
> dev->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
> else
> dev->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;
>--
>2.17.1
Acked-by: Sunil Kumar Kori <skori@mavell.com>
@@ -51,6 +51,8 @@
/* ETH_HLEN+ETH_FCS+2*VLAN_HLEN */
#define NIX_L2_OVERHEAD \
(RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 8)
+#define NIX_L2_MAX_LEN \
+ (RTE_ETHER_MTU + NIX_L2_OVERHEAD)
/* HW config of frame size doesn't include FCS */
#define NIX_MAX_HW_FRS 9212
@@ -58,7 +58,7 @@ otx2_nix_mtu_set(struct rte_eth_dev *eth_dev, uint16_t mtu)
if (rc)
return rc;
- if (frame_size > RTE_ETHER_MAX_LEN)
+ if (frame_size > NIX_L2_MAX_LEN)
dev->rx_offloads |= DEV_RX_OFFLOAD_JUMBO_FRAME;
else
dev->rx_offloads &= ~DEV_RX_OFFLOAD_JUMBO_FRAME;