From: Ajit Khaparde <ajit.khaparde@broadcom.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com, Rahul Gupta <rahul.gupta@broadcom.com>
Subject: [dpdk-dev] [PATCH 06/15] net/bnxt: correctly set L4 checksum error for tunnel and non-tunnel packets
Date: Fri, 12 Jul 2019 11:36:13 +0530 [thread overview]
Message-ID: <20190712060622.76975-7-ajit.khaparde@broadcom.com> (raw)
In-Reply-To: <20190712060622.76975-1-ajit.khaparde@broadcom.com>
From: Rahul Gupta <rahul.gupta@broadcom.com>
Update ol_flags correctly for checksum errors in case of tunnel and
non-tunnel packet.
Fixes: 65ee636872eb ("net/bnxt: fix Rx checksum flags)
Signed-off-by: Rahul Gupta <rahul.gupta@broadcom.com>
Signed-off-by: Ajit Khaparde <ajit.khaparde@broadcom.com>
---
drivers/net/bnxt/bnxt_rxr.c | 43 ++++++++++---
drivers/net/bnxt/bnxt_rxr.h | 120 ++++++++++++++++++++++++++++++------
2 files changed, 133 insertions(+), 30 deletions(-)
diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c
index 44303f3b0..54a2cf5fd 100644
--- a/drivers/net/bnxt/bnxt_rxr.c
+++ b/drivers/net/bnxt/bnxt_rxr.c
@@ -362,6 +362,7 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
int rc = 0;
uint8_t agg_buf = 0;
uint16_t cmp_type;
+ uint32_t flags2_f = 0;
rxcmp = (struct rx_pkt_cmpl *)
&cpr->cp_desc_ring[cp_cons];
@@ -440,19 +441,41 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt,
mbuf->ol_flags |= PKT_RX_VLAN | PKT_RX_VLAN_STRIPPED;
}
- if (likely(RX_CMP_IP_CS_OK(rxcmp1)))
- mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
- else if (likely(RX_CMP_IP_CS_UNKNOWN(rxcmp1)))
- mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
- else
+ flags2_f = flags2_0xf(rxcmp1);
+ /* IP Checksum */
+ if (unlikely(((IS_IP_NONTUNNEL_PKT(flags2_f)) &&
+ (RX_CMP_IP_CS_ERROR(rxcmp1))) ||
+ (IS_IP_TUNNEL_PKT(flags2_f) &&
+ (RX_CMP_IP_OUTER_CS_ERROR(rxcmp1))))) {
mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD;
+ } else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1))) {
+ mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN;
+ } else {
+ mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+ }
- if (likely(RX_CMP_L4_CS_OK(rxcmp1)))
- mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
- else if (likely(RX_CMP_L4_CS_UNKNOWN(rxcmp1)))
+ /* L4 Checksum */
+ if (likely(IS_L4_NONTUNNEL_PKT(flags2_f))) {
+ if (unlikely(RX_CMP_L4_INNER_CS_ERR2(rxcmp1)))
+ mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+ else
+ mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+ } else if (IS_L4_TUNNEL_PKT(flags2_f)) {
+ if (unlikely(RX_CMP_L4_INNER_CS_ERR2(rxcmp1)))
+ mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+ else
+ mbuf->ol_flags |= PKT_RX_L4_CKSUM_GOOD;
+ if (unlikely(RX_CMP_L4_OUTER_CS_ERR2(rxcmp1))) {
+ mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_BAD;
+ } else if (unlikely(IS_L4_TUNNEL_PKT_ONLY_INNER_L4_CS
+ (flags2_f))) {
+ mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_UNKNOWN;
+ } else {
+ mbuf->ol_flags |= PKT_RX_OUTER_L4_CKSUM_GOOD;
+ }
+ } else if (unlikely(RX_CMP_L4_CS_UNKNOWN(rxcmp1))) {
mbuf->ol_flags |= PKT_RX_L4_CKSUM_UNKNOWN;
- else
- mbuf->ol_flags |= PKT_RX_L4_CKSUM_BAD;
+ }
mbuf->packet_type = bnxt_parse_pkt_type(rxcmp, rxcmp1);
diff --git a/drivers/net/bnxt/bnxt_rxr.h b/drivers/net/bnxt/bnxt_rxr.h
index 6523b94c6..6a80c37c8 100644
--- a/drivers/net/bnxt/bnxt_rxr.h
+++ b/drivers/net/bnxt/bnxt_rxr.h
@@ -24,36 +24,116 @@
#define BNXT_TPA_OUTER_L3_OFF(hdr_info) \
((hdr_info) & 0x1ff)
-#define RX_CMP_L4_CS_BITS \
- rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_L4_CS_CALC | \
- RX_PKT_CMPL_FLAGS2_T_L4_CS_CALC)
-
-#define RX_CMP_L4_CS_ERR_BITS \
- rte_cpu_to_le_32(RX_PKT_CMPL_ERRORS_L4_CS_ERROR | \
- RX_PKT_CMPL_ERRORS_T_L4_CS_ERROR)
+#define flags2_0xf(rxcmp1) \
+ (((rxcmp1)->flags2) & 0xf)
-#define RX_CMP_L4_CS_OK(rxcmp1) \
- (((rxcmp1)->flags2 & RX_CMP_L4_CS_BITS) && \
- !((rxcmp1)->errors_v2 & RX_CMP_L4_CS_ERR_BITS))
+/* IP non tunnel can be with or without L4-
+ * Ether / (vlan) / IP|IP6 / UDP|TCP|SCTP Or
+ * Ether / (vlan) / outer IP|IP6 / ICMP
+ * we use '==' instead of '&' because tunnel pkts have all 4 fields set.
+ */
+#define IS_IP_NONTUNNEL_PKT(flags2_f) \
+ ( \
+ ((flags2_f) == \
+ (rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_CS_CALC))) || \
+ ((flags2_f) == \
+ (rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_L4_CS_CALC))) \
+ )
+
+/* IP Tunnel pkt must have atleast tunnel-IP-calc set.
+ * again tunnel ie outer L4 is optional bcoz of
+ * Ether / (vlan) / outer IP|IP6 / GRE / Ether / IP|IP6 / UDP|TCP|SCTP
+ * Ether / (vlan) / outer IP|IP6 / outer UDP / VxLAN / Ether / IP|IP6 /
+ * UDP|TCP|SCTP
+ * Ether / (vlan) / outer IP|IP6 / outer UDP / VXLAN-GPE / Ether / IP|IP6 /
+ * UDP|TCP|SCTP
+ * Ether / (vlan) / outer IP|IP6 / outer UDP / VXLAN-GPE / IP|IP6 /
+ * UDP|TCP|SCTP
+ * Ether / (vlan) / outer IP|IP6 / GRE / IP|IP6 / UDP|TCP|SCTP
+ * Ether / (vlan) / outer IP|IP6 / IP|IP6 / UDP|TCP|SCTP
+ * also inner L3 chksum error is not taken into consideration by DPDK.
+ */
+#define IS_IP_TUNNEL_PKT(flags2_f) \
+ ((flags2_f) & rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC))
-#define RX_CMP_L4_CS_UNKNOWN(rxcmp1) \
- !((rxcmp1)->flags2 & RX_CMP_L4_CS_BITS)
+/* RX_PKT_CMPL_ERRORS_IP_CS_ERROR only for Non-tunnel pkts.
+ * For tunnel pkts RX_PKT_CMPL_ERRORS_IP_CS_ERROR is not accounted and treated
+ * as good csum pkt.
+ */
+#define RX_CMP_IP_CS_ERROR(rxcmp1) \
+ ((rxcmp1)->errors_v2 & \
+ rte_cpu_to_le_32(RX_PKT_CMPL_ERRORS_IP_CS_ERROR))
-#define RX_CMP_IP_CS_ERR_BITS \
- rte_cpu_to_le_32(RX_PKT_CMPL_ERRORS_IP_CS_ERROR | \
- RX_PKT_CMPL_ERRORS_T_IP_CS_ERROR)
+#define RX_CMP_IP_OUTER_CS_ERROR(rxcmp1) \
+ ((rxcmp1)->errors_v2 & \
+ rte_cpu_to_le_32(RX_PKT_CMPL_ERRORS_T_IP_CS_ERROR))
#define RX_CMP_IP_CS_BITS \
rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_CS_CALC | \
RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC)
-#define RX_CMP_IP_CS_OK(rxcmp1) \
- (((rxcmp1)->flags2 & RX_CMP_IP_CS_BITS) && \
- !((rxcmp1)->errors_v2 & RX_CMP_IP_CS_ERR_BITS))
-
-#define RX_CMP_IP_CS_UNKNOWN(rxcmp1) \
+#define RX_CMP_IP_CS_UNKNOWN(rxcmp1) \
!((rxcmp1)->flags2 & RX_CMP_IP_CS_BITS)
+/* L4 non tunnel pkt-
+ * Ether / (vlan) / IP6 / UDP|TCP|SCTP
+ */
+#define IS_L4_NONTUNNEL_PKT(flags2_f) \
+ ( \
+ ((flags2_f) == \
+ (rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_L4_CS_CALC))))
+
+/* L4 tunnel pkt-
+ * Outer L4 is not mandatory. Eg: GRE-
+ * Ether / (vlan) / outer IP|IP6 / GRE / Ether / IP|IP6 / UDP|TCP|SCTP
+ * Ether / (vlan) / outer IP|IP6 / outer UDP / VxLAN / Ether / IP|IP6 /
+ * UDP|TCP|SCTP
+ */
+#define IS_L4_TUNNEL_PKT_INNER_OUTER_L4_CS(flags2_f) \
+ ((flags2_f) == \
+ (rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_L4_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_T_L4_CS_CALC)))
+
+#define IS_L4_TUNNEL_PKT_ONLY_INNER_L4_CS(flags2_f) \
+ ((flags2_f) == \
+ (rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_IP_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_L4_CS_CALC | \
+ RX_PKT_CMPL_FLAGS2_T_IP_CS_CALC)))
+
+#define IS_L4_TUNNEL_PKT(flags2_f) \
+ ( \
+ IS_L4_TUNNEL_PKT_INNER_OUTER_L4_CS(flags2_f) || \
+ IS_L4_TUNNEL_PKT_ONLY_INNER_L4_CS(flags2_f) \
+ )
+
+#define RX_CMP_L4_CS_BITS \
+ rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_L4_CS_CALC)
+
+#define RX_CMP_L4_CS_UNKNOWN(rxcmp1) \
+ !((rxcmp1)->flags2 & RX_CMP_L4_CS_BITS)
+
+#define RX_CMP_T_L4_CS_BITS \
+ rte_cpu_to_le_32(RX_PKT_CMPL_FLAGS2_T_L4_CS_CALC)
+
+#define RX_CMP_T_L4_CS_UNKNOWN(rxcmp1) \
+ !((rxcmp1)->flags2 & RX_CMP_T_L4_CS_BITS)
+
+/* Outer L4 chksum error
+ */
+#define RX_CMP_L4_OUTER_CS_ERR2(rxcmp1) \
+ ((rxcmp1)->errors_v2 & \
+ rte_cpu_to_le_32(RX_PKT_CMPL_ERRORS_T_L4_CS_ERROR))
+
+/* Inner L4 chksum error
+ */
+#define RX_CMP_L4_INNER_CS_ERR2(rxcmp1) \
+ ((rxcmp1)->errors_v2 & \
+ rte_cpu_to_le_32(RX_PKT_CMPL_ERRORS_L4_CS_ERROR))
+
#define BNXT_RX_POST_THRESH 32
enum pkt_hash_types {
--
2.20.1 (Apple Git-117)
next prev parent reply other threads:[~2019-07-12 6:07 UTC|newest]
Thread overview: 54+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-12 6:06 [dpdk-dev] [PATCH 00/15] bnxt patch series Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 01/15] net/bnxt: fix extended port counter statistics Ajit Khaparde
2019-07-12 15:04 ` Stephen Hemminger
2019-07-12 6:06 ` [dpdk-dev] [PATCH 02/15] net/bnxt: fix possible segfault in case of probe failure Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 03/15] net/bnxt: do not fail VF probe when the MAC address is zero Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 04/15] net/bnxt: fix Tx hang after port stop/start Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 05/15] net/bnxt: reset Rx allocation state on port restart Ajit Khaparde
2019-07-12 12:06 ` Lance Richardson
2019-07-12 12:09 ` Lance Richardson
2019-07-12 6:06 ` Ajit Khaparde [this message]
2019-07-12 6:06 ` [dpdk-dev] [PATCH 07/15] net/bnxt: fix for doorbell register offset for Tx ring Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 08/15] net/bnxt: save the number of EM flow count Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 09/15] net/bnxt: nq doorbell cleanups Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 10/15] net/bnxt: avoid null pointer dereference Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 11/15] net/bnxt: fix to enable disable interrupts correctly in start stop Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 12/15] net/bnxt: fix to check for invalid VNIC in cleanup path Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 13/15] net/bnxt: fix a compilation warning Ajit Khaparde
2019-07-12 13:50 ` Ajit Kumar Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 14/15] net/bnxt: fix rxq count if ntuple filtering is disabled Ajit Khaparde
2019-07-12 6:06 ` [dpdk-dev] [PATCH 15/15] net/bnxt: fix to avoid sending invalid VNIC id to firmware Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 00/15] bnxt patch series Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 01/15] net/bnxt: fix extended port counter statistics Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 02/15] net/bnxt: fix possible segfault in case of probe failure Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 03/15] net/bnxt: do not fail VF probe when the MAC address is zero Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 04/15] net/bnxt: fix Tx hang after port stop/start Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 05/15] net/bnxt: reset Rx allocation state on port restart Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 06/15] net/bnxt: correctly set L4 checksum error for tunnel and non-tunnel packets Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 07/15] net/bnxt: fix for doorbell register offset for Tx ring Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 08/15] net/bnxt: save the number of EM flow count Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 09/15] net/bnxt: nq doorbell cleanups Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 10/15] net/bnxt: avoid null pointer dereference Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 11/15] net/bnxt: fix to enable disable interrupts correctly in start stop Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 12/15] net/bnxt: fix to check for invalid VNIC in cleanup path Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 13/15] net/bnxt: fix a compilation warning Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 14/15] net/bnxt: fix rxq count if ntuple filtering is disabled Ajit Khaparde
2019-07-16 9:28 ` [dpdk-dev] [PATCH v2 15/15] net/bnxt: fix to avoid sending invalid VNIC id to firmware Ajit Khaparde
2019-07-16 18:42 ` [dpdk-dev] [PATCH v2 00/15] bnxt patch series Ferruh Yigit
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 " Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 01/15] net/bnxt: fix extended port counter statistics Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 02/15] net/bnxt: fix possible segfault in case of probe failure Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 03/15] net/bnxt: do not fail VF probe when the MAC address is zero Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 04/15] net/bnxt: fix Tx hang after port stop/start Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 05/15] net/bnxt: reset Rx allocation state on port restart Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 06/15] net/bnxt: fix L4 checksum error indication in Rx path Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 07/15] net/bnxt: fix for doorbell register offset for Tx ring Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 08/15] net/bnxt: save the number of EM flow count Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 09/15] net/bnxt: nq doorbell cleanups Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 10/15] net/bnxt: avoid null pointer dereference Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 11/15] net/bnxt: fix to enable disable interrupts correctly Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 12/15] net/bnxt: fix to check for invalid VNIC in cleanup path Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 13/15] net/bnxt: fix a compilation warning Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 14/15] net/bnxt: fix rxq count if ntuple filtering is disabled Ajit Khaparde
2019-07-17 10:41 ` [dpdk-dev] [PATCH v3 15/15] net/bnxt: fix to avoid sending invalid VNIC id to firmware Ajit Khaparde
2019-07-17 17:15 ` [dpdk-dev] [PATCH v3 00/15] bnxt patch series Ferruh Yigit
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=20190712060622.76975-7-ajit.khaparde@broadcom.com \
--to=ajit.khaparde@broadcom.com \
--cc=dev@dpdk.org \
--cc=ferruh.yigit@intel.com \
--cc=rahul.gupta@broadcom.com \
/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).