DPDK patches and discussions
 help / color / mirror / Atom feed
From: Xuan Ding <xuan.ding@intel.com>
To: qi.z.zhang@intel.com, jingjing.wu@intel.com, beilei.xing@intel.com
Cc: dev@dpdk.org, Xuan Ding <xuan.ding@intel.com>
Subject: [dpdk-dev] [PATCH] net/iavf: fix default RSS configuration
Date: Sun, 31 Jan 2021 10:47:24 +0000	[thread overview]
Message-ID: <20210131104724.73202-1-xuan.ding@intel.com> (raw)

Add advanced RSS offloads check due to some legacy driver(kernel/DPDK PF)
does not support virtual channel command VIRTCHNL_OP_RSS_HENA with
hena = 0 and VIRTCHNL_OP_ADD_RSS_CFG.

Fixes: 95f2f0e9fc2a6("net/iavf: improve default RSS")

Signed-off-by: Xuan Ding <xuan.ding@intel.com>
---
 drivers/net/iavf/iavf_ethdev.c | 67 +++++++++++++++++++++-------------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 58a20b443f..d8735401d9 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -291,11 +291,13 @@ iavf_init_rss(struct iavf_adapter *adapter)
 	if (ret)
 		return ret;
 
-	/* Set RSS hash configuration based on rss_conf->rss_hf. */
-	ret = iavf_rss_hash_set(adapter, rss_conf->rss_hf, true);
-	if (ret) {
-		PMD_DRV_LOG(ERR, "fail to set default RSS");
-		return ret;
+	if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF) {
+		/* Set RSS hash configuration based on rss_conf->rss_hf. */
+		ret = iavf_rss_hash_set(adapter, rss_conf->rss_hf, true);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "fail to set default RSS");
+			return ret;
+		}
 	}
 
 	return 0;
@@ -1251,21 +1253,23 @@ iavf_dev_rss_hash_update(struct rte_eth_dev *dev,
 	if (rss_conf->rss_hf == 0)
 		return 0;
 
-	/* Clear existing RSS. */
-	ret = iavf_set_hena(adapter, 0);
+	if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF) {
+		/* Clear existing RSS. */
+		ret = iavf_set_hena(adapter, 0);
 
-	/* It is a workaround, temporarily allow error to be returned
-	 * due to possible lack of PF handling for hena = 0.
-	 */
-	if (ret)
-		PMD_DRV_LOG(WARNING, "fail to clean existing RSS,"
-			    "lack PF support");
+		/* It is a workaround, temporarily allow error to be returned
+		 * due to possible lack of PF handling for hena = 0.
+		 */
+		if (ret)
+			PMD_DRV_LOG(WARNING, "fail to clean existing RSS,"
+				    "lack PF support");
 
-	/* Set new RSS configuration. */
-	ret = iavf_rss_hash_set(adapter, rss_conf->rss_hf, true);
-	if (ret) {
-		PMD_DRV_LOG(ERR, "fail to set new RSS");
-		return ret;
+		/* Set new RSS configuration. */
+		ret = iavf_rss_hash_set(adapter, rss_conf->rss_hf, true);
+		if (ret) {
+			PMD_DRV_LOG(ERR, "fail to set new RSS");
+			return ret;
+		}
 	}
 
 	return 0;
@@ -2092,6 +2096,24 @@ iavf_dev_filter_ctrl(struct rte_eth_dev *dev,
 	return ret;
 }
 
+static void
+iavf_default_rss_disable(struct iavf_adapter *adapter)
+{
+	struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter);
+	int ret = 0;
+
+	if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF) {
+		/* Set hena = 0 to ask PF to cleanup all existing RSS. */
+		ret = iavf_set_hena(adapter, 0);
+		if (ret)
+			/* It is a workaround, temporarily allow error to be
+			 * returned due to possible lack of PF handling for
+			 * hena = 0.
+			 */
+			PMD_INIT_LOG(WARNING, "fail to disable default RSS,"
+				    "lack PF support");
+	}
+}
 
 static int
 iavf_dev_init(struct rte_eth_dev *eth_dev)
@@ -2180,14 +2202,7 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
 		return ret;
 	}
 
-	/* Set hena = 0 to ask PF to cleanup all existing RSS. */
-	ret = iavf_set_hena(adapter, 0);
-	if (ret)
-		/* It is a workaround, temporarily allow error to be returned
-		 * due to possible lack of PF handling for hena = 0.
-		 */
-		PMD_DRV_LOG(WARNING, "fail to disable default RSS,"
-			    "lack PF support");
+	iavf_default_rss_disable(adapter);
 
 	return 0;
 }
-- 
2.17.1


             reply	other threads:[~2021-01-31 11:01 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-31 10:47 Xuan Ding [this message]
2021-02-01  0:44 ` Zhang, Qi Z

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210131104724.73202-1-xuan.ding@intel.com \
    --to=xuan.ding@intel.com \
    --cc=beilei.xing@intel.com \
    --cc=dev@dpdk.org \
    --cc=jingjing.wu@intel.com \
    --cc=qi.z.zhang@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).