From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3422241EA5 for ; Wed, 15 Mar 2023 23:47:52 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F1F040A7A; Wed, 15 Mar 2023 23:47:52 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 7ECA140EE4 for ; Wed, 15 Mar 2023 23:47:50 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id k25-20020a7bc419000000b003ed23114fa7so1992198wmi.4 for ; Wed, 15 Mar 2023 15:47:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=danJ+GiE1iNl51IhIKGwH2aaMry848oKNpoVjS9AnuQ=; b=Qp+d2BRjg4NDQuxwvWfJ1XeEbEd6Gwi4LWx4zLFANCvrPTF+8xrd12MvdI/dnCSbUj 2TLrZvaH6NRDtPyQgb9usJNeuSEf+QWDmnKlBdLBr4hTpEomtMZe5XunEIxHGJRmJbit kANrnsnz8+3tY0DyApSjT9HjRXh0jryTo79+pxmanM+T/Qpjnto5hq4Hn5E1iR39ksTS P2QOGEDZaLJZZwUne+r4eA+zKk5KGPQdYPljDQq6BgDFdNNZyvluvLFyavmM/brLbwH7 HDh4WvE6QYbYJM/FDpnYivpBOTmJnLIlx5dxWlurvqISvt95Gi6NhxUyy6N0tktulGYY iuEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=danJ+GiE1iNl51IhIKGwH2aaMry848oKNpoVjS9AnuQ=; b=34Qa3MgeN3HLpxtbVQMHcXXFSP5eYr+wMy02VUeqXnBPaTxt3th/ge0TfbnzbAAurs QVMRQUoeE4DbbT6unYuw+B6CMGdDDmFUWxqRM5idF5Q4lcAF4m397s8evTjAkqOSAM2N C3xMzXtqABBqukueXzSrEmBdjiDrNZXWqxJ0Z7I8MylPoRh3IY0ih2p3XvVly0lKcusU PNYWlURX0if0q94rhxbbxgKmCaUkkHjAGe/1zaTIv/o0ynp7Rl4SPIU2QX5pmXb5QxJJ TUE5LRF4rlQj4GLomYqvjO75jbFyc36Oex7SmMOgDj+VH0GrgEDP5E8Tvh9smQPTyoK0 e4cQ== X-Gm-Message-State: AO0yUKXVsKXIKelyZN8JqdM+X6IsM2ymQ4/2qrzy99fZpuQjNva8wheK LE7aSiJG4AS2jeQW6/ZVj7E= X-Google-Smtp-Source: AK7set8A9PLAkccPwtM3xORdAIbRADvzqe7dmChpXew9Gz0MIb9eZ85Gvmw7y3YKM150PaZoRtR2cw== X-Received: by 2002:a05:600c:a05:b0:3eb:29fe:f922 with SMTP id z5-20020a05600c0a0500b003eb29fef922mr19544184wmp.29.1678920470155; Wed, 15 Mar 2023 15:47:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id z19-20020a1c4c13000000b003ed246c1d28sm3307631wmf.44.2023.03.15.15.47.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:47:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: use hardware config to report hash key' has been queued to stable release 20.11.8 Date: Wed, 15 Mar 2023 22:46:17 +0000 Message-Id: <20230315224631.1025649-26-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230315224631.1025649-1-luca.boccassi@gmail.com> References: <20230223093715.3926893-71-luca.boccassi@gmail.com> <20230315224631.1025649-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/17/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/a4362eaf1312d2eb3641b3b38b3eca4df9de74b5 Thanks. Luca Boccassi --- >From a4362eaf1312d2eb3641b3b38b3eca4df9de74b5 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:05 +0800 Subject: [PATCH] net/hns3: use hardware config to report hash key [ upstream commit 7da415d27d8872a45a2d0cf9b5e66a8027c8f53c ] Currently, hns3_dev_rss_hash_conf_get() interface reports RSS key from the key maintained by driver. It's better to report the key from hardware, which is more realistic. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_rss.c | 53 ++++++++++++++++++++++++++++++++++++- drivers/net/hns3/hns3_rss.h | 3 ++- 2 files changed, 54 insertions(+), 2 deletions(-) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 4926189588..e624df073e 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -321,6 +321,48 @@ hns3_set_rss_algo_key(struct hns3_hw *hw, uint8_t hash_algo, return 0; } +int +hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo, + uint8_t *key, uint8_t key_len) +{ + struct hns3_rss_generic_config_cmd *req; + struct hns3_cmd_desc desc; + uint16_t cur_key_size; + uint16_t max_bd_num; + uint8_t *cur_key; + uint16_t idx; + int ret; + + req = (struct hns3_rss_generic_config_cmd *)desc.data; + max_bd_num = DIV_ROUND_UP(key_len, HNS3_RSS_HASH_KEY_NUM); + for (idx = 0; idx < max_bd_num; idx++) { + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_GENERIC_CONFIG, + true); + + req->hash_config |= (idx << HNS3_RSS_HASH_KEY_OFFSET_B); + ret = hns3_cmd_send(hw, &desc, 1); + if (ret) { + hns3_err(hw, "fail to obtain RSS algo and key from firmware, ret = %d", + ret); + return ret; + } + + if (idx == 0) + *hash_algo = req->hash_config & HNS3_RSS_HASH_ALGO_MASK; + + if (idx == max_bd_num - 1 && + (key_len % HNS3_RSS_HASH_KEY_NUM) != 0) + cur_key_size = key_len % HNS3_RSS_HASH_KEY_NUM; + else + cur_key_size = HNS3_RSS_HASH_KEY_NUM; + + cur_key = key + idx * HNS3_RSS_HASH_KEY_NUM; + memcpy(cur_key, req->hash_key, cur_key_size); + } + + return 0; +} + /* * rss_indirection_table command function, opcode:0x0D07. * Used to configure the indirection table of rss. @@ -550,13 +592,22 @@ hns3_dev_rss_hash_conf_get(struct rte_eth_dev *dev, struct hns3_adapter *hns = dev->data->dev_private; struct hns3_hw *hw = &hns->hw; struct hns3_rss_conf *rss_cfg = &hw->rss_info; + uint8_t hash_algo; + int ret; rte_spinlock_lock(&hw->lock); rss_conf->rss_hf = rss_cfg->conf.types; /* Get the RSS Key required by the user */ if (rss_conf->rss_key && rss_conf->rss_key_len >= hw->rss_key_size) { - memcpy(rss_conf->rss_key, rss_cfg->key, hw->rss_key_size); + ret = hns3_rss_get_algo_key(hw, &hash_algo, rss_conf->rss_key, + hw->rss_key_size); + if (ret != 0) { + rte_spinlock_unlock(&hw->lock); + hns3_err(hw, "obtain hash algo and key failed, ret = %d", + ret); + return ret; + } rss_conf->rss_key_len = hw->rss_key_size; } rte_spinlock_unlock(&hw->lock); diff --git a/drivers/net/hns3/hns3_rss.h b/drivers/net/hns3/hns3_rss.h index 636b6fdf3a..5af3005653 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -117,6 +117,7 @@ int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); int hns3_set_rss_algo_key(struct hns3_hw *hw, uint8_t hash_algo, const uint8_t *key, uint8_t key_len); int hns3_restore_filter(struct hns3_adapter *hns); - +int hns3_rss_get_algo_key(struct hns3_hw *hw, uint8_t *hash_algo, + uint8_t *key, uint8_t key_len); #endif /* _HNS3_RSS_H_ */ -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 22:44:51.137220608 +0000 +++ 0026-net-hns3-use-hardware-config-to-report-hash-key.patch 2023-03-15 22:44:49.623851099 +0000 @@ -1 +1 @@ -From 7da415d27d8872a45a2d0cf9b5e66a8027c8f53c Mon Sep 17 00:00:00 2001 +From a4362eaf1312d2eb3641b3b38b3eca4df9de74b5 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 7da415d27d8872a45a2d0cf9b5e66a8027c8f53c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index ed397587b5..a8ea5150ab 100644 +index 4926189588..e624df073e 100644 @@ -24 +25 @@ -@@ -321,6 +321,48 @@ hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, +@@ -321,6 +321,48 @@ hns3_set_rss_algo_key(struct hns3_hw *hw, uint8_t hash_algo, @@ -98 +99 @@ -index d6f81996f4..be0141f602 100644 +index 636b6fdf3a..5af3005653 100644 @@ -101,3 +102,2 @@ -@@ -112,6 +112,7 @@ void hns3_rss_uninit(struct hns3_adapter *hns); - int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); - int hns3_rss_set_algo_key(struct hns3_hw *hw, uint8_t hash_algo, +@@ -117,6 +117,7 @@ int hns3_set_rss_tuple_by_rss_hf(struct hns3_hw *hw, uint64_t rss_hf); + int hns3_set_rss_algo_key(struct hns3_hw *hw, uint8_t hash_algo, @@ -104,0 +105 @@ + int hns3_restore_filter(struct hns3_adapter *hns); @@ -109 +110 @@ - #endif /* HNS3_RSS_H */ + #endif /* _HNS3_RSS_H_ */