From: Pierre Gondois <pierre.gondois@arm.com>
To: Yicong Yang <yangyicong@huawei.com>,
gregkh@linuxfoundation.org, rafael@kernel.org,
sudeep.holla@arm.com, palmer@rivosinc.com,
linux-kernel@vger.kernel.org
Cc: prime.zeng@hisilicon.com, linuxarm@huawei.com, yangyicong@hisilicon.com
Subject: Re: [PATCH v2] cacheinfo: Fix LLC is not exported through sysfs
Date: Tue, 28 Mar 2023 14:14:51 +0200 [thread overview]
Message-ID: <bda4c7e6-a819-dfa4-7f1d-f9e3f6adbd23@arm.com> (raw)
In-Reply-To: <20230328114915.33340-1-yangyicong@huawei.com>
Hello Yicong,
Thanks for the new version,
Reviewed-by: Pierre Gondois <pierre.gondois@arm.com>
On 3/28/23 13:49, Yicong Yang wrote:
> From: Yicong Yang <yangyicong@hisilicon.com>
>
> After entering 6.3-rc1 the LLC cacheinfo is not exported on our ACPI
> based arm64 server. This is because the LLC cacheinfo is partly reset
> when secondary CPUs boot up. On arm64 the primary cpu will allocate
> and setup cacheinfo:
> init_cpu_topology()
> for_each_possible_cpu()
> fetch_cache_info() // Allocate cacheinfo and init levels
> detect_cache_attributes()
> cache_shared_cpu_map_setup()
> if (!last_level_cache_is_valid()) // not valid, setup LLC
> cache_setup_properties() // setup LLC
>
> On secondary CPU boot up:
> detect_cache_attributes()
> populate_cache_leaves()
> get_cache_type() // Get cache type from clidr_el1,
> // for LLC type=CACHE_TYPE_NOCACHE
> cache_shared_cpu_map_setup()
> if (!last_level_cache_is_valid()) // Valid and won't go to this branch,
> // leave LLC's type=CACHE_TYPE_NOCACHE
>
> The last_level_cache_is_valid() use cacheinfo->{attributes, fw_token} to
> test it's valid or not, but populate_cache_leaves() will only reset
> LLC's type, so we won't try to re-setup LLC's type and leave it
> CACHE_TYPE_NOCACHE and won't export it through sysfs.
>
> This patch tries to fix this by not re-populating the cache leaves if
> the LLC is valid.
>
> Fixes: 5944ce092b97 ("arch_topology: Build cacheinfo from primary CPU")
> Signed-off-by: Yicong Yang <yangyicong@hisilicon.com>
> ---
> Change since v1:
> - Get rid of the goto label, per Pierre
> Link: https://lore.kernel.org/all/20230323122528.16691-1-yangyicong@huawei.com/
>
> drivers/base/cacheinfo.c | 16 +++++++++++-----
> 1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
> index f6573c335f4c..f3903d002819 100644
> --- a/drivers/base/cacheinfo.c
> +++ b/drivers/base/cacheinfo.c
> @@ -474,12 +474,18 @@ int detect_cache_attributes(unsigned int cpu)
>
> populate_leaves:
> /*
> - * populate_cache_leaves() may completely setup the cache leaves and
> - * shared_cpu_map or it may leave it partially setup.
> + * If LLC is valid the cache leaves were already populated so just go to
> + * update the cpu map.
> */
> - ret = populate_cache_leaves(cpu);
> - if (ret)
> - goto free_ci;
> + if (!last_level_cache_is_valid(cpu)) {
> + /*
> + * populate_cache_leaves() may completely setup the cache leaves and
> + * shared_cpu_map or it may leave it partially setup.
> + */
> + ret = populate_cache_leaves(cpu);
> + if (ret)
> + goto free_ci;
> + }
>
> /*
> * For systems using DT for cache hierarchy, fw_token
next prev parent reply other threads:[~2023-03-28 12:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-28 11:49 Yicong Yang
2023-03-28 12:14 ` Pierre Gondois [this message]
2023-03-28 12:47 ` Sudeep Holla
2023-03-29 6:41 ` Greg KH
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=bda4c7e6-a819-dfa4-7f1d-f9e3f6adbd23@arm.com \
--to=pierre.gondois@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=palmer@rivosinc.com \
--cc=prime.zeng@hisilicon.com \
--cc=rafael@kernel.org \
--cc=sudeep.holla@arm.com \
--cc=yangyicong@hisilicon.com \
--cc=yangyicong@huawei.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®