Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/117191/?format=api
{ "id": 117191, "url": "https://patches.dpdk.org/api/patches/117191/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20220930072220.20753-16-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": "<20220930072220.20753-16-liudongdong3@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20220930072220.20753-16-liudongdong3@huawei.com", "date": "2022-09-30T07:22:16", "name": "[15/19] net/hns3: fix inconsistent RSS behavior", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "97eafb2325293de4488c2b4a4ddec3bd2c9b9e6c", "submitter": { "id": 2718, "url": "https://patches.dpdk.org/api/people/2718/?format=api", "name": "Dongdong Liu", "email": "liudongdong3@huawei.com" }, "delegate": { "id": 3961, "url": "https://patches.dpdk.org/api/users/3961/?format=api", "username": "arybchenko", "first_name": "Andrew", "last_name": "Rybchenko", "email": "andrew.rybchenko@oktetlabs.ru" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20220930072220.20753-16-liudongdong3@huawei.com/mbox/", "series": [ { "id": 24928, "url": "https://patches.dpdk.org/api/series/24928/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=24928", "date": "2022-09-30T07:22:03", "name": "some bugfixes and clean code for hns3 - part2", "version": 1, "mbox": "https://patches.dpdk.org/series/24928/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/117191/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/117191/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 99E56A0540;\n\tFri, 30 Sep 2022 09:25:38 +0200 (CEST)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 9090642BC3;\n\tFri, 30 Sep 2022 09:24:26 +0200 (CEST)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id 0F2ED42BAC;\n Fri, 30 Sep 2022 09:24:22 +0200 (CEST)", "from kwepemi500017.china.huawei.com (unknown [172.30.72.53])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Mf1qk2t1fzpVMf;\n Fri, 30 Sep 2022 15:21:22 +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.2375.31; Fri, 30 Sep 2022 15:24:20 +0800" ], "From": "Dongdong Liu <liudongdong3@huawei.com>", "To": "<dev@dpdk.org>, <andrew.rybchenko@oktetlabs.ru>, <ferruh.yigit@amd.com>,\n <thomas@monjalon.net>", "CC": "<stable@dpdk.org>, <fengchengwen@huawei.com>, <yisen.zhuang@huawei.com>,\n <liudongdong3@huawei.com>, <lihuisong@huawei.com>, <haijie1@huawei.com>", "Subject": "[PATCH 15/19] net/hns3: fix inconsistent RSS behavior", "Date": "Fri, 30 Sep 2022 15:22:16 +0800", "Message-ID": "<20220930072220.20753-16-liudongdong3@huawei.com>", "X-Mailer": "git-send-email 2.22.0", "In-Reply-To": "<20220930072220.20753-1-liudongdong3@huawei.com>", "References": "<20220930072220.20753-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\nWhen user only use 'ipv4' to set 'rss_hf', hns3 will enable\nall tuple fields for 'ipv4' flow. But if user use 'ipv4-tcp'\n, 'ipv4' and 'l4-src-only' to set 'rss_hf', driver does not\nenable all tuple fields for 'ipv4' flow. So this patch fixes\nthis problem.\n\nFixes: 806f1d5ab0e3 (\"net/hns3: set RSS hash type input configuration\")\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 | 266 ++++++++++++++++++++++++------------\n 1 file changed, 176 insertions(+), 90 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c\nindex 6d71ee94a9..ea745c791f 100644\n--- a/drivers/net/hns3/hns3_rss.c\n+++ b/drivers/net/hns3/hns3_rss.c\n@@ -70,130 +70,209 @@ enum hns3_tuple_field {\n \tHNS3_RSS_FIELD_IPV6_FRAG_IP_S\n };\n \n+enum hns3_rss_tuple_type {\n+\tHNS3_RSS_IP_TUPLE,\n+\tHNS3_RSS_IP_L4_TUPLE,\n+};\n+\n static const struct {\n \tuint64_t rss_types;\n+\tuint16_t tuple_type;\n \tuint64_t rss_field;\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{ 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{ 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+\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{ 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{ 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+\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{ 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{ 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+\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{ 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{ 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{ 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{ 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+\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{ 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{ 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{ 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{ 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+\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{ 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{ 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{ 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{ RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_L3_SRC_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) },\n-\t{ RTE_ETH_RSS_IPV4 | RTE_ETH_RSS_L3_DST_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_SRC_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_S) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV4_OTHER | RTE_ETH_RSS_L3_DST_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_NONFRAG_IP_D) },\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+\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{ 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{ 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+\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{ 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{ 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+\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{ 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{ 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+\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{ 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{ 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{ 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{ 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+\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{ 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{ 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{ 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{ 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+\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{ 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{ 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{ 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{ RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_L3_SRC_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) },\n-\t{ RTE_ETH_RSS_IPV6 | RTE_ETH_RSS_L3_DST_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_SRC_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV6_OTHER | RTE_ETH_RSS_L3_DST_ONLY,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n-};\n-\n-static const struct {\n-\tuint64_t rss_types;\n-\tuint64_t rss_field;\n-} hns3_set_rss_types[] = {\n-\t{ RTE_ETH_RSS_FRAG_IPV4, BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_D) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV4_EN_FRAG_IP_S) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV4_TCP, 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{ RTE_ETH_RSS_NONFRAG_IPV4_UDP, 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{ RTE_ETH_RSS_NONFRAG_IPV4_SCTP, 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{ RTE_ETH_RSS_IPV4,\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{ RTE_ETH_RSS_NONFRAG_IPV4_OTHER,\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{ RTE_ETH_RSS_FRAG_IPV6, BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_FRAG_IP_D) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV6_TCP, 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{ RTE_ETH_RSS_NONFRAG_IPV6_UDP, 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{ RTE_ETH_RSS_NONFRAG_IPV6_SCTP, BIT_ULL(HNS3_RSS_FIELD_IPV6_SCTP_EN_IP_S) |\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{ RTE_ETH_RSS_IPV6,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) },\n-\t{ RTE_ETH_RSS_NONFRAG_IPV6_OTHER,\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_S) |\n-\t BIT_ULL(HNS3_RSS_FIELD_IPV6_NONFRAG_IP_D) }\n };\n \n /*\n@@ -321,46 +400,53 @@ hns3_rss_reset_indir_table(struct hns3_hw *hw)\n \treturn ret;\n }\n \n+static uint64_t\n+hns3_rss_calc_tuple_filed(uint64_t rss_hf)\n+{\n+\tuint64_t l3_only_mask = RTE_ETH_RSS_L3_SRC_ONLY |\n+\t\t\t\tRTE_ETH_RSS_L3_DST_ONLY;\n+\tuint64_t l4_only_mask = RTE_ETH_RSS_L4_SRC_ONLY |\n+\t\t\t\tRTE_ETH_RSS_L4_DST_ONLY;\n+\tuint64_t l3_l4_only_mask = l3_only_mask | l4_only_mask;\n+\tbool has_l3_l4_only = !!(rss_hf & l3_l4_only_mask);\n+\tbool has_l3_only = !!(rss_hf & l3_only_mask);\n+\tuint64_t tuple = 0;\n+\tuint32_t i;\n+\n+\tfor (i = 0; i < RTE_DIM(hns3_set_tuple_table); i++) {\n+\t\tif ((rss_hf & hns3_set_tuple_table[i].rss_types) !=\n+\t\t hns3_set_tuple_table[i].rss_types)\n+\t\t\tcontinue;\n+\n+\t\tif (hns3_set_tuple_table[i].tuple_type == HNS3_RSS_IP_TUPLE) {\n+\t\t\tif (hns3_set_tuple_table[i].rss_types & l3_only_mask ||\n+\t\t\t !has_l3_only)\n+\t\t\t\ttuple |= hns3_set_tuple_table[i].rss_field;\n+\t\t\tcontinue;\n+\t\t}\n+\n+\t\t/* For IP types with L4, we need check both L3 and L4 */\n+\t\tif (hns3_set_tuple_table[i].rss_types & l3_l4_only_mask ||\n+\t\t !has_l3_l4_only)\n+\t\t\ttuple |= hns3_set_tuple_table[i].rss_field;\n+\t}\n+\n+\treturn tuple;\n+}\n+\n int\n hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf)\n {\n \tstruct hns3_rss_input_tuple_cmd *req;\n \tstruct hns3_cmd_desc desc;\n-\tuint32_t fields_count = 0; /* count times for setting tuple fields */\n-\tuint32_t i;\n+\tuint64_t tuple_field;\n \tint ret;\n \n \thns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_INPUT_TUPLE, false);\n-\n \treq = (struct hns3_rss_input_tuple_cmd *)desc.data;\n \n-\tfor (i = 0; i < RTE_DIM(hns3_set_tuple_table); i++) {\n-\t\tif ((rss_hf & hns3_set_tuple_table[i].rss_types) ==\n-\t\t hns3_set_tuple_table[i].rss_types) {\n-\t\t\treq->tuple_field |=\n-\t\t\t rte_cpu_to_le_64(hns3_set_tuple_table[i].rss_field);\n-\t\t\tfields_count++;\n-\t\t}\n-\t}\n-\n-\t/*\n-\t * When user does not specify the following types or a combination of\n-\t * the following types, it enables all fields for the supported RSS\n-\t * types. the following types as:\n-\t * - RTE_ETH_RSS_L3_SRC_ONLY\n-\t * - RTE_ETH_RSS_L3_DST_ONLY\n-\t * - RTE_ETH_RSS_L4_SRC_ONLY\n-\t * - RTE_ETH_RSS_L4_DST_ONLY\n-\t */\n-\tif (fields_count == 0) {\n-\t\tfor (i = 0; i < RTE_DIM(hns3_set_rss_types); i++) {\n-\t\t\tif ((rss_hf & hns3_set_rss_types[i].rss_types) ==\n-\t\t\t hns3_set_rss_types[i].rss_types)\n-\t\t\t\treq->tuple_field |= rte_cpu_to_le_64(\n-\t\t\t\t\thns3_set_rss_types[i].rss_field);\n-\t\t}\n-\t}\n-\n+\ttuple_field = hns3_rss_calc_tuple_filed(rss_hf);\n+\treq->tuple_field = rte_cpu_to_le_64(tuple_field);\n \tret = hns3_cmd_send(hw, &desc, 1);\n \tif (ret) {\n \t\thns3_err(hw, \"Update RSS flow types tuples failed %d\", ret);\n", "prefixes": [ "15/19" ] }