From: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
To: Borislav Petkov <bp@alien8.de>
Cc: x86@kernel.org, Andreas Herrmann <aherrmann@suse.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Chen Yu <yu.c.chen@intel.com>, Len Brown <len.brown@intel.com>,
Radu Rendec <rrendec@redhat.com>,
Pierre Gondois <Pierre.Gondois@arm.com>, Pu Wen <puwen@hygon.cn>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Sudeep Holla <sudeep.holla@arm.com>,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
Will Deacon <will@kernel.org>, Zhang Rui <rui.zhang@intel.com>,
Nikolay Borisov <nik.borisov@suse.com>,
Huang Ying <ying.huang@intel.com>,
Ricardo Neri <ricardo.neri@intel.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v8 2/2] x86/cacheinfo: Delete global num_cache_leaves
Date: Wed, 4 Dec 2024 08:39:11 -0800 [thread overview]
Message-ID: <20241204163911.GA31633@ranerica-svr.sc.intel.com> (raw)
In-Reply-To: <20241204143206.GAZ1Bn5jsTCvI_1ci0@fat_crate.local>
On Wed, Dec 04, 2024 at 03:32:06PM +0100, Borislav Petkov wrote:
> On Wed, Nov 27, 2024 at 04:22:47PM -0800, Ricardo Neri wrote:
> > arch/x86/kernel/cpu/cacheinfo.c | 41 +++++++++++++++------------------
> > 1 file changed, 18 insertions(+), 23 deletions(-)
>
> Does that work too?
>
> ---
> diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinfo.c
> index 95e38ab98a72..e6fa03ed9172 100644
> --- a/arch/x86/kernel/cpu/cacheinfo.c
> +++ b/arch/x86/kernel/cpu/cacheinfo.c
> @@ -715,22 +715,23 @@ void cacheinfo_hygon_init_llc_id(struct cpuinfo_x86 *c)
>
> void init_amd_cacheinfo(struct cpuinfo_x86 *c)
> {
> -
> - unsigned int cpu = c->cpu_index;
> + struct cpu_cacheinfo *ci = get_cpu_cacheinfo(c->cpu_index);
>
> if (boot_cpu_has(X86_FEATURE_TOPOEXT)) {
> - get_cpu_cacheinfo(cpu)->num_leaves = find_num_cache_leaves(c);
> + ci->num_leaves = find_num_cache_leaves(c);
> } else if (c->extended_cpuid_level >= 0x80000006) {
> if (cpuid_edx(0x80000006) & 0xf000)
> - get_cpu_cacheinfo(cpu)->num_leaves = 4;
> + ci->num_leaves = 4;
> else
> - get_cpu_cacheinfo(cpu)->num_leaves = 3;
> + ci->num_leaves = 3;
> }
> }
>
> void init_hygon_cacheinfo(struct cpuinfo_x86 *c)
> {
> - get_cpu_cacheinfo(c->cpu_index)->num_leaves = find_num_cache_leaves(c);
> + struct cpu_cacheinfo *ci = get_cpu_cacheinfo(c->cpu_index);
> +
> + ci->num_leaves = find_num_cache_leaves(c);
> }
>
> void init_intel_cacheinfo(struct cpuinfo_x86 *c)
> @@ -740,20 +741,21 @@ void init_intel_cacheinfo(struct cpuinfo_x86 *c)
> unsigned int new_l1d = 0, new_l1i = 0; /* Cache sizes from cpuid(4) */
> unsigned int new_l2 = 0, new_l3 = 0, i; /* Cache sizes from cpuid(4) */
> unsigned int l2_id = 0, l3_id = 0, num_threads_sharing, index_msb;
> + struct cpu_cacheinfo *ci = get_cpu_cacheinfo(c->cpu_index);
>
> if (c->cpuid_level > 3) {
> /*
> * There should be at least one leaf. A non-zero value means
> * that the number of leaves has been initialized.
> */
> - if (!get_cpu_cacheinfo(c->cpu_index)->num_leaves)
> - get_cpu_cacheinfo(c->cpu_index)->num_leaves = find_num_cache_leaves(c);
> + if (!ci->num_leaves)
> + ci->num_leaves = find_num_cache_leaves(c);
>
> /*
> * Whenever possible use cpuid(4), deterministic cache
> * parameters cpuid leaf to find the cache details
> */
> - for (i = 0; i < get_cpu_cacheinfo(c->cpu_index)->num_leaves; i++) {
> + for (i = 0; i < ci->num_leaves; i++) {
> struct _cpuid4_info_regs this_leaf = {};
> int retval;
>
> @@ -789,14 +791,14 @@ void init_intel_cacheinfo(struct cpuinfo_x86 *c)
> * Don't use cpuid2 if cpuid4 is supported. For P4, we use cpuid2 for
> * trace cache
> */
> - if ((!get_cpu_cacheinfo(c->cpu_index)->num_leaves || c->x86 == 15) && c->cpuid_level > 1) {
> + if ((!ci->num_leaves || c->x86 == 15) && c->cpuid_level > 1) {
> /* supports eax=2 call */
> int j, n;
> unsigned int regs[4];
> unsigned char *dp = (unsigned char *)regs;
> int only_trace = 0;
>
> - if (get_cpu_cacheinfo(c->cpu_index)->num_leaves && c->x86 == 15)
> + if (ci->num_leaves && c->x86 == 15)
> only_trace = 1;
>
> /* Number of times to iterate */
> @@ -990,8 +992,10 @@ static void ci_leaf_init(struct cacheinfo *this_leaf,
>
> int init_cache_level(unsigned int cpu)
> {
> + struct cpu_cacheinfo *ci = get_cpu_cacheinfo(cpu);
> +
> /* There should be at least one leaf. */
> - if (!get_cpu_cacheinfo(cpu)->num_leaves)
> + if (!ci->num_leaves)
> return -ENOENT;
>
> return 0;
Yes, this looks OK to me and is an improvement.
I can post a v9 with these changes.
I think I can keep the Reviewed-by tags as they were given to Patch 1.
Thanks and BR,
Ricardo
next prev parent reply other threads:[~2024-12-04 16:32 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-28 0:22 [PATCH v8 0/2] x86/cacheinfo: Set the number of leaves per CPU Ricardo Neri
2024-11-28 0:22 ` [PATCH v8 1/2] cacheinfo: Allocate memory during CPU hotplug if not done from the primary CPU Ricardo Neri
2024-11-29 16:12 ` Radu Rendec
2024-12-01 22:39 ` Ricardo Neri
2024-12-02 6:53 ` Nikolay Borisov
2024-12-03 4:09 ` Ricardo Neri
2024-12-02 8:02 ` Andreas Herrmann
2024-12-03 4:09 ` Ricardo Neri
2024-12-02 11:03 ` Sudeep Holla
2024-12-03 4:08 ` Ricardo Neri
2024-12-06 12:24 ` [tip: x86/urgent] " tip-bot2 for Ricardo Neri
2024-11-28 0:22 ` [PATCH v8 2/2] x86/cacheinfo: Delete global num_cache_leaves Ricardo Neri
2024-12-04 14:32 ` Borislav Petkov
2024-12-04 16:39 ` Ricardo Neri [this message]
2024-12-04 19:32 ` Borislav Petkov
2024-12-04 22:22 ` Ricardo Neri
2024-12-05 15:14 ` Borislav Petkov
2024-12-06 1:47 ` Ricardo Neri
2024-12-06 12:08 ` Borislav Petkov
2024-12-06 12:24 ` [tip: x86/urgent] " tip-bot2 for Ricardo Neri
2024-11-28 9:30 ` [PATCH v8 0/2] x86/cacheinfo: Set the number of leaves per CPU Borislav Petkov
2024-12-01 22:41 ` Ricardo Neri
2024-12-02 10:31 ` 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=20241204163911.GA31633@ranerica-svr.sc.intel.com \
--to=ricardo.neri-calderon@linux.intel.com \
--cc=Pierre.Gondois@arm.com \
--cc=aherrmann@suse.com \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=len.brown@intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nik.borisov@suse.com \
--cc=puwen@hygon.cn \
--cc=rafael.j.wysocki@intel.com \
--cc=ricardo.neri@intel.com \
--cc=rrendec@redhat.com \
--cc=rui.zhang@intel.com \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=sudeep.holla@arm.com \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=ying.huang@intel.com \
--cc=yu.c.chen@intel.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®