[folded-merged] memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work-v3.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     Subject: memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work-v3
has been removed from the -mm tree.  Its filename was
     memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work-v3.patch

This patch was dropped because it was folded into memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work.patch

------------------------------------------------------
From: Shakeel Butt <shakeelb@xxxxxxxxxx>
Subject: memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work-v3

TIF_NOTIFY_RESUME can be set from places other than try_charge() in which
case current->memcg_high_reclaim will be null.  Correctly handle such
scenarios.

Link: http://lkml.kernel.org/r/20190110174432.82064-1-shakeelb@xxxxxxxxxx
Signed-off-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Vladimir Davydov <vdavydov.dev@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 mm/memcontrol.c |    8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

--- a/mm/memcontrol.c~memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work-v3
+++ a/mm/memcontrol.c
@@ -2265,15 +2265,17 @@ static void high_work_func(struct work_s
 void mem_cgroup_handle_over_high(void)
 {
 	unsigned int nr_pages = current->memcg_nr_pages_over_high;
-	struct mem_cgroup *memcg;
+	struct mem_cgroup *memcg = current->memcg_high_reclaim;
 
 	if (likely(!nr_pages))
 		return;
 
-	memcg = current->memcg_high_reclaim;
-	current->memcg_high_reclaim = NULL;
+	if (!memcg)
+		memcg = get_mem_cgroup_from_mm(current->mm);
+
 	reclaim_high(memcg, nr_pages, GFP_KERNEL);
 	css_put(&memcg->css);
+	current->memcg_high_reclaim = NULL;
 	current->memcg_nr_pages_over_high = 0;
 }
 
_

Patches currently in -mm which might be from shakeelb@xxxxxxxxxx are

memcg-oom-no-oom-kill-for-__gfp_retry_mayfail.patch
memcg-fsnotify-no-oom-kill-for-remote-memcg-charging.patch
memcg-schedule-high-reclaim-for-remote-memcgs-on-high_work.patch




[Index of Archives]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux