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 C711143829 for ; Tue, 5 Mar 2024 16:36:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75AC742E78; Tue, 5 Mar 2024 16:36:21 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id B1665410D3 for ; Tue, 5 Mar 2024 16:36:18 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652977; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lMdQPmYfuSFVwiKxKj+4BXU+20Ly/E4jLg21azuZWxQ=; b=DcITuYHU2VU0XugDJAYmxvcFJJ3shE2nLTi7dnHOf/afxc9E9ycQpMG+Lh3G0w5/2N/Ri+ uZFp+laXGvbvOsSAlpoEK8n98K7+nYfwff+WoRu1DCbVKDshRvq/IMPyRo++SbGgAu01L6 zWayOCWOiIWdqWSEOvn5EHNlsqecN9I= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-670-4U5EGY0-NtCfyn4a20u3zg-1; Tue, 05 Mar 2024 10:35:39 -0500 X-MC-Unique: 4U5EGY0-NtCfyn4a20u3zg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 85798185A783; Tue, 5 Mar 2024 15:35:39 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE76B200AE7F; Tue, 5 Mar 2024 15:35:38 +0000 (UTC) From: Kevin Traynor To: Akhil Goyal Cc: dpdk stable Subject: patch 'common/cnxk: fix memory leak in CPT init' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:05 +0000 Message-ID: <20240305153449.263666-32-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/24. 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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/aed510b37cc20eab04a7dcaa9083962295bb407f Thanks. Kevin --- >From aed510b37cc20eab04a7dcaa9083962295bb407f Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Wed, 17 Jan 2024 16:00:46 +0530 Subject: [PATCH] common/cnxk: fix memory leak in CPT init [ upstream commit ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c ] dev_init() acquires some resources which need to be cleaned in case a failure is observed afterwards. Fixes: c045d2e5cbbc ("common/cnxk: add CPT configuration") Signed-off-by: Akhil Goyal --- drivers/common/cnxk/roc_cpt.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/common/cnxk/roc_cpt.c b/drivers/common/cnxk/roc_cpt.c index 6179df2f1f..17b5d1e383 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -642,5 +642,5 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) if (rc) { plt_err("Failed to init roc device"); - goto fail; + return rc; } @@ -674,4 +674,5 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) fail: + dev_fini(dev, pci_dev); return rc; } -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.446994811 +0000 +++ 0032-common-cnxk-fix-memory-leak-in-CPT-init.patch 2024-03-05 14:08:54.648520760 +0000 @@ -1 +1 @@ -From ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c Mon Sep 17 00:00:00 2001 +From aed510b37cc20eab04a7dcaa9083962295bb407f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 981e85a204..4e23d8c135 100644 +index 6179df2f1f..17b5d1e383 100644 @@ -21 +22 @@ -@@ -757,5 +757,5 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) +@@ -642,5 +642,5 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) @@ -28 +29 @@ -@@ -789,4 +789,5 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) +@@ -674,4 +674,5 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt)