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 A1693431D5 for ; Sun, 22 Oct 2023 16:30:48 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9598340DCB; Sun, 22 Oct 2023 16:30:48 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.63]) by mails.dpdk.org (Postfix) with ESMTP id A7BC64027E for ; Sun, 22 Oct 2023 16:30:46 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VS6r7EltgHFNB8Sjm9U3gVy6bnfqSu4curG2O5MOo/mMtYo3w+66fAy75pLHwa5JRRwTO4rHWMLktxavryV5U4PP4bIXjMxoG3Ek6r4+9zx/wSUHTiScsZZOv+upaAxnsNyiUsJFolY9ERZhKitwE2CZe4HvizuSghVcTNDpOlqFtR9y7eOc9IY4BfD9wzx7M4ABt18Q05+B5Ebmxr2eg3P7Zv8lP3up8ZSUVgjiV57fyWf3/4JsVt3ls+MLIDdrfbcmcm7e/tBB2zC1IZwB3ZX+GaaPeLnakrvYqeKLzzjrBOOTzzLe2ZeXP8XoUvcA5ZsPTJeftLKhOb0AuZv6Vw== 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=gwPNHKqAjIQmtHsg1te1o+YrjE8S/RzXj10ZUFiwR/8=; b=MUZ+qx7RmGQ2oibcINPu4qDvPrByIvp1CVUr45xbRx5uBDG5CDn/KI0PNMtN6x7CNfbMYtS1sXq2lrMT+SomqJ7nhiAe6HUKrnI7RgJ5dyzuspag+jk4pbmmjvipLoVJcC71MapTuwg7ne+uZC1v//X1N0Ze0Y2TeNrDcXz8hmBzl6I3cvtmTXV4xgfTzA/3muY0wolTHXEGdKH9aco+zm6k+7SdQuxKqZqGmHKkFJ1ZtHMmBrYmMQljHHxbU1XDo2sxAwYvyZIA6nBtLajFPJ7n30FkoHFNwCgPssTPZY2HU1veljDv9Ft+AMf4hLFsuBhBKCR4qlpzN+4BMI16Jw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=gwPNHKqAjIQmtHsg1te1o+YrjE8S/RzXj10ZUFiwR/8=; b=U7p0Pi5OxQlWPQ9giHHHjnSY19itPKyV6y1Qj7g5P+Pf6KpR+2zijIEAeQ8/GQ235q8pkl6rlnXGGmquHUuEloe+dHTIvSg4viwvUKdbb1znItpnaqBQr+G24K//gJbnSUvri4TV4UmEFn6CLMcS3uW7QxGmFj9UecEiX4rkYNbiC73f5ASmQn6/duWqNmaJen3cF+pRX19zfh++qjdPESXW+NsuQmTvH9cIwk+PybduWXiRAEyJVl+XnoLcfjqkoG7BUjDEQz99aMLKDWCIAok7731ii8ncAT3K4JjLPiQtn5YV4ba6P+YXHE/tAYcGlxTWcjDVc1kG3weYy0F00g== Received: from CYZPR12CA0014.namprd12.prod.outlook.com (2603:10b6:930:8b::18) by DM4PR12MB7765.namprd12.prod.outlook.com (2603:10b6:8:113::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:30:43 +0000 Received: from CY4PEPF0000EE37.namprd05.prod.outlook.com (2603:10b6:930:8b:cafe::ee) by CYZPR12CA0014.outlook.office365.com (2603:10b6:930:8b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.33 via Frontend Transport; Sun, 22 Oct 2023 14:30:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE37.mail.protection.outlook.com (10.167.242.43) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:30:43 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:30:30 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sun, 22 Oct 2023 07:30:28 -0700 From: Xueming Li To: Bruce Richardson CC: Qi Zhang , dpdk stable Subject: patch 'net/i40e: fix buffer leak on Rx reconfiguration' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:54 +0800 Message-ID: <20231022142250.10324-86-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE37:EE_|DM4PR12MB7765:EE_ X-MS-Office365-Filtering-Correlation-Id: 32109368-e0f1-4fa8-a38f-08dbd30b7909 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mcGdHHl6TQtP7r8gTVJ6nHG9VApWQCoLXXxIN8f1BbdDO76GodmVEkSt5ExVmpXLcGGY3iZbmIEHoD3FSkyIJ7ePstMpoteafAonXDteLve3zIp3c/WGqPExXdwYUGNd4K9X6ghkhjg4sluFZhW0RvlEDIRo6lUVLn9CzgdcEFR5u1SGn3fpkiqpICrUOxn/pSSHA6StOfdTKHkqHltBzgik3ZN2GJEP+cMoDULz/2cbxQ5y/LLK4nHB0cLKIZF0EYX7FtrgeA9+eTClnpryv1huFHkUxEYSKVM7yIv8ctzmVBVFEkkT8KTRkvgnWt+7mnzknJkdb8GLa82Ko7jCYWoq4OIX8ewaziszpsNQlv7CP24s14Wy7DZeb3LDCEkrqEcXjKZTABiEN8PUKW7hSoq0yDW2P4J5soRc4Moev8MpMS1UgOGhOVsyOnN/OT7GzrGckGMvTWY+cQavwoujwoZnAfN7wSfnAKJHUQk3Mx9Ya3s7spLywluqLDBN0fpgPnkrbc//LQsV6kJR+gEK7te1K0xRC42W0o0sFFqUwz87o57mkk+8PrXoXeA88LNw7V5pGZ2nun2ZnQJZLRdGUbySmNh384MVr/hhLXsy0UEk6DlM7iM5pt22RNusumoy5ZnRynqgPtfWQTidNtDFJ4d5x2HEmeihH+6TxA7UTRzRSQaDStpqpoIVtOurXv+fpHk2Y//88jyhEeiWUTjXattCFKTctw93j9n5tRTavWB1e4G1zXsTcVsuH5ywc1KtNhxG/2AI4yeV00ZJ/yKmnT0QIzFfoH4gigP7xdAGfjU= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(396003)(376002)(39850400004)(136003)(346002)(230922051799003)(451199024)(64100799003)(1800799009)(82310400011)(186009)(36840700001)(46966006)(40470700004)(40480700001)(55016003)(40460700003)(41300700001)(26005)(36756003)(6286002)(336012)(426003)(4001150100001)(2906002)(4326008)(8936002)(86362001)(8676002)(16526019)(2616005)(36860700001)(82740400003)(7636003)(356005)(47076005)(7696005)(6666004)(53546011)(5660300002)(316002)(6916009)(478600001)(1076003)(966005)(70206006)(70586007)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:30:43.0270 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 32109368-e0f1-4fa8-a38f-08dbd30b7909 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE37.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7765 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 22.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/15/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=36e302e98b46a1a0999178d45b08937b469e7ca9 Thanks. Xueming Li --- >From 36e302e98b46a1a0999178d45b08937b469e7ca9 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 31 Aug 2023 13:33:34 +0100 Subject: [PATCH] net/i40e: fix buffer leak on Rx reconfiguration Cc: Xueming Li [ upstream commit 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c ] When reconfiguring a single queue on a device, the mbuf initializer value was not getting set, and remained at zero. This lead to mbuf leaks as the refcount was incorrect (0), so on free it wrapped around to UINT16_MAX. When setting up the mbuf initializer, also ensure that the queue is explicitly marked as using a vector function by setting the "rx_using_sse" flag. Fixes: a3c83a2527e1 ("net/i40e: enable runtime queue setup") Signed-off-by: Bruce Richardson Acked-by: Qi Zhang --- drivers/net/i40e/i40e_rxtx.c | 6 ++++++ drivers/net/i40e/i40e_rxtx_vec_common.h | 1 + 2 files changed, 7 insertions(+) diff --git a/drivers/net/i40e/i40e_rxtx.c b/drivers/net/i40e/i40e_rxtx.c index b4f65b58fa..d96bbbb677 100644 --- a/drivers/net/i40e/i40e_rxtx.c +++ b/drivers/net/i40e/i40e_rxtx.c @@ -1918,6 +1918,12 @@ i40e_dev_rx_queue_setup_runtime(struct rte_eth_dev *dev, if (use_def_burst_func) ad->rx_bulk_alloc_allowed = false; i40e_set_rx_function(dev); + + if (ad->rx_vec_allowed && i40e_rxq_vec_setup(rxq)) { + PMD_DRV_LOG(ERR, "Failed vector rx setup."); + return -EINVAL; + } + return 0; } else if (ad->rx_vec_allowed && !rte_is_power_of_2(rxq->nb_rx_desc)) { PMD_DRV_LOG(ERR, "Vector mode is allowed, but descriptor" diff --git a/drivers/net/i40e/i40e_rxtx_vec_common.h b/drivers/net/i40e/i40e_rxtx_vec_common.h index fe1a6ec75e..8b745630e4 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_common.h +++ b/drivers/net/i40e/i40e_rxtx_vec_common.h @@ -201,6 +201,7 @@ i40e_rxq_vec_setup_default(struct i40e_rx_queue *rxq) rte_compiler_barrier(); p = (uintptr_t)&mb_def.rearm_data; rxq->mbuf_initializer = *(uint64_t *)p; + rxq->rx_using_sse = 1; return 0; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:37.473782200 +0800 +++ 0085-net-i40e-fix-buffer-leak-on-Rx-reconfiguration.patch 2023-10-22 22:17:34.326723700 +0800 @@ -1 +1 @@ -From 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c Mon Sep 17 00:00:00 2001 +From 36e302e98b46a1a0999178d45b08937b469e7ca9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 56dcaa41325a8a347ba52e5d89dce5e8dafa7f8c ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index f37bf30d56..9aa5facb53 100644 +index b4f65b58fa..d96bbbb677 100644