From: James Morse <james.morse@arm.com>
To: x86@kernel.org, linux-kernel@vger.kernel.org
Cc: Fenghua Yu <fenghua.yu@intel.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
H Peter Anvin <hpa@zytor.com>, Babu Moger <Babu.Moger@amd.com>,
James Morse <james.morse@arm.com>
Subject: [PATCH v5 10/10] cacheinfo: Move resctrl's get_cache_id() to the cacheinfo header file
Date: Wed, 8 Jul 2020 16:39:29 +0000 [thread overview]
Message-ID: <20200708163929.2783-11-james.morse@arm.com> (raw)
In-Reply-To: <20200708163929.2783-1-james.morse@arm.com>
resctrl/core.c defines get_cache_id() for use in its cpu-hotplug
callbacks. This gets the id attribute of the cache at the corresponding
level of a cpu.
Later rework means this private function needs to be shared. Move
it to the header file.
The name conflicts with a different definition in intel_cacheinfo.c,
name it get_cpu_cacheinfo_id() to show its relation with
get_cpu_cacheinfo().
Now this is visible on other architectures, check the id attribute
has actually been set.
Signed-off-by: James Morse <james.morse@arm.com>
Reviewed-by: Babu Moger <babu.moger@amd.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
---
arch/x86/kernel/cpu/resctrl/core.c | 17 ++---------------
include/linux/cacheinfo.h | 21 +++++++++++++++++++++
2 files changed, 23 insertions(+), 15 deletions(-)
diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resctrl/core.c
index 587f9791d2a6..3cc0fe435d19 100644
--- a/arch/x86/kernel/cpu/resctrl/core.c
+++ b/arch/x86/kernel/cpu/resctrl/core.c
@@ -350,19 +350,6 @@ static void rdt_get_cdp_l2_config(void)
rdt_get_cdp_config(RDT_RESOURCE_L2, RDT_RESOURCE_L2CODE);
}
-static int get_cache_id(int cpu, int level)
-{
- struct cpu_cacheinfo *ci = get_cpu_cacheinfo(cpu);
- int i;
-
- for (i = 0; i < ci->num_leaves; i++) {
- if (ci->info_list[i].level == level)
- return ci->info_list[i].id;
- }
-
- return -1;
-}
-
static void
mba_wrmsr_amd(struct rdt_domain *d, struct msr_param *m, struct rdt_resource *r)
{
@@ -560,7 +547,7 @@ static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_domain *d)
*/
static void domain_add_cpu(int cpu, struct rdt_resource *r)
{
- int id = get_cache_id(cpu, r->cache_level);
+ int id = get_cpu_cacheinfo_id(cpu, r->cache_level);
struct list_head *add_pos = NULL;
struct rdt_domain *d;
@@ -606,7 +593,7 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r)
static void domain_remove_cpu(int cpu, struct rdt_resource *r)
{
- int id = get_cache_id(cpu, r->cache_level);
+ int id = get_cpu_cacheinfo_id(cpu, r->cache_level);
struct rdt_domain *d;
d = rdt_find_domain(r, id, NULL);
diff --git a/include/linux/cacheinfo.h b/include/linux/cacheinfo.h
index 46b92cd61d0c..4f72b47973c3 100644
--- a/include/linux/cacheinfo.h
+++ b/include/linux/cacheinfo.h
@@ -3,6 +3,7 @@
#define _LINUX_CACHEINFO_H
#include <linux/bitops.h>
+#include <linux/cpu.h>
#include <linux/cpumask.h>
#include <linux/smp.h>
@@ -119,4 +120,24 @@ int acpi_find_last_cache_level(unsigned int cpu);
const struct attribute_group *cache_get_priv_group(struct cacheinfo *this_leaf);
+/*
+ * Get the id of the cache associated with @cpu at level @level.
+ * cpuhp lock must be held.
+ */
+static inline int get_cpu_cacheinfo_id(int cpu, int level)
+{
+ struct cpu_cacheinfo *ci = get_cpu_cacheinfo(cpu);
+ int i;
+
+ for (i = 0; i < ci->num_leaves; i++) {
+ if (ci->info_list[i].level == level) {
+ if (ci->info_list[i].attributes & CACHE_ID)
+ return ci->info_list[i].id;
+ return -1;
+ }
+ }
+
+ return -1;
+}
+
#endif /* _LINUX_CACHEINFO_H */
--
2.20.1
next prev parent reply other threads:[~2020-07-08 16:40 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-08 16:39 [PATCH v5 00/10] x86/resctrl: Misc cleanup James Morse
2020-07-08 16:39 ` [PATCH v5 01/10] x86/resctrl: Nothing uses struct mbm_state chunks_bw James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Remove unused struct mbm_state::chunks_bw tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 02/10] x86/resctrl: Remove max_delay James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Remove struct rdt_membw::max_delay tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 03/10] x86/resctrl: Fix stale comment James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 04/10] x86/resctrl: use container_of() in delayed_work handlers James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Use " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 05/10] x86/resctrl: Include pid.h James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 06/10] x86/resctrl: Use is_closid_match() in more places James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 07/10] x86/resctrl: Add arch_needs_linear to explain AMD/Intel MBA difference James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Add struct rdt_membw::arch_needs_linear " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 08/10] x86/resctrl: Merge AMD/Intel parse_bw() calls James Morse
2020-08-19 12:33 ` [tip: x86/cache] " tip-bot2 for James Morse
2020-07-08 16:39 ` [PATCH v5 09/10] x86/resctrl: Add arch_has_{sparse,empty}_bitmaps to explain CAT differences James Morse
2020-08-19 12:33 ` [tip: x86/cache] x86/resctrl: Add struct rdt_cache::arch_has_{sparse, empty}_bitmaps tip-bot2 for James Morse
2020-07-08 16:39 ` James Morse [this message]
2020-08-19 12:33 ` [tip: x86/cache] cacheinfo: Move resctrl's get_cache_id() to the cacheinfo header file tip-bot2 for James Morse
2020-07-23 18:31 ` [PATCH v5 00/10] x86/resctrl: Misc cleanup James Morse
2020-07-23 20:31 ` Reinette Chatre
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=20200708163929.2783-11-james.morse@arm.com \
--to=james.morse@arm.com \
--cc=Babu.Moger@amd.com \
--cc=bp@alien8.de \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=reinette.chatre@intel.com \
--cc=tglx@linutronix.de \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).