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 74C4CA034F
for <public@inbox.dpdk.org>; Wed, 10 Nov 2021 07:35:24 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 067CC40142;
Wed, 10 Nov 2021 07:35:24 +0100 (CET)
Received: from NAM10-MW2-obe.outbound.protection.outlook.com
(mail-mw2nam10on2041.outbound.protection.outlook.com [40.107.94.41])
by mails.dpdk.org (Postfix) with ESMTP id C52F440142
for <stable@dpdk.org>; Wed, 10 Nov 2021 07:35:22 +0100 (CET)
ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;
b=Y0LLGjHkZURRVfYLl8xDsSbXs7LMXMnXHNWAd8sVhP0xsneffJFJpH88wjGDGwmAzNn/o2ALLyMIluNAqynt9uTwsRRUuEYFpCFZFAV9X/HK4n0lkj8Ivl2cP1MGfk/b9ViJynApizbWQqY9PMIGqVd5YaFpuGMDSmnQb5gfXXcp8q7eEuq5UL9j/SS5ayhUJ/Pz3lKSN11EcuNJELWfhXb74CqEhYopxiRnNEx4pWJCl+1dE64unBaem9ybOHDfBN5SS2/ij7Z+a6kgP/XtJbF3JnpOBf49IYnQjUt4B9G/PhfeY3fXoFYXOrMN7Q43/QGIJN9WA57OBltrhcDvHw==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;
s=arcselector9901;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;
bh=TI64ditRntuhLi7h6IV6FZwB7l9+GnhZYmd1dHARDRI=;
b=YqNU9uTs+vGb0i26qBR0Mm0+e3latCfTEEdJu2/WPj91mUnOhgUmBc3TwVo9wFngUz1ZdpAUc+pkBWl1MB2EL8Isrk6Rei3PDvfqR+cT4FZQWKT6PqGSIgiD184/RIwQGquJWICQ/lC8kxR/nZ0PWGE+09GjWmc3eD63QEPqNTUqPPqauQtUj1OmUJxgo2EPQhM6OdkCB+4SDNhHceec9xNVQSwo/7rMtF/fDcGBF3Y6rnyh7UeHwmXw5CL1zSVgKA9sh8kMXNzh4gSZ3MQLdhD+w8ru+sB5mKAkhGMyGuTadQfCigZnbqZyxtnrgOg4Fp1hH/ej7KZpJfE1JE6LEQ==
ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is
216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com;
dmarc=pass (p=quarantine sp=quarantine pct=100) action=none
header.from=nvidia.com; dkim=none (message not signed); arc=none
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;
s=selector2;
h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;
bh=TI64ditRntuhLi7h6IV6FZwB7l9+GnhZYmd1dHARDRI=;
b=fJLrMPekLXI7swxzHsmhKjFOd8rgQnIvLDnLxpBDBtZ7+HO8/KCuvmjIbBYJyZxKbLB90Rq1eWVLHqr7bZkBlEib/5rSUskd71bHwDa1Gk7BB41OMa7GloyAjZOubc5bNa4XQwmMdbdDSRfh1hCfgVCS2HelU4YXAsOpXNugeziBJNWPDhMe3lBkSMcquOticI6m+0MiaaPOKOAgx37qGRDFjyxX7fkCkrz0bUb5P3kd3HCGcx63m9oXqZFgBtQ3lF/qLKYF8Zl+YvmdyG+EPsKMpBxjI4W1Geoms2m0tfEYvjQJ/bnhFqtKUywnXxcHbAd0ra/9tMYOJAVYGoPhvA==
Received: from DM6PR05CA0043.namprd05.prod.outlook.com (2603:10b6:5:335::12)
by SA0PR12MB4463.namprd12.prod.outlook.com (2603:10b6:806:92::14) with
Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov
2021 06:35:21 +0000
Received: from DM6NAM11FT033.eop-nam11.prod.protection.outlook.com
(2603:10b6:5:335:cafe::47) by DM6PR05CA0043.outlook.office365.com
(2603:10b6:5:335::12) with Microsoft SMTP Server (version=TLS1_2,
cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.7 via Frontend
Transport; Wed, 10 Nov 2021 06:35:21 +0000
X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34)
smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed)
header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
216.228.112.34 as permitted sender) receiver=protection.outlook.com;
client-ip=216.228.112.34; helo=mail.nvidia.com;
Received: from mail.nvidia.com (216.228.112.34) by
DM6NAM11FT033.mail.protection.outlook.com (10.13.172.221) with Microsoft SMTP
Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id
15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:35:20 +0000
Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com
(172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov
2021 06:35:18 +0000
From: Xueming Li <xuemingl@nvidia.com>
To: Tudor Cornea <tudor.cornea@gmail.com>
CC: Luca Boccassi <bluca@debian.org>, Qi Zhang <qi.z.zhang@intel.com>, dpdk
stable <stable@dpdk.org>
Date: Wed, 10 Nov 2021 14:28:29 +0800
Message-ID: <20211110063216.2744012-26-xuemingl@nvidia.com>
X-Mailer: git-send-email 2.33.0
In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com>
References: <20211110063216.2744012-1-xuemingl@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-Originating-IP: [172.20.187.5]
X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To
HQMAIL107.nvidia.com (172.20.187.13)
X-EOPAttributedMessage: 0
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: 105e8b21-e2b7-40e7-6fba-08d9a4144483
X-MS-TrafficTypeDiagnostic: SA0PR12MB4463:
X-Microsoft-Antispam-PRVS: <SA0PR12MB44638920D7E7996C582F2F84A1939@SA0PR12MB4463.namprd12.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:10000;
X-MS-Exchange-SenderADCheck: 1
X-MS-Exchange-AntiSpam-Relay: 0
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: ORbo6O8t7m0jMSdfo1y7H0PxI8UyG85CVQXzlXWe0rJqWJU+1qWA9JUYNlJj2OXygbXrr+nc4n07GM/xtWgK4pBJHeGpZtW6B0vzSoq0GNAYqa9Q/exhUHL5+J/zd/jjDyDXTKuZLffMdaGM5HoZouWLr9K9gyhp3Rm0E/YnQKgn2xs37Iggmcx5o9HOOPZxN/Y+fbkI1Aq1mYSZis14zpyUVJGHBWS5Nn7hqk73o4wXjQbhg9P5FIADMfF1LY3701H5V3PXzzJAz1jR4ckN5zL2gcXvZlcEPEELt4VeOmlQCMybu45F4fQiVpqtb06Lek5Z88HIKEUk3+RWn29aP0jvzyXEgt1YtcWDa6SOLyr7NoOtVYD5XM4Xtej1qhgx/+Wn030niU1t/47h0ZYGM9YaJiL4Gc6s776ohWxGg2zJ6JOfIQAlDmAZZXvIeGBQd7czYKubFo9cQvxFMpixT+mC3/UuLDOHvwo6iTXW3/8WG8pCr5xUrmT9vCew2Yjrg5RzH4/a7Sc4Pc78OIUxiL39ONxlfWD9NgtH82ku/E3G4FvGx29GWEedKyaOe6mORPDMIf4+BtqcczMtr/7Xn5NxBjgd5bnTob/CLfnJMaBxzhW9cCkHGuPdt4aUWkKUQ+8YKZ7yqb5DWRx6pacnhp1pJarYmUv9D0IKe6/PU12jf0kMtEygOsmOfJJHvY5rS71B5f/BmrpGGQJwCZ1A6WQRulSDo+FehiLudKk3wjEAFyMtC/Gko+Ab7YpCaRsux3/VRWjjmuYIS/mRcCfA1rn9FtfmGOgdC0yNNF6jCRAIhn+pw4jZ0Eegk8Mtf5NrUHg+FwWrGZHydFuiTCcGjA==
X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:;
IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE;
SFS:(4636009)(46966006)(36840700001)(55016002)(7696005)(86362001)(36860700001)(54906003)(2616005)(70586007)(36756003)(16526019)(316002)(70206006)(336012)(4001150100001)(53546011)(6916009)(82310400003)(26005)(8936002)(4326008)(6666004)(47076005)(186003)(8676002)(508600001)(83380400001)(966005)(356005)(7636003)(36906005)(6286002)(1076003)(2906002)(426003)(5660300002);
DIR:OUT; SFP:1101;
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:35:20.4282 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 105e8b21-e2b7-40e7-6fba-08d9a4144483
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34];
Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT033.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4463
Subject: [dpdk-stable] patch 'net/iavf: fix overflow in maximum packet
length config' has been queued to stable release 20.11.4
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
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.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 11/12/21. 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/steevenlee/dpdk
This queued commit can be viewed at:
https://github.com/steevenlee/dpdk/commit/c660ad64aae2f2174d5160de227ec965b35c0eda
Thanks.
Xueming Li <xuemingl@nvidia.com>
---
>From c660ad64aae2f2174d5160de227ec965b35c0eda Mon Sep 17 00:00:00 2001
From: Tudor Cornea <tudor.cornea@gmail.com>
Date: Thu, 5 Aug 2021 14:35:23 +0300
Subject: [PATCH] net/iavf: fix overflow in maximum packet length config
Cc: Xueming Li <xuemingl@nvidia.com>
[ upstream commit 7fe741821337f3cbeecac768b8ef3a16bf21c938 ]
The len variable, used in the computation of max_pkt_len could
overflow, if used to store the result of the following computation:
rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS
Since, we could define the mbuf size to have a large value (i.e 13312),
and IAVF_MAX_CHAINED_RX_BUFFERS is defined as 5, the computation
mentioned above could potentially result in a value which might be
bigger than MAX_USHORT.
The result will be that Jumbo Frames will not work properly
Fixes: 69dd4c3d0898 ("net/avf: enable queue and device")
Signed-off-by: Tudor Cornea <tudor.cornea@gmail.com>
Acked-by: Qi Zhang <qi.z.zhang@intel.com>
---
drivers/net/iavf/iavf_ethdev.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 9671c957d8..885b2a4bd0 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -408,13 +408,14 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
{
struct iavf_hw *hw = IAVF_DEV_PRIVATE_TO_HW(dev->data->dev_private);
struct rte_eth_dev_data *dev_data = dev->data;
- uint16_t buf_size, max_pkt_len, len;
+ uint16_t buf_size, max_pkt_len;
buf_size = rte_pktmbuf_data_room_size(rxq->mp) - RTE_PKTMBUF_HEADROOM;
/* Calculate the maximum packet length allowed */
- len = rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS;
- max_pkt_len = RTE_MIN(len, dev->data->dev_conf.rxmode.max_rx_pkt_len);
+ max_pkt_len = RTE_MIN((uint32_t)
+ rxq->rx_buf_len * IAVF_MAX_CHAINED_RX_BUFFERS,
+ dev->data->dev_conf.rxmode.max_rx_pkt_len);
/* Check if the jumbo frame and maximum packet length are set
* correctly.
--
2.33.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-11-10 14:17:03.234998975 +0800
+++ 0025-net-iavf-fix-overflow-in-maximum-packet-length-confi.patch 2021-11-10 14:17:01.764080297 +0800
@@ -1 +1 @@
-From 7fe741821337f3cbeecac768b8ef3a16bf21c938 Mon Sep 17 00:00:00 2001
+From c660ad64aae2f2174d5160de227ec965b35c0eda Mon Sep 17 00:00:00 2001
@@ -4,0 +5,3 @@
+Cc: Xueming Li <xuemingl@nvidia.com>
+
+[ upstream commit 7fe741821337f3cbeecac768b8ef3a16bf21c938 ]
@@ -19 +21,0 @@
-Cc: stable@dpdk.org
@@ -28 +30 @@
-index 574cfe055e..dc5cbc22f5 100644
+index 9671c957d8..885b2a4bd0 100644
@@ -31 +33 @@
-@@ -574,13 +574,14 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)
+@@ -408,13 +408,14 @@ iavf_init_rxq(struct rte_eth_dev *dev, struct iavf_rx_queue *rxq)