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 A836243C60 for ; Thu, 7 Mar 2024 02:35:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 98D4742EF0; Thu, 7 Mar 2024 02:35:15 +0100 (CET) Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) by mails.dpdk.org (Postfix) with ESMTP id 4B4EC42EE3 for ; Thu, 7 Mar 2024 02:35:14 +0100 (CET) Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40fd72f7125so3435985e9.1 for ; Wed, 06 Mar 2024 17:35:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775314; x=1710380114; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bLKlujI+DKn3+eA8D8VHy8iOGMd0b89ViNMHit/0IGM=; b=amNzAxPyxcgxQkUvs/aYy0W1yOi24I0DrqW8Hw6/kDR/UeYGz5t8wXKF9mT15iPbtG nNAm3QA8GNwsIq5XGx6iCEKk52gxhnFC5DEtHSUZDPNJzWpvDucDtSNfbyuqhPZ1NyfT kQ7LN6OtKWw6Uh4uj7G/MFldkGXHGE+RZBSDA8U8E25NNv7bIrUeA+UR1HY1+yzIXRHj XzxhtFiu+mZxAYbdq0niKPiEy6TDe9ML+xZMEpas12T5cR0HhnTcQ6antPi42yFvXdeG 0zq9wXpAK/UIzN33ypFX+u34qHuKHmpOsROMlxiK3NGNhMIE4ahOuZsBc9rq+1FuC+MC ueMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775314; x=1710380114; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bLKlujI+DKn3+eA8D8VHy8iOGMd0b89ViNMHit/0IGM=; b=GQBqvvAK9G1/Dh7zu1d1Ir1UD/P/D4KbDgxqCpGcV8kSjpdtR5fVmT/KToJT6OETzX IyR7xOOBwKLMGviE0HcWzboer+suLxkbwoBgOGYjE4CwRIpIAw/8Ynl127wY6B6NydIc 9V01EDzztbPCM9lq8odUT88bJs6QWl+6sTrYCA3W8AYiUtoOPA9DfdBBn+DU2h5+hZ7b XUPfdAodK1eLc2w+OERHKoGpMXWgdG99fgwghO10ALp7tCnoD62GxxFGu9m2VuE82D7B tCgYqlC8W13jHrP8CWSYnYtYnbQZ9nzeXFOzSXVHyPO7DG4O80f1jb7MYb5YS2qaQZ4f hexQ== X-Gm-Message-State: AOJu0YyZCjVk8wUwXZCHfxHU5r+4ZXaXLJHMtPkj/F3y1lR+Bzh1Ga15 CmOgGVCpjwTTcpul/Bv6ch9PbLErRPVW7qJ2L2qVOO1w+lU8GV1K2JrfJXf7 X-Google-Smtp-Source: AGHT+IECbA6mMsvGMJDR8IKZ5H5mjmV7Z4arwkUk/cMF94BaraSqKJ9UGGQm3rZhQsT2bgO7xN92zg== X-Received: by 2002:a05:600c:4fc2:b0:412:dda9:1038 with SMTP id o2-20020a05600c4fc200b00412dda91038mr8463857wmq.4.1709775313899; Wed, 06 Mar 2024 17:35:13 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id bq3-20020a5d5a03000000b0033e2750194fsm13975240wrb.89.2024.03.06.17.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:35:13 -0800 (PST) From: luca.boccassi@gmail.com To: Akhil Goyal Cc: dpdk stable Subject: patch 'common/cnxk: fix memory leak in CPT init' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:08 +0000 Message-Id: <20240307013159.1735343-51-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.5 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/09/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3d8b8805d8bbb570a2fa6b74affde8b02f1f8975 Thanks. Luca Boccassi --- >From 3d8b8805d8bbb570a2fa6b74affde8b02f1f8975 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 fb97ec89b2..c9adfe6a02 100644 --- a/drivers/common/cnxk/roc_cpt.c +++ b/drivers/common/cnxk/roc_cpt.c @@ -656,7 +656,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) rc = dev_init(dev, pci_dev); if (rc) { plt_err("Failed to init roc device"); - goto fail; + return rc; } cpt->pci_dev = pci_dev; @@ -688,6 +688,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) return 0; fail: + dev_fini(dev, pci_dev); return rc; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:39.261768310 +0000 +++ 0051-common-cnxk-fix-memory-leak-in-CPT-init.patch 2024-03-07 01:05:34.802940101 +0000 @@ -1 +1 @@ -From ffe0b570cfd04a35b3a2f8f753efbbbe0225c38c Mon Sep 17 00:00:00 2001 +From 3d8b8805d8bbb570a2fa6b74affde8b02f1f8975 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 fb97ec89b2..c9adfe6a02 100644 @@ -21 +22 @@ -@@ -756,7 +756,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) +@@ -656,7 +656,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) @@ -30 +31 @@ -@@ -788,6 +788,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt) +@@ -688,6 +688,7 @@ roc_cpt_dev_init(struct roc_cpt *roc_cpt)