dc9da0240d
1. fix some RSS bugs and optimize RSS codes for hns3 2. reimplement hash flow function for hns3 to satisfy the mainstream usage of rte flow hash in the community (cherry picked from commit 651fc55df087a9855b899eea5e5fda45a1316893)
132 lines
4.2 KiB
Diff
132 lines
4.2 KiB
Diff
From b99379a51ab920cbd8d4ee51122efff2f1af57db Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Fri, 10 Mar 2023 17:35:11 +0800
|
|
Subject: net/hns3: separate setting RSS types
|
|
|
|
[ upstream commit 791e56935e488b8154a83daaf3952e1901ed7552 ]
|
|
|
|
The settings of RSS types comes from the ethdev ops (like, dev_configure
|
|
and rss_hash_update) and rte_flow API. For the ethdev ops, driver has to
|
|
save it so as to it can be restored when reset is triggered.
|
|
While rte_flow API no need to maintain this field, it can be restored by
|
|
the saved rule.
|
|
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_flow.c | 3 ++-
|
|
drivers/net/hns3/hns3_rss.c | 22 ++++++++++++++--------
|
|
drivers/net/hns3/hns3_rss.h | 1 +
|
|
3 files changed, 17 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c
|
|
index 875c0eec11..9e51891bd9 100644
|
|
--- a/drivers/net/hns3/hns3_flow.c
|
|
+++ b/drivers/net/hns3/hns3_flow.c
|
|
@@ -1433,6 +1433,7 @@ hns3_disable_rss(struct hns3_hw *hw)
|
|
ret = hns3_set_rss_tuple_by_rss_hf(hw, 0);
|
|
if (ret)
|
|
return ret;
|
|
+ hw->rss_info.rss_hf = 0;
|
|
|
|
return 0;
|
|
}
|
|
@@ -1580,7 +1581,7 @@ hns3_config_rss_filter(struct hns3_hw *hw,
|
|
/* Filter the unsupported flow types */
|
|
flow_types = conf->conf.types ?
|
|
rss_flow_conf.types & HNS3_ETH_RSS_SUPPORT :
|
|
- hw->rss_info.conf.types;
|
|
+ hw->rss_info.rss_hf;
|
|
if (flow_types != rss_flow_conf.types)
|
|
hns3_warn(hw, "modified RSS types based on hardware support,"
|
|
" requested:0x%" PRIx64 " configured:0x%" PRIx64,
|
|
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
|
|
index 751033d98f..f51d70a8e5 100644
|
|
--- a/drivers/net/hns3/hns3_rss.c
|
|
+++ b/drivers/net/hns3/hns3_rss.c
|
|
@@ -628,9 +628,6 @@ hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf)
|
|
return ret;
|
|
}
|
|
|
|
- /* Update supported flow types when set tuple success */
|
|
- hw->rss_info.conf.types = rss_hf;
|
|
-
|
|
return 0;
|
|
}
|
|
|
|
@@ -648,7 +645,7 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
|
|
struct rte_eth_rss_conf *rss_conf)
|
|
{
|
|
struct hns3_hw *hw = HNS3_DEV_PRIVATE_TO_HW(dev->data->dev_private);
|
|
- uint64_t rss_hf_bk = hw->rss_info.conf.types;
|
|
+ uint64_t rss_hf_bk = hw->rss_info.rss_hf;
|
|
uint8_t key_len = rss_conf->rss_key_len;
|
|
uint64_t rss_hf = rss_conf->rss_hf;
|
|
uint8_t *key = rss_conf->rss_key;
|
|
@@ -673,6 +670,7 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,
|
|
/* Update the shadow RSS key with user specified */
|
|
memcpy(hw->rss_info.key, key, hw->rss_key_size);
|
|
}
|
|
+ hw->rss_info.rss_hf = rss_hf;
|
|
rte_spinlock_unlock(&hw->lock);
|
|
|
|
return 0;
|
|
@@ -1030,6 +1028,7 @@ hns3_rss_set_default_args(struct hns3_hw *hw)
|
|
/* Default hash algorithm */
|
|
rss_cfg->hash_algo = HNS3_RSS_HASH_ALGO_TOEPLITZ;
|
|
|
|
+ hw->rss_info.rss_hf = 0;
|
|
memcpy(rss_cfg->key, hns3_hash_key,
|
|
RTE_MIN(sizeof(hns3_hash_key), hw->rss_key_size));
|
|
|
|
@@ -1067,15 +1066,22 @@ hns3_config_rss(struct hns3_adapter *hns)
|
|
return ret;
|
|
|
|
/*
|
|
- * When muli-queue RSS mode flag is not set or unsupported tuples are
|
|
+ * When multi-queue RSS mode flag is not set or unsupported tuples are
|
|
* set, disable all tuples.
|
|
*/
|
|
- rss_hf = hw->rss_info.conf.types;
|
|
+ rss_hf = hw->rss_info.rss_hf;
|
|
if (!((uint32_t)mq_mode & RTE_ETH_MQ_RX_RSS_FLAG) ||
|
|
!(rss_hf & HNS3_ETH_RSS_SUPPORT))
|
|
rss_hf = 0;
|
|
|
|
- return hns3_set_rss_tuple_by_rss_hf(hw, rss_hf);
|
|
+ ret = hns3_set_rss_tuple_by_rss_hf(hw, rss_hf);
|
|
+ if (ret != 0) {
|
|
+ hns3_err(hw, "set RSS tuples failed, ret = %d.", ret);
|
|
+ return ret;
|
|
+ }
|
|
+ hw->rss_info.rss_hf = rss_hf;
|
|
+
|
|
+ return 0;
|
|
}
|
|
|
|
/*
|
|
@@ -1093,5 +1099,5 @@ hns3_rss_uninit(struct hns3_adapter *hns)
|
|
return;
|
|
|
|
/* Disable RSS */
|
|
- hw->rss_info.conf.types = 0;
|
|
+ hw->rss_info.rss_hf = 0;
|
|
}
|
|
diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h
|
|
index 6e679b709b..21b90789d0 100644
|
|
--- a/drivers/net/hns3/hns3_rss.h
|
|
+++ b/drivers/net/hns3/hns3_rss.h
|
|
@@ -41,6 +41,7 @@
|
|
struct hns3_rss_conf {
|
|
/* RSS parameters :algorithm, flow_types, key, queue */
|
|
struct rte_flow_action_rss conf;
|
|
+ uint64_t rss_hf;
|
|
uint8_t hash_algo; /* hash function type defined by hardware */
|
|
uint8_t rte_flow_hash_algo;
|
|
uint8_t key[HNS3_RSS_KEY_SIZE_MAX]; /* Hash key */
|
|
--
|
|
2.23.0
|
|
|