From: Sudeep Holla <sudeep.holla@arm.com>
To: linux-kernel@vger.kernel.org, Greg KH <gregkh@linuxfoundation.org>
Cc: Sudeep Holla <sudeep.holla@arm.com>,
Atish Patra <atishp@atishpatra.org>,
Atish Patra <atishp@rivosinc.com>,
Vincent Guittot <vincent.guittot@linaro.org>,
Dietmar Eggemann <dietmar.eggemann@arm.com>,
Qing Wang <wangqing@vivo.com>, Rob Herring <robh+dt@kernel.org>,
"Rafael J . Wysocki" <rafael@kernel.org>,
Ionela Voinescu <ionela.voinescu@arm.com>,
Pierre Gondois <pierre.gondois@arm.com>,
linux-arm-kernel@lists.infradead.org,
linux-riscv@lists.infradead.org, Gavin Shan <gshan@redhat.com>
Subject: [PATCH v4 03/20] cacheinfo: Add helper to access any cache index for a given CPU
Date: Tue, 21 Jun 2022 20:20:17 +0100 [thread overview]
Message-ID: <20220621192034.3332546-4-sudeep.holla@arm.com> (raw)
In-Reply-To: <20220621192034.3332546-1-sudeep.holla@arm.com>
The cacheinfo for a given CPU at a given index is used at quite a few
places by fetching the base point for index 0 using the helper
per_cpu_cacheinfo(cpu) and offseting it by the required index.
Instead, add another helper to fetch the required pointer directly and
use it to simplify and improve readability.
Reviewed-by: Gavin Shan <gshan@redhat.com>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
drivers/base/cacheinfo.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c
index b0bde272e2ae..e13ef41763e4 100644
--- a/drivers/base/cacheinfo.c
+++ b/drivers/base/cacheinfo.c
@@ -25,6 +25,8 @@ static DEFINE_PER_CPU(struct cpu_cacheinfo, ci_cpu_cacheinfo);
#define ci_cacheinfo(cpu) (&per_cpu(ci_cpu_cacheinfo, cpu))
#define cache_leaves(cpu) (ci_cacheinfo(cpu)->num_leaves)
#define per_cpu_cacheinfo(cpu) (ci_cacheinfo(cpu)->info_list)
+#define per_cpu_cacheinfo_idx(cpu, idx) \
+ (per_cpu_cacheinfo(cpu) + (idx))
struct cpu_cacheinfo *get_cpu_cacheinfo(unsigned int cpu)
{
@@ -172,7 +174,7 @@ static int cache_setup_of_node(unsigned int cpu)
}
while (index < cache_leaves(cpu)) {
- this_leaf = this_cpu_ci->info_list + index;
+ this_leaf = per_cpu_cacheinfo_idx(cpu, index);
if (this_leaf->level != 1)
np = of_find_next_cache_node(np);
else
@@ -231,7 +233,7 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
for (index = 0; index < cache_leaves(cpu); index++) {
unsigned int i;
- this_leaf = this_cpu_ci->info_list + index;
+ this_leaf = per_cpu_cacheinfo_idx(cpu, index);
/* skip if shared_cpu_map is already populated */
if (!cpumask_empty(&this_leaf->shared_cpu_map))
continue;
@@ -242,7 +244,7 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
if (i == cpu || !sib_cpu_ci->info_list)
continue;/* skip if itself or no cacheinfo */
- sib_leaf = sib_cpu_ci->info_list + index;
+ sib_leaf = per_cpu_cacheinfo_idx(i, index);
if (cache_leaves_are_shared(this_leaf, sib_leaf)) {
cpumask_set_cpu(cpu, &sib_leaf->shared_cpu_map);
cpumask_set_cpu(i, &this_leaf->shared_cpu_map);
@@ -258,12 +260,11 @@ static int cache_shared_cpu_map_setup(unsigned int cpu)
static void cache_shared_cpu_map_remove(unsigned int cpu)
{
- struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
struct cacheinfo *this_leaf, *sib_leaf;
unsigned int sibling, index;
for (index = 0; index < cache_leaves(cpu); index++) {
- this_leaf = this_cpu_ci->info_list + index;
+ this_leaf = per_cpu_cacheinfo_idx(cpu, index);
for_each_cpu(sibling, &this_leaf->shared_cpu_map) {
struct cpu_cacheinfo *sib_cpu_ci;
@@ -274,7 +275,7 @@ static void cache_shared_cpu_map_remove(unsigned int cpu)
if (!sib_cpu_ci->info_list)
continue;
- sib_leaf = sib_cpu_ci->info_list + index;
+ sib_leaf = per_cpu_cacheinfo_idx(sibling, index);
cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
}
@@ -609,7 +610,6 @@ static int cache_add_dev(unsigned int cpu)
int rc;
struct device *ci_dev, *parent;
struct cacheinfo *this_leaf;
- struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
const struct attribute_group **cache_groups;
rc = cpu_cache_sysfs_init(cpu);
@@ -618,7 +618,7 @@ static int cache_add_dev(unsigned int cpu)
parent = per_cpu_cache_dev(cpu);
for (i = 0; i < cache_leaves(cpu); i++) {
- this_leaf = this_cpu_ci->info_list + i;
+ this_leaf = per_cpu_cacheinfo_idx(cpu, i);
if (this_leaf->disable_sysfs)
continue;
if (this_leaf->type == CACHE_TYPE_NOCACHE)
--
2.36.1
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2022-06-21 19:21 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-21 19:20 [PATCH v4 00/20] arch_topology: Updates to add socket support and fix cluster ids Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 01/20] ACPI: PPTT: Use table offset as fw_token instead of virtual address Sudeep Holla
2022-06-22 11:47 ` Rafael J. Wysocki
2022-06-27 13:41 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 02/20] cacheinfo: Use of_cpu_device_node_get instead cpu_dev->of_node Sudeep Holla
2022-06-21 19:20 ` Sudeep Holla [this message]
2022-06-21 19:20 ` [PATCH v4 04/20] cacheinfo: Move cache_leaves_are_shared out of CONFIG_OF Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 05/20] cacheinfo: Add support to check if last level cache(LLC) is valid or shared Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 06/20] cacheinfo: Allow early detection and population of cache attributes Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 07/20] cacheinfo: Use cache identifiers to check if the caches are shared if available Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 08/20] arch_topology: Add support to parse and detect cache attributes Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 09/20] arch_topology: Use the last level cache information from the cacheinfo Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 10/20] arm64: topology: Remove redundant setting of llc_id in CPU topology Sudeep Holla
2022-06-23 15:55 ` Catalin Marinas
2022-06-21 19:20 ` [PATCH v4 11/20] arch_topology: Drop LLC identifier stash from the " Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 12/20] arch_topology: Set thread sibling cpumask only within the cluster Sudeep Holla
2022-06-27 13:42 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 13/20] arch_topology: Check for non-negative value rather than -1 for IDs validity Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 14/20] arch_topology: Avoid parsing through all the CPUs once a outlier CPU is found Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 15/20] arch_topology: Don't set cluster identifier as physical package identifier Sudeep Holla
2022-06-27 13:43 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 16/20] arch_topology: Drop unnecessary check for uninitialised package_id Sudeep Holla
2022-06-27 13:12 ` Ionela Voinescu
2022-06-27 16:30 ` Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 17/20] arch_topology: Limit span of cpu_clustergroup_mask() Sudeep Holla
2022-06-21 19:20 ` [PATCH v4 18/20] arch_topology: Set cluster identifier in each core/thread from /cpu-map Sudeep Holla
2022-06-27 13:47 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 19/20] arch_topology: Add support for parsing sockets in /cpu-map Sudeep Holla
2022-06-27 13:47 ` Ionela Voinescu
2022-06-21 19:20 ` [PATCH v4 20/20] arch_topology: Warn that topology for nested clusters is not supported Sudeep Holla
2022-06-22 15:06 ` Ionela Voinescu
2022-06-22 15:46 ` Sudeep Holla
2022-06-27 13:54 ` [PATCH v4 00/20] arch_topology: Updates to add socket support and fix cluster ids Ionela Voinescu
2022-06-27 16:22 ` 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=20220621192034.3332546-4-sudeep.holla@arm.com \
--to=sudeep.holla@arm.com \
--cc=atishp@atishpatra.org \
--cc=atishp@rivosinc.com \
--cc=dietmar.eggemann@arm.com \
--cc=gregkh@linuxfoundation.org \
--cc=gshan@redhat.com \
--cc=ionela.voinescu@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=pierre.gondois@arm.com \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=vincent.guittot@linaro.org \
--cc=wangqing@vivo.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;
as well as URLs for NNTP newsgroup(s).