git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/sfc: add dedicated header file with MCDI interface
[dpdk.git] / drivers / net / iavf / iavf_hash.c
diff --git a/drivers/net/iavf/iavf_hash.c b/drivers/net/iavf/iavf_hash.c
index 3152218..325c35e 100644 (file)
--- a/drivers/net/iavf/iavf_hash.c
+++ b/drivers/net/iavf/iavf_hash.c
@@ -539,6 +539,14 @@ iavf_hash_parse_pattern(struct iavf_pattern_match_item *pattern_match_item,
        return 0;
 }
 
+#define REFINE_PROTO_FLD(op, fld) \
+       VIRTCHNL_##op##_PROTO_HDR_FIELD(hdr, VIRTCHNL_PROTO_HDR_##fld)
+#define REPALCE_PROTO_FLD(fld_1, fld_2) \
+do { \
+       REFINE_PROTO_FLD(DEL, fld_1);   \
+       REFINE_PROTO_FLD(ADD, fld_2);   \
+} while (0)
+
 /* refine proto hdrs base on l2, l3, l4 rss type */
 static void
 iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
@@ -554,11 +562,9 @@ iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
                        if (!(rss_type & ETH_RSS_ETH))
                                hdr->field_selector = 0;
                        else if (rss_type & ETH_RSS_L2_SRC_ONLY)
-                               VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                       VIRTCHNL_PROTO_HDR_ETH_DST);
+                               REFINE_PROTO_FLD(DEL, ETH_DST);
                        else if (rss_type & ETH_RSS_L2_DST_ONLY)
-                               VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                       VIRTCHNL_PROTO_HDR_ETH_SRC);
+                               REFINE_PROTO_FLD(DEL, ETH_SRC);
                        break;
                case VIRTCHNL_PROTO_HDR_IPV4:
                        if (rss_type &
@@ -567,11 +573,9 @@ iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
                             ETH_RSS_NONFRAG_IPV4_TCP |
                             ETH_RSS_NONFRAG_IPV4_SCTP)) {
                                if (rss_type & ETH_RSS_L3_SRC_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                               VIRTCHNL_PROTO_HDR_IPV4_DST);
+                                       REFINE_PROTO_FLD(DEL, IPV4_DST);
                                else if (rss_type & ETH_RSS_L3_DST_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                               VIRTCHNL_PROTO_HDR_IPV4_SRC);
+                                       REFINE_PROTO_FLD(DEL, IPV4_SRC);
                                else if (rss_type &
                                         (ETH_RSS_L4_SRC_ONLY |
                                          ETH_RSS_L4_DST_ONLY))
@@ -587,11 +591,9 @@ iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
                             ETH_RSS_NONFRAG_IPV6_TCP |
                             ETH_RSS_NONFRAG_IPV6_SCTP)) {
                                if (rss_type & ETH_RSS_L3_SRC_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                               VIRTCHNL_PROTO_HDR_IPV6_DST);
+                                       REFINE_PROTO_FLD(DEL, IPV6_DST);
                                else if (rss_type & ETH_RSS_L3_DST_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                               VIRTCHNL_PROTO_HDR_IPV6_SRC);
+                                       REFINE_PROTO_FLD(DEL, IPV6_SRC);
                                else if (rss_type &
                                         (ETH_RSS_L4_SRC_ONLY |
                                          ETH_RSS_L4_DST_ONLY))
@@ -599,17 +601,23 @@ iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
                        } else {
                                hdr->field_selector = 0;
                        }
+                       if (rss_type & RTE_ETH_RSS_L3_PRE64) {
+                               if (REFINE_PROTO_FLD(TEST, IPV6_SRC))
+                                       REPALCE_PROTO_FLD(IPV6_SRC,
+                                                         IPV6_PREFIX64_SRC);
+                               if (REFINE_PROTO_FLD(TEST, IPV6_DST))
+                                       REPALCE_PROTO_FLD(IPV6_DST,
+                                                         IPV6_PREFIX64_DST);
+                       }
                        break;
                case VIRTCHNL_PROTO_HDR_UDP:
                        if (rss_type &
                            (ETH_RSS_NONFRAG_IPV4_UDP |
                             ETH_RSS_NONFRAG_IPV6_UDP)) {
                                if (rss_type & ETH_RSS_L4_SRC_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                           VIRTCHNL_PROTO_HDR_UDP_DST_PORT);
+                                       REFINE_PROTO_FLD(DEL, UDP_DST_PORT);
                                else if (rss_type & ETH_RSS_L4_DST_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                           VIRTCHNL_PROTO_HDR_UDP_SRC_PORT);
+                                       REFINE_PROTO_FLD(DEL, UDP_SRC_PORT);
                                else if (rss_type &
                                         (ETH_RSS_L3_SRC_ONLY |
                                          ETH_RSS_L3_DST_ONLY))
@@ -623,11 +631,9 @@ iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
                            (ETH_RSS_NONFRAG_IPV4_TCP |
                             ETH_RSS_NONFRAG_IPV6_TCP)) {
                                if (rss_type & ETH_RSS_L4_SRC_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                           VIRTCHNL_PROTO_HDR_TCP_DST_PORT);
+                                       REFINE_PROTO_FLD(DEL, TCP_DST_PORT);
                                else if (rss_type & ETH_RSS_L4_DST_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                           VIRTCHNL_PROTO_HDR_TCP_SRC_PORT);
+                                       REFINE_PROTO_FLD(DEL, TCP_SRC_PORT);
                                else if (rss_type &
                                         (ETH_RSS_L3_SRC_ONLY |
                                          ETH_RSS_L3_DST_ONLY))
@@ -641,11 +647,9 @@ iavf_refine_proto_hdrs_l234(struct virtchnl_proto_hdrs *proto_hdrs,
                            (ETH_RSS_NONFRAG_IPV4_SCTP |
                             ETH_RSS_NONFRAG_IPV6_SCTP)) {
                                if (rss_type & ETH_RSS_L4_SRC_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                           VIRTCHNL_PROTO_HDR_SCTP_DST_PORT);
+                                       REFINE_PROTO_FLD(DEL, SCTP_DST_PORT);
                                else if (rss_type & ETH_RSS_L4_DST_ONLY)
-                                       VIRTCHNL_DEL_PROTO_HDR_FIELD(hdr,
-                                           VIRTCHNL_PROTO_HDR_TCP_SRC_PORT);
+                                       REFINE_PROTO_FLD(DEL, SCTP_SRC_PORT);
                                else if (rss_type &
                                         (ETH_RSS_L3_SRC_ONLY |
                                          ETH_RSS_L3_DST_ONLY))
@@ -699,8 +703,7 @@ iavf_refine_proto_hdrs_gtpu(struct virtchnl_proto_hdrs *proto_hdrs,
                hdr = &proto_hdrs->proto_hdr[i];
                switch (hdr->type) {
                case VIRTCHNL_PROTO_HDR_GTPU_IP:
-                       VIRTCHNL_ADD_PROTO_HDR_FIELD(hdr,
-                               VIRTCHNL_PROTO_HDR_GTPU_IP_TEID);
+                       REFINE_PROTO_FLD(ADD, GTPU_IP_TEID);
                        break;
                default:
                        break;
@@ -763,6 +766,47 @@ static uint64_t invalid_rss_comb[] = {
        RTE_ETH_RSS_L3_PRE96
 };
 
+struct rss_attr_type {
+       uint64_t attr;
+       uint64_t type;
+};
+
+#define VALID_RSS_IPV4_L4      (ETH_RSS_NONFRAG_IPV4_UDP       | \
+                                ETH_RSS_NONFRAG_IPV4_TCP       | \
+                                ETH_RSS_NONFRAG_IPV4_SCTP)
+
+#define VALID_RSS_IPV6_L4      (ETH_RSS_NONFRAG_IPV6_UDP       | \
+                                ETH_RSS_NONFRAG_IPV6_TCP       | \
+                                ETH_RSS_NONFRAG_IPV6_SCTP)
+
+#define VALID_RSS_IPV4         (ETH_RSS_IPV4 | VALID_RSS_IPV4_L4)
+#define VALID_RSS_IPV6         (ETH_RSS_IPV6 | VALID_RSS_IPV6_L4)
+#define VALID_RSS_L3           (VALID_RSS_IPV4 | VALID_RSS_IPV6)
+#define VALID_RSS_L4           (VALID_RSS_IPV4_L4 | VALID_RSS_IPV6_L4)
+
+#define VALID_RSS_ATTR         (ETH_RSS_L3_SRC_ONLY    | \
+                                ETH_RSS_L3_DST_ONLY    | \
+                                ETH_RSS_L4_SRC_ONLY    | \
+                                ETH_RSS_L4_DST_ONLY    | \
+                                ETH_RSS_L2_SRC_ONLY    | \
+                                ETH_RSS_L2_DST_ONLY    | \
+                                RTE_ETH_RSS_L3_PRE64)
+
+#define INVALID_RSS_ATTR       (RTE_ETH_RSS_L3_PRE32   | \
+                                RTE_ETH_RSS_L3_PRE40   | \
+                                RTE_ETH_RSS_L3_PRE48   | \
+                                RTE_ETH_RSS_L3_PRE56   | \
+                                RTE_ETH_RSS_L3_PRE96)
+
+static struct rss_attr_type rss_attr_to_valid_type[] = {
+       {ETH_RSS_L2_SRC_ONLY | ETH_RSS_L2_DST_ONLY,     ETH_RSS_ETH},
+       {ETH_RSS_L3_SRC_ONLY | ETH_RSS_L3_DST_ONLY,     VALID_RSS_L3},
+       {ETH_RSS_L4_SRC_ONLY | ETH_RSS_L4_DST_ONLY,     VALID_RSS_L4},
+       /* current ipv6 prefix only supports prefix 64 bits*/
+       {RTE_ETH_RSS_L3_PRE64,                          VALID_RSS_IPV6},
+       {INVALID_RSS_ATTR,                              0}
+};
+
 static bool
 iavf_any_invalid_rss_type(uint64_t rss_type, uint64_t allow_rss_type)
 {
@@ -774,21 +818,16 @@ iavf_any_invalid_rss_type(uint64_t rss_type, uint64_t allow_rss_type)
                        return true;
        }
 
+       /* check invalid RSS attribute */
+       for (i = 0; i < RTE_DIM(rss_attr_to_valid_type); i++) {
+               struct rss_attr_type *rat = &rss_attr_to_valid_type[i];
+
+               if (rat->attr & rss_type && !(rat->type & rss_type))
+                       return true;
+       }
+
        /* check not allowed RSS type */
-#define _RSS_ATTR_ (ETH_RSS_L3_SRC_ONLY                | \
-                   ETH_RSS_L3_DST_ONLY         | \
-                   ETH_RSS_L4_SRC_ONLY         | \
-                   ETH_RSS_L4_DST_ONLY         | \
-                   ETH_RSS_L2_SRC_ONLY         | \
-                   ETH_RSS_L2_DST_ONLY         | \
-                   RTE_ETH_RSS_L3_PRE32        | \
-                   RTE_ETH_RSS_L3_PRE40        | \
-                   RTE_ETH_RSS_L3_PRE48        | \
-                   RTE_ETH_RSS_L3_PRE56        | \
-                   RTE_ETH_RSS_L3_PRE64        | \
-                   RTE_ETH_RSS_L3_PRE96)
-
-       rss_type &= ~_RSS_ATTR_;
+       rss_type &= ~VALID_RSS_ATTR;
 
        return ((rss_type & allow_rss_type) != rss_type);
 }
DPDK repo used for reviews