From: James Morse <james.morse@arm.com>
To: linux-kernel@vger.kernel.org
Cc: x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>,
Fenghua Yu <fenghua.yu@intel.com>,
Tony Luck <tony.luck@intel.com>, Ingo Molnar <mingo@redhat.com>,
H Peter Anvin <hpa@zytor.com>,
Reinette Chatre <reinette.chatre@intel.com>,
Vikas Shivappa <vikas.shivappa@linux.intel.com>
Subject: [RFC PATCH 20/20] x86/intel_rdt: Merge cdp enable/disable calls
Date: Fri, 24 Aug 2018 11:45:19 +0100 [thread overview]
Message-ID: <20180824104519.11203-21-james.morse@arm.com> (raw)
In-Reply-To: <20180824104519.11203-1-james.morse@arm.com>
Now that the cdp_enable() and cdp_disable() calls are basically the same,
merge them into cdp_set_enabled(true/false).
All these functions are behind resctrl_arch_set_cdp_enabled(),
so the can take the rdt_hw_resource directly.
Signed-off-by: James Morse <james.morse@arm.com>
---
arch/x86/kernel/cpu/intel_rdt_rdtgroup.c | 49 ++++++------------------
1 file changed, 12 insertions(+), 37 deletions(-)
diff --git a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
index 38cd463443e8..b9b7375ef8a9 100644
--- a/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
+++ b/arch/x86/kernel/cpu/intel_rdt_rdtgroup.c
@@ -1017,10 +1017,9 @@ static inline bool is_mba_linear(void)
return rdt_resources_all[RDT_RESOURCE_MBA].resctrl.membw.delay_linear;
}
-static int set_cache_qos_cfg(int level, bool enable)
+static int set_cache_qos_cfg(struct rdt_hw_resource *hw_res, bool enable)
{
void (*update)(void *arg);
- struct rdt_resource *r_l;
cpumask_var_t cpu_mask;
struct rdt_domain *d;
int cpu;
@@ -1028,15 +1027,14 @@ static int set_cache_qos_cfg(int level, bool enable)
if (!zalloc_cpumask_var(&cpu_mask, GFP_KERNEL))
return -ENOMEM;
- if (level == RDT_RESOURCE_L3)
+ if (hw_res == &rdt_resources_all[RDT_RESOURCE_L3])
update = l3_qos_cfg_update;
- else if (level == RDT_RESOURCE_L2)
+ else if (hw_res == &rdt_resources_all[RDT_RESOURCE_L2])
update = l2_qos_cfg_update;
else
return -EINVAL;
- r_l = &rdt_resources_all[level].resctrl;
- list_for_each_entry(d, &r_l->domains, list) {
+ list_for_each_entry(d, &hw_res->resctrl.domains, list) {
/* Pick one CPU from each domain instance to update MSR */
cpumask_set_cpu(cpumask_any(&d->cpu_mask), cpu_mask);
}
@@ -1078,53 +1076,30 @@ static int set_mba_sc(bool mba_sc)
return 0;
}
-static int cdp_enable(int level)
+static int cdp_set_enabled(struct rdt_hw_resource *hw_res, bool enable)
{
- struct rdt_resource *r_l = &rdt_resources_all[level].resctrl;
int ret;
- if (!r_l->alloc_capable || !r_l->cdp_capable)
+ if (!hw_res->resctrl.cdp_capable)
return -EINVAL;
- ret = set_cache_qos_cfg(level, true);
+ ret = set_cache_qos_cfg(hw_res, enable);
if (!ret)
- r_l->cdp_enabled = true;
+ hw_res->resctrl.cdp_enabled = enable;
return ret;
}
-static void cdp_disable(int level)
-{
- struct rdt_resource *r = &rdt_resources_all[level].resctrl;
-
- if (r->cdp_enabled) {
- set_cache_qos_cfg(level, false);
- r->cdp_enabled = false;
- }
-}
-
int resctrl_arch_set_cdp_enabled(bool enable)
{
int ret = -EINVAL;
struct rdt_hw_resource *l3 = &rdt_resources_all[RDT_RESOURCE_L3];
struct rdt_hw_resource *l2 = &rdt_resources_all[RDT_RESOURCE_L2];
- if (l3 && l3->resctrl.cdp_capable) {
- if (!enable) {
- cdp_disable(RDT_RESOURCE_L3);
- ret = 0;
- } else {
- ret = cdp_enable(RDT_RESOURCE_L3);
- }
- }
- if (l2 && l2->resctrl.cdp_capable) {
- if (!enable) {
- cdp_disable(RDT_RESOURCE_L2);
- ret = 0;
- } else {
- ret = cdp_enable(RDT_RESOURCE_L2);
- }
- }
+ if (l3 && l3->resctrl.cdp_capable)
+ ret = cdp_set_enabled(l3, enable);
+ if (l2 && l2->resctrl.cdp_capable)
+ ret = cdp_set_enabled(l2, enable);
return ret;
}
--
2.18.0
next prev parent reply other threads:[~2018-08-24 10:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-24 10:44 [RFC PATCH 00/20] x86/intel_rdt: Start abstraction for a second arch James Morse
2018-08-24 10:45 ` [RFC PATCH 01/20] x86/intel_rdt: Split struct rdt_resource James Morse
2018-08-24 10:45 ` [RFC PATCH 02/20] x86/intel_rdt: Split struct rdt_domain James Morse
2018-08-24 10:45 ` [RFC PATCH 03/20] x86/intel_rdt: Group staged configuration into a separate struct James Morse
2018-08-24 10:45 ` [RFC PATCH 04/20] x86/intel_rdt: Add closid to the staged config James Morse
2018-08-24 10:45 ` [RFC PATCH 05/20] x86/intel_rdt: make update_domains() learn the affected closids James Morse
2018-08-24 10:45 ` [RFC PATCH 06/20] x86/intel_rdt: Add a helper to read a closid's configuration for show_doms() James Morse
2018-08-24 10:45 ` [RFC PATCH 07/20] x86/intel_rdt: Expose update_domains() as an arch helper James Morse
2018-08-24 10:45 ` [RFC PATCH 08/20] x86/intel_rdt: Make cdp enable/disable global James Morse
2018-08-24 10:45 ` [RFC PATCH 09/20] x86/intel_rdt: Track the actual number of closids separately James Morse
2018-08-24 10:45 ` [RFC PATCH 10/20] x86/intel_rdt: Let resctrl change the resources's num_closid James Morse
2018-08-24 10:45 ` [RFC PATCH 11/20] x86/intel_rdt: Pass in the code/data/both configuration value when parsing James Morse
2018-08-24 10:45 ` [RFC PATCH 12/20] x86/intel_rdt: Correct the closid when staging configuration changes James Morse
2018-08-24 10:45 ` [RFC PATCH 13/20] x86/intel_rdt: Allow different CODE/DATA configurations to be staged James Morse
2018-08-24 10:45 ` [RFC PATCH 14/20] x86/intel_rdt: Add a separate resource list for resctrl James Morse
2018-08-24 10:45 ` [RFC PATCH 15/20] x86/intel_rdt: Walk the resctrl schema list instead of the arch's resource list James Morse
2018-08-24 10:45 ` [RFC PATCH 16/20] x86/intel_rdt: Move the schemata names into struct resctrl_schema James Morse
2018-08-24 10:45 ` [RFC PATCH 17/20] x86/intel_rdt: Stop using Lx CODE/DATA resources James Morse
2018-08-24 10:45 ` [RFC PATCH 18/20] x86/intel_rdt: Remove the CODE/DATA illusionary caches James Morse
2018-08-24 10:45 ` [RFC PATCH 19/20] x86/intel_rdt: Kill off alloc_enabled James Morse
2018-08-24 10:45 ` James Morse [this message]
2018-08-27 14:22 ` [RFC PATCH 00/20] x86/intel_rdt: Start abstraction for a second arch Fenghua Yu
2018-08-31 15:34 ` James Morse
2018-09-06 14:03 ` Thomas Gleixner
2018-11-27 12:33 ` Yury Norov
2018-11-30 19:23 ` James Morse
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=20180824104519.11203-21-james.morse@arm.com \
--to=james.morse@arm.com \
--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=tony.luck@intel.com \
--cc=vikas.shivappa@linux.intel.com \
--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).