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 8555541EA5 for ; Wed, 15 Mar 2023 23:47:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 81F6642686; Wed, 15 Mar 2023 23:47:54 +0100 (CET) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mails.dpdk.org (Postfix) with ESMTP id 873EB40141 for ; Wed, 15 Mar 2023 23:47:52 +0100 (CET) Received: by mail-wm1-f41.google.com with SMTP id m35so16032wms.4 for ; Wed, 15 Mar 2023 15:47:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678920472; 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=tCDeoPc6d6JcQVEh8SlXg4dpy86Ey9v3pClHTy3S9F0=; b=UM0ChQ6N4QnxshENVeQMCl0ruEiMEZETXvpmlJ3s6X81J+43aZdhg9Bqn1phNWiZmP CNq2ls276rgeXmhlnUE+8y7tNw+4kFPQMuz5/5+iI723wFMZ6CX12vofszqeVOdGdrm7 E9NjWp3mIXqbDArlUhd0M8cQ/JAxwtfpclSP6dyQ0U69Dz/dAgaaqfY9nKkljy970c4d vTjS+D6H8gheE/U9/DbGR9A+VfL3zXsVGi65fRRHG8wmFMOCEm+27y6HDtn7XQyx+PJC WIPM97hmBiPelIUXrcxpyDmgagNmeazCeySqgFyPY7/Vaxw9fGHI3szVbomw1l7AVU8z NKIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678920472; 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=tCDeoPc6d6JcQVEh8SlXg4dpy86Ey9v3pClHTy3S9F0=; b=n826G1TqeCzkcr8SjxCcGWHI/vVqpX1L/3HQJQjKO3Z/ioZlpMKPoACkDCiino8dzc 3+242Ydy1MXpZXCQGswzcMtNxTbVqixwPpY7u1cwZ0eOBbUhKN8NYCakrfxGZHuNg4e3 p81P1Sl5ecvgCe8ACygSPDBxc/X+LLKKfrPcRKdjA2TgaOl1HiZQ+BorBnQ/oOXZ14HL cWzO/KqKe/cx8HUPLaqn8K25NpEu2NDOHS/USONkjN9uVEURrky/TbXN0+GVImG4Bpjk BaqOxddKcrUWteuB+mV/SvmkXHONSmV2M/Tov/46zV6osRq/1j9GKHjpnP0+hMZ63XV3 vEBw== X-Gm-Message-State: AO0yUKWsSSqOgtzSl2E1tQMqtALVaisiBIxghOIeybdC++NE+w1TNncC M+S5iUrdvAHD8t/2l34RvbpBQf7J/Lbv2w== X-Google-Smtp-Source: AK7set/pgJZguhnREhz4pLD4uzJg/LGLc9gUAoVdkUQlWEmReZPGG82A1Gw5lSYUGl5hKKTibJ2d7Q== X-Received: by 2002:a05:600c:4752:b0:3ea:e834:d0d1 with SMTP id w18-20020a05600c475200b003eae834d0d1mr19391484wmo.36.1678920472303; Wed, 15 Mar 2023 15:47:52 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id k3-20020a7bc403000000b003ed1f69c967sm3236126wmi.9.2023.03.15.15.47.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Mar 2023 15:47:51 -0700 (PDT) From: luca.boccassi@gmail.com To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: use hardware config to report redirection table' has been queued to stable release 20.11.8 Date: Wed, 15 Mar 2023 22:46:19 +0000 Message-Id: <20230315224631.1025649-28-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/f1e6a8d8d020e08f73f9a79d18b500e8c649e1bc Thanks. Luca Boccassi --- >From f1e6a8d8d020e08f73f9a79d18b500e8c649e1bc Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 10 Mar 2023 17:35:07 +0800 Subject: [PATCH] net/hns3: use hardware config to report redirection table [ upstream commit d1e37d1c6916858314a2c67e6317b0bb6c691b36 ] Currently, reta_query() API reports the redirection table from software. This patch uses the one in hardware to report. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Signed-off-by: Dongdong Liu --- drivers/net/hns3/hns3_cmd.h | 1 + drivers/net/hns3/hns3_rss.c | 65 ++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 4 deletions(-) diff --git a/drivers/net/hns3/hns3_cmd.h b/drivers/net/hns3/hns3_cmd.h index 02bb6fa3c8..c5e7fc1064 100644 --- a/drivers/net/hns3/hns3_cmd.h +++ b/drivers/net/hns3/hns3_cmd.h @@ -579,6 +579,7 @@ struct hns3_rss_input_tuple_cmd { #define HNS3_RSS_CFG_TBL_SIZE_H 4 #define HNS3_RSS_CFG_TBL_BW_H 2 #define HNS3_RSS_CFG_TBL_BW_L 8 +#define HNS3_RSS_CFG_TBL_BW_H_M 0x3 /* Configure the indirection table, opcode:0x0D07 */ struct hns3_rss_indirection_table_cmd { diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 7c2b4bcd1f..d36c1776bb 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -481,6 +481,54 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size) return 0; } +static int +hns3_get_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size) +{ + struct hns3_rss_indirection_table_cmd *req; + uint16_t max_bd_num, cfg_tbl_size; + uint8_t qid_msb_off, qid_msb_idx; + struct hns3_cmd_desc desc; + uint16_t q_id, q_hi, q_lo; + uint8_t rss_result_h; + uint16_t i, j; + int ret; + + req = (struct hns3_rss_indirection_table_cmd *)desc.data; + max_bd_num = DIV_ROUND_UP(size, HNS3_RSS_CFG_TBL_SIZE); + for (i = 0; i < max_bd_num; i++) { + hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_INDIR_TABLE, + true); + req->start_table_index = + rte_cpu_to_le_16(i * HNS3_RSS_CFG_TBL_SIZE); + ret = hns3_cmd_send(hw, &desc, 1); + if (ret) { + hns3_err(hw, "fail to get RSS indirection table from firmware, ret = %d", + ret); + return ret; + } + + if (i == max_bd_num - 1 && (size % HNS3_RSS_CFG_TBL_SIZE) != 0) + cfg_tbl_size = size % HNS3_RSS_CFG_TBL_SIZE; + else + cfg_tbl_size = HNS3_RSS_CFG_TBL_SIZE; + + for (j = 0; j < cfg_tbl_size; j++) { + qid_msb_idx = + j * HNS3_RSS_CFG_TBL_BW_H / HNS3_BITS_PER_BYTE; + rss_result_h = req->rss_result_h[qid_msb_idx]; + qid_msb_off = + j * HNS3_RSS_CFG_TBL_BW_H % HNS3_BITS_PER_BYTE; + q_hi = (rss_result_h >> qid_msb_off) & + HNS3_RSS_CFG_TBL_BW_H_M; + q_lo = req->rss_result_l[j]; + q_id = (q_hi << HNS3_RSS_CFG_TBL_BW_L) | q_lo; + indir[i * HNS3_RSS_CFG_TBL_SIZE + j] = q_id; + } + } + + return 0; +} + int hns3_rss_reset_indir_table(struct hns3_hw *hw) { @@ -842,10 +890,11 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev, uint16_t reta_size) { struct hns3_adapter *hns = dev->data->dev_private; + uint16_t reta_table[HNS3_RSS_IND_TBL_SIZE_MAX]; struct hns3_hw *hw = &hns->hw; - struct hns3_rss_conf *rss_cfg = &hw->rss_info; uint16_t idx, shift; uint16_t i; + int ret; if (reta_size != hw->rss_ind_tbl_size) { hns3_err(hw, "The size of hash lookup table configured (%u)" @@ -854,14 +903,22 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev, return -EINVAL; } rte_spinlock_lock(&hw->lock); + ret = hns3_get_rss_indir_table(hw, reta_table, reta_size); + if (ret != 0) { + rte_spinlock_unlock(&hw->lock); + hns3_err(hw, "query RSS redirection table failed, ret = %d.", + ret); + return ret; + } + rte_spinlock_unlock(&hw->lock); + for (i = 0; i < reta_size; i++) { idx = i / RTE_RETA_GROUP_SIZE; shift = i % RTE_RETA_GROUP_SIZE; if (reta_conf[idx].mask & (1ULL << shift)) - reta_conf[idx].reta[shift] = - rss_cfg->rss_indirection_tbl[i]; + reta_conf[idx].reta[shift] = reta_table[i]; } - rte_spinlock_unlock(&hw->lock); + return 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-15 22:44:51.241381056 +0000 +++ 0028-net-hns3-use-hardware-config-to-report-redirection-t.patch 2023-03-15 22:44:49.627851183 +0000 @@ -1 +1 @@ -From d1e37d1c6916858314a2c67e6317b0bb6c691b36 Mon Sep 17 00:00:00 2001 +From f1e6a8d8d020e08f73f9a79d18b500e8c649e1bc Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d1e37d1c6916858314a2c67e6317b0bb6c691b36 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 994dfc48cc..eb394c9dec 100644 +index 02bb6fa3c8..c5e7fc1064 100644 @@ -23 +24 @@ -@@ -606,6 +606,7 @@ struct hns3_rss_input_tuple_cmd { +@@ -579,6 +579,7 @@ struct hns3_rss_input_tuple_cmd { @@ -32 +33 @@ -index 9addc00a67..7dc4e03d83 100644 +index 7c2b4bcd1f..d36c1776bb 100644 @@ -117,2 +118,2 @@ - idx = i / RTE_ETH_RETA_GROUP_SIZE; - shift = i % RTE_ETH_RETA_GROUP_SIZE; + idx = i / RTE_RETA_GROUP_SIZE; + shift = i % RTE_RETA_GROUP_SIZE;