The patch titled
cpusets: fix bug when adding nonexistent cpu or mem
has been removed from the -mm tree. Its filename was
cpusets-fix-bug-when-adding-nonexistent-cpu-or-mem.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: cpusets: fix bug when adding nonexistent cpu or mem
From: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Adding a nonexistent cpu to a cpuset will be omitted quietly. It should
return -EINVAL.
Example: (real_nr_cpus <= 4 < NR_CPUS or cpu#4 was just offline)
# cat cpus
0-1
# /bin/echo 4 > cpus
# /bin/echo $?
0
# cat cpus
#
The same occurs when add a nonexistent mem.
This patch will fix this bug.
And when *buf == "", the check is unneeded.
Signed-off-by: Lai Jiangshan <laijs@xxxxxxxxxxxxxx>
Acked-by: Paul Jackson <pj@xxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/cpuset.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff -puN kernel/cpuset.c~cpusets-fix-bug-when-adding-nonexistent-cpu-or-mem kernel/cpuset.c
--- a/kernel/cpuset.c~cpusets-fix-bug-when-adding-nonexistent-cpu-or-mem
+++ a/kernel/cpuset.c
@@ -797,8 +797,10 @@ static int update_cpumask(struct cpuset
retval = cpulist_parse(buf, trialcs.cpus_allowed);
if (retval < 0)
return retval;
+
+ if (!cpus_subset(trialcs.cpus_allowed, cpu_online_map))
+ return -EINVAL;
}
- cpus_and(trialcs.cpus_allowed, trialcs.cpus_allowed, cpu_online_map);
retval = validate_change(cs, &trialcs);
if (retval < 0)
return retval;
@@ -932,9 +934,11 @@ static int update_nodemask(struct cpuset
retval = nodelist_parse(buf, trialcs.mems_allowed);
if (retval < 0)
goto done;
+
+ if (!nodes_subset(trialcs.mems_allowed,
+ node_states[N_HIGH_MEMORY]))
+ return -EINVAL;
}
- nodes_and(trialcs.mems_allowed, trialcs.mems_allowed,
- node_states[N_HIGH_MEMORY]);
oldmem = cs->mems_allowed;
if (nodes_equal(oldmem, trialcs.mems_allowed)) {
retval = 0; /* Too easy - nothing to do */
_
Patches currently in -mm which might be from laijs@xxxxxxxxxxxxxx are
origin.patch
rcu-remove-unused-field-struct-rcu_data-rcu_tasklet.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
