Commit 8f264d10 authored by James Morse's avatar James Morse Committed by Wenkuan Wang
Browse files

x86/resctrl: Add domain online callback for resctrl work 

mainline inclusion
from mainline-v6.1-rc1
commit 3a7232cd
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9U2JC


CVE: NA

--------------------------------

Because domains are exposed to user-space via resctrl, the filesystem
must update its state when CPU hotplug callbacks are triggered.

Some of this work is common to any architecture that would support
resctrl, but the work is tied up with the architecture code to
allocate the memory.

Move domain_setup_mon_state(), the monitor subdir creation call and the
mbm/limbo workers into a new resctrl_online_domain() call. These bits
are not specific to the architecture. Grouping them in one function
allows that code to be moved to /fs/ and re-used by another architecture.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarJamie Iles <quic_jiles@quicinc.com>
Reviewed-by: default avatarShaopeng Tan <tan.shaopeng@fujitsu.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Tested-by: default avatarXin Hao <xhao@linux.alibaba.com>
Tested-by: default avatarShaopeng Tan <tan.shaopeng@fujitsu.com>
Tested-by: default avatarCristian Marussi <cristian.marussi@arm.com>
Link: https://lore.kernel.org/r/20220902154829.30399-4-james.morse@arm.com



Conflicts:
	include/linux/resctrl.h

Signed-off-by: default avatarWenkuan Wang <Wenkuan.Wang@amd.com>
parent afe2133a

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

+6 −47
Original line number Diff line number Diff line
@@ -562,42 +562,6 @@ static int domain_setup_ctrlval(struct rdt_resource *r, struct rdt_domain *d) 
	return 0;

}



static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_domain *d)

{

	size_t tsize;



	if (is_llc_occupancy_enabled()) {

		d->rmid_busy_llc = bitmap_zalloc(r->num_rmid, GFP_KERNEL);

		if (!d->rmid_busy_llc)

			return -ENOMEM;

		INIT_DELAYED_WORK(&d->cqm_limbo, cqm_handle_limbo);

	}

	if (is_mbm_total_enabled()) {

		tsize = sizeof(*d->mbm_total);

		d->mbm_total = kcalloc(r->num_rmid, tsize, GFP_KERNEL);

		if (!d->mbm_total) {

			bitmap_free(d->rmid_busy_llc);

			return -ENOMEM;

		}

	}

	if (is_mbm_local_enabled()) {

		tsize = sizeof(*d->mbm_local);

		d->mbm_local = kcalloc(r->num_rmid, tsize, GFP_KERNEL);

		if (!d->mbm_local) {

			bitmap_free(d->rmid_busy_llc);

			kfree(d->mbm_total);

			return -ENOMEM;

		}

	}



	if (is_mbm_enabled()) {

		INIT_DELAYED_WORK(&d->mbm_over, mbm_handle_overflow);

		mbm_setup_overflow_handler(d, MBM_OVERFLOW_INTERVAL);

	}



	return 0;

}



/*

 * domain_add_cpu - Add a cpu to a resource's domain list.

 *
@@ -617,6 +581,7 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) 
	struct list_head *add_pos = NULL;

	struct rdt_hw_domain *hw_dom;

	struct rdt_domain *d;

	int err;



	d = rdt_find_domain(r, id, &add_pos);

	if (IS_ERR(d)) {
@@ -646,21 +611,15 @@ static void domain_add_cpu(int cpu, struct rdt_resource *r) 
		return;

	}



	if (r->mon_capable && domain_setup_mon_state(r, d)) {

	list_add_tail(&d->list, add_pos);



	err = resctrl_online_domain(r, d);

	if (err) {

		list_del(&d->list);

		kfree(hw_dom->ctrl_val);

		kfree(hw_dom->mbps_val);

		kfree(hw_dom);

		return;

	}



	list_add_tail(&d->list, add_pos);



	/*

	 * If resctrl is mounted, add

	 * per domain monitor data directories.

	 */

	if (static_branch_unlikely(&rdt_mon_enable_key))

		mkdir_mondata_subdir_allrdtgrp(r, d);

}



static void domain_remove_cpu(int cpu, struct rdt_resource *r)

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

+0 −2
Original line number Diff line number Diff line
@@ -535,8 +535,6 @@ void mon_event_count(void *info); 
int rdtgroup_mondata_show(struct seq_file *m, void *arg);

void rmdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,

				    unsigned int dom_id);

void mkdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,

				    struct rdt_domain *d);

void mon_event_read(struct rmid_read *rr, struct rdt_resource *r,

		    struct rdt_domain *d, struct rdtgroup *rdtgrp,

		    int evtid, int first);

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

+60 −5
Original line number Diff line number Diff line
@@ -2801,16 +2801,13 @@ static int mkdir_mondata_subdir(struct kernfs_node *parent_kn, 
 * Add all subdirectories of mon_data for "ctrl_mon" groups

 * and "monitor" groups with given domain id.

 */

void mkdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,

static void mkdir_mondata_subdir_allrdtgrp(struct rdt_resource *r,

					   struct rdt_domain *d)

{

	struct kernfs_node *parent_kn;

	struct rdtgroup *prgrp, *crgrp;

	struct list_head *head;



	if (!r->mon_capable)

		return;



	list_for_each_entry(prgrp, &rdt_all_groups, rdtgroup_list) {

		parent_kn = prgrp->mon.mon_data_kn;

		mkdir_mondata_subdir(parent_kn, d, r, prgrp);
@@ -3468,6 +3465,64 @@ static int __init rdtgroup_setup_root(void) 
	return ret;

}



static int domain_setup_mon_state(struct rdt_resource *r, struct rdt_domain *d)

{

	size_t tsize;



	if (is_llc_occupancy_enabled()) {

		d->rmid_busy_llc = bitmap_zalloc(r->num_rmid, GFP_KERNEL);

		if (!d->rmid_busy_llc)

			return -ENOMEM;

	}

	if (is_mbm_total_enabled()) {

		tsize = sizeof(*d->mbm_total);

		d->mbm_total = kcalloc(r->num_rmid, tsize, GFP_KERNEL);

		if (!d->mbm_total) {

			bitmap_free(d->rmid_busy_llc);

			return -ENOMEM;

		}

	}

	if (is_mbm_local_enabled()) {

		tsize = sizeof(*d->mbm_local);

		d->mbm_local = kcalloc(r->num_rmid, tsize, GFP_KERNEL);

		if (!d->mbm_local) {

			bitmap_free(d->rmid_busy_llc);

			kfree(d->mbm_total);

			return -ENOMEM;

		}

	}



	return 0;

}



int resctrl_online_domain(struct rdt_resource *r, struct rdt_domain *d)

{

	int err;



	lockdep_assert_held(&rdtgroup_mutex);



	if (!r->mon_capable)

		return 0;



	err = domain_setup_mon_state(r, d);

	if (err)

		return err;



	if (is_mbm_enabled()) {

		INIT_DELAYED_WORK(&d->mbm_over, mbm_handle_overflow);

		mbm_setup_overflow_handler(d, MBM_OVERFLOW_INTERVAL);

	}



	if (is_llc_occupancy_enabled())

		INIT_DELAYED_WORK(&d->cqm_limbo, cqm_handle_limbo);



	/* If resctrl is mounted, add per domain monitor data directories. */

	if (static_branch_unlikely(&rdt_mon_enable_key))

		mkdir_mondata_subdir_allrdtgrp(r, d);



	return 0;

}



/*

 * rdtgroup_init - rdtgroup initialization

 *

include/linux/resctrl.h

+1 −0
Original line number Diff line number Diff line
@@ -161,5 +161,6 @@ struct rdt_resource { 
 * This can be called from any CPU.

 */

void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_domain *d);

int resctrl_online_domain(struct rdt_resource *r, struct rdt_domain *d);



#endif /* _RESCTRL_H */