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 46456A034F for ; Wed, 10 Nov 2021 07:43:08 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3DE264014D; Wed, 10 Nov 2021 07:43:08 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2055.outbound.protection.outlook.com [40.107.93.55]) by mails.dpdk.org (Postfix) with ESMTP id DF7F14014D for ; Wed, 10 Nov 2021 07:43:06 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RVdD8kcuc4ur1M/Z1Z9c466Ia0kGlFo4cq4eoWeA2uau+EkrkXMGSd0rcxV3ba/9LrnrBjIrfTPrCIaWD97zZShBs/5FIPHzVIizhpmzfN6/5VYgkgnWsj8Ig4B1AzcadFtHAfBj/pRz1qRhddSFp8GxrevcktaWRlc3hVL1IZjX3U6Hgbo6eJDhbWq9RlO+OUqnIIaw9BqbSiuHBkEUKp/U3RPAzLpILilD9ui5Lo7yuTDurr+cqgLtEpcciloH9HwgDq6U2WCUJVLFe7VbDSGjLbuuZPpobn7Lz0KOxmPWQs3tl2INr88X9L6dDefyK3RLk4xhn2I2lyTWX1d4zA== 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=Z70NJugK8jf6jsUiyIrdspXjA/Wft/BRuPogJdMDo6Q=; b=QITkBY1tmS+IaFCZURmq8WMaBMYqOBYydwNY6Pi6pxKo2r5letkfkSrYS3a3GD6AQaVbd9xJvjyEOIUPMnAewwFAjylFfmILSERlF3nqgo4YU0EBdHx4ThFRdTF8Wr7nKYyeHFyPzsIaeCBXBV/pAeIWUsKKZG2CPGg7sMu9/5SaB84+QpBy3qD5sMf8DXJIdwxjrU4DRgwreAJlm9QitK/M0O48mwEzSjZJGFXBJ9PNgqeIHCpj6QTqb8jFLDVZymYn7Va2MjG9asZF9WOxDOWOmvdCVhnnuzr+q0JrtAFYUHhNVSqgofU3OxRLw2194LO4FGfoi1Mmq7YNNuwqQQ== 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=Z70NJugK8jf6jsUiyIrdspXjA/Wft/BRuPogJdMDo6Q=; b=J4dWzDAUNroGXoLJWD4Leaqerif+BeX4pbTvmhN/RiEOt4up3lNcspyQcRvRLDBzARRsW210pwSu14fw8IyRyV4KFh7MKQlNF3u1+5osHphAtpYUQmgifO4NcnwFMTk/HjNjlFQNxrSBuuxmyTtV5v+x4lFlYku+WwDf/v5mLO89VBz+Q0V5KG3OEB/juSBpJlMnEVgPP4pA/ogFOwwO0aN5zoZWzWtljXGoF57QnqYt5W3XnCn1RkLrtyCmZ5q0os2Evg6UaSDbs+ZP4q5h+3kRT2LJfgyj790xU3FAtaHdFgJkpXfczAvh26uoyMAg6IyyYV1kJcjaMiFlGh7g2g== Received: from DM5PR07CA0113.namprd07.prod.outlook.com (2603:10b6:4:ae::42) by SN1PR12MB2543.namprd12.prod.outlook.com (2603:10b6:802:2a::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10; Wed, 10 Nov 2021 06:43:05 +0000 Received: from DM6NAM11FT017.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::a6) by DM5PR07CA0113.outlook.office365.com (2603:10b6:4:ae::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:43:05 +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 DM6NAM11FT017.mail.protection.outlook.com (10.13.172.145) 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:43:04 +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:43:01 +0000 From: Xueming Li To: Qiming Chen CC: Luca Boccassi , Qi Zhang , dpdk stable Date: Wed, 10 Nov 2021 14:29:39 +0800 Message-ID: <20211110063216.2744012-96-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: 0e201a0b-c13d-42cd-25dd-08d9a415594d X-MS-TrafficTypeDiagnostic: SN1PR12MB2543: 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: QTyd6LyCJAaXphYKvJ1LSaWMZvjr0Z5wiEbALYWmNYCO/j283vmwSe1IvKcdMLNqoVHO05ctqgZFnk6YaUMm63kUpmudAU7FmQZcsQa7tmP4Xnb2dtAHnPCeuXR0toVhe+sIxmZktY78lF5MeeHSoFbPLcTimEjomCbplf1kbTdm3vnNL9rGitBLU/9aevkzyFbhsiiSSXP5LwtoFCuzcLgSLWp4Ki27N8ymmrqxr/mZe8clRS5wfOEsoDJtYRxWGb34mVbBLduXTRvOcH8AyF3WNRzgcrm5XFexaRyKR52V3aORWLDBGFslxuot8czqPTu3Zclk0I0HeAQaFWGDHLezOgsFgwDuQY50wiPmi1sJPzCofj3K8hrZ4UZVTkQ1vmlZc0o7DlrWJkSXF8L4D9IG8C0+saZGO04Ptkem9y2UvWbByHgEBdimM2Bw7t4X8EoXpCFauaFZRO5Kycyyz6qRwTPRQaxSCA+dL4jFh6s1UWC2GzfZzLr9LOfsdoq0wnyn+4N/SKmdsNAQH1hwFFlVDtG0wy4j3ZF6M/fMS3+AwL8bYjN3shs4t0CZuIBm14XPYX5MMAlUN1jnuidEPePqkuYHshhJxrbjvhdj3a0Z3mASzBtlwEr39oe2SZwye/Acym4CFuoFjmraO8Ynz4Joxoq+jVH8dl47db5hcVRdCjOg3+4OnPL5NlT40aAZ/AiuBn0q1CHIyzT9Z9vP4/zpsEu19LpIWPOdiwLX2OL+LofkPwV894nvr4/WSJPBrXz+4ApiHNYXdPsmZwcYgIhGnkygm8aE8o9l0RygBs/pZ0NVaxAA/wSVCdarhaKk/vt+JWeOfdOIkG2KthByuA== 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)(186003)(36756003)(8936002)(55016002)(83380400001)(26005)(508600001)(966005)(2616005)(86362001)(4001150100001)(426003)(53546011)(6666004)(6286002)(6916009)(54906003)(47076005)(4326008)(356005)(70586007)(336012)(16526019)(82310400003)(7696005)(7636003)(36860700001)(70206006)(8676002)(2906002)(316002)(1076003)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:43:04.5624 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0e201a0b-c13d-42cd-25dd-08d9a415594d 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: DM6NAM11FT017.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2543 Subject: [dpdk-stable] patch 'common/iavf: fix ARQ resource leak' 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/90d7fd5b10ec48ae9cb0397d34043ce198c110f1 Thanks. Xueming Li --- >From 90d7fd5b10ec48ae9cb0397d34043ce198c110f1 Mon Sep 17 00:00:00 2001 From: Qiming Chen Date: Fri, 10 Sep 2021 11:12:49 +0800 Subject: [PATCH] common/iavf: fix ARQ resource leak Cc: Xueming Li [ upstream commit 395d41fbb1dd2faa21e143865ce12c195ec8194b ] In the iavf_init_arq function, if an exception occurs in the iavf_config_arq_regs function, and the previously applied ARQ (Admin Receive Queue) bufs resource is released. This patch maintains the same modification as the iavf_init_asq function to roll back resources. Fixes: 87aca6d8d8a4 ("net/iavf/base: fix command buffer memory leak") Signed-off-by: Qiming Chen Acked-by: Qi Zhang --- drivers/common/iavf/iavf_adminq.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/common/iavf/iavf_adminq.c b/drivers/common/iavf/iavf_adminq.c index 8bae51a46a..8d03de0553 100644 --- a/drivers/common/iavf/iavf_adminq.c +++ b/drivers/common/iavf/iavf_adminq.c @@ -417,7 +417,7 @@ enum iavf_status iavf_init_arq(struct iavf_hw *hw) /* initialize base registers */ ret_code = iavf_config_arq_regs(hw); if (ret_code != IAVF_SUCCESS) - goto init_adminq_free_rings; + goto init_config_regs; /* success! */ hw->aq.arq.count = hw->aq.num_arq_entries; @@ -425,6 +425,10 @@ enum iavf_status iavf_init_arq(struct iavf_hw *hw) init_adminq_free_rings: iavf_free_adminq_arq(hw); + return ret_code; + +init_config_regs: + iavf_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:06.242456542 +0800 +++ 0095-common-iavf-fix-ARQ-resource-leak.patch 2021-11-10 14:17:01.850746254 +0800 @@ -1 +1 @@ -From 395d41fbb1dd2faa21e143865ce12c195ec8194b Mon Sep 17 00:00:00 2001 +From 90d7fd5b10ec48ae9cb0397d34043ce198c110f1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 395d41fbb1dd2faa21e143865ce12c195ec8194b ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 0bf5af0cbe..9c36e8908e 100644 +index 8bae51a46a..8d03de0553 100644