Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7206eca1 authored by James Morse's avatar James Morse Committed by Greg Kroah-Hartman
Browse files

x86/resctrl: Use is_closid_match() in more places 



[ Upstream commit e6b2fac36fcc0b73cbef063d700a9841850e37a0 ]

rdtgroup_tasks_assigned() and show_rdt_tasks() loop over threads testing
for a CTRL/MON group match by closid/rmid with the provided rdtgrp.
Further down the file are helpers to do this, move these further up and
make use of them here.

These helpers additionally check for alloc/mon capable. This is harmless
as rdtgroup_mkdir() tests these capable flags before allowing the config
directories to be created.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Link: https://lkml.kernel.org/r/20200708163929.2783-7-james.morse@arm.com


Stable-dep-of: 2997d94b5dd0 ("x86/resctrl: Only show tasks' pid in current pid namespace")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6f2bb37d

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

+14 −16
Original line number Diff line number Diff line
@@ -593,6 +593,18 @@ static int __rdtgroup_move_task(struct task_struct *tsk, 
	return 0;

}



static bool is_closid_match(struct task_struct *t, struct rdtgroup *r)

{

	return (rdt_alloc_capable &&

	       (r->type == RDTCTRL_GROUP) && (t->closid == r->closid));

}



static bool is_rmid_match(struct task_struct *t, struct rdtgroup *r)

{

	return (rdt_mon_capable &&

	       (r->type == RDTMON_GROUP) && (t->rmid == r->mon.rmid));

}



/**

 * rdtgroup_tasks_assigned - Test if tasks have been assigned to resource group

 * @r: Resource group
@@ -608,8 +620,7 @@ int rdtgroup_tasks_assigned(struct rdtgroup *r) 


	rcu_read_lock();

	for_each_process_thread(p, t) {

		if ((r->type == RDTCTRL_GROUP && t->closid == r->closid) ||

		    (r->type == RDTMON_GROUP && t->rmid == r->mon.rmid)) {

		if (is_closid_match(t, r) || is_rmid_match(t, r)) {

			ret = 1;

			break;

		}
@@ -707,8 +718,7 @@ static void show_rdt_tasks(struct rdtgroup *r, struct seq_file *s) 


	rcu_read_lock();

	for_each_process_thread(p, t) {

		if ((r->type == RDTCTRL_GROUP && t->closid == r->closid) ||

		    (r->type == RDTMON_GROUP && t->rmid == r->mon.rmid))

		if (is_closid_match(t, r) || is_rmid_match(t, r))

			seq_printf(s, "%d\n", t->pid);

	}

	rcu_read_unlock();
@@ -2148,18 +2158,6 @@ static int reset_all_ctrls(struct rdt_resource *r) 
	return 0;

}



static bool is_closid_match(struct task_struct *t, struct rdtgroup *r)

{

	return (rdt_alloc_capable &&

		(r->type == RDTCTRL_GROUP) && (t->closid == r->closid));

}



static bool is_rmid_match(struct task_struct *t, struct rdtgroup *r)

{

	return (rdt_mon_capable &&

		(r->type == RDTMON_GROUP) && (t->rmid == r->mon.rmid));

}



/*

 * Move tasks from one to the other group. If @from is NULL, then all tasks

 * in the systems are moved unconditionally (used for teardown).