Commit bea2a13b authored by Dawei Li's avatar Dawei Li Committed by Will Deacon

perf/arm_dsu: Avoid placing cpumask on the stack

In general it's preferable to avoid placing cpumasks on the stack, as
for large values of NR_CPUS these can consume significant amounts of
stack space and make stack overflows more likely.

Use cpumask_any_and_but() to avoid the need for a temporary cpumask on
the stack.
Suggested-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarDawei Li <dawei.li@shingroup.cn>
Link: https://lore.kernel.org/r/20240403155950.2068109-6-dawei.li@shingroup.cnSigned-off-by: default avatarWill Deacon <will@kernel.org>
parent b5310fa1
...@@ -230,15 +230,6 @@ static const struct attribute_group *dsu_pmu_attr_groups[] = { ...@@ -230,15 +230,6 @@ static const struct attribute_group *dsu_pmu_attr_groups[] = {
NULL, NULL,
}; };
static int dsu_pmu_get_online_cpu_any_but(struct dsu_pmu *dsu_pmu, int cpu)
{
struct cpumask online_supported;
cpumask_and(&online_supported,
&dsu_pmu->associated_cpus, cpu_online_mask);
return cpumask_any_but(&online_supported, cpu);
}
static inline bool dsu_pmu_counter_valid(struct dsu_pmu *dsu_pmu, u32 idx) static inline bool dsu_pmu_counter_valid(struct dsu_pmu *dsu_pmu, u32 idx)
{ {
return (idx < dsu_pmu->num_counters) || return (idx < dsu_pmu->num_counters) ||
...@@ -827,14 +818,16 @@ static int dsu_pmu_cpu_online(unsigned int cpu, struct hlist_node *node) ...@@ -827,14 +818,16 @@ static int dsu_pmu_cpu_online(unsigned int cpu, struct hlist_node *node)
static int dsu_pmu_cpu_teardown(unsigned int cpu, struct hlist_node *node) static int dsu_pmu_cpu_teardown(unsigned int cpu, struct hlist_node *node)
{ {
int dst; struct dsu_pmu *dsu_pmu;
struct dsu_pmu *dsu_pmu = hlist_entry_safe(node, struct dsu_pmu, unsigned int dst;
cpuhp_node);
dsu_pmu = hlist_entry_safe(node, struct dsu_pmu, cpuhp_node);
if (!cpumask_test_and_clear_cpu(cpu, &dsu_pmu->active_cpu)) if (!cpumask_test_and_clear_cpu(cpu, &dsu_pmu->active_cpu))
return 0; return 0;
dst = dsu_pmu_get_online_cpu_any_but(dsu_pmu, cpu); dst = cpumask_any_and_but(&dsu_pmu->associated_cpus,
cpu_online_mask, cpu);
/* If there are no active CPUs in the DSU, leave IRQ disabled */ /* If there are no active CPUs in the DSU, leave IRQ disabled */
if (dst >= nr_cpu_ids) if (dst >= nr_cpu_ids)
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment