From: Feifei Wang <feifei.wang2@arm.com>
To: feifei.wang2@arm.com, ruifeng.wang@arm.com, stable@dpdk.org
Cc: nd@arm.com
Subject: [dpdk-stable] [PATCH 19.11 3/4] net/ixgbe: support good checksum flag for NEON
Date: Fri, 19 Feb 2021 14:20:40 +0800 [thread overview]
Message-ID: <20210219062041.2015421-4-feifei.wang2@arm.com> (raw)
In-Reply-To: <20210219062041.2015421-1-feifei.wang2@arm.com>
[ upstream commit 4b194d481b8f1c42ec4b58d217effca7eecad621 ]
Add CKSUM_GOOD flag to distinguish a good checksum from an unknown one
in neon vertor RX function.
Fixes: b20971b6cca0 ("net/ixgbe: implement vector driver for ARM")
Signed-off-by: Feifei Wang <feifei.wang2@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.wang@arm.com>
---
drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c | 37 +++++++++++++++++--------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
index 23c1e56ca4..3aa5a1e056 100644
--- a/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx_vec_neon.c
@@ -86,13 +86,13 @@ desc_to_olflags_v(uint8x16x2_t sterr_tmp1, uint8x16x2_t sterr_tmp2,
uint8x16_t staterr, uint8_t vlan_flags, struct rte_mbuf **rx_pkts)
{
uint8x16_t ptype;
- uint8x16_t vtag;
+ uint8x16_t vtag_lo, vtag_hi, vtag;
uint8x16_t temp_csum;
uint32x4_t csum = {0, 0, 0, 0};
union {
- uint8_t e[4];
- uint32_t word;
+ uint16_t e[4];
+ uint64_t word;
} vol;
const uint8x16_t rsstype_msk = {
@@ -119,18 +119,26 @@ desc_to_olflags_v(uint8x16x2_t sterr_tmp1, uint8x16x2_t sterr_tmp2,
(IXGBE_RXDADV_ERR_TCPE | IXGBE_RXDADV_ERR_IPE) >> 24};
/* map vlan present (0x8), IPE (0x2), L4E (0x1) to ol_flags */
- const uint8x16_t vlan_csum_map = {
- 0,
- PKT_RX_L4_CKSUM_BAD,
+ const uint8x16_t vlan_csum_map_lo = {
+ PKT_RX_IP_CKSUM_GOOD,
+ PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD,
PKT_RX_IP_CKSUM_BAD,
PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD,
0, 0, 0, 0,
- vlan_flags,
- vlan_flags | PKT_RX_L4_CKSUM_BAD,
+ vlan_flags | PKT_RX_IP_CKSUM_GOOD,
+ vlan_flags | PKT_RX_IP_CKSUM_GOOD | PKT_RX_L4_CKSUM_BAD,
vlan_flags | PKT_RX_IP_CKSUM_BAD,
vlan_flags | PKT_RX_IP_CKSUM_BAD | PKT_RX_L4_CKSUM_BAD,
0, 0, 0, 0};
+ const uint8x16_t vlan_csum_map_hi = {
+ PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t), 0,
+ PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t), 0,
+ 0, 0, 0, 0,
+ PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t), 0,
+ PKT_RX_L4_CKSUM_GOOD >> sizeof(uint8_t), 0,
+ 0, 0, 0, 0};
+
ptype = vzipq_u8(sterr_tmp1.val[0], sterr_tmp2.val[0]).val[0];
ptype = vandq_u8(ptype, rsstype_msk);
ptype = vqtbl1q_u8(rss_flags, ptype);
@@ -150,11 +158,16 @@ desc_to_olflags_v(uint8x16x2_t sterr_tmp1, uint8x16x2_t sterr_tmp2,
csum = vsetq_lane_u32(vgetq_lane_u32(vreinterpretq_u32_u8(temp_csum), 3), csum, 0);
vtag = vorrq_u8(vreinterpretq_u8_u32(csum), vtag);
- /* convert VP, IPE, L4E to ol_flags */
- vtag = vqtbl1q_u8(vlan_csum_map, vtag);
- vtag = vorrq_u8(ptype, vtag);
+ /* convert L4 checksum correct type to vtag_hi */
+ vtag_hi = vqtbl1q_u8(vlan_csum_map_hi, vtag);
+ vtag_hi = vshrq_n_u8(vtag_hi, 7);
+
+ /* convert VP, IPE, L4E to vtag_lo */
+ vtag_lo = vqtbl1q_u8(vlan_csum_map_lo, vtag);
+ vtag_lo = vorrq_u8(ptype, vtag_lo);
- vol.word = vgetq_lane_u32(vreinterpretq_u32_u8(vtag), 0);
+ vtag = vzipq_u8(vtag_lo, vtag_hi).val[0];
+ vol.word = vgetq_lane_u64(vreinterpretq_u64_u8(vtag), 0);
rx_pkts[0]->ol_flags = vol.e[0];
rx_pkts[1]->ol_flags = vol.e[1];
--
2.25.1
next prev parent reply other threads:[~2021-02-19 6:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-19 6:20 [dpdk-stable] [PATCH 19.11 0/4] Enable Checksum Offloading for NEON vector Feifei Wang
2021-02-19 6:20 ` [dpdk-stable] [PATCH 19.11 1/4] net/ixgbe: add new flag of stripped VLAN for NEON Feifei Wang
2021-02-19 6:20 ` [dpdk-stable] [PATCH 19.11 2/4] net/ixgbe: support bad checksum flag " Feifei Wang
2021-02-19 6:20 ` Feifei Wang [this message]
2021-02-19 6:20 ` [dpdk-stable] [PATCH 19.11 4/4] net/ixgbe: enable IXGBE NEON vector PMD when CHECKSUM need to checksum Feifei Wang
2021-02-22 13:21 ` [dpdk-stable] [PATCH 19.11 0/4] Enable Checksum Offloading for NEON vector Christian Ehrhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210219062041.2015421-4-feifei.wang2@arm.com \
--to=feifei.wang2@arm.com \
--cc=nd@arm.com \
--cc=ruifeng.wang@arm.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).