From: Sudeep Holla <sudeep.holla@kernel.org>
To: driver-core@lists.linux.dev
Cc: Sudeep Holla <sudeep.holla@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sashiko <sashiko-bot@kernel.org>
Subject: [PATCH v2 1/2] arch_topology: Reset SMT state when socket parsing fails
Date: Fri, 6 Nov 2026 16:44:07 +0000 [thread overview]
Message-ID: <20261106164408.158337-1-sudeep.holla@kernel.org> (raw)
If a later socket's cluster fails device tree parsing, parse_socket()
returns immediately. Cores parsed earlier can have raised
max_smt_thread_num, but this return skips the reset to 1 and the
cpu_smt_set_num_threads() notification. The framework is left with an
inconsistent SMT state after topology parsing fails.
Break out of the socket loop on parse_cluster() failure so the existing
error handling resets the thread count and notifies the SMT framework
before returning the error.
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/bug/linux-73adead8-21f3-470d-938c-b1f07a269a72
Fixes: 5deb9c789ae4 ("arch_topology: Support SMT control for OF based system")
Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org>
---
drivers/base/arch_topology.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
v1->v2:
- No change(just posting together with 2/2 which was result of sashiko review)
- v1: https://lore.kernel.org/all/20261103093421.1283949-1-sudeep.holla@kernel.org
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index 8c5e47c28d9a..1569ab3335f5 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -633,7 +633,7 @@ static int __init parse_socket(struct device_node *socket)
has_socket = true;
ret = parse_cluster(c, package_id, -1, 0);
if (ret != 0)
- return ret;
+ break;
package_id++;
} while (1);
--
2.43.0
next reply other threads:[~2026-11-06 16:44 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-06 16:44 Sudeep Holla [this message]
2026-11-06 16:44 ` [PATCH v2 2/2] arch_topology: Free ACPI SMT entries on lookup failure Sudeep Holla
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=20261106164408.158337-1-sudeep.holla@kernel.org \
--to=sudeep.holla@kernel.org \
--cc=driver-core@lists.linux.dev \
--cc=gregkh@linuxfoundation.org \
--cc=sashiko-bot@kernel.org \
/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