From: Huisong Li <lihuisong@huawei.com>
To: <stable@dpdk.org>, <ktraynor@redhat.com>
Cc: <liudongdong3@huawei.com>, <huangdaode@huawei.com>,
<lihuisong@huawei.com>
Subject: [PATCH 21.11 3/4] net/hns3: fix lock protection of RSS flow rule
Date: Wed, 2 Nov 2022 10:32:54 +0800 [thread overview]
Message-ID: <20221102023255.15686-4-lihuisong@huawei.com> (raw)
In-Reply-To: <20221102023255.15686-1-lihuisong@huawei.com>
[ upstream commit a35799625e6849151f7d7bae312e300f8d5c2675 ]
RSS flow rules are saved in RSS filter linked list. The linked
list is modified by rte_flow API and is used to restore RSS rules
during reset process. So this patch uses 'hw->flows_lock' to protect
the configuration and recovery of RSS rule.
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
drivers/net/hns3/hns3_flow.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
index 25af8d3976..213537965e 100644
--- a/drivers/net/hns3/hns3_flow.c
+++ b/drivers/net/hns3/hns3_flow.c
@@ -1549,27 +1549,20 @@ hns3_config_rss_filter(struct rte_eth_dev *dev,
hns3_warn(hw, "Config queue numbers %u are beyond the scope of truncated",
rss_flow_conf.queue_num);
hns3_info(hw, "Max of contiguous %u PF queues are configured", num);
-
- rte_spinlock_lock(&hw->lock);
if (num) {
ret = hns3_update_indir_table(dev, &rss_flow_conf, num);
if (ret)
- goto rss_config_err;
+ return ret;
}
/* Set hash algorithm and flow types by the user's config */
ret = hns3_hw_rss_hash_set(hw, &rss_flow_conf);
if (ret)
- goto rss_config_err;
+ return ret;
ret = hns3_rss_conf_copy(rss_info, &rss_flow_conf);
- if (ret) {
+ if (ret)
hns3_err(hw, "RSS config init fail(%d)", ret);
- goto rss_config_err;
- }
-
-rss_config_err:
- rte_spinlock_unlock(&hw->lock);
return ret;
}
@@ -1615,6 +1608,7 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
struct hns3_hw *hw = &hns->hw;
int ret = 0;
+ pthread_mutex_lock(&hw->flows_lock);
TAILQ_FOREACH(filter, &hw->flow_rss_list, entries) {
if (!filter->filter_info.valid)
continue;
@@ -1627,6 +1621,8 @@ hns3_restore_rss_filter(struct rte_eth_dev *dev)
}
out:
+ pthread_mutex_unlock(&hw->flows_lock);
+
return ret;
}
--
2.33.0
next prev parent reply other threads:[~2022-11-02 2:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-02 2:32 [PATCH 21.11 0/4] net/hns3: backporting some bugfix Huisong Li
2022-11-02 2:32 ` [PATCH 21.11 1/4] net/hns3: extract functions to create RSS and FDIR flow rule Huisong Li
2022-11-02 2:32 ` [PATCH 21.11 2/4] net/hns3: fix RSS rule restore Huisong Li
2022-11-02 2:32 ` Huisong Li [this message]
2022-11-02 2:32 ` [PATCH 21.11 4/4] net/hns3: fix restore filter function input Huisong Li
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=20221102023255.15686-4-lihuisong@huawei.com \
--to=lihuisong@huawei.com \
--cc=huangdaode@huawei.com \
--cc=ktraynor@redhat.com \
--cc=liudongdong3@huawei.com \
--cc=stable@dpdk.org \
/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).