[dpdk-dev] [PATCH v1] i40e: fix olflags for vector RX

[dpdk-dev] [PATCH v1] i40e: fix olflags for vector RX

[Zhe Tao]

Problem:
The flag for RSS and flow director is not set correctly in the
vector RX function, so the upper layer APP which base on the related
flags will not work correctly.

Fix this problem by change the shuffle table. the original shuffle
table is not correct.

Fixes: 9ed94 (i40e: add vector Rx)

Signed-off-by: Zhe Tao <zhe.tao@intel.com>
---
 drivers/net/i40e/i40e_rxtx_vec.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec.c b/drivers/net/i40e/i40e_rxtx_vec.c
index eef80d9..9f674bf 100644
--- a/drivers/net/i40e/i40e_rxtx_vec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec.c
@@ -149,7 +149,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 	*/
 	const __m128i rss_vlan_msk = _mm_set_epi16(
 			0x0000, 0x0000, 0x0000, 0x0000,
-			0x3004, 0x3004, 0x3004, 0x3004);
+			0x3804, 0x3804, 0x3804, 0x3804);
 
 	/* map rss and vlan type to rss hash and vlan flag */
 	const __m128i vlan_flags = _mm_set_epi8(0, 0, 0, 0,
@@ -159,8 +159,8 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 
 	const __m128i rss_flags = _mm_set_epi8(0, 0, 0, 0,
 			0, 0, 0, 0,
-			0, 0, 0, 0,
-			PKT_RX_FDIR, 0, PKT_RX_RSS_HASH, 0);
+			PKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH, 0, 0,
+			0, 0, PKT_RX_FDIR, 0);
 
 	vlan0 = _mm_unpackhi_epi16(descs[0], descs[1]);
 	vlan1 = _mm_unpackhi_epi16(descs[2], descs[3]);
@@ -169,7 +169,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 	vlan1 = _mm_and_si128(vlan0, rss_vlan_msk);
 	vlan0 = _mm_shuffle_epi8(vlan_flags, vlan1);
 
-	rss = _mm_srli_epi16(vlan1, 12);
+	rss = _mm_srli_epi16(vlan1, 11);
 	rss = _mm_shuffle_epi8(rss_flags, rss);
 
 	vlan0 = _mm_or_si128(vlan0, rss);
-- 
2.1.4

Re: [dpdk-dev] [PATCH v1] i40e: fix olflags for vector RX

[Azarewicz, PiotrX T]

Hi,

> --- a/drivers/net/i40e/i40e_rxtx_vec.c
> +++ b/drivers/net/i40e/i40e_rxtx_vec.c
> @@ -149,7 +149,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf
> **rx_pkts)
>
>	/* mask everything except rss and vlan flags
>	*bit2 is for vlan tag, bits 13:12 for rss
>  	*/

Please, update or remove the comment above.
Thanks, Piotr

>  	const __m128i rss_vlan_msk = _mm_set_epi16(
>  			0x0000, 0x0000, 0x0000, 0x0000,
> -			0x3004, 0x3004, 0x3004, 0x3004);
> +			0x3804, 0x3804, 0x3804, 0x3804);
> 

Re: [dpdk-dev] [PATCH v1] i40e: fix olflags for vector RX

[Bruce Richardson]

On Fri, Jun 03, 2016 at 07:19:09AM +0000, Azarewicz, PiotrX T wrote:
> Hi,
> 
> > --- a/drivers/net/i40e/i40e_rxtx_vec.c
> > +++ b/drivers/net/i40e/i40e_rxtx_vec.c
> > @@ -149,7 +149,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf
> > **rx_pkts)
> >
> >	/* mask everything except rss and vlan flags
> >	*bit2 is for vlan tag, bits 13:12 for rss
> >  	*/
> 
> Please, update or remove the comment above.
> Thanks, Piotr
> 
ping.
is a v2 of this patch being produced?

/Bruce

[dpdk-dev] [PATCH v2] i40e: fix olflags for vector RX

[Zhe Tao]

Problem:
The flag for RSS and flow director is not set correctly in the
vector RX function, so the upper layer APP which base on the related
flags will not work correctly.

Fix this problem by change the shuffle table. the original shuffle
table is not correct.

Fixes: 9ed94 (i40e: add vector Rx)

Signed-off-by: Zhe Tao <zhe.tao@intel.com>
---
v2: Changed the comments according to the code change.

 drivers/net/i40e/i40e_rxtx_vec.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec.c b/drivers/net/i40e/i40e_rxtx_vec.c
index eef80d9..dd113f3 100644
--- a/drivers/net/i40e/i40e_rxtx_vec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec.c
@@ -144,12 +144,13 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 		uint64_t dword;
 	} vol;
 
-	/* mask everything except rss and vlan flags
-	*bit2 is for vlan tag, bits 13:12 for rss
-	*/
+	/* mask everything except RSS, flow director and VLAN flags
+	 * bit2 is for VLAN tag, bit11 for flow director indication
+	 * bit13:12 for RSS indication. 
+	 */
 	const __m128i rss_vlan_msk = _mm_set_epi16(
 			0x0000, 0x0000, 0x0000, 0x0000,
-			0x3004, 0x3004, 0x3004, 0x3004);
+			0x3804, 0x3804, 0x3804, 0x3804);
 
 	/* map rss and vlan type to rss hash and vlan flag */
 	const __m128i vlan_flags = _mm_set_epi8(0, 0, 0, 0,
@@ -159,8 +160,8 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 
 	const __m128i rss_flags = _mm_set_epi8(0, 0, 0, 0,
 			0, 0, 0, 0,
-			0, 0, 0, 0,
-			PKT_RX_FDIR, 0, PKT_RX_RSS_HASH, 0);
+			PKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH, 0, 0,
+			0, 0, PKT_RX_FDIR, 0);
 
 	vlan0 = _mm_unpackhi_epi16(descs[0], descs[1]);
 	vlan1 = _mm_unpackhi_epi16(descs[2], descs[3]);
@@ -169,7 +170,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 	vlan1 = _mm_and_si128(vlan0, rss_vlan_msk);
 	vlan0 = _mm_shuffle_epi8(vlan_flags, vlan1);
 
-	rss = _mm_srli_epi16(vlan1, 12);
+	rss = _mm_srli_epi16(vlan1, 11);
 	rss = _mm_shuffle_epi8(rss_flags, rss);
 
 	vlan0 = _mm_or_si128(vlan0, rss);
-- 
2.1.4

Re: [dpdk-dev] [PATCH v2] i40e: fix olflags for vector RX

[Azarewicz, PiotrX T]

> Problem:
> The flag for RSS and flow director is not set correctly in the vector RX
> function, so the upper layer APP which base on the related flags will not work
> correctly.
> 
> Fix this problem by change the shuffle table. the original shuffle table is not
> correct.
> 
> Fixes: 9ed94 (i40e: add vector Rx)
> 
> Signed-off-by: Zhe Tao <zhe.tao@intel.com>

Reviewed-by: Piotr Azarewicz <piotrx.t.azarewicz@intel.com>

[dpdk-dev] [PATCH v3] i40e: fix olflags for vector Rx

[Zhe Tao]

Problem:
The flag for RSS and flow director is not set correctly in the
vector Rx function, so the upper layer APP which base on the related
flags will not work correctly.

Fix this problem by change the shuffle table. the original shuffle
table is not correct.

Fixes: 9ed94e5bb04e ("i40e: add vector Rx")

Signed-off-by: Zhe Tao <zhe.tao@intel.com>
---
v2: Changed the comments according to the code change.
v3: Fixed the issues reported by check-git-log.sh.

 drivers/net/i40e/i40e_rxtx_vec.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec.c b/drivers/net/i40e/i40e_rxtx_vec.c
index eef80d9..704924f 100644
--- a/drivers/net/i40e/i40e_rxtx_vec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec.c
@@ -144,12 +144,13 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 		uint64_t dword;
 	} vol;
 
-	/* mask everything except rss and vlan flags
-	*bit2 is for vlan tag, bits 13:12 for rss
-	*/
+	/* mask everything except RSS, flow director and VLAN flags
+	 * bit2 is for VLAN tag, bit11 for flow director indication
+	 * bit13:12 for RSS indication.
+	 */
 	const __m128i rss_vlan_msk = _mm_set_epi16(
 			0x0000, 0x0000, 0x0000, 0x0000,
-			0x3004, 0x3004, 0x3004, 0x3004);
+			0x3804, 0x3804, 0x3804, 0x3804);
 
 	/* map rss and vlan type to rss hash and vlan flag */
 	const __m128i vlan_flags = _mm_set_epi8(0, 0, 0, 0,
@@ -159,8 +160,8 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 
 	const __m128i rss_flags = _mm_set_epi8(0, 0, 0, 0,
 			0, 0, 0, 0,
-			0, 0, 0, 0,
-			PKT_RX_FDIR, 0, PKT_RX_RSS_HASH, 0);
+			PKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH, 0, 0,
+			0, 0, PKT_RX_FDIR, 0);
 
 	vlan0 = _mm_unpackhi_epi16(descs[0], descs[1]);
 	vlan1 = _mm_unpackhi_epi16(descs[2], descs[3]);
@@ -169,7 +170,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 	vlan1 = _mm_and_si128(vlan0, rss_vlan_msk);
 	vlan0 = _mm_shuffle_epi8(vlan_flags, vlan1);
 
-	rss = _mm_srli_epi16(vlan1, 12);
+	rss = _mm_srli_epi16(vlan1, 11);
 	rss = _mm_shuffle_epi8(rss_flags, rss);
 
 	vlan0 = _mm_or_si128(vlan0, rss);
-- 
2.1.4

Re: [dpdk-dev] [PATCH v3] i40e: fix olflags for vector Rx

[Azarewicz, PiotrX T]

> Problem:
> The flag for RSS and flow director is not set correctly in the vector Rx
> function, so the upper layer APP which base on the related flags will not work
> correctly.
> 
> Fix this problem by change the shuffle table. the original shuffle table is not
> correct.
> 
> Fixes: 9ed94e5bb04e ("i40e: add vector Rx")
> 
> Signed-off-by: Zhe Tao <zhe.tao@intel.com>

Reviewed-by: Piotr Azarewicz <piotrx.t.azarewicz@intel.com>

Re: [dpdk-dev] [PATCH v3] i40e: fix olflags for vector Rx

[Wu, Jingjing]

> -----Original Message-----
> From: Tao, Zhe
> Sent: Tuesday, June 14, 2016 1:24 PM
> To: dev@dpdk.org
> Cc: Tao, Zhe <zhe.tao@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>
> Subject: [PATCH v3] i40e: fix olflags for vector Rx
> 
> Problem:
> The flag for RSS and flow director is not set correctly in the
> vector Rx function, so the upper layer APP which base on the related
> flags will not work correctly.
> 
> Fix this problem by change the shuffle table. the original shuffle
> table is not correct.
> 
> Fixes: 9ed94e5bb04e ("i40e: add vector Rx")
> 
> Signed-off-by: Zhe Tao <zhe.tao@intel.com>

Acked-by: Jingjing Wu <jingjing.wu@intel.com>

Re: [dpdk-dev] [PATCH v3] i40e: fix olflags for vector Rx

[Peng, Yuan]

Tested-by: Peng Yuan <yuan.peng@intel.com>

- Test Commit: 04920e693a053a923f94c271ee68881756649cec
- OS/Kernel: Fedora 23/4.2.3
- GCC: gcc version 5.3.1 20151207 (Red Hat 5.3.1-2) (GCC)
- CPU: Intel(R) Xeon(R) CPU E5-2699 v3 @ 2.30GHz
- Total 1 cases, 1 passed, 0 failed.

Case1: read RSS HASH and RSS queue in the received packet.  Passed.

DUT:
./tools/dpdk_nic_bind.py --bind=igb_uio 0000:82:00.0 0000:82:00.1 ./x86_64-native-linuxapp-gcc/app/testpmd  -c fffff -n 4 -- -i --coremask=0xffffe --portmask=0x3 --rxq=16 --txq=16 --txqflags=0
testpmd> set verbose 8
testpmd> set fwd rxonly
testpmd> port stop all
testpmd> set_hash_global_config  0 toeplitz ipv4-udp enable port start 
testpmd> all port config all rss udp start

tester:
scapy
>>> sendp([Ether(dst="00:00:00:00:01:00", 
>>> src=get_if_hwaddr("enp132s0f1"))/IP(src="192.168.0.1", 
>>> dst="192.168.0.2")/UDP(sport=1024,dport=1024)], iface="enp132s0f1")

If test in commit 04920e693a053a923f94c271ee68881756649cec (without the patch) DUT receive the packet:
testpmd> port 0/queue 1: received 1 packets
  src=00:00:00:00:01:01 - dst=00:00:00:00:01:00 - type=0x0800 - length=60 - nb_segs=1 - FDIR matched hash=0xc3f2 ID=0x5263 Unknown packet type
 - Receive queue=0x1
  PKT_RX_FDIR
You can't find the RSS HASH and RSS queue

If test with [PATCH v3] i40e: fix olflags for vector Rx DUT receive the packet:
testpmd> port 0/queue 1: received 1 packets
  src=00:00:00:00:01:01 - dst=00:00:00:00:01:00 - type=0x0800 - length=60 - nb_segs=1 - RSS hash=0x5263c3f2 - RSS queue=0x1 - (outer) L2 type: ETHER - (outer) L3 type: IPV4_EXT_UNKNOWN - (outer) L4 type: UDP - Tunnel type: Unknown - Inner L2 type: Unknown - Inner L3 type: Unknown - Inner L4 type: Unknown
 - Receive queue=0x1
  PKT_RX_RSS_HASH
You can check that RSS hash=0x5263c3f2 - RSS queue=0x1

The case was run in the default settings: CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y

so the issue has been fixed.

Thank you.
Yuan.

-----Original Message-----
From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Zhe Tao
Sent: Tuesday, June 14, 2016 1:24 PM
To: dev@dpdk.org
Cc: Tao, Zhe <zhe.tao@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>
Subject: [dpdk-dev] [PATCH v3] i40e: fix olflags for vector Rx

Problem:
The flag for RSS and flow director is not set correctly in the vector Rx function, so the upper layer APP which base on the related flags will not work correctly.

Fix this problem by change the shuffle table. the original shuffle table is not correct.

Fixes: 9ed94e5bb04e ("i40e: add vector Rx")

Signed-off-by: Zhe Tao <zhe.tao@intel.com>
---
v2: Changed the comments according to the code change.
v3: Fixed the issues reported by check-git-log.sh.

 drivers/net/i40e/i40e_rxtx_vec.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/net/i40e/i40e_rxtx_vec.c b/drivers/net/i40e/i40e_rxtx_vec.c
index eef80d9..704924f 100644
--- a/drivers/net/i40e/i40e_rxtx_vec.c
+++ b/drivers/net/i40e/i40e_rxtx_vec.c
@@ -144,12 +144,13 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 		uint64_t dword;
 	} vol;
 
-	/* mask everything except rss and vlan flags
-	*bit2 is for vlan tag, bits 13:12 for rss
-	*/
+	/* mask everything except RSS, flow director and VLAN flags
+	 * bit2 is for VLAN tag, bit11 for flow director indication
+	 * bit13:12 for RSS indication.
+	 */
 	const __m128i rss_vlan_msk = _mm_set_epi16(
 			0x0000, 0x0000, 0x0000, 0x0000,
-			0x3004, 0x3004, 0x3004, 0x3004);
+			0x3804, 0x3804, 0x3804, 0x3804);
 
 	/* map rss and vlan type to rss hash and vlan flag */
 	const __m128i vlan_flags = _mm_set_epi8(0, 0, 0, 0, @@ -159,8 +160,8 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 
 	const __m128i rss_flags = _mm_set_epi8(0, 0, 0, 0,
 			0, 0, 0, 0,
-			0, 0, 0, 0,
-			PKT_RX_FDIR, 0, PKT_RX_RSS_HASH, 0);
+			PKT_RX_RSS_HASH | PKT_RX_FDIR, PKT_RX_RSS_HASH, 0, 0,
+			0, 0, PKT_RX_FDIR, 0);
 
 	vlan0 = _mm_unpackhi_epi16(descs[0], descs[1]);
 	vlan1 = _mm_unpackhi_epi16(descs[2], descs[3]); @@ -169,7 +170,7 @@ desc_to_olflags_v(__m128i descs[4], struct rte_mbuf **rx_pkts)
 	vlan1 = _mm_and_si128(vlan0, rss_vlan_msk);
 	vlan0 = _mm_shuffle_epi8(vlan_flags, vlan1);
 
-	rss = _mm_srli_epi16(vlan1, 12);
+	rss = _mm_srli_epi16(vlan1, 11);
 	rss = _mm_shuffle_epi8(rss_flags, rss);
 
 	vlan0 = _mm_or_si128(vlan0, rss);
--
2.1.4

Re: [dpdk-dev] [PATCH v3] i40e: fix olflags for vector Rx

[Bruce Richardson]

On Wed, Jun 15, 2016 at 08:35:30AM +0000, Wu, Jingjing wrote:
> 
> 
> > -----Original Message-----
> > From: Tao, Zhe
> > Sent: Tuesday, June 14, 2016 1:24 PM
> > To: dev@dpdk.org
> > Cc: Tao, Zhe <zhe.tao@intel.com>; Wu, Jingjing <jingjing.wu@intel.com>
> > Subject: [PATCH v3] i40e: fix olflags for vector Rx
> > 
> > Problem:
> > The flag for RSS and flow director is not set correctly in the
> > vector Rx function, so the upper layer APP which base on the related
> > flags will not work correctly.
> > 
> > Fix this problem by change the shuffle table. the original shuffle
> > table is not correct.
> > 
> > Fixes: 9ed94e5bb04e ("i40e: add vector Rx")
> > 
> > Signed-off-by: Zhe Tao <zhe.tao@intel.com>
> 
> Acked-by: Jingjing Wu <jingjing.wu@intel.com>
>
Applied to dpdk-next-net/rel_16_07

/Bruce