* [dpdk-dev] [PATCH] net/ice: fix max frame size
@ 2019-03-27 11:38 Qi Zhang
2019-03-27 11:38 ` Qi Zhang
2019-04-10 7:25 ` Lu, Wenzhuo
0 siblings, 2 replies; 6+ messages in thread
From: Qi Zhang @ 2019-03-27 11:38 UTC (permalink / raw)
To: wenzhuo.lu, qiming.yang; +Cc: dev, ferruh.yigit, Qi Zhang
Max frame size setup should consider double VLAN case.
Fixes: ae2bdd0219cb ("net/ice: support MTU setting")
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/ice/ice_ethdev.c | 3 +--
drivers/net/ice/ice_ethdev.h | 7 +++++++
drivers/net/ice/ice_rxtx.c | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index cdb5502d1..b9b32fa97 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2043,8 +2043,7 @@ ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
struct rte_eth_dev_data *dev_data = pf->dev_data;
- uint32_t frame_size = mtu + ETHER_HDR_LEN
- + ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE;
+ uint32_t frame_size = mtu + ICE_ETH_OVERHEAD;
/* check if mtu is within the allowed range */
if (mtu < ETHER_MIN_MTU || frame_size > ICE_FRAME_SIZE_MAX)
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 3cefa5b5b..655624c3c 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -115,6 +115,13 @@
ETH_RSS_NONFRAG_IPV6_OTHER | \
ETH_RSS_L2_PAYLOAD)
+/**
+ * The overhead from MTU to max frame size.
+ * Considering QinQ packet, the VLAN tag needs to be counted twice.
+ */
+#define ICE_ETH_OVERHEAD \
+ (ETHER_HDR_LEN + ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE * 2)
+
struct ice_adapter;
/**
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index c794ee861..b3ff14694 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -113,7 +113,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
RTE_PKTMBUF_HEADROOM);
/* Check if scattered RX needs to be used. */
- if ((rxq->max_pkt_len + 2 * ICE_VLAN_TAG_SIZE) > buf_size)
+ if (rxq->max_pkt_len > buf_size)
dev->data->scattered_rx = 1;
rxq->qrx_tail = hw->hw_addr + QRX_TAIL(rxq->reg_idx);
--
2.13.6
^ permalink raw reply [flat|nested] 6+ messages in thread* [dpdk-dev] [PATCH] net/ice: fix max frame size
2019-03-27 11:38 [dpdk-dev] [PATCH] net/ice: fix max frame size Qi Zhang
@ 2019-03-27 11:38 ` Qi Zhang
2019-04-10 7:25 ` Lu, Wenzhuo
1 sibling, 0 replies; 6+ messages in thread
From: Qi Zhang @ 2019-03-27 11:38 UTC (permalink / raw)
To: wenzhuo.lu, qiming.yang; +Cc: dev, ferruh.yigit, Qi Zhang
Max frame size setup should consider double VLAN case.
Fixes: ae2bdd0219cb ("net/ice: support MTU setting")
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/ice/ice_ethdev.c | 3 +--
drivers/net/ice/ice_ethdev.h | 7 +++++++
drivers/net/ice/ice_rxtx.c | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index cdb5502d1..b9b32fa97 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -2043,8 +2043,7 @@ ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct ice_pf *pf = ICE_DEV_PRIVATE_TO_PF(dev->data->dev_private);
struct rte_eth_dev_data *dev_data = pf->dev_data;
- uint32_t frame_size = mtu + ETHER_HDR_LEN
- + ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE;
+ uint32_t frame_size = mtu + ICE_ETH_OVERHEAD;
/* check if mtu is within the allowed range */
if (mtu < ETHER_MIN_MTU || frame_size > ICE_FRAME_SIZE_MAX)
diff --git a/drivers/net/ice/ice_ethdev.h b/drivers/net/ice/ice_ethdev.h
index 3cefa5b5b..655624c3c 100644
--- a/drivers/net/ice/ice_ethdev.h
+++ b/drivers/net/ice/ice_ethdev.h
@@ -115,6 +115,13 @@
ETH_RSS_NONFRAG_IPV6_OTHER | \
ETH_RSS_L2_PAYLOAD)
+/**
+ * The overhead from MTU to max frame size.
+ * Considering QinQ packet, the VLAN tag needs to be counted twice.
+ */
+#define ICE_ETH_OVERHEAD \
+ (ETHER_HDR_LEN + ETHER_CRC_LEN + ICE_VLAN_TAG_SIZE * 2)
+
struct ice_adapter;
/**
diff --git a/drivers/net/ice/ice_rxtx.c b/drivers/net/ice/ice_rxtx.c
index c794ee861..b3ff14694 100644
--- a/drivers/net/ice/ice_rxtx.c
+++ b/drivers/net/ice/ice_rxtx.c
@@ -113,7 +113,7 @@ ice_program_hw_rx_queue(struct ice_rx_queue *rxq)
RTE_PKTMBUF_HEADROOM);
/* Check if scattered RX needs to be used. */
- if ((rxq->max_pkt_len + 2 * ICE_VLAN_TAG_SIZE) > buf_size)
+ if (rxq->max_pkt_len > buf_size)
dev->data->scattered_rx = 1;
rxq->qrx_tail = hw->hw_addr + QRX_TAIL(rxq->reg_idx);
--
2.13.6
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: fix max frame size
2019-03-27 11:38 [dpdk-dev] [PATCH] net/ice: fix max frame size Qi Zhang
2019-03-27 11:38 ` Qi Zhang
@ 2019-04-10 7:25 ` Lu, Wenzhuo
2019-04-10 7:25 ` Lu, Wenzhuo
2019-04-10 15:10 ` Zhang, Qi Z
1 sibling, 2 replies; 6+ messages in thread
From: Lu, Wenzhuo @ 2019-04-10 7:25 UTC (permalink / raw)
To: Zhang, Qi Z, Yang, Qiming; +Cc: dev, Yigit, Ferruh
Hi,
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Wednesday, March 27, 2019 7:39 PM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Subject: [PATCH] net/ice: fix max frame size
>
> Max frame size setup should consider double VLAN case.
>
> Fixes: ae2bdd0219cb ("net/ice: support MTU setting")
>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: fix max frame size
2019-04-10 7:25 ` Lu, Wenzhuo
@ 2019-04-10 7:25 ` Lu, Wenzhuo
2019-04-10 15:10 ` Zhang, Qi Z
1 sibling, 0 replies; 6+ messages in thread
From: Lu, Wenzhuo @ 2019-04-10 7:25 UTC (permalink / raw)
To: Zhang, Qi Z, Yang, Qiming; +Cc: dev, Yigit, Ferruh
Hi,
> -----Original Message-----
> From: Zhang, Qi Z
> Sent: Wednesday, March 27, 2019 7:39 PM
> To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>
> Subject: [PATCH] net/ice: fix max frame size
>
> Max frame size setup should consider double VLAN case.
>
> Fixes: ae2bdd0219cb ("net/ice: support MTU setting")
>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: fix max frame size
2019-04-10 7:25 ` Lu, Wenzhuo
2019-04-10 7:25 ` Lu, Wenzhuo
@ 2019-04-10 15:10 ` Zhang, Qi Z
2019-04-10 15:10 ` Zhang, Qi Z
1 sibling, 1 reply; 6+ messages in thread
From: Zhang, Qi Z @ 2019-04-10 15:10 UTC (permalink / raw)
To: Lu, Wenzhuo, Yang, Qiming; +Cc: dev, Yigit, Ferruh
> -----Original Message-----
> From: Lu, Wenzhuo
> Sent: Wednesday, April 10, 2019 3:26 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>
> Subject: RE: [PATCH] net/ice: fix max frame size
>
> Hi,
>
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Wednesday, March 27, 2019 7:39 PM
> > To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> > <qiming.yang@intel.com>
> > Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>
> > Subject: [PATCH] net/ice: fix max frame size
> >
> > Max frame size setup should consider double VLAN case.
> >
> > Fixes: ae2bdd0219cb ("net/ice: support MTU setting")
> >
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ice: fix max frame size
2019-04-10 15:10 ` Zhang, Qi Z
@ 2019-04-10 15:10 ` Zhang, Qi Z
0 siblings, 0 replies; 6+ messages in thread
From: Zhang, Qi Z @ 2019-04-10 15:10 UTC (permalink / raw)
To: Lu, Wenzhuo, Yang, Qiming; +Cc: dev, Yigit, Ferruh
> -----Original Message-----
> From: Lu, Wenzhuo
> Sent: Wednesday, April 10, 2019 3:26 PM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>; Yang, Qiming <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>
> Subject: RE: [PATCH] net/ice: fix max frame size
>
> Hi,
>
> > -----Original Message-----
> > From: Zhang, Qi Z
> > Sent: Wednesday, March 27, 2019 7:39 PM
> > To: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yang, Qiming
> > <qiming.yang@intel.com>
> > Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>
> > Subject: [PATCH] net/ice: fix max frame size
> >
> > Max frame size setup should consider double VLAN case.
> >
> > Fixes: ae2bdd0219cb ("net/ice: support MTU setting")
> >
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> Acked-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Applied to dpdk-next-net-intel.
Thanks
Qi
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-04-10 15:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-03-27 11:38 [dpdk-dev] [PATCH] net/ice: fix max frame size Qi Zhang
2019-03-27 11:38 ` Qi Zhang
2019-04-10 7:25 ` Lu, Wenzhuo
2019-04-10 7:25 ` Lu, Wenzhuo
2019-04-10 15:10 ` Zhang, Qi Z
2019-04-10 15:10 ` Zhang, Qi Z
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).