X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=drivers%2Fnet%2Fmlx5%2Fmlx5_rss.c;h=bf19aca145792823e831694bf54884923583eb77;hb=0573873d5b7dda5ffb8b1e6733497df115a29073;hp=2dc58e56b5cf77ada7d7eb52055ca075c5a4cf62;hpb=2f97422e7759d83061fd04876c2110cf2655a604;p=dpdk.git

diff --git a/drivers/net/mlx5/mlx5_rss.c b/drivers/net/mlx5/mlx5_rss.c
index 2dc58e56b5..bf19aca145 100644
--- a/drivers/net/mlx5/mlx5_rss.c
+++ b/drivers/net/mlx5/mlx5_rss.c
@@ -60,6 +60,33 @@
 #include "mlx5.h"
 #include "mlx5_rxtx.h"
 
+/**
+ * Get a RSS configuration hash key.
+ *
+ * @param priv
+ *   Pointer to private structure.
+ * @param rss_hf
+ *   RSS hash functions configuration must be retrieved for.
+ *
+ * @return
+ *   Pointer to a RSS configuration structure or NULL if rss_hf cannot
+ *   be matched.
+ */
+static struct rte_eth_rss_conf *
+rss_hash_get(struct priv *priv, uint64_t rss_hf)
+{
+	unsigned int i;
+
+	for (i = 0; (i != hash_rxq_init_n); ++i) {
+		uint64_t dpdk_rss_hf = hash_rxq_init[i].dpdk_rss_hf;
+
+		if (!(dpdk_rss_hf & rss_hf))
+			continue;
+		return (*priv->rss_conf)[i];
+	}
+	return NULL;
+}
+
 /**
  * Register a RSS key.
  *
@@ -69,25 +96,35 @@
  *   Hash key to register.
  * @param key_len
  *   Hash key length in bytes.
+ * @param rss_hf
+ *   RSS hash functions the provided key applies to.
  *
  * @return
  *   0 on success, errno value on failure.
  */
 int
 rss_hash_rss_conf_new_key(struct priv *priv, const uint8_t *key,
-			  unsigned int key_len)
+			  unsigned int key_len, uint64_t rss_hf)
 {
-	struct rte_eth_rss_conf *rss_conf;
-
-	rss_conf = rte_realloc(priv->rss_conf,
-			       (sizeof(*rss_conf) + key_len),
-			       0);
-	if (!rss_conf)
-		return ENOMEM;
-	rss_conf->rss_key = (void *)(rss_conf + 1);
-	rss_conf->rss_key_len = key_len;
-	memcpy(rss_conf->rss_key, key, key_len);
-	priv->rss_conf = rss_conf;
+	unsigned int i;
+
+	for (i = 0; (i != hash_rxq_init_n); ++i) {
+		struct rte_eth_rss_conf *rss_conf;
+		uint64_t dpdk_rss_hf = hash_rxq_init[i].dpdk_rss_hf;
+
+		if (!(dpdk_rss_hf & rss_hf))
+			continue;
+		rss_conf = rte_realloc((*priv->rss_conf)[i],
+				       (sizeof(*rss_conf) + key_len),
+				       0);
+		if (!rss_conf)
+			return ENOMEM;
+		rss_conf->rss_key = (void *)(rss_conf + 1);
+		rss_conf->rss_key_len = key_len;
+		rss_conf->rss_hf = dpdk_rss_hf;
+		memcpy(rss_conf->rss_key, key, key_len);
+		(*priv->rss_conf)[i] = rss_conf;
+	}
 	return 0;
 }
 
@@ -117,11 +154,13 @@ mlx5_rss_hash_update(struct rte_eth_dev *dev,
 	if (rss_conf->rss_key)
 		err = rss_hash_rss_conf_new_key(priv,
 						rss_conf->rss_key,
-						rss_conf->rss_key_len);
+						rss_conf->rss_key_len,
+						rss_conf->rss_hf);
 	else
 		err = rss_hash_rss_conf_new_key(priv,
 						rss_hash_default_key,
-						rss_hash_default_key_len);
+						rss_hash_default_key_len,
+						ETH_RSS_PROTO_MASK);
 
 	/* Store the configuration set into port configure.
 	 * This will enable/disable hash RX queues associated to the protocols
@@ -149,19 +188,25 @@ mlx5_rss_hash_conf_get(struct rte_eth_dev *dev,
 		       struct rte_eth_rss_conf *rss_conf)
 {
 	struct priv *priv = dev->data->dev_private;
+	struct rte_eth_rss_conf *priv_rss_conf;
 
 	priv_lock(priv);
 
 	assert(priv->rss_conf != NULL);
 
+	priv_rss_conf = rss_hash_get(priv, rss_conf->rss_hf);
+	if (!priv_rss_conf) {
+		rss_conf->rss_hf = 0;
+		priv_unlock(priv);
+		return -EINVAL;
+	}
 	if (rss_conf->rss_key &&
-	    rss_conf->rss_key_len >= priv->rss_conf->rss_key_len)
+	    rss_conf->rss_key_len >= priv_rss_conf->rss_key_len)
 		memcpy(rss_conf->rss_key,
-		       priv->rss_conf->rss_key,
-		       priv->rss_conf->rss_key_len);
-	rss_conf->rss_key_len = priv->rss_conf->rss_key_len;
-	/* FIXME: rss_hf should be more specific. */
-	rss_conf->rss_hf = ETH_RSS_PROTO_MASK;
+		       priv_rss_conf->rss_key,
+		       priv_rss_conf->rss_key_len);
+	rss_conf->rss_key_len = priv_rss_conf->rss_key_len;
+	rss_conf->rss_hf = priv_rss_conf->rss_hf;
 
 	priv_unlock(priv);
 	return 0;