* [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on
@ 2017-10-27 13:24 Radu Nicolau
2017-10-31 15:47 ` Ananyev, Konstantin
2017-11-01 11:28 ` [dpdk-dev] [PATCH v2] " Radu Nicolau
0 siblings, 2 replies; 6+ messages in thread
From: Radu Nicolau @ 2017-10-27 13:24 UTC (permalink / raw)
To: dev; +Cc: konstantin.ananyev, Radu Nicolau
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
And small performance improvement
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
---
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 79 +++++++++++++---------------------
1 file changed, 30 insertions(+), 49 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
index 158ccd9..6d7ed5d 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
@@ -126,54 +126,35 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq)
static inline void
desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts)
{
- __m128i sterr0, sterr1, sterr2, sterr3;
- __m128i tmp1, tmp2, tmp3, tmp4;
- __m128i rearm0, rearm1, rearm2, rearm3;
-
- const __m128i ipsec_sterr_msk = _mm_set_epi32(
- 0, IXGBE_RXDADV_IPSEC_STATUS_SECP |
- IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED,
- 0, 0);
- const __m128i ipsec_proc_msk = _mm_set_epi32(
- 0, IXGBE_RXDADV_IPSEC_STATUS_SECP, 0, 0);
- const __m128i ipsec_err_flag = _mm_set_epi32(
- 0, PKT_RX_SEC_OFFLOAD_FAILED | PKT_RX_SEC_OFFLOAD,
- 0, 0);
- const __m128i ipsec_proc_flag = _mm_set_epi32(
- 0, PKT_RX_SEC_OFFLOAD, 0, 0);
-
- rearm0 = _mm_load_si128((__m128i *)&rx_pkts[0]->rearm_data);
- rearm1 = _mm_load_si128((__m128i *)&rx_pkts[1]->rearm_data);
- rearm2 = _mm_load_si128((__m128i *)&rx_pkts[2]->rearm_data);
- rearm3 = _mm_load_si128((__m128i *)&rx_pkts[3]->rearm_data);
- sterr0 = _mm_and_si128(descs[0], ipsec_sterr_msk);
- sterr1 = _mm_and_si128(descs[1], ipsec_sterr_msk);
- sterr2 = _mm_and_si128(descs[2], ipsec_sterr_msk);
- sterr3 = _mm_and_si128(descs[3], ipsec_sterr_msk);
- tmp1 = _mm_cmpeq_epi32(sterr0, ipsec_sterr_msk);
- tmp2 = _mm_cmpeq_epi32(sterr0, ipsec_proc_msk);
- tmp3 = _mm_cmpeq_epi32(sterr1, ipsec_sterr_msk);
- tmp4 = _mm_cmpeq_epi32(sterr1, ipsec_proc_msk);
- sterr0 = _mm_or_si128(_mm_and_si128(tmp1, ipsec_err_flag),
- _mm_and_si128(tmp2, ipsec_proc_flag));
- sterr1 = _mm_or_si128(_mm_and_si128(tmp3, ipsec_err_flag),
- _mm_and_si128(tmp4, ipsec_proc_flag));
- tmp1 = _mm_cmpeq_epi32(sterr2, ipsec_sterr_msk);
- tmp2 = _mm_cmpeq_epi32(sterr2, ipsec_proc_msk);
- tmp3 = _mm_cmpeq_epi32(sterr3, ipsec_sterr_msk);
- tmp4 = _mm_cmpeq_epi32(sterr3, ipsec_proc_msk);
- sterr2 = _mm_or_si128(_mm_and_si128(tmp1, ipsec_err_flag),
- _mm_and_si128(tmp2, ipsec_proc_flag));
- sterr3 = _mm_or_si128(_mm_and_si128(tmp3, ipsec_err_flag),
- _mm_and_si128(tmp4, ipsec_proc_flag));
- rearm0 = _mm_or_si128(rearm0, sterr0);
- rearm1 = _mm_or_si128(rearm1, sterr1);
- rearm2 = _mm_or_si128(rearm2, sterr2);
- rearm3 = _mm_or_si128(rearm3, sterr3);
- _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);
- _mm_store_si128((__m128i *)&rx_pkts[3]->rearm_data, rearm3);
+ __m128i sterr, rearm, tmp_e, tmp_p;
+ const __m128i ipsec_sterr_msk =
+ _mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP |
+ IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED);
+ const __m128i ipsec_proc_msk =
+ _mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP);
+ const __m128i ipsec_err_flag =
+ _mm_set1_epi32(PKT_RX_SEC_OFFLOAD_FAILED |
+ PKT_RX_SEC_OFFLOAD);
+ const __m128i ipsec_proc_flag = _mm_set1_epi32(PKT_RX_SEC_OFFLOAD);
+
+ rearm = _mm_set_epi32(((uint32_t *)rx_pkts[0]->rearm_data)[2],
+ ((uint32_t *)rx_pkts[1]->rearm_data)[2],
+ ((uint32_t *)rx_pkts[2]->rearm_data)[2],
+ ((uint32_t *)rx_pkts[3]->rearm_data)[2]);
+ sterr = _mm_set_epi32(_mm_extract_epi32(descs[0], 2),
+ _mm_extract_epi32(descs[1], 2),
+ _mm_extract_epi32(descs[2], 2),
+ _mm_extract_epi32(descs[3], 2));
+ sterr = _mm_and_si128(sterr, ipsec_sterr_msk);
+ tmp_e = _mm_cmpeq_epi32(sterr, ipsec_sterr_msk);
+ tmp_p = _mm_cmpeq_epi32(sterr, ipsec_proc_msk);
+ sterr = _mm_or_si128(_mm_and_si128(tmp_e, ipsec_err_flag),
+ _mm_and_si128(tmp_p, ipsec_proc_flag));
+ rearm = _mm_or_si128(rearm, sterr);
+ ((uint32_t *)rx_pkts[0]->rearm_data)[2] = _mm_extract_epi32(rearm, 3);
+ ((uint32_t *)rx_pkts[1]->rearm_data)[2] = _mm_extract_epi32(rearm, 2);
+ ((uint32_t *)rx_pkts[2]->rearm_data)[2] = _mm_extract_epi32(rearm, 1);
+ ((uint32_t *)rx_pkts[3]->rearm_data)[2] = _mm_extract_epi32(rearm, 0);
}
#endif
@@ -533,7 +514,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
#ifdef RTE_LIBRTE_SECURITY
if (unlikely(use_ipsec))
- desc_to_olflags_v_ipsec(descs, rx_pkts);
+ desc_to_olflags_v_ipsec(descs, &rx_pkts[pos]);
#endif
/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
--
2.7.5
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on
2017-10-27 13:24 [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on Radu Nicolau
@ 2017-10-31 15:47 ` Ananyev, Konstantin
2017-10-31 17:15 ` Ferruh Yigit
2017-11-01 11:28 ` [dpdk-dev] [PATCH v2] " Radu Nicolau
1 sibling, 1 reply; 6+ messages in thread
From: Ananyev, Konstantin @ 2017-10-31 15:47 UTC (permalink / raw)
To: Nicolau, Radu, dev
> -----Original Message-----
> From: Nicolau, Radu
> Sent: Friday, October 27, 2017 2:25 PM
> To: dev@dpdk.org
> Cc: Ananyev, Konstantin <konstantin.ananyev@intel.com>; Nicolau, Radu <radu.nicolau@intel.com>
> Subject: [PATCH] net/ixgbe: fix IPsec Rx with SSE on
>
> Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
> And small performance improvement
>
> Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
> ---
> drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 79 +++++++++++++---------------------
> 1 file changed, 30 insertions(+), 49 deletions(-)
>
> diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
> index 158ccd9..6d7ed5d 100644
> --- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
> +++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
> @@ -126,54 +126,35 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq)
> static inline void
> desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts)
> {
> - __m128i sterr0, sterr1, sterr2, sterr3;
> - __m128i tmp1, tmp2, tmp3, tmp4;
> - __m128i rearm0, rearm1, rearm2, rearm3;
> -
> - const __m128i ipsec_sterr_msk = _mm_set_epi32(
> - 0, IXGBE_RXDADV_IPSEC_STATUS_SECP |
> - IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED,
> - 0, 0);
> - const __m128i ipsec_proc_msk = _mm_set_epi32(
> - 0, IXGBE_RXDADV_IPSEC_STATUS_SECP, 0, 0);
> - const __m128i ipsec_err_flag = _mm_set_epi32(
> - 0, PKT_RX_SEC_OFFLOAD_FAILED | PKT_RX_SEC_OFFLOAD,
> - 0, 0);
> - const __m128i ipsec_proc_flag = _mm_set_epi32(
> - 0, PKT_RX_SEC_OFFLOAD, 0, 0);
> -
> - rearm0 = _mm_load_si128((__m128i *)&rx_pkts[0]->rearm_data);
> - rearm1 = _mm_load_si128((__m128i *)&rx_pkts[1]->rearm_data);
> - rearm2 = _mm_load_si128((__m128i *)&rx_pkts[2]->rearm_data);
> - rearm3 = _mm_load_si128((__m128i *)&rx_pkts[3]->rearm_data);
> - sterr0 = _mm_and_si128(descs[0], ipsec_sterr_msk);
> - sterr1 = _mm_and_si128(descs[1], ipsec_sterr_msk);
> - sterr2 = _mm_and_si128(descs[2], ipsec_sterr_msk);
> - sterr3 = _mm_and_si128(descs[3], ipsec_sterr_msk);
> - tmp1 = _mm_cmpeq_epi32(sterr0, ipsec_sterr_msk);
> - tmp2 = _mm_cmpeq_epi32(sterr0, ipsec_proc_msk);
> - tmp3 = _mm_cmpeq_epi32(sterr1, ipsec_sterr_msk);
> - tmp4 = _mm_cmpeq_epi32(sterr1, ipsec_proc_msk);
> - sterr0 = _mm_or_si128(_mm_and_si128(tmp1, ipsec_err_flag),
> - _mm_and_si128(tmp2, ipsec_proc_flag));
> - sterr1 = _mm_or_si128(_mm_and_si128(tmp3, ipsec_err_flag),
> - _mm_and_si128(tmp4, ipsec_proc_flag));
> - tmp1 = _mm_cmpeq_epi32(sterr2, ipsec_sterr_msk);
> - tmp2 = _mm_cmpeq_epi32(sterr2, ipsec_proc_msk);
> - tmp3 = _mm_cmpeq_epi32(sterr3, ipsec_sterr_msk);
> - tmp4 = _mm_cmpeq_epi32(sterr3, ipsec_proc_msk);
> - sterr2 = _mm_or_si128(_mm_and_si128(tmp1, ipsec_err_flag),
> - _mm_and_si128(tmp2, ipsec_proc_flag));
> - sterr3 = _mm_or_si128(_mm_and_si128(tmp3, ipsec_err_flag),
> - _mm_and_si128(tmp4, ipsec_proc_flag));
> - rearm0 = _mm_or_si128(rearm0, sterr0);
> - rearm1 = _mm_or_si128(rearm1, sterr1);
> - rearm2 = _mm_or_si128(rearm2, sterr2);
> - rearm3 = _mm_or_si128(rearm3, sterr3);
> - _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);
> - _mm_store_si128((__m128i *)&rx_pkts[3]->rearm_data, rearm3);
> + __m128i sterr, rearm, tmp_e, tmp_p;
> + const __m128i ipsec_sterr_msk =
> + _mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP |
> + IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED);
> + const __m128i ipsec_proc_msk =
> + _mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP);
> + const __m128i ipsec_err_flag =
> + _mm_set1_epi32(PKT_RX_SEC_OFFLOAD_FAILED |
> + PKT_RX_SEC_OFFLOAD);
> + const __m128i ipsec_proc_flag = _mm_set1_epi32(PKT_RX_SEC_OFFLOAD);
> +
> + rearm = _mm_set_epi32(((uint32_t *)rx_pkts[0]->rearm_data)[2],
> + ((uint32_t *)rx_pkts[1]->rearm_data)[2],
> + ((uint32_t *)rx_pkts[2]->rearm_data)[2],
> + ((uint32_t *)rx_pkts[3]->rearm_data)[2]);
> + sterr = _mm_set_epi32(_mm_extract_epi32(descs[0], 2),
> + _mm_extract_epi32(descs[1], 2),
> + _mm_extract_epi32(descs[2], 2),
> + _mm_extract_epi32(descs[3], 2));
> + sterr = _mm_and_si128(sterr, ipsec_sterr_msk);
> + tmp_e = _mm_cmpeq_epi32(sterr, ipsec_sterr_msk);
> + tmp_p = _mm_cmpeq_epi32(sterr, ipsec_proc_msk);
> + sterr = _mm_or_si128(_mm_and_si128(tmp_e, ipsec_err_flag),
> + _mm_and_si128(tmp_p, ipsec_proc_flag));
> + rearm = _mm_or_si128(rearm, sterr);
> + ((uint32_t *)rx_pkts[0]->rearm_data)[2] = _mm_extract_epi32(rearm, 3);
> + ((uint32_t *)rx_pkts[1]->rearm_data)[2] = _mm_extract_epi32(rearm, 2);
> + ((uint32_t *)rx_pkts[2]->rearm_data)[2] = _mm_extract_epi32(rearm, 1);
> + ((uint32_t *)rx_pkts[3]->rearm_data)[2] = _mm_extract_epi32(rearm, 0);
> }
> #endif
>
> @@ -533,7 +514,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
>
> #ifdef RTE_LIBRTE_SECURITY
> if (unlikely(use_ipsec))
> - desc_to_olflags_v_ipsec(descs, rx_pkts);
> + desc_to_olflags_v_ipsec(descs, &rx_pkts[pos]);
> #endif
>
> /* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
> --
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> 2.7.5
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on
2017-10-31 15:47 ` Ananyev, Konstantin
@ 2017-10-31 17:15 ` Ferruh Yigit
2017-10-31 18:51 ` Shahaf Shuler
0 siblings, 1 reply; 6+ messages in thread
From: Ferruh Yigit @ 2017-10-31 17:15 UTC (permalink / raw)
To: Ananyev, Konstantin, Nicolau, Radu, dev
On 10/31/2017 8:47 AM, Ananyev, Konstantin wrote:
>
>
>> -----Original Message-----
>> From: Nicolau, Radu
>> Sent: Friday, October 27, 2017 2:25 PM
>> To: dev@dpdk.org
>> Cc: Ananyev, Konstantin <konstantin.ananyev@intel.com>; Nicolau, Radu <radu.nicolau@intel.com>
>> Subject: [PATCH] net/ixgbe: fix IPsec Rx with SSE on
>>
>> Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
>> And small performance improvement
>>
>> Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on
2017-10-31 17:15 ` Ferruh Yigit
@ 2017-10-31 18:51 ` Shahaf Shuler
0 siblings, 0 replies; 6+ messages in thread
From: Shahaf Shuler @ 2017-10-31 18:51 UTC (permalink / raw)
To: Ferruh Yigit, Ananyev, Konstantin, Nicolau, Radu, dev
Tuesday, October 31, 2017 7:16 PM, Ferruh Yigit:
> On 10/31/2017 8:47 AM, Ananyev, Konstantin wrote:
> >
> >
> >> -----Original Message-----
> >> From: Nicolau, Radu
> >> Sent: Friday, October 27, 2017 2:25 PM
> >> To: dev@dpdk.org
> >> Cc: Ananyev, Konstantin <konstantin.ananyev@intel.com>; Nicolau, Radu
> >> <radu.nicolau@intel.com>
> >> Subject: [PATCH] net/ixgbe: fix IPsec Rx with SSE on
> >>
> >> Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec") And small
> >> performance improvement
> >>
> >> Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
>
> > Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
>
> Applied to dpdk-next-net/master, thanks.
It looks this commit breaks the compilation with GCC on redhat 7.3.
Server details:
4.13.0-rc4+ #1 SMP Wed Aug 9 09:18:48 IDT 2017 x86_64 x86_64 x86_64 GNU/Linux
gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-11)
Compilation log:
Configuration done using x86_64-native-linuxapp-gcc
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c: In function ‘desc_to_olflags_v_ipsec’:
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:140:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
rearm = _mm_set_epi32(((uint32_t *)rx_pkts[0]->rearm_data)[2],
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:141:10: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[1]->rearm_data)[2],
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:142:10: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[2]->rearm_data)[2],
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:143:10: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[3]->rearm_data)[2]);
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:154:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[0]->rearm_data)[2] = _mm_extract_epi32(rearm, 3);
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:155:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[1]->rearm_data)[2] = _mm_extract_epi32(rearm, 2);
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:156:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[2]->rearm_data)[2] = _mm_extract_epi32(rearm, 1);
^
/work/dpdk.org/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c:157:2: error: dereferencing type-punned pointer will break strict-aliasing rules [-Werror=strict-aliasing]
((uint32_t *)rx_pkts[3]->rearm_data)[2] = _mm_extract_epi32(rearm, 0);
^
cc1: all warnings being treated as errors
make[4]: *** [ixgbe_rxtx_vec_sse.o] Error 1
make[3]: *** [ixgbe] Error 2
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [net] Error 2
make[1]: *** [drivers] Error 2
make: *** [all] Error 2
^ permalink raw reply [flat|nested] 6+ messages in thread
* [dpdk-dev] [PATCH v2] net/ixgbe: fix IPsec Rx with SSE on
2017-10-27 13:24 [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on Radu Nicolau
2017-10-31 15:47 ` Ananyev, Konstantin
@ 2017-11-01 11:28 ` Radu Nicolau
2017-11-01 20:03 ` Ferruh Yigit
1 sibling, 1 reply; 6+ messages in thread
From: Radu Nicolau @ 2017-11-01 11:28 UTC (permalink / raw)
To: dev; +Cc: Yigit, Ferruh, Ananyev, Konstantin, Shahaf Shuler, Radu Nicolau
Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
And small performance improvement
Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
v2: fixed build on gcc 4.8.5
drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c | 80 +++++++++++++---------------------
1 file changed, 31 insertions(+), 49 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
index 158ccd9..7258ff9 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_sse.c
@@ -126,54 +126,36 @@ ixgbe_rxq_rearm(struct ixgbe_rx_queue *rxq)
static inline void
desc_to_olflags_v_ipsec(__m128i descs[4], struct rte_mbuf **rx_pkts)
{
- __m128i sterr0, sterr1, sterr2, sterr3;
- __m128i tmp1, tmp2, tmp3, tmp4;
- __m128i rearm0, rearm1, rearm2, rearm3;
-
- const __m128i ipsec_sterr_msk = _mm_set_epi32(
- 0, IXGBE_RXDADV_IPSEC_STATUS_SECP |
- IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED,
- 0, 0);
- const __m128i ipsec_proc_msk = _mm_set_epi32(
- 0, IXGBE_RXDADV_IPSEC_STATUS_SECP, 0, 0);
- const __m128i ipsec_err_flag = _mm_set_epi32(
- 0, PKT_RX_SEC_OFFLOAD_FAILED | PKT_RX_SEC_OFFLOAD,
- 0, 0);
- const __m128i ipsec_proc_flag = _mm_set_epi32(
- 0, PKT_RX_SEC_OFFLOAD, 0, 0);
-
- rearm0 = _mm_load_si128((__m128i *)&rx_pkts[0]->rearm_data);
- rearm1 = _mm_load_si128((__m128i *)&rx_pkts[1]->rearm_data);
- rearm2 = _mm_load_si128((__m128i *)&rx_pkts[2]->rearm_data);
- rearm3 = _mm_load_si128((__m128i *)&rx_pkts[3]->rearm_data);
- sterr0 = _mm_and_si128(descs[0], ipsec_sterr_msk);
- sterr1 = _mm_and_si128(descs[1], ipsec_sterr_msk);
- sterr2 = _mm_and_si128(descs[2], ipsec_sterr_msk);
- sterr3 = _mm_and_si128(descs[3], ipsec_sterr_msk);
- tmp1 = _mm_cmpeq_epi32(sterr0, ipsec_sterr_msk);
- tmp2 = _mm_cmpeq_epi32(sterr0, ipsec_proc_msk);
- tmp3 = _mm_cmpeq_epi32(sterr1, ipsec_sterr_msk);
- tmp4 = _mm_cmpeq_epi32(sterr1, ipsec_proc_msk);
- sterr0 = _mm_or_si128(_mm_and_si128(tmp1, ipsec_err_flag),
- _mm_and_si128(tmp2, ipsec_proc_flag));
- sterr1 = _mm_or_si128(_mm_and_si128(tmp3, ipsec_err_flag),
- _mm_and_si128(tmp4, ipsec_proc_flag));
- tmp1 = _mm_cmpeq_epi32(sterr2, ipsec_sterr_msk);
- tmp2 = _mm_cmpeq_epi32(sterr2, ipsec_proc_msk);
- tmp3 = _mm_cmpeq_epi32(sterr3, ipsec_sterr_msk);
- tmp4 = _mm_cmpeq_epi32(sterr3, ipsec_proc_msk);
- sterr2 = _mm_or_si128(_mm_and_si128(tmp1, ipsec_err_flag),
- _mm_and_si128(tmp2, ipsec_proc_flag));
- sterr3 = _mm_or_si128(_mm_and_si128(tmp3, ipsec_err_flag),
- _mm_and_si128(tmp4, ipsec_proc_flag));
- rearm0 = _mm_or_si128(rearm0, sterr0);
- rearm1 = _mm_or_si128(rearm1, sterr1);
- rearm2 = _mm_or_si128(rearm2, sterr2);
- rearm3 = _mm_or_si128(rearm3, sterr3);
- _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);
- _mm_store_si128((__m128i *)&rx_pkts[3]->rearm_data, rearm3);
+ __m128i sterr, rearm, tmp_e, tmp_p;
+ uint32_t *rearm0 = (uint32_t *)rx_pkts[0]->rearm_data + 2;
+ uint32_t *rearm1 = (uint32_t *)rx_pkts[1]->rearm_data + 2;
+ uint32_t *rearm2 = (uint32_t *)rx_pkts[2]->rearm_data + 2;
+ uint32_t *rearm3 = (uint32_t *)rx_pkts[3]->rearm_data + 2;
+ const __m128i ipsec_sterr_msk =
+ _mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP |
+ IXGBE_RXDADV_IPSEC_ERROR_AUTH_FAILED);
+ const __m128i ipsec_proc_msk =
+ _mm_set1_epi32(IXGBE_RXDADV_IPSEC_STATUS_SECP);
+ const __m128i ipsec_err_flag =
+ _mm_set1_epi32(PKT_RX_SEC_OFFLOAD_FAILED |
+ PKT_RX_SEC_OFFLOAD);
+ const __m128i ipsec_proc_flag = _mm_set1_epi32(PKT_RX_SEC_OFFLOAD);
+
+ rearm = _mm_set_epi32(*rearm3, *rearm2, *rearm1, *rearm0);
+ sterr = _mm_set_epi32(_mm_extract_epi32(descs[3], 2),
+ _mm_extract_epi32(descs[2], 2),
+ _mm_extract_epi32(descs[1], 2),
+ _mm_extract_epi32(descs[0], 2));
+ sterr = _mm_and_si128(sterr, ipsec_sterr_msk);
+ tmp_e = _mm_cmpeq_epi32(sterr, ipsec_sterr_msk);
+ tmp_p = _mm_cmpeq_epi32(sterr, ipsec_proc_msk);
+ sterr = _mm_or_si128(_mm_and_si128(tmp_e, ipsec_err_flag),
+ _mm_and_si128(tmp_p, ipsec_proc_flag));
+ rearm = _mm_or_si128(rearm, sterr);
+ *rearm0 = _mm_extract_epi32(rearm, 0);
+ *rearm1 = _mm_extract_epi32(rearm, 1);
+ *rearm2 = _mm_extract_epi32(rearm, 2);
+ *rearm3 = _mm_extract_epi32(rearm, 3);
}
#endif
@@ -533,7 +515,7 @@ _recv_raw_pkts_vec(struct ixgbe_rx_queue *rxq, struct rte_mbuf **rx_pkts,
#ifdef RTE_LIBRTE_SECURITY
if (unlikely(use_ipsec))
- desc_to_olflags_v_ipsec(descs, rx_pkts);
+ desc_to_olflags_v_ipsec(descs, &rx_pkts[pos]);
#endif
/* D.2 pkt 3,4 set in_port/nb_seg and remove crc */
--
2.7.5
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [dpdk-dev] [PATCH v2] net/ixgbe: fix IPsec Rx with SSE on
2017-11-01 11:28 ` [dpdk-dev] [PATCH v2] " Radu Nicolau
@ 2017-11-01 20:03 ` Ferruh Yigit
0 siblings, 0 replies; 6+ messages in thread
From: Ferruh Yigit @ 2017-11-01 20:03 UTC (permalink / raw)
To: Radu Nicolau, DPDK; +Cc: Konstantin, Shahaf Shuler
On 11/1/2017 4:28 AM, Radu Nicolau wrote:
> Fixes: 9a0752f498d2 ("net/ixgbe: enable inline IPsec")
> And small performance improvement
>
> Signed-off-by: Radu Nicolau <radu.nicolau@intel.com>
> Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Applied to dpdk-next-net/master, thanks.
(Replaced with previous version.)
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-11-01 20:03 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-27 13:24 [dpdk-dev] [PATCH] net/ixgbe: fix IPsec Rx with SSE on Radu Nicolau
2017-10-31 15:47 ` Ananyev, Konstantin
2017-10-31 17:15 ` Ferruh Yigit
2017-10-31 18:51 ` Shahaf Shuler
2017-11-01 11:28 ` [dpdk-dev] [PATCH v2] " Radu Nicolau
2017-11-01 20:03 ` Ferruh Yigit
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).