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 F18B5A0093 for ; Wed, 9 Mar 2022 12:03:13 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDEA141104; Wed, 9 Mar 2022 12:03:13 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id E27F9410F5 for ; Wed, 9 Mar 2022 12:03:12 +0100 (CET) Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id BF2323F79B for ; Wed, 9 Mar 2022 11:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823792; bh=3HCCEQlPADHotynmuwWHgeIf9B9uuNoxH7TI/dHJpNg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=jIIHXD9X9bzc5ERROFb3LARjgTEtI6xDYJviDxLOVs/7jce4tEOTIFouIPm7j1CcL pmlZ1n0dkajoOpHk4I9q0laVZhNHhUeSMmXnCC40IUTzwBv54/IBhMaP1LzIO9zkCt kxF9Y2bfVfgJ7Ek7at6jWqVm3lHr845jmjSJ8Qii4Dvn9b/VaRp2R6PCBqx15kNXKW oPjrQVOxGW3+SJhYjbcl2Qv5unk6BBZZLNdS765a+vt996ntJkPB5wS0P0Z3KW+EDy 26kCvp2tMqdX8IPv8dOur9uoPBYVr5MXRgoDz4GaDN0yvc/y4k0Iy3QMfsLFp0X16a 8oN/VwCHloNAQ== Received: by mail-wr1-f70.google.com with SMTP id m18-20020a5d4a12000000b00203731460e6so639241wrq.3 for ; Wed, 09 Mar 2022 03:03:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3HCCEQlPADHotynmuwWHgeIf9B9uuNoxH7TI/dHJpNg=; b=0PBwTSa0iaQPjdpSYiIrfd1cHX5h5owMU2Kabqh1Jgppkzv0YbfJ8RJL+VETQK+HaC xECsCr8lYHur0D1E0z8pGMbn6csko9/RuqLhZPJqbxUWLl7SqsuPxyQxHcnk1SCfGH10 5g3kfd/f92SwFZWzatLbmImi1DC0UFwy2U5RivBp7IOeUh8gLrmsN9EDuYjhkdPiNvre YbbOb28aq8VXAe0QsVJBK4cjtUxuimBCpPyzt1zguYZdQq6571jyXHDunpAW6+T3EiLM zWHLL2w4obqe+S5UbGbCcWX2J3pgYiokfxIlDfU/NFHKVI7LSvG3AnAXgyVJMP3sUt6i G9vQ== X-Gm-Message-State: AOAM530UyEVgu3rDVp3ndFg82yvu8oN9NmR2YjtxzPu5hzivd8TMeyq+ wX9EAJJRGr7TgAen8+KkA0It0XEOFYFXmNcSdYVwwsrXXXRXT6qFiAqSfHUwjTls6lL6cx6ZBVf xpmcEkESSfn+S3vPoVVc4duRA X-Received: by 2002:adf:a142:0:b0:1ed:bdb0:5297 with SMTP id r2-20020adfa142000000b001edbdb05297mr15969044wrr.434.1646823792022; Wed, 09 Mar 2022 03:03:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJxvmBzDiRgoTpuMjFXCDHJvze36v9GBndeRR3PRGa8DG9vfuKYZqHaCjEH6lA1AR3rQ137Fvg== X-Received: by 2002:adf:a142:0:b0:1ed:bdb0:5297 with SMTP id r2-20020adfa142000000b001edbdb05297mr15969013wrr.434.1646823791612; Wed, 09 Mar 2022 03:03:11 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id 9-20020a05600c268900b00381394d74a1sm1509439wmt.9.2022.03.09.03.03.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:11 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: fix VF RSS TC mode entry' has been queued to stable release 19.11.12 Date: Wed, 9 Mar 2022 12:01:06 +0100 Message-Id: <20220309110116.1295395-35-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.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 19.11.12 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/11/22. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/d7dd823ceb924ff021721779e039f5483f941d3c Thanks. Christian Ehrhardt --- >From d7dd823ceb924ff021721779e039f5483f941d3c Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 28 Feb 2022 11:21:46 +0800 Subject: [PATCH] net/hns3: fix VF RSS TC mode entry [ upstream commit 87f9628e2c786dff500139baf59720693e46b0bc ] For packets with VLAN priorities destined for the VF, hardware still assign Rx queue based on the Up-to-TC mapping PF configured. But VF has only one TC. If other TC don't enable, it causes that the priority packets that aren't destined for TC0 aren't received by RSS hash but is destined for queue 0. So driver has to enable the unused TC by using TC0 queue mapping configuration. Fixes: c37ca66f2b27 ("net/hns3: support RSS") Signed-off-by: Huisong Li Acked-by: Min Hu (Connor) --- drivers/net/hns3/hns3_rss.c | 56 +++++++++++++++++++++++++++---------- 1 file changed, 41 insertions(+), 15 deletions(-) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 08d64e5196..7aa57f054c 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -433,33 +433,59 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev, return 0; } -/* - * Used to configure the tc_size and tc_offset. - */ +static void +hns3_set_rss_tc_mode_entry(struct hns3_hw *hw, uint8_t *tc_valid, + uint16_t *tc_size, uint16_t *tc_offset, + uint8_t tc_num) +{ + struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); + uint16_t rss_size = hw->alloc_rss_size; + uint16_t roundup_size; + uint16_t i; + + roundup_size = roundup_pow_of_two(rss_size); + roundup_size = ilog2(roundup_size); + + for (i = 0; i < tc_num; i++) { + if (hns->is_vf) { + /* + * For packets with VLAN priorities destined for the VF, + * hardware still assign Rx queue based on the Up-to-TC + * mapping PF configured. But VF has only one TC. If + * other TC don't enable, it causes that the priority + * packets that aren't destined for TC0 aren't received + * by RSS hash but is destined for queue 0. So driver + * has to enable the unused TC by using TC0 queue + * mapping configuration. + */ + tc_valid[i] = (hw->hw_tc_map & BIT(i)) ? + !!(hw->hw_tc_map & BIT(i)) : 1; + tc_size[i] = roundup_size; + tc_offset[i] = (hw->hw_tc_map & BIT(i)) ? + rss_size * i : 0; + } else { + tc_valid[i] = !!(hw->hw_tc_map & BIT(i)); + tc_size[i] = tc_valid[i] ? roundup_size : 0; + tc_offset[i] = tc_valid[i] ? rss_size * i : 0; + } + } +} + static int hns3_set_rss_tc_mode(struct hns3_hw *hw) { - uint16_t rss_size = hw->alloc_rss_size; struct hns3_rss_tc_mode_cmd *req; uint16_t tc_offset[HNS3_MAX_TC_NUM]; uint8_t tc_valid[HNS3_MAX_TC_NUM]; uint16_t tc_size[HNS3_MAX_TC_NUM]; struct hns3_cmd_desc desc; - uint16_t roundup_size; uint16_t i; int ret; - req = (struct hns3_rss_tc_mode_cmd *)desc.data; - - roundup_size = roundup_pow_of_two(rss_size); - roundup_size = ilog2(roundup_size); - - for (i = 0; i < HNS3_MAX_TC_NUM; i++) { - tc_valid[i] = !!(hw->hw_tc_map & BIT(i)); - tc_size[i] = tc_valid[i] ? roundup_size : 0; - tc_offset[i] = tc_valid[i] ? rss_size * i : 0; - } + hns3_set_rss_tc_mode_entry(hw, tc_valid, tc_size, + tc_offset, HNS3_MAX_TC_NUM); + req = (struct hns3_rss_tc_mode_cmd *)desc.data; hns3_cmd_setup_basic_desc(&desc, HNS3_OPC_RSS_TC_MODE, false); for (i = 0; i < HNS3_MAX_TC_NUM; i++) { uint16_t mode = 0; -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:45.183913903 +0100 +++ 0035-net-hns3-fix-VF-RSS-TC-mode-entry.patch 2022-03-09 11:57:43.400938432 +0100 @@ -1 +1 @@ -From 87f9628e2c786dff500139baf59720693e46b0bc Mon Sep 17 00:00:00 2001 +From d7dd823ceb924ff021721779e039f5483f941d3c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87f9628e2c786dff500139baf59720693e46b0bc ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index ebf3c60f07..1493b10f96 100644 +index 08d64e5196..7aa57f054c 100644 @@ -26 +27 @@ -@@ -578,33 +578,59 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev, +@@ -433,33 +433,59 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev,