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 74E864301E for ; Thu, 10 Aug 2023 01:53:40 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E24C40DD8; Thu, 10 Aug 2023 01:53:40 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2064.outbound.protection.outlook.com [40.107.220.64]) by mails.dpdk.org (Postfix) with ESMTP id 47493406B6 for ; Thu, 10 Aug 2023 01:53:39 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ekLw9j1bkqN9VYEMP0rrD3uV/8/QeGSubDoUqAOplP9xQrntDX4JEB5f4aMewhlTr3vr34+M66bD/gP4xSFFAVYMEbE9V8u4gwreBU5qHFhkJ36TK8vHo+9+iKJlGJW7lZzYr9ZInTNP9dlKqzmXQs3LSWpiqaZGyi71vCzyPms4bLYkLEudjWdIKreBwUx5o75zVnRFF0D3q1A9eezrogOi6rF6uFK44yW/EljUQ0YrtKaWwn+V07nuNo9LH0HBgWsaUXAscHweM9zys/L3ep+QJqN3KXYfyuqRssnJBXXeBhe3HcqevSMM2+iDi5FDZmOmFFBmnmxIEaGB7cBEJA== 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=xtFqQgdTMy1vVhSBftctpAPZV3nZO2DWRxOfPyL9HPk=; b=j79VrcA7g93QJ2QzUCnot3I1GXGUJEmpkia9H8npxUStYKw7xNnYhQwa6QRNPq2lwGnQU/Ljp2inSqQaxCoHg8laJsDHwjc1HCLIj6o6qVV/33aUr7O1zXenQyRwyzjh8dLIO2oYS+wuhg8P/vHCvoINszvUizNEh6ncQ81H4SUCp184QrCyL7Ot+CBsz95fH4JOILkOHsc4HI3mAzoGgwbOxml9W4f/MEs02ryB8qPCZKe1SSzm1D9CJcOEa/4fk8xcXT1JHDFbpSaXDDlvdqBCe+B2zs/us3rzJ+9PvZZodoEbEptz74e6tyf1zqmAFgUxtVWyR72QSD+z+Znw9A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) 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=xtFqQgdTMy1vVhSBftctpAPZV3nZO2DWRxOfPyL9HPk=; b=RCDem05t9X/wnSPAkp/Sqz7lPOWOu32loIJjB+v962lodK164Ro9HtnU48WiP/gUOROLTxEV/QF8ACykXhbuU0+QNggff2ybZAiNaaexxyaGbGXSpilsQYKoWBF8g37vDLsVV/oJdlSaUHYyExzJTKAdxPJnxvKvITS95CXTqQnmj9kCAutrro2G4t903Hu3ECUabLcHjyw59YgC324jR8tKpPXnjJSVgrPpa78BKgcnhFIXa55MAC8MHKza+x3eLC8cdc8OQxdbaDskoXh4W36YQBhF495mDhNAiVek+o0p5Cgj2e9aCrbas8xBXRbyGklgKyjhgEAWzUkz+Wa0Mw== Received: from CYZPR14CA0005.namprd14.prod.outlook.com (2603:10b6:930:8f::24) by DS7PR12MB6095.namprd12.prod.outlook.com (2603:10b6:8:9c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Wed, 9 Aug 2023 23:53:37 +0000 Received: from CY4PEPF0000E9DB.namprd05.prod.outlook.com (2603:10b6:930:8f:cafe::22) by CYZPR14CA0005.outlook.office365.com (2603:10b6:930:8f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30 via Frontend Transport; Wed, 9 Aug 2023 23:53:37 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CY4PEPF0000E9DB.mail.protection.outlook.com (10.167.241.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Wed, 9 Aug 2023 23:53:36 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 16:53:23 -0700 Received: from nvidia.com (10.126.230.37) 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.37; Wed, 9 Aug 2023 16:53:21 -0700 From: Xueming Li To: Wenjun Wu CC: Qi Zhang , dpdk stable Subject: patch 'common/idpf: fix memory leak on AVX512 Tx queue close' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:48:00 +0800 Message-ID: <20230809234930.32424-39-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000E9DB:EE_|DS7PR12MB6095:EE_ X-MS-Office365-Filtering-Correlation-Id: f83af8ed-a6c3-4332-ab8d-08db9933d942 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nPguum2XSprcPe9lOUcPGeWgDNrWZLOaE+DVylv3QGVKGcNWS+8B2OgQ8eDYiWpEYm/FbL8HsMWyJIwUHEp7pN78a02XeaQB8zZ+Z32ISGA7ybdIO0AS6eMTvhPYnjZPk9zTXwpv85g6ORGn0opYT9m4c16LqnmJ+B0KFNwaiw/xgki+KyGpZq39bhQywI20dZMOgIu8V6+xxn12XpJ9NbMOPCFFhKS60RJGYo4DXBQ+WiAO1dGXTrAyiPTzlwDbXwTcZaLStBIgXvUOeipKIuNzoUhMOuUZXqMIYRjjSRTIRJ0WKpda4brvdAGAIaEDmRhIuFBSeOZyPixkitwj+Qro8GGowhgQP//PP2BfqAa50U2+QReIm+Skm9w1tcBGB4OIaMEPscEajmm0l6jrXVCJvS1Nw97fGPCNzx2TuqVnfng6LPCdxLy4S5aAaPP8h8meRJ2oes40718uD8+GD8O5QzuBM09KcSpI00bEU3omAt3cjz78VniYCXgT7dZKwOtV00xqwN24b6yemXgCaP0bH7WEWrbSQGdevK55pvKTbb/9nEpbvZGO1HwTiPiFp8wl4BamPJ161a5607vlfI3+L96qMHdCVaRLOzHKH2GjxbtY0oFZ70zNmBiAuXjXmBtWOWraJo+NHmOw9y9IVoIrOZXpsTX7JHYrOYPCu52ayzcvXbZ+kneZLXBCn65v3SlqaouvmAEhXYvFnX3viM7EoCvvrnRiy/wJMhmqG2sqgHSCOBY/KfsS6Zfe5Yl8WOrCh7RFcqqPmq3edHXObw== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(136003)(346002)(376002)(396003)(1800799006)(186006)(451199021)(82310400008)(40470700004)(36840700001)(46966006)(40460700003)(55016003)(40480700001)(6286002)(6916009)(70586007)(54906003)(70206006)(336012)(16526019)(53546011)(1076003)(26005)(6666004)(478600001)(36756003)(83380400001)(47076005)(426003)(2616005)(36860700001)(41300700001)(316002)(966005)(4326008)(7696005)(2906002)(86362001)(82740400003)(356005)(7636003)(8676002)(8936002)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:53:36.9370 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f83af8ed-a6c3-4332-ab8d-08db9933d942 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000E9DB.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6095 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=520330cbb1764754866e416e04bb5abae3400923 Thanks. Xueming Li --- >From 520330cbb1764754866e416e04bb5abae3400923 Mon Sep 17 00:00:00 2001 From: Wenjun Wu Date: Fri, 9 Jun 2023 18:54:05 +0800 Subject: [PATCH] common/idpf: fix memory leak on AVX512 Tx queue close Cc: Xueming Li [ upstream commit b28f22e8709661fb9927c8121bbd4257ddd9202a ] When releasing mbufs for TX queue software ring of AVX512, the mbuf in the range [i, tx_tail] should also be freed. The variable i refers to the index of the last mbuf released in the software ring. Fixes: 5bf87b45b2c8 ("net/idpf: add AVX512 data path for single queue model") Signed-off-by: Wenjun Wu Acked-by: Qi Zhang --- drivers/net/idpf/idpf_rxtx_vec_avx512.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/idpf/idpf_rxtx_vec_avx512.c b/drivers/net/idpf/idpf_rxtx_vec_avx512.c index fb2b6bb53c..f31582f5fd 100644 --- a/drivers/net/idpf/idpf_rxtx_vec_avx512.c +++ b/drivers/net/idpf/idpf_rxtx_vec_avx512.c @@ -843,6 +843,10 @@ idpf_singleq_tx_release_mbufs_avx512(struct idpf_tx_queue *txq) } i = 0; } + for (; i < txq->tx_tail; i++) { + rte_pktmbuf_free_seg(swr[i].mbuf); + swr[i].mbuf = NULL; + } } static const struct idpf_txq_ops avx512_singleq_tx_vec_ops = { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:19.233333400 +0800 +++ 0038-common-idpf-fix-memory-leak-on-AVX512-Tx-queue-close.patch 2023-08-09 21:51:18.174352000 +0800 @@ -1 +1 @@ -From b28f22e8709661fb9927c8121bbd4257ddd9202a Mon Sep 17 00:00:00 2001 +From 520330cbb1764754866e416e04bb5abae3400923 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b28f22e8709661fb9927c8121bbd4257ddd9202a ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -17 +19 @@ - drivers/common/idpf/idpf_common_rxtx_avx512.c | 4 ++++ + drivers/net/idpf/idpf_rxtx_vec_avx512.c | 4 ++++ @@ -20,5 +22,5 @@ -diff --git a/drivers/common/idpf/idpf_common_rxtx_avx512.c b/drivers/common/idpf/idpf_common_rxtx_avx512.c -index dffb11fcf2..81312617cc 100644 ---- a/drivers/common/idpf/idpf_common_rxtx_avx512.c -+++ b/drivers/common/idpf/idpf_common_rxtx_avx512.c -@@ -1601,6 +1601,10 @@ idpf_tx_release_mbufs_avx512(struct idpf_tx_queue *txq) +diff --git a/drivers/net/idpf/idpf_rxtx_vec_avx512.c b/drivers/net/idpf/idpf_rxtx_vec_avx512.c +index fb2b6bb53c..f31582f5fd 100644 +--- a/drivers/net/idpf/idpf_rxtx_vec_avx512.c ++++ b/drivers/net/idpf/idpf_rxtx_vec_avx512.c +@@ -843,6 +843,10 @@ idpf_singleq_tx_release_mbufs_avx512(struct idpf_tx_queue *txq) @@ -34 +36 @@ - static const struct idpf_txq_ops avx512_tx_vec_ops = { + static const struct idpf_txq_ops avx512_singleq_tx_vec_ops = {