Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/124993/?format=api
{ "id": 124993, "url": "https://patches.dpdk.org/api/patches/124993/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20230310093518.5198-5-liudongdong3@huawei.com/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230310093518.5198-5-liudongdong3@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230310093518.5198-5-liudongdong3@huawei.com", "date": "2023-03-10T09:35:06", "name": "[04/16] net/hns3: use hardware config to report hash types", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c505b173b3551b30789f89d50b82dd0d78f486b0", "submitter": { "id": 2718, "url": "https://patches.dpdk.org/api/people/2718/?format=api", "name": "Dongdong Liu", "email": "liudongdong3@huawei.com" }, "delegate": { "id": 319, "url": "https://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20230310093518.5198-5-liudongdong3@huawei.com/mbox/", "series": [ { "id": 27329, "url": "https://patches.dpdk.org/api/series/27329/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=27329", "date": "2023-03-10T09:35:02", "name": "net/hns3: some code refactor for hns3 RSS", "version": 1, "mbox": "https://patches.dpdk.org/series/27329/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/124993/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/124993/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 39CA341E3A;\n\tFri, 10 Mar 2023 10:36:52 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id CB27642D0B;\n\tFri, 10 Mar 2023 10:36:33 +0100 (CET)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id AE52440ED9;\n Fri, 10 Mar 2023 10:36:28 +0100 (CET)", "from kwepemi500017.china.huawei.com (unknown [172.30.72.54])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PY1BL14PSzrSYd;\n Fri, 10 Mar 2023 17:35:38 +0800 (CST)", "from localhost.localdomain (10.28.79.22) by\n kwepemi500017.china.huawei.com (7.221.188.110) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id\n 15.1.2507.21; Fri, 10 Mar 2023 17:36:26 +0800" ], "From": "Dongdong Liu <liudongdong3@huawei.com>", "To": "<dev@dpdk.org>, <ferruh.yigit@amd.com>, <thomas@monjalon.net>,\n <andrew.rybchenko@oktetlabs.ru>", "CC": "<stable@dpdk.org>, <yisen.zhuang@huawei.com>, <liudongdong3@huawei.com>,\n <lihuisong@huawei.com>", "Subject": "[PATCH 04/16] net/hns3: use hardware config to report hash types", "Date": "Fri, 10 Mar 2023 17:35:06 +0800", "Message-ID": "<20230310093518.5198-5-liudongdong3@huawei.com>", "X-Mailer": "git-send-email 2.22.0", "In-Reply-To": "<20230310093518.5198-1-liudongdong3@huawei.com>", "References": "<20230310093518.5198-1-liudongdong3@huawei.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-Originating-IP": "[10.28.79.22]", "X-ClientProxiedBy": "dggems702-chm.china.huawei.com (10.3.19.179) To\n kwepemi500017.china.huawei.com (7.221.188.110)", "X-CFilter-Loop": "Reflected", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "From: Huisong Li <lihuisong@huawei.com>\n\nUse the configuration in hardware to report hash types instead\nof data maintained in software.\n\nFixes: c37ca66f2b27 (\"net/hns3: support RSS\")\nCc: stable@dpdk.org\n\nSigned-off-by: Huisong Li <lihuisong@huawei.com>\nSigned-off-by: Dongdong Liu <liudongdong3@huawei.com>\n---\n drivers/net/hns3/hns3_rss.c | 260 ++++++++++++++++++++++++++++--------\n drivers/net/hns3/hns3_rss.h | 1 +\n 2 files changed, 208 insertions(+), 53 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c\nindex a046cc31d1..21266d64b7 100644\n--- a/drivers/net/hns3/hns3_rss.c\n+++ b/drivers/net/hns3/hns3_rss.c\n@@ -70,6 +70,17 @@ enum hns3_tuple_field {\n \tHNS3_RSS_FIELD_IPV6_FRAG_IP_S\n };\n \n+#define HNS3_RSS_TUPLE_IPV4_TCP_M\tGENMASK(3, 0)\n+#define HNS3_RSS_TUPLE_IPV4_UDP_M\tGENMASK(11, 8)\n+#define HNS3_RSS_TUPLE_IPV4_SCTP_M\tGENMASK(20, 16)\n+#define HNS3_RSS_TUPLE_IPV4_NONF_M\tGENMASK(25, 24)\n+#define HNS3_RSS_TUPLE_IPV4_FLAG_M\tGENMASK(27, 26)\n+#define HNS3_RSS_TUPLE_IPV6_TCP_M\tGENMASK(35, 32)\n+#define HNS3_RSS_TUPLE_IPV6_UDP_M\tGENMASK(43, 40)\n+#define HNS3_RSS_TUPLE_IPV6_SCTP_M\tGENMASK(52, 48)\n+#define HNS3_RSS_TUPLE_IPV6_NONF_M\tGENMASK(57, 56)\n+#define HNS3_RSS_TUPLE_IPV6_FLAG_M\tGENMASK(59, 58)\n+\n enum hns3_rss_tuple_type {\n \tHNS3_RSS_IP_TUPLE,\n \tHNS3_RSS_IP_L4_TUPLE,\n@@ -79,200 +90,249 @@ static const struct {\n \tuint64_t rss_types;\n \tuint16_t tuple_type;\n \tuint64_t rss_field;\n+\tuint64_t tuple_mask;\n } hns3_set_tuple_table[] = {\n \t/* IPV4-FRAG */\n \t{ RTE_ETH_RSS_FRAG_IPV4 | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_S),\n+\t HNS3_RSS_TUPLE_IPV4_FLAG_M },\n \t{ RTE_ETH_RSS_FRAG_IPV4 | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_FLAG_M },\n \t{ RTE_ETH_RSS_FRAG_IPV4,\n \t HNS3_RSS_IP_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_FLAG_M },\n \n \t/* IPV4 */\n \t{ RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S),\n+\t HNS3_RSS_TUPLE_IPV4_NONF_M },\n \t{ RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_NONF_M },\n \t{ RTE_ETH_RSS_IPV4,\n \t HNS3_RSS_IP_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_NONF_M },\n \n \t/* IPV4-OTHER */\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S),\n+\t HNS3_RSS_TUPLE_IPV4_NONF_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_NONF_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_OTHER,\n \t HNS3_RSS_IP_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_NONF_M },\n \n \t/* IPV4-TCP */\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S),\n+\t HNS3_RSS_TUPLE_IPV4_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L4_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_S),\n+\t HNS3_RSS_TUPLE_IPV4_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_TCP | RTE_ETH_RSS_L4_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D),\n+\t HNS3_RSS_TUPLE_IPV4_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_TCP,\n \t HNS3_RSS_IP_L4_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_IP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_TCP_EN_TCP_D),\n+\t HNS3_RSS_TUPLE_IPV4_TCP_M },\n \n \t/* IPV4-UDP */\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_S),\n+\t HNS3_RSS_TUPLE_IPV4_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L4_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_S),\n+\t HNS3_RSS_TUPLE_IPV4_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_UDP | RTE_ETH_RSS_L4_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_D),\n+\t HNS3_RSS_TUPLE_IPV4_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_UDP,\n \t HNS3_RSS_IP_L4_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_IP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_UDP_EN_UDP_D),\n+\t HNS3_RSS_TUPLE_IPV4_UDP_M },\n \n \t/* IPV4-SCTP */\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_S),\n+\t HNS3_RSS_TUPLE_IPV4_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_D),\n+\t HNS3_RSS_TUPLE_IPV4_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L4_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S),\n+\t HNS3_RSS_TUPLE_IPV4_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_SCTP | RTE_ETH_RSS_L4_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D),\n+\t HNS3_RSS_TUPLE_IPV4_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV4_SCTP,\n \t HNS3_RSS_IP_L4_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_IP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_D) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_VER) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV4_SCTP_EN_SCTP_VER),\n+\t HNS3_RSS_TUPLE_IPV4_SCTP_M },\n \n \t/* IPV6-FRAG */\n \t{ RTE_ETH_RSS_FRAG_IPV6 | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S),\n+\t HNS3_RSS_TUPLE_IPV6_FLAG_M },\n \t{ RTE_ETH_RSS_FRAG_IPV6 | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_FLAG_M },\n \t{ RTE_ETH_RSS_FRAG_IPV6,\n \t HNS3_RSS_IP_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_FLAG_M },\n \n \t/* IPV6 */\n \t{ RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S),\n+\t HNS3_RSS_TUPLE_IPV6_NONF_M },\n \t{ RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_NONF_M },\n \t{ RTE_ETH_RSS_IPV6,\n \t HNS3_RSS_IP_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_NONF_M },\n \n \t/* IPV6-OTHER */\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S),\n+\t HNS3_RSS_TUPLE_IPV6_NONF_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_NONF_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_OTHER,\n \t HNS3_RSS_IP_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_NONF_M },\n \n \t/* IPV6-TCP */\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_S),\n+\t HNS3_RSS_TUPLE_IPV6_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L4_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_S),\n+\t HNS3_RSS_TUPLE_IPV6_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_TCP | RTE_ETH_RSS_L4_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_D),\n+\t HNS3_RSS_TUPLE_IPV6_TCP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_TCP,\n \t HNS3_RSS_IP_L4_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_IP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_TCP_EN_TCP_D),\n+\t HNS3_RSS_TUPLE_IPV6_TCP_M },\n \n \t/* IPV6-UDP */\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S),\n+\t HNS3_RSS_TUPLE_IPV6_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L4_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_S),\n+\t HNS3_RSS_TUPLE_IPV6_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_UDP | RTE_ETH_RSS_L4_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D),\n+\t HNS3_RSS_TUPLE_IPV6_UDP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_UDP,\n \t HNS3_RSS_IP_L4_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_IP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_UDP_EN_UDP_D),\n+\t HNS3_RSS_TUPLE_IPV6_UDP_M },\n \n \t/* IPV6-SCTP */\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L3_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S),\n+\t HNS3_RSS_TUPLE_IPV6_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L3_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D),\n+\t HNS3_RSS_TUPLE_IPV6_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L4_SRC_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_S) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_S),\n+\t HNS3_RSS_TUPLE_IPV6_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_SCTP | RTE_ETH_RSS_L4_DST_ONLY,\n \t HNS3_RSS_IP_L4_TUPLE,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_D) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_D),\n+\t HNS3_RSS_TUPLE_IPV6_SCTP_M },\n \t{ RTE_ETH_RSS_NONFRAG_IPV6_SCTP,\n \t HNS3_RSS_IP_L4_TUPLE,\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_D) |\n \t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_VER) },\n+\t BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_VER),\n+\t HNS3_RSS_TUPLE_IPV6_SCTP_M },\n };\n \n /*\n@@ -575,6 +635,96 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,\n \treturn ret;\n }\n \n+int\n+hns3_get_rss_tuple_field(struct hns3_hw *hw, uint64_t *tuple_fields)\n+{\n+\tstruct hns3_rss_input_tuple_cmd *req;\n+\tstruct hns3_cmd_desc desc;\n+\tint ret;\n+\n+\thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_INPUT_TUPLE, true);\n+\treq = (struct hns3_rss_input_tuple_cmd *)desc.data;\n+\tret = hns3_cmd_send(hw, &desc, 1);\n+\tif (ret != 0) {\n+\t\thns3_err(hw, \"fail to get RSS hash tuple fields from firmware, ret = %d\",\n+\t\t\t ret);\n+\t\treturn ret;\n+\t}\n+\n+\t*tuple_fields = rte_le_to_cpu_64(req->tuple_field);\n+\n+\treturn 0;\n+}\n+\n+static uint64_t\n+hns3_rss_tuple_fields_to_rss_hf(struct hns3_hw *hw, uint64_t tuple_fields)\n+{\n+\tuint64_t ipv6_sctp_l4_mask =\n+\t\t\t\tBIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_D) |\n+\t\t\t\tBIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_SCTP_S);\n+\tuint64_t rss_hf = 0;\n+\tuint64_t tuple_mask;\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < RTE_DIM(hns3_set_tuple_table); i++) {\n+\t\ttuple_mask = hns3_set_tuple_table[i].tuple_mask;\n+\t\t/*\n+\t\t * The RSS hash of the packet type is disabled if its tuples is\n+\t\t * zero.\n+\t\t */\n+\t\tif ((tuple_fields & tuple_mask) == 0)\n+\t\t\tcontinue;\n+\n+\t\t/*\n+\t\t * Some hardware don't support to use src/dst port fields to\n+\t\t * hash for IPV6-SCTP packet.\n+\t\t */\n+\t\tif ((hns3_set_tuple_table[i].rss_types &\n+\t\t\t\t\tRTE_ETH_RSS_NONFRAG_IPV6_SCTP) &&\n+\t\t !hw->rss_info.ipv6_sctp_offload_supported)\n+\t\t\ttuple_mask &= ~ipv6_sctp_l4_mask;\n+\n+\t\t/*\n+\t\t * The framework (ethdev ops) or driver (rte flow API) ensure\n+\t\t * that both L3_SRC/DST_ONLY and L4_SRC/DST_ONLY cannot be set\n+\t\t * to driver at the same time. But if user doesn't specify\n+\t\t * anything L3/L4_SRC/DST_ONLY, driver enables all tuple fields.\n+\t\t * In this case, driver should not report L3/L4_SRC/DST_ONLY.\n+\t\t */\n+\t\tif ((tuple_fields & tuple_mask) == tuple_mask) {\n+\t\t\t/* Skip the item enabled part tuples. */\n+\t\t\tif ((tuple_fields & hns3_set_tuple_table[i].rss_field) !=\n+\t\t\t\t\ttuple_mask)\n+\t\t\t\tcontinue;\n+\n+\t\t\trss_hf |= hns3_set_tuple_table[i].rss_types;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* Match the item enabled part tuples.*/\n+\t\tif ((tuple_fields & hns3_set_tuple_table[i].rss_field) ==\n+\t\t\t\t\thns3_set_tuple_table[i].rss_field)\n+\t\t\trss_hf |= hns3_set_tuple_table[i].rss_types;\n+\t}\n+\n+\treturn rss_hf;\n+}\n+\n+static int\n+hns3_rss_hash_get_rss_hf(struct hns3_hw *hw, uint64_t *rss_hf)\n+{\n+\tuint64_t tuple_fields;\n+\tint ret;\n+\n+\tret = hns3_get_rss_tuple_field(hw, &tuple_fields);\n+\tif (ret != 0)\n+\t\treturn ret;\n+\n+\t*rss_hf = hns3_rss_tuple_fields_to_rss_hf(hw, tuple_fields);\n+\n+\treturn 0;\n+}\n+\n /*\n * Get rss key and rss_hf types set of RSS hash configuration.\n * @param dev\n@@ -590,28 +740,32 @@ hns3_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n {\n \tstruct hns3_adapter *hns = dev->data->dev_private;\n \tstruct hns3_hw *hw = &hns->hw;\n-\tstruct hns3_rss_conf *rss_cfg = &hw->rss_info;\n \tuint8_t hash_algo;\n \tint ret;\n \n \trte_spinlock_lock(&hw->lock);\n-\trss_conf->rss_hf = rss_cfg->conf.types;\n+\tret = hns3_rss_hash_get_rss_hf(hw, &rss_conf->rss_hf);\n+\tif (ret != 0) {\n+\t\thns3_err(hw, \"obtain hash tuples failed, ret = %d\", ret);\n+\t\tgoto out;\n+\t}\n \n \t/* Get the RSS Key required by the user */\n \tif (rss_conf->rss_key && rss_conf->rss_key_len >= hw->rss_key_size) {\n \t\tret = hns3_rss_get_algo_key(hw, &hash_algo, rss_conf->rss_key,\n \t\t\t\t\t hw->rss_key_size);\n \t\tif (ret != 0) {\n-\t\t\trte_spinlock_unlock(&hw->lock);\n \t\t\thns3_err(hw, \"obtain hash algo and key failed, ret = %d\",\n \t\t\t\t ret);\n-\t\t\treturn ret;\n+\t\t\tgoto out;\n \t\t}\n \t\trss_conf->rss_key_len = hw->rss_key_size;\n \t}\n+\n+out:\n \trte_spinlock_unlock(&hw->lock);\n \n-\treturn 0;\n+\treturn ret;\n }\n \n /*\ndiff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h\nindex be0141f602..17473e70e2 100644\n--- a/drivers/net/hns3/hns3_rss.h\n+++ b/drivers/net/hns3/hns3_rss.h\n@@ -110,6 +110,7 @@ int hns3_rss_reset_indir_table(struct hns3_hw *hw);\n int hns3_config_rss(struct hns3_adapter *hns);\n void hns3_rss_uninit(struct hns3_adapter *hns);\n int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf);\n+int hns3_get_rss_tuple_field(struct hns3_hw *hw, uint64_t *tuple_fields);\n int hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo,\n \t\t\t const uint8_t *key, uint8_t key_len);\n int hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo,\n", "prefixes": [ "04/16" ] }