Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/122666/?format=api
{ "id": 122666, "url": "http://patches.dpdk.org/api/patches/122666/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230130093129.18529-5-liudongdong3@huawei.com/", "project": { "id": 1, "url": "http://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": "<20230130093129.18529-5-liudongdong3@huawei.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230130093129.18529-5-liudongdong3@huawei.com", "date": "2023-01-30T09:31:23", "name": "[V2,04/10] net/hns3: fix fixed RSS key size to be more compatibility", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "ee255886933ca1686af296706bb9ff0ab86d2d02", "submitter": { "id": 2718, "url": "http://patches.dpdk.org/api/people/2718/?format=api", "name": "Dongdong Liu", "email": "liudongdong3@huawei.com" }, "delegate": { "id": 319, "url": "http://patches.dpdk.org/api/users/319/?format=api", "username": "fyigit", "first_name": "Ferruh", "last_name": "Yigit", "email": "ferruh.yigit@amd.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230130093129.18529-5-liudongdong3@huawei.com/mbox/", "series": [ { "id": 26688, "url": "http://patches.dpdk.org/api/series/26688/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26688", "date": "2023-01-30T09:31:20", "name": "net/hns3: some bugfixes for rss", "version": 2, "mbox": "http://patches.dpdk.org/series/26688/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/122666/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/122666/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 C04CB41B7E;\n\tMon, 30 Jan 2023 10:32:15 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4D95342BB1;\n\tMon, 30 Jan 2023 10:32:05 +0100 (CET)", "from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187])\n by mails.dpdk.org (Postfix) with ESMTP id 4EA8740EE1;\n Mon, 30 Jan 2023 10:32:01 +0100 (CET)", "from kwepemi500017.china.huawei.com (unknown [172.30.72.53])\n by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4P52vq5nVHznVS1;\n Mon, 30 Jan 2023 17:29:59 +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.34; Mon, 30 Jan 2023 17:31:59 +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 V2 04/10] net/hns3: fix fixed RSS key size to be more\n compatibility", "Date": "Mon, 30 Jan 2023 17:31:23 +0800", "Message-ID": "<20230130093129.18529-5-liudongdong3@huawei.com>", "X-Mailer": "git-send-email 2.22.0", "In-Reply-To": "<20230130093129.18529-1-liudongdong3@huawei.com>", "References": "<20230129105140.29921-1-liudongdong3@huawei.com>\n <20230130093129.18529-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": "dggems701-chm.china.huawei.com (10.3.19.178) 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\nFor better compatibility, the RSS key size of PF and VF are obtained from\nfirmware. However, many places still used the old macro HNS3_RSS_KEY_SIZE\nas the key size.\n\nFixes: 9c740336f024 (\"net/hns3: get device specifications from firmware\")\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_common.c | 12 +++++++++++-\n drivers/net/hns3/hns3_flow.c | 26 ++++++++++++--------------\n drivers/net/hns3/hns3_rss.c | 23 +++++++++++------------\n drivers/net/hns3/hns3_rss.h | 3 ++-\n 4 files changed, 36 insertions(+), 28 deletions(-)", "diff": "diff --git a/drivers/net/hns3/hns3_common.c b/drivers/net/hns3/hns3_common.c\nindex b0c7f8d62c..2da0f30964 100644\n--- a/drivers/net/hns3/hns3_common.c\n+++ b/drivers/net/hns3/hns3_common.c\n@@ -129,7 +129,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)\n \t};\n \n \tinfo->reta_size = hw->rss_ind_tbl_size;\n-\tinfo->hash_key_size = HNS3_RSS_KEY_SIZE;\n+\tinfo->hash_key_size = hw->rss_key_size;\n \tinfo->flow_type_rss_offloads = HNS3_ETH_RSS_SUPPORT;\n \n \tinfo->default_rxportconf.burst_size = HNS3_DEFAULT_PORT_CONF_BURST_SIZE;\n@@ -895,6 +895,16 @@ hns3_check_dev_specifications(struct hns3_hw *hw)\n \t\treturn -EINVAL;\n \t}\n \n+\tif (hw->rss_key_size == 0 || hw->rss_key_size > HNS3_RSS_KEY_SIZE_MAX) {\n+\t\thns3_err(hw, \"the RSS key size obtained (%u) is invalid, and should not be zero or exceed the maximum(%u)\",\n+\t\t\t hw->rss_key_size, HNS3_RSS_KEY_SIZE_MAX);\n+\t\treturn -EINVAL;\n+\t}\n+\n+\tif (hw->rss_key_size > HNS3_RSS_KEY_SIZE)\n+\t\thns3_warn(hw, \"the RSS key size obtained (%u) is greater than the default key size (%u)\",\n+\t\t\t hw->rss_key_size, HNS3_RSS_KEY_SIZE);\n+\n \treturn 0;\n }\n \ndiff --git a/drivers/net/hns3/hns3_flow.c b/drivers/net/hns3/hns3_flow.c\nindex 95609f8483..a18ec7650d 100644\n--- a/drivers/net/hns3/hns3_flow.c\n+++ b/drivers/net/hns3/hns3_flow.c\n@@ -1406,10 +1406,10 @@ hns3_parse_rss_filter(struct rte_eth_dev *dev,\n \t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF, act,\n \t\t\t\t\t \"a nonzero RSS encapsulation level is not supported\");\n-\tif (rss->key_len && rss->key_len != RTE_DIM(rss_conf->key))\n+\tif (rss->key_len && rss->key_len != hw->rss_key_size)\n \t\treturn rte_flow_error_set(error, ENOTSUP,\n \t\t\t\t\t RTE_FLOW_ERROR_TYPE_ACTION_CONF, act,\n-\t\t\t\t\t \"RSS hash key must be exactly 40 bytes\");\n+\t\t\t\t\t \"invalid RSS key length\");\n \n \tif (!hns3_rss_input_tuple_supported(hw, rss))\n \t\treturn rte_flow_error_set(error, EINVAL,\n@@ -1443,16 +1443,6 @@ hns3_disable_rss(struct hns3_hw *hw)\n \treturn 0;\n }\n \n-static void\n-hns3_adjust_rss_key(struct hns3_hw *hw, struct rte_flow_action_rss *rss_conf)\n-{\n-\tif (rss_conf->key == NULL || rss_conf->key_len < HNS3_RSS_KEY_SIZE) {\n-\t\thns3_warn(hw, \"Default RSS hash key to be set\");\n-\t\trss_conf->key = hns3_hash_key;\n-\t\trss_conf->key_len = HNS3_RSS_KEY_SIZE;\n-\t}\n-}\n-\n static int\n hns3_parse_rss_algorithm(struct hns3_hw *hw, enum rte_eth_hash_function *func,\n \t\t\t uint8_t *hash_algo)\n@@ -1485,9 +1475,16 @@ hns3_parse_rss_algorithm(struct hns3_hw *hw, enum rte_eth_hash_function *func,\n static int\n hns3_hw_rss_hash_set(struct hns3_hw *hw, struct rte_flow_action_rss *rss_config)\n {\n+\tuint8_t rss_key[HNS3_RSS_KEY_SIZE_MAX] = {0};\n+\tbool use_default_key = false;\n \tint ret;\n \n-\thns3_adjust_rss_key(hw, rss_config);\n+\tif (rss_config->key == NULL || rss_config->key_len != hw->rss_key_size) {\n+\t\thns3_warn(hw, \"Default RSS hash key to be set\");\n+\t\tmemcpy(rss_key, hns3_hash_key,\n+\t\t\tRTE_MIN(sizeof(hns3_hash_key), hw->rss_key_size));\n+\t\tuse_default_key = true;\n+\t}\n \n \tret = hns3_parse_rss_algorithm(hw, &rss_config->func,\n \t\t\t\t &hw->rss_info.hash_algo);\n@@ -1495,7 +1492,8 @@ hns3_hw_rss_hash_set(struct hns3_hw *hw, struct rte_flow_action_rss *rss_config)\n \t\treturn ret;\n \n \tret = hns3_rss_set_algo_key(hw, hw->rss_info.hash_algo,\n-\t\t\t\t rss_config->key, HNS3_RSS_KEY_SIZE);\n+\t\t\t\t use_default_key ? rss_key : rss_config->key,\n+\t\t\t\t hw->rss_key_size);\n \tif (ret)\n \t\treturn ret;\n \ndiff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c\nindex 3db7bf0445..d6e0754273 100644\n--- a/drivers/net/hns3/hns3_rss.c\n+++ b/drivers/net/hns3/hns3_rss.c\n@@ -316,7 +316,7 @@ hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo,\n \t\t}\n \t}\n \t/* Update the shadow RSS key with user specified */\n-\tmemcpy(hw->rss_info.key, key, HNS3_RSS_KEY_SIZE);\n+\tmemcpy(hw->rss_info.key, key, hw->rss_key_size);\n \treturn 0;\n }\n \n@@ -498,9 +498,9 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,\n \tuint8_t *key = rss_conf->rss_key;\n \tint ret;\n \n-\tif (key && key_len != HNS3_RSS_KEY_SIZE) {\n+\tif (key && key_len != hw->rss_key_size) {\n \t\thns3_err(hw, \"the hash key len(%u) is invalid, must be %u\",\n-\t\t\t key_len, HNS3_RSS_KEY_SIZE);\n+\t\t\t key_len, hw->rss_key_size);\n \t\treturn -EINVAL;\n \t}\n \n@@ -511,7 +511,7 @@ hns3_dev_rss_hash_update(struct rte_eth_dev *dev,\n \n \tif (key) {\n \t\tret = hns3_rss_set_algo_key(hw, hw->rss_info.hash_algo,\n-\t\t\t\t\t key, HNS3_RSS_KEY_SIZE);\n+\t\t\t\t\t key, hw->rss_key_size);\n \t\tif (ret)\n \t\t\tgoto set_algo_key_fail;\n \t}\n@@ -547,9 +547,9 @@ hns3_dev_rss_hash_conf_get(struct rte_eth_dev *dev,\n \trss_conf->rss_hf = rss_cfg->conf.types;\n \n \t/* Get the RSS Key required by the user */\n-\tif (rss_conf->rss_key && rss_conf->rss_key_len >= HNS3_RSS_KEY_SIZE) {\n-\t\tmemcpy(rss_conf->rss_key, rss_cfg->key, HNS3_RSS_KEY_SIZE);\n-\t\trss_conf->rss_key_len = HNS3_RSS_KEY_SIZE;\n+\tif (rss_conf->rss_key && rss_conf->rss_key_len >= hw->rss_key_size) {\n+\t\tmemcpy(rss_conf->rss_key, rss_cfg->key, hw->rss_key_size);\n+\t\trss_conf->rss_key_len = hw->rss_key_size;\n \t}\n \trte_spinlock_unlock(&hw->lock);\n \n@@ -754,8 +754,8 @@ hns3_rss_set_default_args(struct hns3_hw *hw)\n \t/* Default hash algorithm */\n \trss_cfg->conf.func = RTE_ETH_HASH_FUNCTION_TOEPLITZ;\n \n-\t/* Default RSS key */\n-\tmemcpy(rss_cfg->key, hns3_hash_key, HNS3_RSS_KEY_SIZE);\n+\tmemcpy(rss_cfg->key, hns3_hash_key,\n+\t\tRTE_MIN(sizeof(hns3_hash_key), hw->rss_key_size));\n \n \t/* Initialize RSS indirection table */\n \tfor (i = 0; i < hw->rss_ind_tbl_size; i++)\n@@ -788,9 +788,8 @@ hns3_config_rss(struct hns3_adapter *hns)\n \t\tbreak;\n \t}\n \n-\t/* Configure RSS hash algorithm and hash key */\n-\tret = hns3_rss_set_algo_key(hw, hw->rss_info.hash_algo, hash_key,\n-\t\t\t\t HNS3_RSS_KEY_SIZE);\n+\tret = hns3_rss_set_algo_key(hw, rss_cfg->hash_algo,\n+\t\t\t\t hash_key, hw->rss_key_size);\n \tif (ret)\n \t\treturn ret;\n \ndiff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h\nindex b7f62ca1ee..d6f81996f4 100644\n--- a/drivers/net/hns3/hns3_rss.h\n+++ b/drivers/net/hns3/hns3_rss.h\n@@ -29,6 +29,7 @@\n #define HNS3_RSS_IND_TBL_SIZE\t512 /* The size of hash lookup table */\n #define HNS3_RSS_IND_TBL_SIZE_MAX 2048\n #define HNS3_RSS_KEY_SIZE\t40\n+#define HNS3_RSS_KEY_SIZE_MAX\t128\n #define HNS3_RSS_SET_BITMAP_MSK\t0xffff\n \n #define HNS3_RSS_HASH_ALGO_TOEPLITZ\t0\n@@ -41,7 +42,7 @@ struct hns3_rss_conf {\n \t/* RSS parameters :algorithm, flow_types, key, queue */\n \tstruct rte_flow_action_rss conf;\n \tuint8_t hash_algo; /* hash function type defined by hardware */\n-\tuint8_t key[HNS3_RSS_KEY_SIZE]; /* Hash key */\n+\tuint8_t key[HNS3_RSS_KEY_SIZE_MAX]; /* Hash key */\n \tuint16_t rss_indirection_tbl[HNS3_RSS_IND_TBL_SIZE_MAX];\n \tuint16_t queue[HNS3_RSS_QUEUES_BUFFER_NUM]; /* Queues indices to use */\n \tbool valid; /* check if RSS rule is valid */\n", "prefixes": [ "V2", "04/10" ] }