[dpdk-dev,2/2] net/i40e: remove option to disable offload flags

Message ID 20170403143944.17719-3-bruce.richardson@intel.com (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail apply patch file failure

Commit Message

Bruce Richardson April 3, 2017, 2:39 p.m. UTC
  Having packets received without any offload flags given in the mbuf is not
very useful, and performance tests with testpmd indicates little to no
benefit is got with the current code by turning off the flags. This makes
the build-time option pointless, so we can remove it.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
---
 config/common_base                      |  1 -
 doc/guides/nics/i40e.rst                |  5 -----
 drivers/net/i40e/i40e_rxtx_vec_common.h |  8 --------
 drivers/net/i40e/i40e_rxtx_vec_neon.c   | 11 -----------
 drivers/net/i40e/i40e_rxtx_vec_sse.c    | 11 -----------
 5 files changed, 36 deletions(-)
  

Comments

Ferruh Yigit April 3, 2017, 2:45 p.m. UTC | #1
On 4/3/2017 3:39 PM, Bruce Richardson wrote:
> Having packets received without any offload flags given in the mbuf is not
> very useful, and performance tests with testpmd indicates little to no
> benefit is got with the current code by turning off the flags. This makes
> the build-time option pointless, so we can remove it.
> 
> Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> ---
>  config/common_base                      |  1 -
>  doc/guides/nics/i40e.rst                |  5 -----
>  drivers/net/i40e/i40e_rxtx_vec_common.h |  8 --------
>  drivers/net/i40e/i40e_rxtx_vec_neon.c   | 11 -----------
>  drivers/net/i40e/i40e_rxtx_vec_sse.c    | 11 -----------

Should this patch also update powerpc vector PMD (i40e_rxtx_vec_altivec.c) ?

Thanks,
ferruh
  
Bruce Richardson April 3, 2017, 2:51 p.m. UTC | #2
On Mon, Apr 03, 2017 at 03:45:46PM +0100, Ferruh Yigit wrote:
> On 4/3/2017 3:39 PM, Bruce Richardson wrote:
> > Having packets received without any offload flags given in the mbuf is not
> > very useful, and performance tests with testpmd indicates little to no
> > benefit is got with the current code by turning off the flags. This makes
> > the build-time option pointless, so we can remove it.
> > 
> > Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
> > ---
> >  config/common_base                      |  1 -
> >  doc/guides/nics/i40e.rst                |  5 -----
> >  drivers/net/i40e/i40e_rxtx_vec_common.h |  8 --------
> >  drivers/net/i40e/i40e_rxtx_vec_neon.c   | 11 -----------
> >  drivers/net/i40e/i40e_rxtx_vec_sse.c    | 11 -----------
> 
> Should this patch also update powerpc vector PMD (i40e_rxtx_vec_altivec.c) ?
> 
Yes, good catch. I based this work off the main tree rather than
next-net as I was looking at the mbuf changes primarily. Once we get
either next-net or the mbuf patches merged in, I'll do a V2 with all
updates included.

/Bruce
  

Patch

diff --git a/config/common_base b/config/common_base
index 38e9483..e898f51 100644
--- a/config/common_base
+++ b/config/common_base
@@ -186,7 +186,6 @@  CONFIG_RTE_LIBRTE_I40E_DEBUG_TX_FREE=n
 CONFIG_RTE_LIBRTE_I40E_DEBUG_DRIVER=n
 CONFIG_RTE_LIBRTE_I40E_RX_ALLOW_BULK_ALLOC=y
 CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y
-CONFIG_RTE_LIBRTE_I40E_RX_OLFLAGS_ENABLE=y
 CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC=n
 CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF=64
 CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF=4
diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst
index 043de34..1daf63d 100644
--- a/doc/guides/nics/i40e.rst
+++ b/doc/guides/nics/i40e.rst
@@ -105,11 +105,6 @@  Please note that enabling debugging options may affect system performance.
   Toggle the use of Vector PMD instead of normal RX/TX path.
   To enable vPMD for RX, bulk allocation for Rx must be allowed.
 
-- ``CONFIG_RTE_LIBRTE_I40E_RX_OLFLAGS_ENABLE`` (default ``y``)
-
-  Toggle to enable RX ``olflags``.
-  This is only meaningful when Vector PMD is used.
-
 - ``CONFIG_RTE_LIBRTE_I40E_16BYTE_RX_DESC`` (default ``n``)
 
   Toggle to use a 16-byte RX descriptor, by default the RX descriptor is 32 byte.
diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h
index 76031fe..952fd4b 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_common.h
+++ b/drivers/net/i40e/i40e_rxtx_vec_common.h
@@ -224,14 +224,6 @@  i40e_rx_vec_dev_conf_condition_check_default(struct rte_eth_dev *dev)
 	struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
 	struct rte_fdir_conf *fconf = &dev->data->dev_conf.fdir_conf;
 
-#ifndef RTE_LIBRTE_I40E_RX_OLFLAGS_ENABLE
-	/* whithout rx ol_flags, no VP flag report */
-	if (rxmode->hw_vlan_strip != 0 ||
-	    rxmode->hw_vlan_extend != 0 ||
-	    rxmode->hw_ip_checksum != 0)
-		return -1;
-#endif
-
 	/* no fdir support */
 	if (fconf->mode != RTE_FDIR_MODE_NONE)
 		return -1;
diff --git a/drivers/net/i40e/i40e_rxtx_vec_neon.c b/drivers/net/i40e/i40e_rxtx_vec_neon.c
index 011c54e..adfd3e5 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_neon.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_neon.c
@@ -116,14 +116,6 @@  i40e_rxq_rearm(struct i40e_rx_queue *rxq)
 	I40E_PCI_REG_WRITE(rxq->qrx_tail, rx_id);
 }
 
-/* Handling the offload flags (olflags) field takes computation
- * time when receiving packets. Therefore we provide a flag to disable
- * the processing of the olflags field when they are not needed. This
- * gives improved performance, at the cost of losing the offload info
- * in the received packet
- */
-#ifdef RTE_LIBRTE_I40E_RX_OLFLAGS_ENABLE
-
 static inline void
 desc_to_olflags_v(uint64x2_t descs[4], struct rte_mbuf **rx_pkts)
 {
@@ -187,9 +179,6 @@  desc_to_olflags_v(uint64x2_t descs[4], struct rte_mbuf **rx_pkts)
 	rx_pkts[2]->ol_flags = vgetq_lane_u32(vlan0, 2);
 	rx_pkts[3]->ol_flags = vgetq_lane_u32(vlan0, 3);
 }
-#else
-#define desc_to_olflags_v(descs, rx_pkts) do {} while (0)
-#endif
 
 #define PKTLEN_SHIFT     10
 
diff --git a/drivers/net/i40e/i40e_rxtx_vec_sse.c b/drivers/net/i40e/i40e_rxtx_vec_sse.c
index 09a33c3..ace5bd7 100644
--- a/drivers/net/i40e/i40e_rxtx_vec_sse.c
+++ b/drivers/net/i40e/i40e_rxtx_vec_sse.c
@@ -124,14 +124,6 @@  desc_to_olflags_v(struct i40e_rx_queue *rxq, __m128i descs[4] __rte_unused,
 	const __m128i mbuf_init = _mm_set_epi64x(0, rxq->mbuf_initializer);
 	__m128i rearm0, rearm1, rearm2, rearm3;
 
-/* Handling the offload flags (olflags) field takes computation
- * time when receiving packets. Therefore we provide a flag to disable
- * the processing of the olflags field when they are not needed. This
- * gives improved performance, at the cost of losing the offload info
- * in the received packet
- */
-#ifdef RTE_LIBRTE_I40E_RX_OLFLAGS_ENABLE
-
 	__m128i vlan0, vlan1, rss, l3_l4e;
 
 	/* mask everything except RSS, flow director and VLAN flags
@@ -212,9 +204,6 @@  desc_to_olflags_v(struct i40e_rx_queue *rxq, __m128i descs[4] __rte_unused,
 	rearm1 = _mm_blend_epi16(mbuf_init, _mm_slli_si128(vlan0, 4), 0x10);
 	rearm2 = _mm_blend_epi16(mbuf_init, vlan0, 0x10);
 	rearm3 = _mm_blend_epi16(mbuf_init, _mm_srli_si128(vlan0, 4), 0x10);
-#else
-	rearm0 = rearm1 = rearm2 = rearm3 = mbuf_init;
-#endif
 	_mm_store_si128((__m128i *)&rx_pkts[0]->rearm_data, rearm0);
 	_mm_store_si128((__m128i *)&rx_pkts[1]->rearm_data, rearm1);
 	_mm_store_si128((__m128i *)&rx_pkts[2]->rearm_data, rearm2);