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 0B03941E9F for ; Wed, 15 Mar 2023 15:37:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0711642BDA; Wed, 15 Mar 2023 15:37:31 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 0E11842D13 for ; Wed, 15 Mar 2023 15:37:28 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678891048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Kfi0h2qqBIZahDdTsgCC2BbvA5WCShT8l0CXYfEGPc=; b=QrqIVAqzAJhJXXOUYfASefFb/Y5a/xqXw6ATrdETlcGSYXUB2I8fj/ai9bmLVgZzURyXFR kyUVfIt+KquHd7EV0Ttc+z6dYMdfNEX7fHKEexvERfItUgyGZuEK5C9XGBNA3Ef2dHeqpk 8DfYCCQnuRe6xF3vrgtDUu6MnGDuRoE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-230-tgF49tbHNxSqCuUSQsAaRg-1; Wed, 15 Mar 2023 10:37:27 -0400 X-MC-Unique: tgF49tbHNxSqCuUSQsAaRg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 037AD884626; Wed, 15 Mar 2023 14:37:27 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4858640C6E67; Wed, 15 Mar 2023 14:37:26 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Dongdong Liu , dpdk stable Subject: patch 'net/hns3: fix possible truncation of redirection table' has been queued to stable release 21.11.4 Date: Wed, 15 Mar 2023 14:36:33 +0000 Message-Id: <20230315143640.677317-40-ktraynor@redhat.com> In-Reply-To: <20230315143640.677317-1-ktraynor@redhat.com> References: <20230315143640.677317-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.4 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/20/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/abeba16e38adec4961b08f97c6a238538dd456ea Thanks. Kevin --- >From abeba16e38adec4961b08f97c6a238538dd456ea Mon Sep 17 00:00:00 2001 From: Huisong Li 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 Signed-off-by: Dongdong Liu --- 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 6f62f32a27..e94fabccc3 100644 --- a/drivers/net/hns3/hns3_rss.c +++ b/drivers/net/hns3/hns3_rss.c @@ -330,4 +330,5 @@ 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; @@ -338,6 +339,6 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size) 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); @@ -345,5 +346,11 @@ hns3_set_rss_indir_table(struct hns3_hw *hw, uint16_t *indir, uint16_t size) 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 14:30:21.559779994 +0000 +++ 0040-net-hns3-fix-possible-truncation-of-redirection-tabl.patch 2023-03-15 14:30:20.611123790 +0000 @@ -1 +1 @@ -From 4729376e555b58a739e6e231d403ca3b029ad92c Mon Sep 17 00:00:00 2001 +From abeba16e38adec4961b08f97c6a238538dd456ea 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 6f62f32a27..e94fabccc3 100644