130 lines
3.8 KiB
Diff
130 lines
3.8 KiB
Diff
From 611f7edcab5623afa0d88da000b9320c0c111d94 Mon Sep 17 00:00:00 2001
|
|
From: Jian Shen <shenjian15@huawei.com>
|
|
Date: Sat, 24 Jul 2021 15:43:38 +0800
|
|
Subject: [PATCH 049/283] net: hns3: refactor out hclge_get_rss_tuple()
|
|
|
|
mainline inclusion
|
|
from mainline-v5.12-rc1-dontuse
|
|
commit 405642a15cba0c01d14fc6aa9b8deadf325ab7c3
|
|
category: feature
|
|
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I8EMQV
|
|
CVE: NA
|
|
|
|
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=405642a15cba0c01d14fc6aa9b8deadf325ab7c3
|
|
|
|
----------------------------------------------------------------------
|
|
|
|
To improve code readability and maintainability, separate
|
|
the flow type parsing part and the converting part from
|
|
bloated hclge_get_rss_tuple().
|
|
|
|
Signed-off-by: Jian Shen <shenjian15@huawei.com>
|
|
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
Reviewed-by: Yongxin Li <liyongxin1@huawei.com>
|
|
Signed-off-by: Junxin Chen <chenjunxin1@huawei.com>
|
|
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com>
|
|
Signed-off-by: Xiaodong Li <lixiaodong67@huawei.com>
|
|
---
|
|
.../hisilicon/hns3/hns3pf/hclge_main.c | 59 ++++++++++++-------
|
|
1 file changed, 38 insertions(+), 21 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
index e26373b1f38e..986d9e5acb3b 100644
|
|
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
|
|
@@ -4532,52 +4532,69 @@ static int hclge_set_rss_tuple(struct hnae3_handle *handle,
|
|
return 0;
|
|
}
|
|
|
|
-static int hclge_get_rss_tuple(struct hnae3_handle *handle,
|
|
- struct ethtool_rxnfc *nfc)
|
|
+static int hclge_get_vport_rss_tuple(struct hclge_vport *vport, int flow_type,
|
|
+ u8 *tuple_sets)
|
|
{
|
|
- struct hclge_vport *vport = hclge_get_vport(handle);
|
|
- u8 tuple_sets;
|
|
-
|
|
- nfc->data = 0;
|
|
-
|
|
- switch (nfc->flow_type) {
|
|
+ switch (flow_type) {
|
|
case TCP_V4_FLOW:
|
|
- tuple_sets = vport->rss_tuple_sets.ipv4_tcp_en;
|
|
+ *tuple_sets = vport->rss_tuple_sets.ipv4_tcp_en;
|
|
break;
|
|
case UDP_V4_FLOW:
|
|
- tuple_sets = vport->rss_tuple_sets.ipv4_udp_en;
|
|
+ *tuple_sets = vport->rss_tuple_sets.ipv4_udp_en;
|
|
break;
|
|
case TCP_V6_FLOW:
|
|
- tuple_sets = vport->rss_tuple_sets.ipv6_tcp_en;
|
|
+ *tuple_sets = vport->rss_tuple_sets.ipv6_tcp_en;
|
|
break;
|
|
case UDP_V6_FLOW:
|
|
- tuple_sets = vport->rss_tuple_sets.ipv6_udp_en;
|
|
+ *tuple_sets = vport->rss_tuple_sets.ipv6_udp_en;
|
|
break;
|
|
case SCTP_V4_FLOW:
|
|
- tuple_sets = vport->rss_tuple_sets.ipv4_sctp_en;
|
|
+ *tuple_sets = vport->rss_tuple_sets.ipv4_sctp_en;
|
|
break;
|
|
case SCTP_V6_FLOW:
|
|
- tuple_sets = vport->rss_tuple_sets.ipv6_sctp_en;
|
|
+ *tuple_sets = vport->rss_tuple_sets.ipv6_sctp_en;
|
|
break;
|
|
case IPV4_FLOW:
|
|
case IPV6_FLOW:
|
|
- tuple_sets = HCLGE_S_IP_BIT | HCLGE_D_IP_BIT;
|
|
+ *tuple_sets = HCLGE_S_IP_BIT | HCLGE_D_IP_BIT;
|
|
break;
|
|
default:
|
|
return -EINVAL;
|
|
}
|
|
|
|
- if (!tuple_sets)
|
|
- return 0;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static u64 hclge_convert_rss_tuple(u8 tuple_sets)
|
|
+{
|
|
+ u64 tuple_data = 0;
|
|
|
|
if (tuple_sets & HCLGE_D_PORT_BIT)
|
|
- nfc->data |= RXH_L4_B_2_3;
|
|
+ tuple_data |= RXH_L4_B_2_3;
|
|
if (tuple_sets & HCLGE_S_PORT_BIT)
|
|
- nfc->data |= RXH_L4_B_0_1;
|
|
+ tuple_data |= RXH_L4_B_0_1;
|
|
if (tuple_sets & HCLGE_D_IP_BIT)
|
|
- nfc->data |= RXH_IP_DST;
|
|
+ tuple_data |= RXH_IP_DST;
|
|
if (tuple_sets & HCLGE_S_IP_BIT)
|
|
- nfc->data |= RXH_IP_SRC;
|
|
+ tuple_data |= RXH_IP_SRC;
|
|
+
|
|
+ return tuple_data;
|
|
+}
|
|
+
|
|
+static int hclge_get_rss_tuple(struct hnae3_handle *handle,
|
|
+ struct ethtool_rxnfc *nfc)
|
|
+{
|
|
+ struct hclge_vport *vport = hclge_get_vport(handle);
|
|
+ u8 tuple_sets;
|
|
+ int ret;
|
|
+
|
|
+ nfc->data = 0;
|
|
+
|
|
+ ret = hclge_get_vport_rss_tuple(vport, nfc->flow_type, &tuple_sets);
|
|
+ if (ret || !tuple_sets)
|
|
+ return ret;
|
|
+
|
|
+ nfc->data = hclge_convert_rss_tuple(tuple_sets);
|
|
|
|
return 0;
|
|
}
|
|
--
|
|
2.34.1
|
|
|