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 v4 4/4] arch_topology: Avoid zero CPU capacity on parse failure
Date: Wed, 11 Nov 2026 10:03:31 +0000 [thread overview]
Message-ID: <20261111100331.2945297-5-sudeep.holla@kernel.org> (raw)
In-Reply-To: <20261111100331.2945297-1-sudeep.holla@kernel.org>
When a possible CPU is missing from cpu-map, parse_dt_topology()
normalizes the partially populated raw_capacity array before checking
that all possible CPUs are represented. This leaves the missing CPU with
a capacity of 0.
Validate all possible CPUs before normalizing capacities so parse
failures do not write partial values to cpu_scale. Free raw_capacity on
the failure path to discard partial data and avoid a leak.
Reported-by: Sashiko <sashiko-bot@kernel.org>
Closes: https://sashiko.dev/#/bug/linux-1a2a8094-971d-40cb-b0cf-2e6d9f26c549
Fixes: 60c1b220d8bc ("cpu-topology: Move cpu topology code to common code.")
Signed-off-by: Sudeep Holla <sudeep.holla@kernel.org>
---
drivers/base/arch_topology.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c
index c439fc91270d..e868b7de88fa 100644
--- a/drivers/base/arch_topology.c
+++ b/drivers/base/arch_topology.c
@@ -682,8 +682,6 @@ static int __init parse_dt_topology(void)
if (ret != 0)
return ret;
- topology_normalize_cpu_scale();
-
/*
* Check that all cores are in the topology; the SMP code will
* only mark cores described in the DT as possible.
@@ -693,6 +691,8 @@ static int __init parse_dt_topology(void)
return -EINVAL;
}
+ topology_normalize_cpu_scale();
+
return ret;
}
#endif
@@ -954,6 +954,7 @@ void __init init_cpu_topology(void)
* arch-specific early cache level detection a chance to run.
*/
reset_cpu_topology();
+ free_raw_capacity();
cpu_smt_set_num_threads(1, 1);
}
--
2.43.0
prev parent reply other threads:[~2026-11-11 10:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-11 10:03 [PATCH v4 0/4] arch_topology: Bunch of error patch related fixes Sudeep Holla
2026-11-11 10:03 ` [PATCH v4 1/4] arch_topology: Reset SMT state when socket parsing fails Sudeep Holla
2026-11-11 10:03 ` [PATCH v4 2/4] arch_topology: Free ACPI SMT entries on lookup failure Sudeep Holla
2026-11-11 10:03 ` [PATCH v4 3/4] arch_topology: Reset SMT state when topology is unavailable Sudeep Holla
2026-11-11 10:03 ` Sudeep Holla [this message]
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=20261111100331.2945297-5-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