Skip to content

Commit a4846aa

Browse files
James Morsebp3tk0v
authored andcommitted
x86/resctrl: Add cpumask_any_housekeeping() for limbo/overflow
The limbo and overflow code picks a CPU to use from the domain's list of online CPUs. Work is then scheduled on these CPUs to maintain the limbo list and any counters that may overflow. cpumask_any() may pick a CPU that is marked nohz_full, which will either penalise the work that CPU was dedicated to, or delay the processing of limbo list or counters that may overflow. Perhaps indefinitely. Delaying the overflow handling will skew the bandwidth values calculated by mba_sc, which expects to be called once a second. Add cpumask_any_housekeeping() as a replacement for cpumask_any() that prefers housekeeping CPUs. This helper will still return a nohz_full CPU if that is the only option. The CPU to use is re-evaluated each time the limbo/overflow work runs. This ensures the work will move off a nohz_full CPU once a housekeeping CPU is available. Signed-off-by: James Morse <james.morse@arm.com> Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de> Reviewed-by: Shaopeng Tan <tan.shaopeng@fujitsu.com> Reviewed-by: Reinette Chatre <reinette.chatre@intel.com> Reviewed-by: Babu Moger <babu.moger@amd.com> Tested-by: Shaopeng Tan <tan.shaopeng@fujitsu.com> Tested-by: Peter Newman <peternewman@google.com> Tested-by: Babu Moger <babu.moger@amd.com> Tested-by: Carl Worth <carl@os.amperecomputing.com> # arm64 Link: https://lore.kernel.org/r/20240213184438.16675-13-james.morse@arm.com Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
1 parent 6eca639 commit a4846aa

2 files changed

Lines changed: 37 additions & 7 deletions

File tree

arch/x86/kernel/cpu/resctrl/internal.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include <linux/kernfs.h>
88
#include <linux/fs_context.h>
99
#include <linux/jump_label.h>
10+
#include <linux/tick.h>
1011

1112
#include <asm/resctrl.h>
1213

@@ -55,6 +56,29 @@
5556
/* Max event bits supported */
5657
#define MAX_EVT_CONFIG_BITS GENMASK(6, 0)
5758

59+
/**
60+
* cpumask_any_housekeeping() - Choose any CPU in @mask, preferring those that
61+
* aren't marked nohz_full
62+
* @mask: The mask to pick a CPU from.
63+
*
64+
* Returns a CPU in @mask. If there are housekeeping CPUs that don't use
65+
* nohz_full, these are preferred.
66+
*/
67+
static inline unsigned int cpumask_any_housekeeping(const struct cpumask *mask)
68+
{
69+
unsigned int cpu, hk_cpu;
70+
71+
cpu = cpumask_any(mask);
72+
if (!tick_nohz_full_cpu(cpu))
73+
return cpu;
74+
75+
hk_cpu = cpumask_nth_andnot(0, mask, tick_nohz_full_mask);
76+
if (hk_cpu < nr_cpu_ids)
77+
cpu = hk_cpu;
78+
79+
return cpu;
80+
}
81+
5882
struct rdt_fs_context {
5983
struct kernfs_fs_context kfc;
6084
bool enable_cdpl2;

arch/x86/kernel/cpu/resctrl/monitor.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,6 @@ static void mbm_update(struct rdt_resource *r, struct rdt_domain *d,
761761
void cqm_handle_limbo(struct work_struct *work)
762762
{
763763
unsigned long delay = msecs_to_jiffies(CQM_LIMBOCHECK_INTERVAL);
764-
int cpu = smp_processor_id();
765764
struct rdt_domain *d;
766765

767766
mutex_lock(&rdtgroup_mutex);
@@ -770,8 +769,11 @@ void cqm_handle_limbo(struct work_struct *work)
770769

771770
__check_limbo(d, false);
772771

773-
if (has_busy_rmid(d))
774-
schedule_delayed_work_on(cpu, &d->cqm_limbo, delay);
772+
if (has_busy_rmid(d)) {
773+
d->cqm_work_cpu = cpumask_any_housekeeping(&d->cpu_mask);
774+
schedule_delayed_work_on(d->cqm_work_cpu, &d->cqm_limbo,
775+
delay);
776+
}
775777

776778
mutex_unlock(&rdtgroup_mutex);
777779
}
@@ -781,7 +783,7 @@ void cqm_setup_limbo_handler(struct rdt_domain *dom, unsigned long delay_ms)
781783
unsigned long delay = msecs_to_jiffies(delay_ms);
782784
int cpu;
783785

784-
cpu = cpumask_any(&dom->cpu_mask);
786+
cpu = cpumask_any_housekeeping(&dom->cpu_mask);
785787
dom->cqm_work_cpu = cpu;
786788

787789
schedule_delayed_work_on(cpu, &dom->cqm_limbo, delay);
@@ -791,7 +793,6 @@ void mbm_handle_overflow(struct work_struct *work)
791793
{
792794
unsigned long delay = msecs_to_jiffies(MBM_OVERFLOW_INTERVAL);
793795
struct rdtgroup *prgrp, *crgrp;
794-
int cpu = smp_processor_id();
795796
struct list_head *head;
796797
struct rdt_resource *r;
797798
struct rdt_domain *d;
@@ -815,7 +816,12 @@ void mbm_handle_overflow(struct work_struct *work)
815816
update_mba_bw(prgrp, d);
816817
}
817818

818-
schedule_delayed_work_on(cpu, &d->mbm_over, delay);
819+
/*
820+
* Re-check for housekeeping CPUs. This allows the overflow handler to
821+
* move off a nohz_full CPU quickly.
822+
*/
823+
d->mbm_work_cpu = cpumask_any_housekeeping(&d->cpu_mask);
824+
schedule_delayed_work_on(d->mbm_work_cpu, &d->mbm_over, delay);
819825

820826
out_unlock:
821827
mutex_unlock(&rdtgroup_mutex);
@@ -828,7 +834,7 @@ void mbm_setup_overflow_handler(struct rdt_domain *dom, unsigned long delay_ms)
828834

829835
if (!static_branch_likely(&rdt_mon_enable_key))
830836
return;
831-
cpu = cpumask_any(&dom->cpu_mask);
837+
cpu = cpumask_any_housekeeping(&dom->cpu_mask);
832838
dom->mbm_work_cpu = cpu;
833839
schedule_delayed_work_on(cpu, &dom->mbm_over, delay);
834840
}

0 commit comments

Comments
 (0)