vhost: mark vDPA driver API as internal

[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 d6308dc..83f5c1e 100644 (file)
--- a/drivers/net/sfc/sfc_ef100_rx.c
+++ b/drivers/net/sfc/sfc_ef100_rx.c
@@ -20,7 +20,9 @@
 #include "efx_regs_ef100.h"
 #include "efx.h"
 
+#include "sfc.h"
 #include "sfc_debug.h"
+#include "sfc_flow_tunnel.h"
 #include "sfc_tweak.h"
 #include "sfc_dp_rx.h"
 #include "sfc_kvargs.h"
@@ -75,6 +77,7 @@ struct sfc_ef100_rxq {
        uint64_t                        rearm_data;
        uint16_t                        buf_size;
        uint16_t                        prefix_size;
+       uint32_t                        user_mark_mask;
 
        unsigned int                    evq_hw_index;
        volatile void                   *evq_prime;
@@ -205,7 +208,7 @@ sfc_ef100_rx_nt_or_inner_l4_csum(const efx_word_t class)
        return EFX_WORD_FIELD(class,
                              ESF_GZ_RX_PREFIX_HCLASS_NT_OR_INNER_L4_CSUM) ==
                ESE_GZ_RH_HCLASS_L4_CSUM_GOOD ?
-               PKT_RX_L4_CKSUM_GOOD : PKT_RX_L4_CKSUM_BAD;
+               RTE_MBUF_F_RX_L4_CKSUM_GOOD : RTE_MBUF_F_RX_L4_CKSUM_BAD;
 }
 
 static inline uint64_t
@@ -214,7 +217,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_BAD;
+               RTE_MBUF_F_RX_OUTER_L4_CKSUM_GOOD : RTE_MBUF_F_RX_OUTER_L4_CKSUM_BAD;
 }
 
 static uint32_t
@@ -270,11 +273,11 @@ sfc_ef100_rx_class_decode(const efx_word_t class, uint64_t *ol_flags)
                        ESF_GZ_RX_PREFIX_HCLASS_NT_OR_INNER_L3_CLASS)) {
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP4GOOD:
                        ptype |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
-                       *ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+                       *ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP4BAD:
                        ptype |= RTE_PTYPE_L3_IPV4_EXT_UNKNOWN;
-                       *ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       *ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP6:
                        ptype |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
@@ -311,7 +314,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_OUTER_IP_CKSUM_BAD;
+                       *ol_flags |= RTE_MBUF_F_RX_OUTER_IP_CKSUM_BAD;
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP6:
                        ptype |= RTE_PTYPE_L3_IPV6_EXT_UNKNOWN;
@@ -322,11 +325,11 @@ sfc_ef100_rx_class_decode(const efx_word_t class, uint64_t *ol_flags)
                        ESF_GZ_RX_PREFIX_HCLASS_NT_OR_INNER_L3_CLASS)) {
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP4GOOD:
                        ptype |= RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN;
-                       *ol_flags |= PKT_RX_IP_CKSUM_GOOD;
+                       *ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP4BAD:
                        ptype |= RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN;
-                       *ol_flags |= PKT_RX_IP_CKSUM_BAD;
+                       *ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
                        break;
                case ESE_GZ_RH_HCLASS_L3_CLASS_IP6:
                        ptype |= RTE_PTYPE_INNER_L3_IPV6_EXT_UNKNOWN;
@@ -406,7 +409,7 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
        if ((rxq->flags & SFC_EF100_RXQ_RSS_HASH) &&
            EFX_TEST_XWORD_BIT(rx_prefix[0],
                               ESF_GZ_RX_PREFIX_RSS_HASH_VALID_LBN)) {
-               ol_flags |= PKT_RX_RSS_HASH;
+               ol_flags |= RTE_MBUF_F_RX_RSS_HASH;
                /* EFX_XWORD_FIELD converts little-endian to CPU */
                m->hash.rss = EFX_XWORD_FIELD(rx_prefix[0],
                                              ESF_GZ_RX_PREFIX_RSS_HASH);
@@ -418,19 +421,34 @@ sfc_ef100_rx_prefix_to_offloads(const struct sfc_ef100_rxq *rxq,
                user_flag = EFX_XWORD_FIELD(rx_prefix[0],
                                            ESF_GZ_RX_PREFIX_USER_FLAG);
                if (user_flag != 0)
-                       ol_flags |= PKT_RX_FDIR;
+                       ol_flags |= RTE_MBUF_F_RX_FDIR;
        }
 
        if (rxq->flags & SFC_EF100_RXQ_USER_MARK) {
+               uint8_t tunnel_mark;
                uint32_t user_mark;
+               uint32_t mark;
 
                /* EFX_XWORD_FIELD converts little-endian to CPU */
-               user_mark = EFX_XWORD_FIELD(rx_prefix[0],
-                                           ESF_GZ_RX_PREFIX_USER_MARK);
+               mark = EFX_XWORD_FIELD(rx_prefix[0],
+                                      ESF_GZ_RX_PREFIX_USER_MARK);
+
+               user_mark = mark & rxq->user_mark_mask;
                if (user_mark != SFC_EF100_USER_MARK_INVALID) {
-                       ol_flags |= PKT_RX_FDIR | PKT_RX_FDIR_ID;
+                       ol_flags |= RTE_MBUF_F_RX_FDIR | RTE_MBUF_F_RX_FDIR_ID;
                        m->hash.fdir.hi = user_mark;
                }
+
+               tunnel_mark = SFC_FT_GET_TUNNEL_MARK(mark);
+               if (tunnel_mark != SFC_FT_TUNNEL_MARK_INVALID) {
+                       sfc_ft_id_t ft_id;
+
+                       ft_id = SFC_FT_TUNNEL_MARK_TO_ID(tunnel_mark);
+
+                       ol_flags |= sfc_dp_ft_id_valid;
+                       *RTE_MBUF_DYNFIELD(m, sfc_dp_ft_id_offset,
+                                          sfc_ft_id_t *) = ft_id;
+               }
        }
 
        if (rxq->flags & SFC_EF100_RXQ_INGRESS_MPORT) {
@@ -760,6 +778,10 @@ sfc_ef100_rx_qcreate(uint16_t port_id, uint16_t queue_id,
        rxq->max_fill_level = info->max_fill_level;
        rxq->refill_threshold = info->refill_threshold;
        rxq->prefix_size = info->prefix_size;
+
+       SFC_ASSERT(info->user_mark_mask != 0);
+       rxq->user_mark_mask = info->user_mark_mask;
+
        rxq->buf_size = info->buf_size;
        rxq->refill_mb_pool = info->refill_mb_pool;
        rxq->rxq_hw_ring = info->rxq_hw_ring;
@@ -957,11 +979,11 @@ struct sfc_dp_rx sfc_ef100_rx = {
                                  SFC_DP_RX_FEAT_INTR |
                                  SFC_DP_RX_FEAT_STATS,
        .dev_offload_capa       = 0,
-       .queue_offload_capa     = DEV_RX_OFFLOAD_CHECKSUM |
-                                 DEV_RX_OFFLOAD_OUTER_IPV4_CKSUM |
-                                 DEV_RX_OFFLOAD_OUTER_UDP_CKSUM |
-                                 DEV_RX_OFFLOAD_SCATTER |
-                                 DEV_RX_OFFLOAD_RSS_HASH,
+       .queue_offload_capa     = RTE_ETH_RX_OFFLOAD_CHECKSUM |
+                                 RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
+                                 RTE_ETH_RX_OFFLOAD_OUTER_UDP_CKSUM |
+                                 RTE_ETH_RX_OFFLOAD_SCATTER |
+                                 RTE_ETH_RX_OFFLOAD_RSS_HASH,
        .get_dev_info           = sfc_ef100_rx_get_dev_info,
        .qsize_up_rings         = sfc_ef100_rx_qsize_up_rings,
        .qcreate                = sfc_ef100_rx_qcreate,