path: root/kernel/torture.c
diff options
authorIulia Manda <iulia.manda21@gmail.com>2014-03-17 15:21:21 +0200
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>2014-05-14 09:46:14 -0700
commit5ed63b199c5b58ed150ce50f1ea68de54669b13f (patch)
tree36e46770633ba73bbcd5450aa1e12ba6213a0cd7 /kernel/torture.c
parent64e4b43ae050146fcfafe696e61efc306f73d449 (diff)
torture: Notice if an all-zero cpumask is passed inside a critical section
In torture_shuffle_tasks function, the check if an all-zero mask can be passed to set_cpus_allowed_ptr() is redundant after clearing the shuffle_idle_cpu bit. If the mask had more than one bit set, after clearing a bit it has at least one bit set. If the mask had only one bit set, a check is made at the beginning, where the function returns, as there is no need to shuffle only one cpu. Also, this code is executed inside a critical section, delimited by get_online_cpus(), and put_online_cpus(), preventing CPUs from leaving between the check of num_online_cpus and the calls to set_cpus_allowed_ptr() function. Signed-off-by: Iulia Manda <iulia.manda21@gmail.com> Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Reviewed-by: Josh Triplett <josh@joshtriplett.org>
Diffstat (limited to 'kernel/torture.c')
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/torture.c b/kernel/torture.c
index bc0ee382b3c8..ae1723a4c751 100644
--- a/kernel/torture.c
+++ b/kernel/torture.c
@@ -335,13 +335,8 @@ static void torture_shuffle_tasks(void)
shuffle_idle_cpu = cpumask_next(shuffle_idle_cpu, shuffle_tmp_mask);
if (shuffle_idle_cpu >= nr_cpu_ids)
shuffle_idle_cpu = -1;
- if (shuffle_idle_cpu != -1) {
+ else
cpumask_clear_cpu(shuffle_idle_cpu, shuffle_tmp_mask);
- if (cpumask_empty(shuffle_tmp_mask)) {
- put_online_cpus();
- return;
- }
- }
list_for_each_entry(stp, &shuffle_task_list, st_l)

Privacy Policy