net/hns3: enable RSS for IPv6-SCTP dst/src port fields

For Kunpeng930 NIC hardware, it supports to use dst/src port to
RSS hash for ipv6-sctp packet type. However, the Kunpeng920 NIC
hardware is different with it. The Kunpeng920 NIC only supports
dst/src ip to RSS hash for ipv6-sctp packet type.

Signed-off-by: Lijun Ou <oulijun@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 5a234e2..c34dbea 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -3037,6 +3037,7 @@ hns3_get_capability(struct hns3_hw *hw)
                hw->vlan_mode = HNS3_SW_SHIFT_AND_DISCARD_MODE;
                hw->min_tx_pkt_len = HNS3_HIP08_MIN_TX_PKT_LEN;
                pf->tqp_config_mode = HNS3_FIXED_MAX_TQP_NUM_MODE;
+               hw->rss_info.ipv6_sctp_offload_supported = false;
                return 0;
        }
 
@@ -3055,6 +3056,7 @@ hns3_get_capability(struct hns3_hw *hw)
        hw->vlan_mode = HNS3_HW_SHIFT_AND_DISCARD_MODE;
        hw->min_tx_pkt_len = HNS3_HIP09_MIN_TX_PKT_LEN;
        pf->tqp_config_mode = HNS3_FLEX_MAX_TQP_NUM_MODE;
+       hw->rss_info.ipv6_sctp_offload_supported = true;
 
        return 0;
 }

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index d1c3fb8..7d3750d 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1213,6 +1213,7 @@ hns3vf_get_capability(struct hns3_hw *hw)
                hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_2US;
                hw->tso_mode = HNS3_TSO_SW_CAL_PSEUDO_H_CSUM;
                hw->min_tx_pkt_len = HNS3_HIP08_MIN_TX_PKT_LEN;
+               hw->rss_info.ipv6_sctp_offload_supported = false;
                return 0;
        }
 
@@ -1229,6 +1230,7 @@ hns3vf_get_capability(struct hns3_hw *hw)
        hw->intr.gl_unit = HNS3_INTR_COALESCE_GL_UINT_1US;
        hw->tso_mode = HNS3_TSO_HW_CAL_PSEUDO_H_CSUM;
        hw->min_tx_pkt_len = HNS3_HIP09_MIN_TX_PKT_LEN;
+       hw->rss_info.ipv6_sctp_offload_supported = true;
 
        return 0;
 }

diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 4fb129e..73f5e8e 100644 (file)
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1399,8 +1399,18 @@ hns3_parse_rss_filter(struct rte_eth_dev *dev,
                                          RTE_FLOW_ERROR_TYPE_ACTION_CONF, act,
                                          "too many queues for RSS context");
 
+       /*
+        * For Kunpeng920 and Kunpeng930 NIC hardware, it is not supported to
+        * use dst port/src port fields to RSS hash for the following packet
+        * types.
+        * - IPV4 FRAG | IPV4 NONFRAG | IPV6 FRAG | IPV6 NONFRAG
+        * Besides, for Kunpeng920, The NIC hardware is not supported to use
+        * src/dst port fields to RSS hash for IPV6 SCTP packet type.
+        */
        if (rss->types & (ETH_RSS_L4_DST_ONLY | ETH_RSS_L4_SRC_ONLY) &&
-           (rss->types & ETH_RSS_IP))
+          (rss->types & ETH_RSS_IP ||
+          (!hw->rss_info.ipv6_sctp_offload_supported &&
+          rss->types & ETH_RSS_NONFRAG_IPV6_SCTP)))
                return rte_flow_error_set(error, EINVAL,
                                          RTE_FLOW_ERROR_TYPE_ACTION_CONF,
                                          &rss->types,

diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index a8b8143..2efd410 100644 (file)
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -61,8 +61,10 @@ enum hns3_tuple_field {
        HNS3_RSS_FIELD_IPV6_UDP_EN_IP_D,
        HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S,
 
-       /* IPV6_UDP ENABLE FIELD */
-       HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D = 50,
+       /* IPV6_SCTP ENABLE FIELD */
+       HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D = 48,
+       HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S,
+       HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D,
        HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S,
        HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_VER,
 
@@ -133,6 +135,10 @@ static const struct {
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) },
        { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D) },
+       { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
+         BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S) },
+       { ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,
+         BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D) },
        { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_SRC_ONLY,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) },
        { ETH_RSS_NONFRAG_IPV6_OTHER | ETH_RSS_L3_DST_ONLY,
@@ -177,6 +183,8 @@ static const struct {
          BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D) },
        { ETH_RSS_NONFRAG_IPV6_SCTP, BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D) |
+         BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_D) |
+         BIT_ULL(HNS3_RSS_FILED_IPV6_SCTP_EN_SCTP_S) |
          BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_VER) },
        { ETH_RSS_NONFRAG_IPV6_OTHER,
          BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) |

diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h
index b5ac8ae..6d1d25f 100644 (file)
--- a/drivers/net/hns3/hns3_rss.h
+++ b/drivers/net/hns3/hns3_rss.h
@@ -48,6 +48,12 @@ struct hns3_rss_conf {
        uint16_t rss_indirection_tbl[HNS3_RSS_IND_TBL_SIZE]; /* Shadow table */
        uint16_t queue[HNS3_RSS_QUEUES_BUFFER_NUM]; /* Queues indices to use */
        bool valid; /* check if RSS rule is valid */
+       /*
+        * For IPv6 SCTP packets type, check whether the NIC hardware support
+        * RSS hash using the src/dst port as the input tuple. For Kunpeng920
+        * NIC hardware, it is not supported
+        */
+       bool ipv6_sctp_offload_supported;
 };
 
 #ifndef ilog2