Commit 823beb31 authored by James Morse's avatar James Morse Committed by Borislav Petkov (AMD)
Browse files

x86/resctrl: Move get_{mon,ctrl}_domain_from_cpu() to live with their callers 



Each of get_{mon,ctrl}_domain_from_cpu() only has one caller.

Once the filesystem code is moved to /fs/, there is no equivalent to
core.c.

Move these functions to each live next to their caller. This allows
them to be made static and the header file entries to be removed.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarFenghua Yu <fenghuay@nvidia.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Reviewed-by: default avatarBabu Moger <babu.moger@amd.com>
Reviewed-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: default avatarPeter Newman <peternewman@google.com>
Tested-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: Amit Singh Tomar <amitsinght@marvell.com> # arm64
Tested-by: Shanker Donthineni <sdonthineni@nvidia.com> # arm64
Tested-by: default avatarBabu Moger <babu.moger@amd.com>
Link: https://lore.kernel.org/r/20250311183715.16445-31-james.morse@arm.com
parent f62b4e45

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

+0 −30
Original line number Diff line number Diff line
@@ -347,36 +347,6 @@ static void cat_wrmsr(struct msr_param *m) 
		wrmsrl(hw_res->msr_base + i, hw_dom->ctrl_val[i]);

}



struct rdt_ctrl_domain *get_ctrl_domain_from_cpu(int cpu, struct rdt_resource *r)

{

	struct rdt_ctrl_domain *d;



	lockdep_assert_cpus_held();



	list_for_each_entry(d, &r->ctrl_domains, hdr.list) {

		/* Find the domain that contains this CPU */

		if (cpumask_test_cpu(cpu, &d->hdr.cpu_mask))

			return d;

	}



	return NULL;

}



struct rdt_mon_domain *get_mon_domain_from_cpu(int cpu, struct rdt_resource *r)

{

	struct rdt_mon_domain *d;



	lockdep_assert_cpus_held();



	list_for_each_entry(d, &r->mon_domains, hdr.list) {

		/* Find the domain that contains this CPU */

		if (cpumask_test_cpu(cpu, &d->hdr.cpu_mask))

			return d;

	}



	return NULL;

}



u32 resctrl_arch_get_num_closid(struct rdt_resource *r)

{

	return resctrl_to_arch_res(r)->num_closid;

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

+0 −2
Original line number Diff line number Diff line
@@ -475,8 +475,6 @@ unsigned int rdtgroup_cbm_to_size(struct rdt_resource *r, struct rdt_ctrl_domain 
				  unsigned long cbm);

enum rdtgrp_mode rdtgroup_mode_by_closid(int closid);

int rdtgroup_tasks_assigned(struct rdtgroup *r);

struct rdt_ctrl_domain *get_ctrl_domain_from_cpu(int cpu, struct rdt_resource *r);

struct rdt_mon_domain *get_mon_domain_from_cpu(int cpu, struct rdt_resource *r);

int closids_supported(void);

void closid_free(int closid);

int alloc_rmid(u32 closid);

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

+16 −0
Original line number Diff line number Diff line
@@ -718,6 +718,22 @@ void mon_event_count(void *info) 
		rr->err = 0;

}



static struct rdt_ctrl_domain *get_ctrl_domain_from_cpu(int cpu,

							struct rdt_resource *r)

{

	struct rdt_ctrl_domain *d;



	lockdep_assert_cpus_held();



	list_for_each_entry(d, &r->ctrl_domains, hdr.list) {

		/* Find the domain that contains this CPU */

		if (cpumask_test_cpu(cpu, &d->hdr.cpu_mask))

			return d;

	}



	return NULL;

}



/*

 * Feedback loop for MBA software controller (mba_sc)

 *

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

+16 −0
Original line number Diff line number Diff line
@@ -4257,6 +4257,22 @@ static void clear_childcpus(struct rdtgroup *r, unsigned int cpu) 
	}

}



static struct rdt_mon_domain *get_mon_domain_from_cpu(int cpu,

						      struct rdt_resource *r)

{

	struct rdt_mon_domain *d;



	lockdep_assert_cpus_held();



	list_for_each_entry(d, &r->mon_domains, hdr.list) {

		/* Find the domain that contains this CPU */

		if (cpumask_test_cpu(cpu, &d->hdr.cpu_mask))

			return d;

	}



	return NULL;

}



void resctrl_offline_cpu(unsigned int cpu)

{

	struct rdt_resource *l3 = resctrl_arch_get_resource(RDT_RESOURCE_L3);