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 39BE9427F6 for ; Tue, 21 Mar 2023 10:24:30 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C22EE410F3; Tue, 21 Mar 2023 10:24:29 +0100 (CET) Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by mails.dpdk.org (Postfix) with ESMTP id B841A40A7A for ; Tue, 21 Mar 2023 10:24:26 +0100 (CET) Received: from kwepemm600004.china.huawei.com (unknown [172.30.72.56]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4PgmP94FyTzrVKM; Tue, 21 Mar 2023 17:23:25 +0800 (CST) Received: from localhost.localdomain (10.28.79.22) by kwepemm600004.china.huawei.com (7.193.23.242) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Tue, 21 Mar 2023 17:24:25 +0800 From: Huisong Li To: , CC: , , , Subject: [PATCH 21.11 06/17] net/hns3: use hardware config to report hash key Date: Tue, 21 Mar 2023 17:22:55 +0800 Message-ID: <20230321092306.16918-7-lihuisong@huawei.com> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20230321092306.16918-1-lihuisong@huawei.com> References: <20230321092306.16918-1-lihuisong@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 kwepemm600004.china.huawei.com (7.193.23.242) X-CFilter-Loop: Reflected 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 [ 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 bf031e6ad7..7c0ca04400 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -321,6 +321,48 @@ hns3_rss_set_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. @@ -597,13 +639,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 68069d6120..598381df84 100644 --- a/drivers/net/hns3/hns3_rss.h +++ b/drivers/net/hns3/hns3_rss.h @@ -114,6 +114,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, const uint8_t *key, uint8_t key_len); - +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.22.0