The patch titled
taskstats: add_del_listener() shouldn't use the wrong node
has been removed from the -mm tree. Its filename was
taskstats-add_del_listener-shouldnt-use-the-wrong-node.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: taskstats: add_del_listener() shouldn't use the wrong node
From: Oleg Nesterov <oleg@xxxxxxxxxx>
1. 26c4caea "don't allow duplicate entries in listener mode"
changed add_del_listener(REGISTER) so that "next_cpu:" can
reuse the listener allocated for the previous cpu, this
doesn't look exactly right even if minor.
Change the code to kfree() in the already-registered case,
this case is unlikely anyway so the extra kmalloc_node()
shouldn't hurt but looke more correct and clean.
2. use the plain list_for_each_entry() instead of _safe() to
scan listeners->list.
3. Remove the unneeded INIT_LIST_HEAD(&s->list), we are going
to list_add(&s->list).
Signed-off-by: Oleg Nesterov <oleg@xxxxxxxxxx>
Reviewed-by: Vasiliy Kulikov <segoon@xxxxxxxxxxxx>
Cc: Balbir Singh <bsingharora@xxxxxxxxx>
Reviewed-by: Jerome Marchand <jmarchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/taskstats.c | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff -puN kernel/taskstats.c~taskstats-add_del_listener-shouldnt-use-the-wrong-node kernel/taskstats.c
--- a/kernel/taskstats.c~taskstats-add_del_listener-shouldnt-use-the-wrong-node
+++ a/kernel/taskstats.c
@@ -291,30 +291,28 @@ static int add_del_listener(pid_t pid, c
if (!cpumask_subset(mask, cpu_possible_mask))
return -EINVAL;
- s = NULL;
if (isadd == REGISTER) {
for_each_cpu(cpu, mask) {
- if (!s)
- s = kmalloc_node(sizeof(struct listener),
- GFP_KERNEL, cpu_to_node(cpu));
+ s = kmalloc_node(sizeof(struct listener),
+ GFP_KERNEL, cpu_to_node(cpu));
if (!s)
goto cleanup;
+
s->pid = pid;
- INIT_LIST_HEAD(&s->list);
s->valid = 1;
listeners = &per_cpu(listener_array, cpu);
down_write(&listeners->sem);
- list_for_each_entry_safe(s2, tmp, &listeners->list, list) {
+ list_for_each_entry(s2, &listeners->list, list) {
if (s2->pid == pid)
- goto next_cpu;
+ goto exists;
}
list_add(&s->list, &listeners->list);
s = NULL;
-next_cpu:
+exists:
up_write(&listeners->sem);
+ kfree(s); /* nop if NULL */
}
- kfree(s);
return 0;
}
_
Patches currently in -mm which might be from oleg@xxxxxxxxxx are
ipc-introduce-shm_rmid_forced-sysctl-testing.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
