ixgbevf: support RSS reta/hash query and update

This patch implements the VF RSS reta/hash query and update function
on 10G NICs. But the update function is only provided for x550. Because
the other NICs don't have the separate registers for VF, we don't want
to let a VF NIC change the shared RSS reta/hash registers. It may cause
PF and other VF NICs' behavior change without being noticed.

Signed-off-by: Wenzhuo Lu <wenzhuo.lu@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst
index c32f50927680f1c97d5ea6bf3e37e99058f37315..97009f04df12f63ce23e077ee0fee0919910545b 100644 (file)
--- a/doc/guides/rel_notes/release_2_2.rst
+++ b/doc/guides/rel_notes/release_2_2.rst
@@ -9,6 +9,7 @@ New Features
 * **RSS enhancement on Intel x550 NIC**
 
   * Support 512 entries RSS redirection table.
+  * Support per VF RSS redirection table.
 
 * **Enhanced support for the Chelsio CXGBE driver.**
 

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c
index 62ea0ed366a4d7baf1df45258928448626037cdb..437366114aad8618b048c77666684183b7cf77be 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.c
+++ b/drivers/net/ixgbe/ixgbe_ethdev.c
@@ -497,6 +497,10 @@ static const struct eth_dev_ops ixgbevf_eth_dev_ops = {
        .mac_addr_set         = ixgbevf_set_default_mac_addr,
        .get_reg_length       = ixgbevf_get_reg_length,
        .get_reg              = ixgbevf_get_regs,
+       .reta_update          = ixgbe_dev_rss_reta_update,
+       .reta_query           = ixgbe_dev_rss_reta_query,
+       .rss_hash_update      = ixgbe_dev_rss_hash_update,
+       .rss_hash_conf_get    = ixgbe_dev_rss_hash_conf_get,
 };
 
 /* store statistics names and its offset in stats structure */
@@ -3214,6 +3218,13 @@ ixgbe_dev_rss_reta_update(struct rte_eth_dev *dev,
        uint32_t reta_reg;
 
        PMD_INIT_FUNC_TRACE();
+
+       if (!ixgbe_rss_update_sp(hw->mac.type)) {
+               PMD_DRV_LOG(ERR, "RSS reta update is not supported on this "
+                       "NIC.");
+               return -ENOTSUP;
+       }
+
        sp_reta_size = ixgbe_reta_size_get(hw->mac.type);
        if (reta_size != sp_reta_size) {
                PMD_DRV_LOG(ERR, "The size of hash lookup table configured "
@@ -5541,6 +5552,18 @@ ixgbe_rssrk_reg_get(enum ixgbe_mac_type mac_type, uint8_t i) {
        }
 }
 
+bool
+ixgbe_rss_update_sp(enum ixgbe_mac_type mac_type) {
+       switch (mac_type) {
+       case ixgbe_mac_82599_vf:
+       case ixgbe_mac_X540_vf:
+               return 0;
+       default:
+               return 1;
+       }
+}
+
+
 static struct rte_driver rte_ixgbe_driver = {
        .type = PMD_PDEV,
        .init = rte_ixgbe_pmd_init,

diff --git a/drivers/net/ixgbe/ixgbe_ethdev.h b/drivers/net/ixgbe/ixgbe_ethdev.h
index 441a17f15a63a17a062ce6f00addd836f976928b..bfc1c01c90412738118aacd80dcbaf30f952ef81 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_ethdev.h
+++ b/drivers/net/ixgbe/ixgbe_ethdev.h
@@ -385,6 +385,8 @@ uint32_t ixgbe_mrqc_reg_get(enum ixgbe_mac_type mac_type);
 
 uint32_t ixgbe_rssrk_reg_get(enum ixgbe_mac_type mac_type, uint8_t i);
 
+bool ixgbe_rss_update_sp(enum ixgbe_mac_type mac_type);
+
 /*
  * Flow director function prototypes
  */

diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxtx.c
index 0b8ca18bf4d9073042a7a950a6e7c498fa9b2680..1158562ea2652f81606de0140dd23bb7689e151f 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_rxtx.c
+++ b/drivers/net/ixgbe/ixgbe_rxtx.c
@@ -2713,9 +2713,17 @@ ixgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
        struct ixgbe_hw *hw;
        uint32_t mrqc;
        uint64_t rss_hf;
+       uint32_t mrqc_reg;
 
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
+       if (!ixgbe_rss_update_sp(hw->mac.type)) {
+               PMD_DRV_LOG(ERR, "RSS hash update is not supported on this "
+                       "NIC.");
+               return -ENOTSUP;
+       }
+       mrqc_reg = ixgbe_mrqc_reg_get(hw->mac.type);
+
        /*
         * Excerpt from section 7.1.2.8 Receive-Side Scaling (RSS):
         *     "RSS enabling cannot be done dynamically while it must be
@@ -2726,7 +2734,7 @@ ixgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
         * disabled at initialization time.
         */
        rss_hf = rss_conf->rss_hf & IXGBE_RSS_OFFLOAD_ALL;
-       mrqc = IXGBE_READ_REG(hw, IXGBE_MRQC);
+       mrqc = IXGBE_READ_REG(hw, mrqc_reg);
        if (!(mrqc & IXGBE_MRQC_RSSEN)) { /* RSS disabled */
                if (rss_hf != 0) /* Enable RSS */
                        return -(EINVAL);
@@ -2749,13 +2757,17 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
        uint32_t rss_key;
        uint64_t rss_hf;
        uint16_t i;
+       uint32_t mrqc_reg;
+       uint32_t rssrk_reg;
 
        hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       mrqc_reg = ixgbe_mrqc_reg_get(hw->mac.type);
+       rssrk_reg = ixgbe_rssrk_reg_get(hw->mac.type, 0);
        hash_key = rss_conf->rss_key;
        if (hash_key != NULL) {
                /* Return RSS hash key */
                for (i = 0; i < 10; i++) {
-                       rss_key = IXGBE_READ_REG_ARRAY(hw, IXGBE_RSSRK(0), i);
+                       rss_key = IXGBE_READ_REG_ARRAY(hw, rssrk_reg, i);
                        hash_key[(i * 4)] = rss_key & 0x000000FF;
                        hash_key[(i * 4) + 1] = (rss_key >> 8) & 0x000000FF;
                        hash_key[(i * 4) + 2] = (rss_key >> 16) & 0x000000FF;
@@ -2764,7 +2776,7 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
        }
 
        /* Get RSS functions configured in MRQC register */
-       mrqc = IXGBE_READ_REG(hw, IXGBE_MRQC);
+       mrqc = IXGBE_READ_REG(hw, mrqc_reg);
        if ((mrqc & IXGBE_MRQC_RSSEN) == 0) { /* RSS is disabled */
                rss_conf->rss_hf = 0;
                return 0;