The patch titled
Subject: oom: make oom_reaper_list single linked
has been removed from the -mm tree. Its filename was
mm-oom_reaper-implement-oom-victims-queuing-fix.patch
This patch was dropped because it was folded into mm-oom_reaper-implement-oom-victims-queuing.patch
------------------------------------------------------
From: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Subject: oom: make oom_reaper_list single linked
Entries are only added/removed from oom_reaper_list at head so we can use
a single linked list and hence save a word in task_struct.
Signed-off-by: Vladimir Davydov <vdavydov@xxxxxxxxxxxxx>
Acked-by: Michal Hocko <mhocko@xxxxxxxx>
Cc: Tetsuo Handa <penguin-kernel@xxxxxxxxxxxxxxxxxxx>
Cc: David Rientjes <rientjes@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/sched.h | 2 +-
mm/oom_kill.c | 15 +++++++--------
2 files changed, 8 insertions(+), 9 deletions(-)
diff -puN include/linux/sched.h~mm-oom_reaper-implement-oom-victims-queuing-fix include/linux/sched.h
--- a/include/linux/sched.h~mm-oom_reaper-implement-oom-victims-queuing-fix
+++ a/include/linux/sched.h
@@ -1850,7 +1850,7 @@ struct task_struct {
#endif
int pagefault_disabled;
#ifdef CONFIG_MMU
- struct list_head oom_reaper_list;
+ struct task_struct *oom_reaper_list;
#endif
/* CPU-specific state of this task */
struct thread_struct thread;
diff -puN mm/oom_kill.c~mm-oom_reaper-implement-oom-victims-queuing-fix mm/oom_kill.c
--- a/mm/oom_kill.c~mm-oom_reaper-implement-oom-victims-queuing-fix
+++ a/mm/oom_kill.c
@@ -419,7 +419,7 @@ bool oom_killer_disabled __read_mostly;
*/
static struct task_struct *oom_reaper_th;
static DECLARE_WAIT_QUEUE_HEAD(oom_reaper_wait);
-static LIST_HEAD(oom_reaper_list);
+static struct task_struct *oom_reaper_list;
static DEFINE_SPINLOCK(oom_reaper_lock);
@@ -524,13 +524,11 @@ static int oom_reaper(void *unused)
while (true) {
struct task_struct *tsk = NULL;
- wait_event_freezable(oom_reaper_wait,
- (!list_empty(&oom_reaper_list)));
+ wait_event_freezable(oom_reaper_wait, oom_reaper_list != NULL);
spin_lock(&oom_reaper_lock);
- if (!list_empty(&oom_reaper_list)) {
- tsk = list_first_entry(&oom_reaper_list,
- struct task_struct, oom_reaper_list);
- list_del(&tsk->oom_reaper_list);
+ if (oom_reaper_list != NULL) {
+ tsk = oom_reaper_list;
+ oom_reaper_list = tsk->oom_reaper_list;
}
spin_unlock(&oom_reaper_lock);
@@ -549,7 +547,8 @@ static void wake_oom_reaper(struct task_
get_task_struct(tsk);
spin_lock(&oom_reaper_lock);
- list_add(&tsk->oom_reaper_list, &oom_reaper_list);
+ tsk->oom_reaper_list = oom_reaper_list;
+ oom_reaper_list = tsk;
spin_unlock(&oom_reaper_lock);
wake_up(&oom_reaper_wait);
}
_
Patches currently in -mm which might be from vdavydov@xxxxxxxxxxxxx are
mm-oom_reaper-implement-oom-victims-queuing.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
