62a20ce454
Signed-off-by: speech_white <humin29@huawei.com> (cherry picked from commit 39c2c5154122fef74060ffd6dbbe8cd4fdd9d21b)
104 lines
3.3 KiB
Diff
104 lines
3.3 KiB
Diff
From 87f9628e2c786dff500139baf59720693e46b0bc Mon Sep 17 00:00:00 2001
|
|
From: Huisong Li <lihuisong@huawei.com>
|
|
Date: Mon, 28 Feb 2022 11:21:46 +0800
|
|
Subject: [PATCH] net/hns3: fix VF RSS TC mode entry
|
|
|
|
For packets with VLAN priorities destined for the VF, hardware still
|
|
assign Rx queue based on the Up-to-TC mapping PF configured. But VF has
|
|
only one TC. If other TC don't enable, it causes that the priority
|
|
packets that aren't destined for TC0 aren't received by RSS hash but is
|
|
destined for queue 0. So driver has to enable the unused TC by using TC0
|
|
queue mapping configuration.
|
|
|
|
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Huisong Li <lihuisong@huawei.com>
|
|
Acked-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/hns3/hns3_rss.c | 56 +++++++++++++++++++++++++++----------
|
|
1 file changed, 41 insertions(+), 15 deletions(-)
|
|
|
|
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
|
|
index ebf3c60f07..1493b10f96 100644
|
|
--- a/drivers/net/hns3/hns3_rss.c
|
|
+++ b/drivers/net/hns3/hns3_rss.c
|
|
@@ -578,33 +578,59 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev,
|
|
return 0;
|
|
}
|
|
|
|
-/*
|
|
- * Used to configure the tc_size and tc_offset.
|
|
- */
|
|
+static void
|
|
+hns3_set_rss_tc_mode_entry(struct hns3_hw *hw, uint8_t *tc_valid,
|
|
+ uint16_t *tc_size, uint16_t *tc_offset,
|
|
+ uint8_t tc_num)
|
|
+{
|
|
+ struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw);
|
|
+ uint16_t rss_size = hw->alloc_rss_size;
|
|
+ uint16_t roundup_size;
|
|
+ uint16_t i;
|
|
+
|
|
+ roundup_size = roundup_pow_of_two(rss_size);
|
|
+ roundup_size = ilog2(roundup_size);
|
|
+
|
|
+ for (i = 0; i < tc_num; i++) {
|
|
+ if (hns->is_vf) {
|
|
+ /*
|
|
+ * For packets with VLAN priorities destined for the VF,
|
|
+ * hardware still assign Rx queue based on the Up-to-TC
|
|
+ * mapping PF configured. But VF has only one TC. If
|
|
+ * other TC don't enable, it causes that the priority
|
|
+ * packets that aren't destined for TC0 aren't received
|
|
+ * by RSS hash but is destined for queue 0. So driver
|
|
+ * has to enable the unused TC by using TC0 queue
|
|
+ * mapping configuration.
|
|
+ */
|
|
+ tc_valid[i] = (hw->hw_tc_map & BIT(i)) ?
|
|
+ !!(hw->hw_tc_map & BIT(i)) : 1;
|
|
+ tc_size[i] = roundup_size;
|
|
+ tc_offset[i] = (hw->hw_tc_map & BIT(i)) ?
|
|
+ rss_size * i : 0;
|
|
+ } else {
|
|
+ tc_valid[i] = !!(hw->hw_tc_map & BIT(i));
|
|
+ tc_size[i] = tc_valid[i] ? roundup_size : 0;
|
|
+ tc_offset[i] = tc_valid[i] ? rss_size * i : 0;
|
|
+ }
|
|
+ }
|
|
+}
|
|
+
|
|
static int
|
|
hns3_set_rss_tc_mode(struct hns3_hw *hw)
|
|
{
|
|
- uint16_t rss_size = hw->alloc_rss_size;
|
|
struct hns3_rss_tc_mode_cmd *req;
|
|
uint16_t tc_offset[HNS3_MAX_TC_NUM];
|
|
uint8_t tc_valid[HNS3_MAX_TC_NUM];
|
|
uint16_t tc_size[HNS3_MAX_TC_NUM];
|
|
struct hns3_cmd_desc desc;
|
|
- uint16_t roundup_size;
|
|
uint16_t i;
|
|
int ret;
|
|
|
|
- req = (struct hns3_rss_tc_mode_cmd *)desc.data;
|
|
-
|
|
- roundup_size = roundup_pow_of_two(rss_size);
|
|
- roundup_size = ilog2(roundup_size);
|
|
-
|
|
- for (i = 0; i < HNS3_MAX_TC_NUM; i++) {
|
|
- tc_valid[i] = !!(hw->hw_tc_map & BIT(i));
|
|
- tc_size[i] = tc_valid[i] ? roundup_size : 0;
|
|
- tc_offset[i] = tc_valid[i] ? rss_size * i : 0;
|
|
- }
|
|
+ hns3_set_rss_tc_mode_entry(hw, tc_valid, tc_size,
|
|
+ tc_offset, HNS3_MAX_TC_NUM);
|
|
|
|
+ req = (struct hns3_rss_tc_mode_cmd *)desc.data;
|
|
hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_TC_MODE, false);
|
|
for (i = 0; i < HNS3_MAX_TC_NUM; i++) {
|
|
uint16_t mode = 0;
|
|
--
|
|
2.33.0
|
|
|