net/atlantic: implement RSS and RETA manipulation API

Add support for Receive Side Scaling feature.
RSS hash and reta table configuration.

Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: Pavel Belous <pavel.belous@aquantia.com>

diff --git a/doc/guides/nics/atlantic.rst b/doc/guides/nics/atlantic.rst
index b09c79b..80591b1 100644 (file)
--- a/doc/guides/nics/atlantic.rst
+++ b/doc/guides/nics/atlantic.rst
@@ -16,6 +16,7 @@ Supported features
 - Promiscuous mode
 - Multicast mode
 - Port statistics
+- RSS (Receive Side Scaling)
 - Checksum offload
 - Jumbo Frame upto 16K
 

diff --git a/doc/guides/nics/features/atlantic.ini b/doc/guides/nics/features/atlantic.ini
index 347ac80..592af81 100644 (file)
--- a/doc/guides/nics/features/atlantic.ini
+++ b/doc/guides/nics/features/atlantic.ini
@@ -11,6 +11,9 @@ Queue start/stop     = Y
 Jumbo frame          = Y
 Promiscuous mode     = Y
 Allmulticast mode    = Y
+RSS hash             = Y
+RSS key update       = Y
+RSS reta update      = Y
 CRC offload          = Y
 L3 checksum offload  = Y
 L4 checksum offload  = Y

diff --git a/drivers/net/atlantic/atl_ethdev.c b/drivers/net/atlantic/atl_ethdev.c
index 5223b57..2f36584 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.c
+++ b/drivers/net/atlantic/atl_ethdev.c
@@ -58,6 +58,19 @@ static int atl_dev_interrupt_action(struct rte_eth_dev *dev,
                                    struct rte_intr_handle *handle);
 static void atl_dev_interrupt_handler(void *param);
 
+/* RSS */
+static int atl_reta_update(struct rte_eth_dev *dev,
+                            struct rte_eth_rss_reta_entry64 *reta_conf,
+                            uint16_t reta_size);
+static int atl_reta_query(struct rte_eth_dev *dev,
+                           struct rte_eth_rss_reta_entry64 *reta_conf,
+                           uint16_t reta_size);
+static int atl_rss_hash_update(struct rte_eth_dev *dev,
+                                struct rte_eth_rss_conf *rss_conf);
+static int atl_rss_hash_conf_get(struct rte_eth_dev *dev,
+                                  struct rte_eth_rss_conf *rss_conf);
+
+
 static int eth_atl_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
        struct rte_pci_device *pci_dev);
 static int eth_atl_pci_remove(struct rte_pci_device *pci_dev);
@@ -208,6 +221,11 @@ static const struct eth_dev_ops atl_eth_dev_ops = {
 
        .rxq_info_get         = atl_rxq_info_get,
        .txq_info_get         = atl_txq_info_get,
+
+       .reta_update          = atl_reta_update,
+       .reta_query           = atl_reta_query,
+       .rss_hash_update      = atl_rss_hash_update,
+       .rss_hash_conf_get    = atl_rss_hash_conf_get,
 };
 
 static inline int32_t
@@ -260,12 +278,18 @@ eth_atl_dev_init(struct rte_eth_dev *eth_dev)
        /* Hardware configuration - hardcode */
        adapter->hw_cfg.is_lro = false;
        adapter->hw_cfg.wol = false;
+       adapter->hw_cfg.is_rss = false;
+       adapter->hw_cfg.num_rss_queues = HW_ATL_B0_RSS_MAX;
+
        adapter->hw_cfg.link_speed_msk = AQ_NIC_RATE_10G |
                          AQ_NIC_RATE_5G |
                          AQ_NIC_RATE_2G5 |
                          AQ_NIC_RATE_1G |
                          AQ_NIC_RATE_100M;
 
+       adapter->hw_cfg.aq_rss.indirection_table_size =
+               HW_ATL_B0_RSS_REDIRECTION_MAX;
+
        hw->aq_nic_cfg = &adapter->hw_cfg;
 
        /* disable interrupt */
@@ -747,6 +771,10 @@ atl_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
        dev_info->rx_desc_lim = rx_desc_lim;
        dev_info->tx_desc_lim = tx_desc_lim;
 
+       dev_info->hash_key_size = HW_ATL_B0_RSS_HASHKEY_BITS / 8;
+       dev_info->reta_size = HW_ATL_B0_RSS_REDIRECTION_MAX;
+       dev_info->flow_type_rss_offloads = ATL_RSS_OFFLOAD_ALL;
+
        dev_info->speed_capa = ETH_LINK_SPEED_1G | ETH_LINK_SPEED_10G;
        dev_info->speed_capa |= ETH_LINK_SPEED_100M;
        dev_info->speed_capa |= ETH_LINK_SPEED_2_5G;
@@ -998,6 +1026,85 @@ atl_dev_interrupt_handler(void *param)
        atl_dev_interrupt_action(dev, dev->intr_handle);
 }
 
+static int
+atl_reta_update(struct rte_eth_dev *dev,
+                  struct rte_eth_rss_reta_entry64 *reta_conf,
+                  uint16_t reta_size)
+{
+       int i;
+       struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct aq_hw_cfg_s *cf = ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private);
+
+       for (i = 0; i < reta_size && i < cf->aq_rss.indirection_table_size; i++)
+               cf->aq_rss.indirection_table[i] = min(reta_conf->reta[i],
+                                       dev->data->nb_rx_queues - 1);
+
+       hw_atl_b0_hw_rss_set(hw, &cf->aq_rss);
+       return 0;
+}
+
+static int
+atl_reta_query(struct rte_eth_dev *dev,
+                   struct rte_eth_rss_reta_entry64 *reta_conf,
+                   uint16_t reta_size)
+{
+       int i;
+       struct aq_hw_cfg_s *cf = ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private);
+
+       for (i = 0; i < reta_size && i < cf->aq_rss.indirection_table_size; i++)
+               reta_conf->reta[i] = cf->aq_rss.indirection_table[i];
+       reta_conf->mask = ~0U;
+       return 0;
+}
+
+static int
+atl_rss_hash_update(struct rte_eth_dev *dev,
+                                struct rte_eth_rss_conf *rss_conf)
+{
+       struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+       struct aq_hw_cfg_s *cfg =
+               ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private);
+       static u8 def_rss_key[40] = {
+               0x1e, 0xad, 0x71, 0x87, 0x65, 0xfc, 0x26, 0x7d,
+               0x0d, 0x45, 0x67, 0x74, 0xcd, 0x06, 0x1a, 0x18,
+               0xb6, 0xc1, 0xf0, 0xc7, 0xbb, 0x18, 0xbe, 0xf8,
+               0x19, 0x13, 0x4b, 0xa9, 0xd0, 0x3e, 0xfe, 0x70,
+               0x25, 0x03, 0xab, 0x50, 0x6a, 0x8b, 0x82, 0x0c
+       };
+
+       cfg->is_rss = !!rss_conf->rss_hf;
+       if (rss_conf->rss_key) {
+               memcpy(cfg->aq_rss.hash_secret_key, rss_conf->rss_key,
+                      rss_conf->rss_key_len);
+               cfg->aq_rss.hash_secret_key_size = rss_conf->rss_key_len;
+       } else {
+               memcpy(cfg->aq_rss.hash_secret_key, def_rss_key,
+                      sizeof(def_rss_key));
+               cfg->aq_rss.hash_secret_key_size = sizeof(def_rss_key);
+       }
+
+       hw_atl_b0_hw_rss_set(hw, &cfg->aq_rss);
+       hw_atl_b0_hw_rss_hash_set(hw, &cfg->aq_rss);
+       return 0;
+}
+
+static int
+atl_rss_hash_conf_get(struct rte_eth_dev *dev,
+                                struct rte_eth_rss_conf *rss_conf)
+{
+       struct aq_hw_cfg_s *cfg =
+               ATL_DEV_PRIVATE_TO_CFG(dev->data->dev_private);
+
+       rss_conf->rss_hf = cfg->is_rss ? ATL_RSS_OFFLOAD_ALL : 0;
+       if (rss_conf->rss_key) {
+               rss_conf->rss_key_len = cfg->aq_rss.hash_secret_key_size;
+               memcpy(rss_conf->rss_key, cfg->aq_rss.hash_secret_key,
+                      rss_conf->rss_key_len);
+       }
+
+       return 0;
+}
+
 RTE_PMD_REGISTER_PCI(net_atlantic, rte_atl_pmd);
 RTE_PMD_REGISTER_PCI_TABLE(net_atlantic, pci_id_atl_map);
 RTE_PMD_REGISTER_KMOD_DEP(net_atlantic, "* igb_uio | uio_pci_generic");

diff --git a/drivers/net/atlantic/atl_ethdev.h b/drivers/net/atlantic/atl_ethdev.h
index c315e04..1e29999 100644 (file)
--- a/drivers/net/atlantic/atl_ethdev.h
+++ b/drivers/net/atlantic/atl_ethdev.h
@@ -10,6 +10,17 @@
 #include "atl_types.h"
 #include "hw_atl/hw_atl_utils.h"
 
+#define ATL_RSS_OFFLOAD_ALL ( \
+       ETH_RSS_IPV4 | \
+       ETH_RSS_NONFRAG_IPV4_TCP | \
+       ETH_RSS_NONFRAG_IPV4_UDP | \
+       ETH_RSS_IPV6 | \
+       ETH_RSS_NONFRAG_IPV6_TCP | \
+       ETH_RSS_NONFRAG_IPV6_UDP | \
+       ETH_RSS_IPV6_EX | \
+       ETH_RSS_IPV6_TCP_EX | \
+       ETH_RSS_IPV6_UDP_EX)
+
 #define ATL_DEV_PRIVATE_TO_HW(adapter) \
        (&((struct atl_adapter *)adapter)->hw)
 
@@ -19,6 +30,9 @@
 #define ATL_DEV_PRIVATE_TO_INTR(adapter) \
        (&((struct atl_adapter *)adapter)->intr)
 
+#define ATL_DEV_PRIVATE_TO_CFG(adapter) \
+       (&((struct atl_adapter *)adapter)->hw_cfg)
+
 #define ATL_FLAG_NEED_LINK_UPDATE (uint32_t)(1 << 0)
 #define ATL_FLAG_NEED_LINK_CONFIG (uint32_t)(4 << 0)
 

diff --git a/drivers/net/atlantic/atl_rxtx.c b/drivers/net/atlantic/atl_rxtx.c
index fbd50a7..0126721 100644 (file)
--- a/drivers/net/atlantic/atl_rxtx.c
+++ b/drivers/net/atlantic/atl_rxtx.c
@@ -336,6 +336,7 @@ int
 atl_rx_init(struct rte_eth_dev *eth_dev)
 {
        struct aq_hw_s *hw = ATL_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
+       struct aq_rss_parameters *rss_params = &hw->aq_nic_cfg->aq_rss;
        struct atl_rx_queue *rxq;
        uint64_t base_addr = 0;
        int i = 0;
@@ -379,6 +380,10 @@ atl_rx_init(struct rte_eth_dev *eth_dev)
                }
        }
 
+       for (i = rss_params->indirection_table_size; i--;)
+               rss_params->indirection_table[i] = i &
+                       (eth_dev->data->nb_rx_queues - 1);
+       hw_atl_b0_hw_rss_set(hw, rss_params);
        return err;
 }