From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9AB1641EA5
for <public@inbox.dpdk.org>; Wed, 15 Mar 2023 23:47:40 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 95C9640A7A;
Wed, 15 Mar 2023 23:47:40 +0100 (CET)
Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com
[209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 71084427F5
for <stable@dpdk.org>; Wed, 15 Mar 2023 23:47:39 +0100 (CET)
Received: by mail-wm1-f54.google.com with SMTP id
bg16-20020a05600c3c9000b003eb34e21bdfso2013779wmb.0
for <stable@dpdk.org>; Wed, 15 Mar 2023 15:47:39 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20210112; t=1678920459;
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=CuO0IWH72BQs8Svlk9/KGACJVDbMd5AkO7FvrAv9L1Y=;
b=JGDFNynUvrJ3EZffynpZAuoHcK1LPknExsLLNe1a/uC7xMWidDw1GXJ8gLiETWmh5S
tK0Mv2XQ3clZLZ0CsW8wh+XBgyavM+MPFhRtrl5t/bXFcYB/RYXytu1W1GhRmqExPCmn
ZPOWQEwGofTjlKckt3II2mGdrZp0hbhUr4a2GnIo1lBMtup1r2kcFuBW2bdbFFIG1YAa
HZXyo4uiyRV2kO8RlnN4RvPm2f2ntRdLV5tUQAL7xkqLcOrz0O7skUwgVNPU47KcjHIY
0Ou6FpKevX5x1wimYoQRdCYKZ1q37r45ccsucK66ojdwsdXc6oNWTuebZUHU/uVmBcwy
qdlQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112; t=1678920459;
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=CuO0IWH72BQs8Svlk9/KGACJVDbMd5AkO7FvrAv9L1Y=;
b=HlrH6WL0X58o1Rtbwrt4y9ExREW5xNFPe5FvH0h4RsaZx1kJFM3gQhI3ELvhrRQMHc
8Bj4mGlBAatGkhvow0TiTASTL2p1iJbWD+iHlOF+23YlpuNxDiD2LEFwgkRQqIPys06O
DpqUopqxLTGaOaaZUDsntqAUgVVGCwQ6FZW98uGfdleyT6nGEEyCaDwpWsloR1nOWAvM
kI8OIkF1kF81mnT8NbEghMrq3QWbWTvCXOpkAIJG51akPdeDKVhH8hxsxR2EYXKUsvLv
h9pXbNvTu7RWkTQlJNqJPVRB68KhwFG9ZDnZK9ZYagK5PBI483mXkWj2x2n7N2mmaiwC
95uQ==
X-Gm-Message-State: AO0yUKX/C0QV8HY5meLp1RjXndoCTAKBGuPsL9dX7X+wcCCMR/2oNJDs
3aDGIDmpxajPQaCoTsh0dKsCiA3ekLPfSQ==
X-Google-Smtp-Source: AK7set/2Gz33Ru5LrSy0Sx+ctsquguxJoLZwUPVfveswF4kD+zXoE96+SCHI47WxCp/XrXVaxOXrJg==
X-Received: by 2002:a05:600c:5009:b0:3eb:39c9:ecb0 with SMTP id
n9-20020a05600c500900b003eb39c9ecb0mr19613820wmr.8.1678920459163;
Wed, 15 Mar 2023 15:47:39 -0700 (PDT)
Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id
u17-20020a05600c19d100b003e204fdb160sm3487489wmq.3.2023.03.15.15.47.38
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 15 Mar 2023 15:47:38 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Huisong Li <lihuisong@huawei.com>
Cc: Dongdong Liu <liudongdong3@huawei.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/hns3: fix possible truncation of redirection table' has
been queued to stable release 20.11.8
Date: Wed, 15 Mar 2023 22:46:16 +0000
Message-Id: <20230315224631.1025649-25-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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=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/4eb35e5bd4c23765a893cc0e0bee770fd6bf2063
Thanks.
Luca Boccassi
---
>From 4eb35e5bd4c23765a893cc0e0bee770fd6bf2063 Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Fri, 10 Mar 2023 17:35:04 +0800
Subject: [PATCH] net/hns3: fix possible truncation of redirection table
[ upstream commit 4729376e555b58a739e6e231d403ca3b029ad92c ]
The size of the redirection table is obtained from firmware. If the size
isn't a multiple of HNS3_RSS_CFG_TBL_SIZE, the redirection table from
user will be truncated.
Fixes: c37ca66f2b27 ("net/hns3: support RSS")
Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Dongdong Liu <liudongdong3@huawei.com>
---
drivers/net/hns3/hns3_rss.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/hns3/hns3_rss.c b/drivers/net/hns3/hns3_rss.c
index 6478150f7b..4926189588 100644
--- a/drivers/net/hns3/hns3_rss.c
+++ b/drivers/net/hns3/hns3_rss.c
@@ -329,6 +329,7 @@ int
hns3_set_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;
struct hns3_cmd_desc desc;
uint8_t qid_msb_off;
uint8_t qid_msb_val;
@@ -337,14 +338,20 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size)
int ret;
req = (struct hns3_rss_indirection_table_cmd *)desc.data;
-
- for (i = 0; i < size / HNS3_RSS_CFG_TBL_SIZE; i++) {
+ 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,
false);
req->start_table_index =
rte_cpu_to_le_16(i * HNS3_RSS_CFG_TBL_SIZE);
req->rss_set_bitmap = rte_cpu_to_le_16(HNS3_RSS_SET_BITMAP_MSK);
- for (j = 0; j < HNS3_RSS_CFG_TBL_SIZE; j++) {
+
+ 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++) {
q_id = indir[i * HNS3_RSS_CFG_TBL_SIZE + j];
req->rss_result_l[j] = q_id & 0xff;
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-03-15 22:44:51.081610436 +0000
+++ 0025-net-hns3-fix-possible-truncation-of-redirection-tabl.patch 2023-03-15 22:44:49.619851015 +0000
@@ -1 +1 @@
-From 4729376e555b58a739e6e231d403ca3b029ad92c Mon Sep 17 00:00:00 2001
+From 4eb35e5bd4c23765a893cc0e0bee770fd6bf2063 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 4729376e555b58a739e6e231d403ca3b029ad92c ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -20 +21 @@
-index 2011c18b9b..ed397587b5 100644
+index 6478150f7b..4926189588 100644