[dpdk-dev] [PATCH v2 09/27] ixgbe: enlarge the hash flags of RSS to 64 bits

Helin Zhang helin.zhang at intel.com
Thu Jun 5 07:08:53 CEST 2014


As the hash flags of RSS has been enlarged from 16 bits to 64 bits
in 'struct rte_eth_rss_conf' in rte_ethdev.h, the size of it in
ixgbe has to be enlarged as well. In addition, the flags for ixgbe
only are masked, as there are flags for others in those 64 bits.

Signed-off-by: Helin Zhang <helin.zhang at intel.com>
Signed-off-by: Jing Chen <jing.d.chen at intel.com>
Acked-by: Cunming Liang <cunming.liang at intel.com>
Acked-by: Jijiang Liu <jijiang.liu at intel.com>
Acked-by: Jingjing Wu <jingjing.wu at intel.com>
Tested-by: Waterman Cao <waterman.cao at intel.com>
---
 lib/librte_pmd_ixgbe/ixgbe_rxtx.c | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
index dc79c4b..bdae98e 100644
--- a/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
+++ b/lib/librte_pmd_ixgbe/ixgbe_rxtx.c
@@ -77,10 +77,18 @@
 #include "ixgbe_ethdev.h"
 #include "ixgbe/ixgbe_dcb.h"
 #include "ixgbe/ixgbe_common.h"
-
-
 #include "ixgbe_rxtx.h"
 
+#define IXGBE_RSS_OFFLOAD_ALL ( \
+		ETH_RSS_IPV4 | \
+		ETH_RSS_IPV4_TCP | \
+		ETH_RSS_IPV6 | \
+		ETH_RSS_IPV6_EX | \
+		ETH_RSS_IPV6_TCP | \
+		ETH_RSS_IPV6_TCP_EX | \
+		ETH_RSS_IPV4_UDP | \
+		ETH_RSS_IPV6_UDP | \
+		ETH_RSS_IPV6_UDP_EX)
 
 static inline struct rte_mbuf *
 rte_rxmbuf_alloc(struct rte_mempool *mp)
@@ -2299,7 +2307,7 @@ ixgbe_hw_rss_hash_set(struct ixgbe_hw *hw, struct rte_eth_rss_conf *rss_conf)
 	uint8_t  *hash_key;
 	uint32_t mrqc;
 	uint32_t rss_key;
-	uint16_t rss_hf;
+	uint64_t rss_hf;
 	uint16_t i;
 
 	hash_key = rss_conf->rss_key;
@@ -2344,7 +2352,7 @@ ixgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
 {
 	struct ixgbe_hw *hw;
 	uint32_t mrqc;
-	uint16_t rss_hf;
+	uint64_t rss_hf;
 
 	hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
 
@@ -2357,7 +2365,7 @@ ixgbe_dev_rss_hash_update(struct rte_eth_dev *dev,
 	 * initialization time, or does not attempt to enable RSS, if RSS was
 	 * disabled at initialization time.
 	 */
-	rss_hf = rss_conf->rss_hf;
+	rss_hf = rss_conf->rss_hf & IXGBE_RSS_OFFLOAD_ALL;
 	mrqc = IXGBE_READ_REG(hw, IXGBE_MRQC);
 	if (!(mrqc & IXGBE_MRQC_RSSEN)) { /* RSS disabled */
 		if (rss_hf != 0) /* Enable RSS */
@@ -2379,7 +2387,7 @@ ixgbe_dev_rss_hash_conf_get(struct rte_eth_dev *dev,
 	uint8_t *hash_key;
 	uint32_t mrqc;
 	uint32_t rss_key;
-	uint16_t rss_hf;
+	uint64_t rss_hf;
 	uint16_t i;
 
 	hw = IXGBE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
@@ -2456,7 +2464,7 @@ ixgbe_rss_configure(struct rte_eth_dev *dev)
 	 * the RSS hash of input packets.
 	 */
 	rss_conf = dev->data->dev_conf.rx_adv_conf.rss_conf;
-	if (rss_conf.rss_hf == 0) {
+	if ((rss_conf.rss_hf & IXGBE_RSS_OFFLOAD_ALL) == 0) {
 		ixgbe_rss_disable(dev);
 		return;
 	}
-- 
1.8.1.4



More information about the dev mailing list