The patch titled
Subject: mm-oom_reaper-implement-oom-victims-queuing-v6
has been removed from the -mm tree. Its filename was
mm-oom_reaper-implement-oom-victims-queuing-v6.patch
This patch was dropped because it was folded into mm-oom_reaper-implement-oom-victims-queuing.patch
------------------------------------------------------
From: Michal Hocko <mhocko@xxxxxxxx>
Subject: mm-oom_reaper-implement-oom-victims-queuing-v6
Signed-off-by: Michal Hocko <mhocko@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/sched.h | 2 +-
mm/oom_kill.c | 15 ++++++++-------
2 files changed, 9 insertions(+), 8 deletions(-)
diff -puN include/linux/sched.h~mm-oom_reaper-implement-oom-victims-queuing-v6 include/linux/sched.h
--- a/include/linux/sched.h~mm-oom_reaper-implement-oom-victims-queuing-v6
+++ a/include/linux/sched.h
@@ -1850,7 +1850,7 @@ struct task_struct {
#endif
int pagefault_disabled;
#ifdef CONFIG_MMU
- struct task_struct *oom_reaper_list;
+ struct list_head 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-v6 mm/oom_kill.c
--- a/mm/oom_kill.c~mm-oom_reaper-implement-oom-victims-queuing-v6
+++ a/mm/oom_kill.c
@@ -417,7 +417,7 @@ bool oom_killer_disabled __read_mostly;
*/
static struct task_struct *oom_reaper_th;
static DECLARE_WAIT_QUEUE_HEAD(oom_reaper_wait);
-static struct task_struct *oom_reaper_list;
+static LIST_HEAD(oom_reaper_list);
static DEFINE_SPINLOCK(oom_reaper_lock);
@@ -527,11 +527,13 @@ static int oom_reaper(void *unused)
while (true) {
struct task_struct *tsk = NULL;
- wait_event_freezable(oom_reaper_wait, oom_reaper_list != NULL);
+ wait_event_freezable(oom_reaper_wait,
+ (!list_empty(&oom_reaper_list)));
spin_lock(&oom_reaper_lock);
- if (oom_reaper_list != NULL) {
- tsk = oom_reaper_list;
- oom_reaper_list = tsk->oom_reaper_list;
+ 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);
}
spin_unlock(&oom_reaper_lock);
@@ -550,8 +552,7 @@ static void wake_oom_reaper(struct task_
get_task_struct(tsk);
spin_lock(&oom_reaper_lock);
- tsk->oom_reaper_list = oom_reaper_list;
- oom_reaper_list = tsk;
+ list_add(&tsk->oom_reaper_list, &oom_reaper_list);
spin_unlock(&oom_reaper_lock);
wake_up(&oom_reaper_wait);
}
_
Patches currently in -mm which might be from mhocko@xxxxxxxx are
mm-oom-introduce-oom-reaper.patch
oom-clear-tif_memdie-after-oom_reaper-managed-to-unmap-the-address-space.patch
mm-oom_reaper-report-success-failure.patch
mm-oom_reaper-implement-oom-victims-queuing.patch
oom-oom_reaper-disable-oom_reaper-for-oom_kill_allocating_task.patch
oom-make-oom_reaper-freezable.patch
mm-oom-rework-oom-detection.patch
mm-throttle-on-io-only-when-there-are-too-many-dirty-and-writeback-pages.patch
mm-use-watermak-checks-for-__gfp_repeat-high-order-allocations.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
