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 BAEF3A034F for ; Wed, 10 Nov 2021 07:39:16 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B561740142; Wed, 10 Nov 2021 07:39:16 +0100 (CET) Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2041.outbound.protection.outlook.com [40.107.95.41]) by mails.dpdk.org (Postfix) with ESMTP id 1BD2140142 for ; Wed, 10 Nov 2021 07:39:16 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YSdsimEf/1/eUBk70vdTjst6t4acpbZGhxzNEeWwNkjAedf9OIV+kBi/O3JTq6MarwxoxDGbFpj1dBkU1ibtVNDRoiB4VCctRG5cfNuSuij86C5BKwE7qLJySrocEVARe/ShlUVNk9DqP6kCsvThgsitkFiQICQ0w6fzBDtmRCD/MKTXLMFESuLkB8mNo0/BzXvYfktii0him8wbE4WPYcPX2IM6SMsCOb12aFw+zMyciYQXU0v2GALQBMmZUuvptSPT4VozX5/GbYGbePqkkMjZy0RheAvl+SWecCQwd58c1jwUVtAcCmMBnYPdP1iM8zBzxRbjhR/NsnpqnLTMdQ== 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=O268/WZTQDw7Xeh8fYkhLe8O2LcMomQkmMA9vSmy3Ak=; b=PHHUNSLzKUnSypaqDBl11Ru25YWqpqKpV70GfQeiTuEACe1UUJzT/ebz7/3zvfXiUX/A2/XTxVW7zElFVPKim4r9oxsY8kiwkbbHER3KkcgFIoA4LPorwlehv0G4Y+mJfg8a83MdDkZQRxZCjzjP+shMw3jdHIMfC3/XfVx6FktpmiOOn4UfWVaRcdeYveFLCSqfxWP6qVjqvKza5k/JKBbvQXbGLVfysajN9/D15EG194AdARSc9vMJzQd3Zoy1oCWThptoxQGGbJhlhNgj7hFkyKPGC/POmgqVu6EAxkC1hwYKva3y+jBgXdw1nXoQJfnttUoZ8Gt2A8VpDLL2fA== 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=O268/WZTQDw7Xeh8fYkhLe8O2LcMomQkmMA9vSmy3Ak=; b=UibWu/HwmbYVEytsFaM6qgBPwV07BSbFrFcbuOsafjulUmxMg3IxlX7C9OXUaisGgBQzS+utXwv13Xa0mJjXC21J9jDlsyGuhjhDxUZT+ICKbdbzMU96rvCwtZX4I+mBtAucQ7q0EyFywWDJkHLiooP4s+uDr5toDqjlno2drpg39UnFQjUgZHH02BZKJzlyZzxP2mniGjM637a50GP/Gld41hVlX5ar6GZYhU2MWncy5uGt8o6PdgLY9oRIPQPdD3tF+W0aDdl9laCHdpXoQXfod7+J6DXs8YF4WFx+yMumOpjwTVQfqrahyktH7E41FFAfrisVLLO+aUyYnOC2wQ== Received: from DM6PR13CA0013.namprd13.prod.outlook.com (2603:10b6:5:bc::26) by MN2PR12MB3710.namprd12.prod.outlook.com (2603:10b6:208:16d::24) 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:39:14 +0000 Received: from DM6NAM11FT068.eop-nam11.prod.protection.outlook.com (2603:10b6:5:bc:cafe::d4) by DM6PR13CA0013.outlook.office365.com (2603:10b6:5:bc::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.4 via Frontend Transport; Wed, 10 Nov 2021 06:39:14 +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 DM6NAM11FT068.mail.protection.outlook.com (10.13.173.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:39:13 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:39:09 +0000 From: Xueming Li To: Qiming Chen CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:29:06 +0800 Message-ID: <20211110063216.2744012-63-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.6] 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: 037dd561-9517-42ea-e23e-08d9a414cf8c X-MS-TrafficTypeDiagnostic: MN2PR12MB3710: X-Microsoft-Antispam-PRVS: 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: Xku15uIIdMOzSzJMtRf++0+YAZSZ57pTEElIfl6YBJqIDt/qij/R5MdfPzb9wqWcfmxUsgVERgtgg/a5NigpJplFmIBAPw2rhjUsQNBNgK7AJgCTilr4GqpvlJ11sfbh0BIyOmeaLA5+6doeKHmfZsno5bAuHcd/4tRm0cbISC1hppllh0cYJFhFG9z7io9jYT6/xqHBNN/VnQajG127wB9scjkz3Igm2mU47zLGu4hYS9HaOtDVBlrEpbbcnhjGSW1m+vQ70AGePQDJz+Cga4RELOULjtGsQ03ztmdWNcBGu5ZhDmc3ZjCcDdraA5LussgxubRzqax0Vg1L9ckKkXggTf0rlFlLFhTfI6rQFWGk5xyGGadO0z1N1y6MVOnBIhPk5GuedW2BxqWRJN3UHlCpxbCco4+sajfiRH2UzJ0A0Sa9yF5kVjU/YlH8Ylql8dudCu6+6OK+PbFAVlPPzRJRKXiTz+y/T3Za+gMhWvH6UyN41Z3r952XejHhWYLVQjsX3luA599nIR5Gr29Ja7+rLlmELK37fGr3fJHRmrGcolPwIAkhf0ZZ3Q+fFaF9GJ+pTPS1phIkhvHJfjP8v2Y6CrApWpKbcWZzA/PuYisGT0yMsHvG34Ylo5ah/uxZEuf5THZ3dEXFriEK8WrZbi3SZ6qfIf9Ol1zr+6BHUoFluUdbbvMe68UTXt++/Onfcph3/YUXH+Q3aARXxUU5ZxdaNOVCkbIo4bWaA9atNzJn2ty09+VDxMHxS3asSJGeHEDzTLc9zoT14uiuI90wASWMPjqNtpOtSVbe0fDZT8bUTJmMHOqM/e0FV/SVV7dUhT+uMGdxU/y+SsavrKSggQ== 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)(316002)(82310400003)(36906005)(6916009)(83380400001)(53546011)(7696005)(7636003)(47076005)(70206006)(356005)(55016002)(966005)(1076003)(8676002)(508600001)(36860700001)(70586007)(8936002)(4001150100001)(6286002)(2616005)(36756003)(2906002)(86362001)(336012)(6666004)(16526019)(186003)(426003)(5660300002)(26005)(54906003)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:39:13.7014 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 037dd561-9517-42ea-e23e-08d9a414cf8c 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: DM6NAM11FT068.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3710 Subject: [dpdk-stable] patch 'net/i40e/base: fix resource leakage' 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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/64734ba6e234485e337ac2a3684fdf937ec64d28 Thanks. Xueming Li --- >From 64734ba6e234485e337ac2a3684fdf937ec64d28 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Sat, 21 Aug 2021 14:30:08 +0800 Subject: [PATCH] net/i40e/base: fix resource leakage Cc: Xueming Li [ upstream commit 071eb26fb53914aafda4aa33356f65d2c7a2e4e0 ] In the i40e_init_arq function, when the i40e_config_arq_regs function returns from processing failure, the previously applied arq_bufs resource is not released, which leads to leakage. The patch is processed in the same way as the i40e_init_asq function, maintaining a unified coding style. Fixes: 49ea51605be4 ("net/i40e/base: gracefully clean the resources") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/net/i40e/base/i40e_adminq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/net/i40e/base/i40e_adminq.c b/drivers/net/i40e/base/i40e_adminq.c index 0da45f03e4..235667d57a 100644 --- a/drivers/net/i40e/base/i40e_adminq.c +++ b/drivers/net/i40e/base/i40e_adminq.c @@ -468,7 +468,7 @@ enum i40e_status_code i40e_init_arq(struct i40e_hw *hw) /* initialize base registers */ ret_code = i40e_config_arq_regs(hw); if (ret_code != I40E_SUCCESS) - goto init_adminq_free_rings; + goto init_config_regs; /* success! */ hw->aq.arq.count = hw->aq.num_arq_entries; @@ -476,6 +476,10 @@ enum i40e_status_code i40e_init_arq(struct i40e_hw *hw) init_adminq_free_rings: i40e_free_adminq_arq(hw); + return ret_code; + +init_config_regs: + i40e_free_arq_bufs(hw); init_adminq_exit: return ret_code; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:04.855993663 +0800 +++ 0062-net-i40e-base-fix-resource-leakage.patch 2021-11-10 14:17:01.824079806 +0800 @@ -1 +1 @@ -From 071eb26fb53914aafda4aa33356f65d2c7a2e4e0 Mon Sep 17 00:00:00 2001 +From 64734ba6e234485e337ac2a3684fdf937ec64d28 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 071eb26fb53914aafda4aa33356f65d2c7a2e4e0 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org