net/mlx5: fix meter policy ID table container

[dpdk.git] / drivers / net / sfc / sfc_ef100_rx.c

diff --git a/drivers/net/sfc/sfc_ef100_rx.c b/drivers/net/sfc/sfc_ef100_rx.c
index 5e76160..8b90463 100644 (file)
--- a/drivers/net/sfc/sfc_ef100_rx.c
+++ b/drivers/net/sfc/sfc_ef100_rx.c
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2019-2021 Xilinx, Inc.
  * Copyright(c) 2018-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
@@ -46,6 +46,9 @@
        ((_ndesc) - 1 /* head must not step on tail */ - \
         1 /* Rx error */ - 1 /* flush */)
 
+/** Invalid user mark value when the mark should be treated as unset */
+#define SFC_EF100_USER_MARK_INVALID    0
+
 struct sfc_ef100_rx_sw_desc {
        struct rte_mbuf                 *mbuf;
 };
@@ -168,7 +171,7 @@ sfc_ef100_rx_qrefill(struct sfc_ef100_rxq *rxq)
                        struct sfc_ef100_rx_sw_desc *rxd;
                        rte_iova_t phys_addr;
 
-                       MBUF_RAW_ALLOC_CHECK(m);
+                       __rte_mbuf_raw_sanity_check(m);
 
                        SFC_ASSERT((id & ~ptr_mask) == 0);
                        rxd = &rxq->sw_ring[id];
@@ -208,7 +211,7 @@ sfc_ef100_rx_tun_outer_l4_csum(const efx_word_t class)
        return EFX_WORD_FIELD(class,
                              ESF_GZ_RX_PREFIX_HCLASS_TUN_OUTER_L4_CSUM) ==
                ESE_GZ_RH_HCLASS_L4_CSUM_GOOD ?
-               PKT_RX_OUTER_L4_CKSUM_GOOD : PKT_RX_OUTER_L4_CKSUM_GOOD;
+               PKT_RX_OUTER_L4_CKSUM_GOOD : PKT_RX_OUTER_L4_CKSUM_BAD;
 }
 
 static uint32_t
@@ -305,7 +308,7 @@ sfc_ef100_rx_class_decode(const efx_word_t class, uint64_t *ol_flags)
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP4BAD:
                        ptype |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
-                       *ol_flags |= PKT_RX_EIP_CKSUM_BAD;
+                       *ol_flags |= PKT_RX_OUTER_IP_CKSUM_BAD;
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP6:
                        ptype |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
@@ -365,7 +368,6 @@ static const efx_rx_prefix_layout_t sfc_ef100_rx_prefix_layout = {
 
                SFC_EF100_RX_PREFIX_FIELD(LENGTH, B_FALSE),
                SFC_EF100_RX_PREFIX_FIELD(RSS_HASH_VALID, B_FALSE),
-               SFC_EF100_RX_PREFIX_FIELD(USER_FLAG, B_FALSE),
                SFC_EF100_RX_PREFIX_FIELD(CLASS, B_FALSE),
                SFC_EF100_RX_PREFIX_FIELD(RSS_HASH, B_FALSE),
                SFC_EF100_RX_PREFIX_FIELD(USER_MARK, B_FALSE),
@@ -404,12 +406,16 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
                                              ESF_GZ_RX_PREFIX_RSS_HASH);
        }
 
-       if ((rxq->flags & SFC_EF100_RXQ_USER_MARK) &&
-           EFX_TEST_OWORD_BIT(rx_prefix[0], ESF_GZ_RX_PREFIX_USER_FLAG_LBN)) {
-               ol_flags |= PKT_RX_FDIR_ID;
+       if (rxq->flags & SFC_EF100_RXQ_USER_MARK) {
+               uint32_t user_mark;
+
                /* EFX_OWORD_FIELD converts little-endian to CPU */
-               m->hash.fdir.hi = EFX_OWORD_FIELD(rx_prefix[0],
-                                                 ESF_GZ_RX_PREFIX_USER_MARK);
+               user_mark = EFX_OWORD_FIELD(rx_prefix[0],
+                                           ESF_GZ_RX_PREFIX_USER_MARK);
+               if (user_mark != SFC_EF100_USER_MARK_INVALID) {
+                       ol_flags |= PKT_RX_FDIR_ID;
+                       m->hash.fdir.hi = user_mark;
+               }
        }
 
        m->ol_flags = ol_flags;
@@ -481,7 +487,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,
                rxq->ready_pkts--;
 
                pkt = sfc_ef100_rx_next_mbuf(rxq);
-               MBUF_RAW_ALLOC_CHECK(pkt);
+               __rte_mbuf_raw_sanity_check(pkt);
 
                RTE_BUILD_BUG_ON(sizeof(pkt->rearm_data[0]) !=
                                 sizeof(rxq->rearm_data));
@@ -505,7 +511,7 @@ sfc_ef100_rx_process_ready_pkts(struct sfc_ef100_rxq *rxq,
                        struct rte_mbuf *seg;
 
                        seg = sfc_ef100_rx_next_mbuf(rxq);
-                       MBUF_RAW_ALLOC_CHECK(seg);
+                       __rte_mbuf_raw_sanity_check(seg);
 
                        seg->data_off = RTE_PKTMBUF_HEADROOM;
 
@@ -794,8 +800,7 @@ sfc_ef100_rx_qstart(struct sfc_dp_rxq *dp_rxq, unsigned int evq_read_ptr,
                rxq->flags &= ~SFC_EF100_RXQ_RSS_HASH;
 
        if ((unsup_rx_prefix_fields &
-            ((1U << EFX_RX_PREFIX_FIELD_USER_FLAG) |
-             (1U << EFX_RX_PREFIX_FIELD_USER_MARK))) == 0)
+            (1U << EFX_RX_PREFIX_FIELD_USER_MARK)) == 0)
                rxq->flags |= SFC_EF100_RXQ_USER_MARK;
        else
                rxq->flags &= ~SFC_EF100_RXQ_USER_MARK;