[BUGFIX][PATCH] memory hotplug: fix notiier chain return value (Was Re: 2.6.28-rc4 mem_cgroup_charge_common panic)

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Badari Pulavarty <pbadari@...>
Cc: Andrew Morton <akpm@...>, linux-mm <linux-mm@...>, linux-kernel <linux-kernel@...>
Date: Thursday, November 13, 2008 - 7:27 am

Badari, I think you used SLUB. If so, page_cgroup's notifier callback was not
called and newly allocated page's page_cgroup wasn't allocated.
This is a fix. (notifier saw STOP_HERE flag added by slub's notifier.)

I'm now testing modified kernel, which does alloc/free page_cgroup by notifier.
(Usually, all page_cgroups are from bootmem and not freed.
 so, modified a bit for test)

And I cannot reproduce panic. I think you do "real" memory hotplug other than
online/offline and saw panic caused by this. 

Is this slub's behavior intentional ? page_cgroup's notifier has lower priority
than slub, now.

Thanks,
-Kame
==
notifier callback's notifier_from_errno() just works well in error
route. (It adds mask for "stop here")

Hanlder should return NOTIFY_OK in explict way.

Signed-off-by:KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
---
 mm/page_cgroup.c |    5 ++++-
 mm/slub.c        |    6 ++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

Index: mmotm-2.6.28-Nov10/mm/slub.c
===================================================================
--- mmotm-2.6.28-Nov10.orig/mm/slub.c
+++ mmotm-2.6.28-Nov10/mm/slub.c
@@ -3220,8 +3220,10 @@ static int slab_memory_callback(struct n
 	case MEM_CANCEL_OFFLINE:
 		break;
 	}
-
-	ret = notifier_from_errno(ret);
+	if (ret)
+		ret = notifier_from_errno(ret);
+	else
+		ret = NOTIFY_OK;
 	return ret;
 }
 
Index: mmotm-2.6.28-Nov10/mm/page_cgroup.c
===================================================================
--- mmotm-2.6.28-Nov10.orig/mm/page_cgroup.c
+++ mmotm-2.6.28-Nov10/mm/page_cgroup.c
@@ -216,7 +216,10 @@ static int page_cgroup_callback(struct n
 		break;
 	}
 
-	ret = notifier_from_errno(ret);
+	if (ret)
+		ret = notifier_from_errno(ret);
+	else
+		ret = NOTIFY_OK;
 
 	return ret;
 }


--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
2.6.28-rc4 mem_cgroup_charge_common panic, Badari Pulavarty, (Mon Nov 10, 5:43 pm)
[BUGFIX][PATCH] memory hotplug: fix notiier chain return val..., KAMEZAWA Hiroyuki, (Thu Nov 13, 7:27 am)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, KAMEZAWA Hiroyuki, (Mon Nov 10, 9:14 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, KAMEZAWA Hiroyuki, (Mon Nov 10, 10:09 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, Badari Pulavarty, (Wed Nov 12, 6:02 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, KAMEZAWA Hiroyuki, (Wed Nov 12, 10:17 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, Badari Pulavarty, (Thu Nov 13, 2:53 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, KAMEZAWA Hiroyuki, (Fri Nov 14, 12:10 am)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, Badari Pulavarty, (Mon Nov 17, 5:30 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, KAMEZAWA Hiroyuki, (Mon Nov 17, 9:08 pm)
Re: 2.6.28-rc4 mem_cgroup_charge_common panic, KAMEZAWA Hiroyuki, (Wed Nov 12, 9:09 pm)