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 BDED7A0093 for ; Wed, 9 Mar 2022 17:31:18 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B85934013F; Wed, 9 Mar 2022 17:31:18 +0100 (CET) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id B5979410F4 for ; Wed, 9 Mar 2022 17:31:16 +0100 (CET) Received: by mail-wm1-f42.google.com with SMTP id n33-20020a05600c3ba100b003832caf7f3aso3219499wms.0 for ; Wed, 09 Mar 2022 08:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4Pl8Nj/0hv+99IQcrDF73nCvUhiunUdCqzkDTnO0Btk=; b=HRxzr1wHlb0vz2KZoeH4htRVcOR+bAw9QhIDDN24oHJ4pXIlZff4Zj2Gigf9rGkuJ1 Xw+25GyFx4c9QlqUOisKgfIgUq/zmA28Kop7c1qoSuhqQKddU/O1iWMwmK7CFbE0Ti0G c5NB0kSIoEq8QC4dQrvsPp7YgH7aIg6U2LWi7hrW/Ns7Zjtp13uhwBRaJgPDif6PWEJB qpxlJ1o6V27YuPNPYwVA79eXmuh4DVjm++spDk9VKPJLnqZiJw1K503qGrrpMfVBVz0w aBRyvyWXi2XxVESfaBx8qGNjfGEIP2LJ0vLoMGaUifa63AUz586fTrpQRx0QXWK+NYT/ NgAw== 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=4Pl8Nj/0hv+99IQcrDF73nCvUhiunUdCqzkDTnO0Btk=; b=EklWj3PUuuP+S7pAQ6SwHd1C8b+Q3aMA12v5xWQrqG9GFpxBZQe5O6TE8fh1WK01Ud pr9I/y7MWDsd0FXJlRVC8xrDpSDQMtXfOr3OJRNyr7r6WJOObqqKBz/yaD/6CNlN+mFV Zqh/R06MQTHKb8kfaxxULxAeeDje0nDyKiTRmhWBmqxpH2CbfKgvZzetqKiPtLAoSF0F lk2FbZYmY+AP4c0UWUZnJ5LJKSpOQcaoKr4SKTT3HbvbS8/Q8JlZiKVOjqZY/YMhToHc QWkG5GFXEA2m/koY+sAIkGKoYLFUBQIcekSW7DqZEXtjYuUav6H5NG6QGtq0IAlsHq8a 99Pw== X-Gm-Message-State: AOAM533vrktlkDY1KLFVZoKZXKWV0QHHQhcRc40Qwpenb8VhRbucAB4h X5LhaGBeHQeViBuhdWwmexbGTCG7i8I= X-Google-Smtp-Source: ABdhPJxAeQZqZr7c6C5kMHu82k9j37LRFGnMF9gSSjnEd69E3pwLUXll7pp/6g7wvlqUWv8fxvS3xw== X-Received: by 2002:a05:600c:4f56:b0:389:d49e:8bdb with SMTP id m22-20020a05600c4f5600b00389d49e8bdbmr155489wmq.166.1646843476405; Wed, 09 Mar 2022 08:31:16 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id l41-20020a05600c1d2900b00389d3e18f8esm1771678wms.26.2022.03.09.08.31.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:31:15 -0800 (PST) From: luca.boccassi@gmail.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 20.11.5 Date: Wed, 9 Mar 2022 16:30:24 +0000 Message-Id: <20220309163053.245754-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-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.5 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/b27dbae232df8873581a78d1c2f47c88ea94fedb Thanks. Luca Boccassi --- >From b27dbae232df8873581a78d1c2f47c88ea94fedb 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 | 58 +++++++++++++++++++++++++++---------- 1 file changed, 42 insertions(+), 16 deletions(-) diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c index 52986d590d..2e9ac328c1 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -578,33 +578,59 @@ hns3_dev_rss_reta_query(struct rte_eth_dev *dev, return 0; } -/* - * Used to configure the tc_size and tc_offset. - */ -static int -hns3_set_rss_tc_mode(struct hns3_hw *hw) +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) +{ 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; + 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; - - 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_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.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:08.846008098 +0000 +++ 0008-net-hns3-fix-VF-RSS-TC-mode-entry.patch 2022-03-09 16:30:08.491023900 +0000 @@ -1 +1 @@ -From 87f9628e2c786dff500139baf59720693e46b0bc Mon Sep 17 00:00:00 2001 +From b27dbae232df8873581a78d1c2f47c88ea94fedb 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 52986d590d..2e9ac328c1 100644