mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: yolezz <yolezz.secret@gmail.com>
To: mario.limonciello@amd.com, yazen.ghannam@amd.com
Cc: x86@kernel.org, linux-kernel@vger.kernel.org,
	yolezz <yolezz.secret@gmail.com>
Subject: [PATCH] x86/amd/node: Release reserved config regions on init error
Date: Tue, 15 Sep 2026 18:22:38 +0200	[thread overview]
Message-ID: <20260915162238.77474-1-yolezz.secret@gmail.com> (raw)

In amd_smn_init(), if pci_request_config_region_exclusive() fails or
if kzalloc_objs() fails to allocate memory for amd_roots, the already
reserved PCI config regions are left allocated.

Add amd_smn_release_config_regions() to clean up and release all
reserved PCI config space regions before returning an error code.

Signed-off-by: yolezz <yolezz.secret@gmail.com>
---
 arch/x86/kernel/amd_node.c | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/arch/x86/kernel/amd_node.c b/arch/x86/kernel/amd_node.c
index b7926ba3610a..6a96d888b5a7 100644
--- a/arch/x86/kernel/amd_node.c
+++ b/arch/x86/kernel/amd_node.c
@@ -239,6 +239,15 @@ static struct pci_dev *get_next_root(struct pci_dev *root)
 	return root;
 }
 
+static void amd_smn_release_config_regions(u16 num_roots)
+{
+	struct pci_dev *root __free(pci_dev_put) = NULL;
+
+	/* Release the PCI config space for each root device. */
+	while (num_roots-- && (root = get_next_root(root)))
+		pci_release_config_region(root, 0, PCI_CFG_SPACE_SIZE);
+}
+
 static bool enable_dfs;
 
 static int __init amd_smn_enable_dfs(char *str)
@@ -273,6 +282,7 @@ static int __init amd_smn_init(void)
 		 */
 		if (!pci_request_config_region_exclusive(root, 0, PCI_CFG_SPACE_SIZE, NULL)) {
 			pci_err(root, "Failed to reserve config space\n");
+			amd_smn_release_config_regions(num_roots);
 			return -EEXIST;
 		}
 
@@ -286,8 +296,10 @@ static int __init amd_smn_init(void)
 
 	num_nodes = amd_num_nodes();
 	amd_roots = kzalloc_objs(*amd_roots, num_nodes);
-	if (!amd_roots)
+	if (!amd_roots) {
+		amd_smn_release_config_regions(num_roots);
 		return -ENOMEM;
+	}
 
 	roots_per_node = num_roots / num_nodes;
 	if (!roots_per_node) {
-- 
2.53.0


             reply	other threads:[~2026-09-15 16:22 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-15 16:22 yolezz [this message]
2026-09-15 16:35 ` Mario Limonciello
2026-09-15 17:23   ` [PATCH v2] " yolezz
2026-09-15 17:32     ` Mario Limonciello
2026-09-15 17:36   ` [PATCH v3] " yolezz
2026-09-15 17:42     ` Mario Limonciello
2026-09-15 18:05   ` [PATCH v4] " yolezz
2026-09-15 19:07     ` Mario Limonciello
2026-09-15 20:54     ` Borislav Petkov
2026-09-15 22:20     ` Yazen Ghannam
     [not found]       ` <CABLVixVbsR1Au=ReUUR2tpzhy0+5L8rm6VAAkrwJKR1ahR1sag@mail.gmail.com>
2026-09-16 15:11         ` Borislav Petkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260915162238.77474-1-yolezz.secret@gmail.com \
    --to=yolezz.secret@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mario.limonciello@amd.com \
    --cc=x86@kernel.org \
    --cc=yazen.ghannam@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®