ethdev: VMDQ enhancements

The change includes several parts:
1. Clear pool bitmap when trying to remove specific MAC.
2. Define RSS, DCB and VMDQ flags to combine rx_mq_mode.
3. Use 'struct' to replace 'union', which to expand the rx_adv_conf
   arguments to better support RSS, DCB and VMDQ.
4. Fix bug in rte_eth_dev_config_restore function, which will restore
   all MAC address to default pool.
5. Define additional 3 arguments for better VMDQ support.

Signed-off-by: Chen Jing D(Mark) <jing.d.chen@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index ff1c769..5e9d576 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -813,7 +813,8 @@ rte_eth_dev_config_restore(uint8_t port_id)
                        continue;
 
                /* add address to the hardware */
-               if  (*dev->dev_ops->mac_addr_add)
+               if  (*dev->dev_ops->mac_addr_add &&
+                       dev->data->mac_pool_sel[i] & (1ULL << pool))
                        (*dev->dev_ops->mac_addr_add)(dev, &addr, i, pool);
                else {
                        PMD_DEBUG_TRACE("port %d: MAC address array not supported\n",
@@ -2220,6 +2221,9 @@ rte_eth_dev_mac_addr_remove(uint8_t port_id, struct ether_addr *addr)
        /* Update address in NIC data structure */
        ether_addr_copy(&null_mac_addr, &dev->data->mac_addrs[index]);
 
+       /* reset pool bitmap */
+       dev->data->mac_pool_sel[index] = 0;
+
        return 0;
 }
 

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 8bf274d..7e4c998 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -252,21 +252,37 @@ struct rte_eth_thresh {
        uint8_t wthresh; /**< Ring writeback threshold. */
 };
 
+/**
+ *  Simple flags are used for rte_eth_conf.rxmode.mq_mode.
+ */
+#define ETH_MQ_RX_RSS_FLAG  0x1
+#define ETH_MQ_RX_DCB_FLAG  0x2
+#define ETH_MQ_RX_VMDQ_FLAG 0x4
+
 /**
  *  A set of values to identify what method is to be used to route
  *  packets to multiple queues.
  */
 enum rte_eth_rx_mq_mode {
-       ETH_MQ_RX_NONE = 0,  /**< None of DCB,RSS or VMDQ mode */
-
-       ETH_MQ_RX_RSS,       /**< For RX side, only RSS is on */
-       ETH_MQ_RX_DCB,       /**< For RX side,only DCB is on. */
-       ETH_MQ_RX_DCB_RSS,   /**< Both DCB and RSS enable */
-
-       ETH_MQ_RX_VMDQ_ONLY, /**< Only VMDQ, no RSS nor DCB */
-       ETH_MQ_RX_VMDQ_RSS,  /**< RSS mode with VMDQ */
-       ETH_MQ_RX_VMDQ_DCB,  /**< Use VMDQ+DCB to route traffic to queues */
-       ETH_MQ_RX_VMDQ_DCB_RSS, /**< Enable both VMDQ and DCB in VMDq */
+       /** None of DCB,RSS or VMDQ mode */
+       ETH_MQ_RX_NONE = 0,
+
+       /** For RX side, only RSS is on */
+       ETH_MQ_RX_RSS = ETH_MQ_RX_RSS_FLAG,
+       /** For RX side,only DCB is on. */
+       ETH_MQ_RX_DCB = ETH_MQ_RX_DCB_FLAG,
+       /** Both DCB and RSS enable */
+       ETH_MQ_RX_DCB_RSS = ETH_MQ_RX_RSS_FLAG | ETH_MQ_RX_DCB_FLAG,
+
+       /** Only VMDQ, no RSS nor DCB */
+       ETH_MQ_RX_VMDQ_ONLY = ETH_MQ_RX_VMDQ_FLAG,
+       /** RSS mode with VMDQ */
+       ETH_MQ_RX_VMDQ_RSS = ETH_MQ_RX_RSS_FLAG | ETH_MQ_RX_VMDQ_FLAG,
+       /** Use VMDQ+DCB to route traffic to queues */
+       ETH_MQ_RX_VMDQ_DCB = ETH_MQ_RX_VMDQ_FLAG | ETH_MQ_RX_DCB_FLAG,
+       /** Enable both VMDQ and DCB in VMDq */
+       ETH_MQ_RX_VMDQ_DCB_RSS = ETH_MQ_RX_RSS_FLAG | ETH_MQ_RX_DCB_FLAG |
+                                ETH_MQ_RX_VMDQ_FLAG,
 };
 
 /**
@@ -850,7 +866,7 @@ struct rte_eth_conf {
                                 Read the datasheet of given ethernet controller
                                 for details. The possible values of this field
                                 are defined in implementation of each driver. */
-       union {
+       struct {
                struct rte_eth_rss_conf rss_conf; /**< Port RSS configuration */
                struct rte_eth_vmdq_dcb_conf vmdq_dcb_conf;
                /**< Port vmdq+dcb configuration. */
@@ -918,6 +934,9 @@ struct rte_eth_dev_info {
        uint32_t tx_offload_capa; /**< Device TX offload capabilities. */
        struct rte_eth_rxconf default_rxconf; /**< Default RX configuration */
        struct rte_eth_txconf default_txconf; /**< Default TX configuration */
+       uint16_t vmdq_queue_base; /**< First queue ID for VMDQ pools. */
+       uint16_t vmdq_queue_num;  /**< Queue number for VMDQ pools. */
+       uint16_t vmdq_pool_base;  /**< First ID of VMDQ pools. */
 };
 
 /** Maximum name length for extended statistics counters */