From: Greg Thelen <gthelen@google.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, containers@lists.osdl.org, Andrea Righi <arighi@develer.com>, Balbir Singh <balbir@linux.vnet.ibm.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>, Minchan Kim <minchan.kim@gmail.com>, Ciju Rajan K <ciju@linux.vnet.ibm.com>, David Rientjes <rientjes@google.com>, Wu Fengguang <fengguang.wu@intel.com> Subject: [PATCH v4 09/11] memcg: CPU hotplug lockdep warning fix Date: Fri, 29 Oct 2010 00:09:12 -0700 [thread overview] Message-ID: <1288336154-23256-10-git-send-email-gthelen@google.com> (raw) In-Reply-To: <1288336154-23256-1-git-send-email-gthelen@google.com> From: Balbir Singh <balbir@linux.vnet.ibm.com> memcg has lockdep warnings (sleep inside rcu lock) From: Balbir Singh <balbir@linux.vnet.ibm.com> Recent move to get_online_cpus() ends up calling get_online_cpus() from mem_cgroup_read_stat(). However mem_cgroup_read_stat() is called under rcu lock. get_online_cpus() can sleep. The dirty limit patches expose this BUG more readily due to their usage of mem_cgroup_page_stat() This patch address this issue as identified by lockdep and moves the hotplug protection to a higher layer. This might increase the time required to hotplug, but not by much. Warning messages BUG: sleeping function called from invalid context at kernel/cpu.c:62 in_atomic(): 0, irqs_disabled(): 0, pid: 6325, name: pagetest 2 locks held by pagetest/6325: do_page_fault+0x27d/0x4a0 mem_cgroup_page_stat+0x0/0x23f Pid: 6325, comm: pagetest Not tainted 2.6.36-rc5-mm1+ #201 Call Trace: [<ffffffff81041224>] __might_sleep+0x12d/0x131 [<ffffffff8104f4af>] get_online_cpus+0x1c/0x51 [<ffffffff8110eedb>] mem_cgroup_read_stat+0x27/0xa3 [<ffffffff811125d2>] mem_cgroup_page_stat+0x131/0x23f [<ffffffff811124a1>] ? mem_cgroup_page_stat+0x0/0x23f [<ffffffff810d57c3>] global_dirty_limits+0x42/0xf8 [<ffffffff810d58b3>] throttle_vm_writeout+0x3a/0xb4 [<ffffffff810dc2f8>] shrink_zone+0x3e6/0x3f8 [<ffffffff81074a35>] ? ktime_get_ts+0xb2/0xbf [<ffffffff810dd1aa>] do_try_to_free_pages+0x106/0x478 [<ffffffff810dd601>] try_to_free_mem_cgroup_pages+0xe5/0x14c [<ffffffff8110f947>] mem_cgroup_hierarchical_reclaim+0x314/0x3a2 [<ffffffff81111b31>] __mem_cgroup_try_charge+0x29b/0x593 [<ffffffff8111194a>] ? __mem_cgroup_try_charge+0xb4/0x593 [<ffffffff81071258>] ? local_clock+0x40/0x59 [<ffffffff81009015>] ? sched_clock+0x9/0xd [<ffffffff810710d5>] ? sched_clock_local+0x1c/0x82 [<ffffffff8111398a>] mem_cgroup_charge_common+0x4b/0x76 [<ffffffff81141469>] ? bio_add_page+0x36/0x38 [<ffffffff81113ba9>] mem_cgroup_cache_charge+0x1f4/0x214 [<ffffffff810cd195>] add_to_page_cache_locked+0x4a/0x148 .... Acked-by: Greg Thelen <gthelen@google.com> Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- Changelog since v3: - Make use of new routine: __mem_cgroup_has_dirty_limit() mm/memcontrol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 52d688d..35dc329 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -579,7 +579,6 @@ static s64 mem_cgroup_read_stat(struct mem_cgroup *mem, int cpu; s64 val = 0; - get_online_cpus(); for_each_online_cpu(cpu) val += per_cpu(mem->stat->count[idx], cpu); #ifdef CONFIG_HOTPLUG_CPU @@ -587,7 +586,6 @@ static s64 mem_cgroup_read_stat(struct mem_cgroup *mem, val += mem->nocpu_base.count[idx]; spin_unlock(&mem->pcp_counter_lock); #endif - put_online_cpus(); return val; } @@ -1345,6 +1343,7 @@ s64 mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item) struct mem_cgroup *iter; s64 value; + get_online_cpus(); rcu_read_lock(); mem = mem_cgroup_from_task(current); if (__mem_cgroup_has_dirty_limit(mem)) { @@ -1366,6 +1365,7 @@ s64 mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item) } else value = -EINVAL; rcu_read_unlock(); + put_online_cpus(); return value; } -- 1.7.3.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
WARNING: multiple messages have this Message-ID (diff)
From: Greg Thelen <gthelen@google.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, containers@lists.osdl.org, Andrea Righi <arighi@develer.com>, Balbir Singh <balbir@linux.vnet.ibm.com>, KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>, Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp>, Minchan Kim <minchan.kim@gmail.com>, Ciju Rajan K <ciju@linux.vnet.ibm.com>, David Rientjes <rientjes@google.com>, Wu Fengguang <fengguang.wu@intel.com> Subject: [PATCH v4 09/11] memcg: CPU hotplug lockdep warning fix Date: Fri, 29 Oct 2010 00:09:12 -0700 [thread overview] Message-ID: <1288336154-23256-10-git-send-email-gthelen@google.com> (raw) In-Reply-To: <1288336154-23256-1-git-send-email-gthelen@google.com> From: Balbir Singh <balbir@linux.vnet.ibm.com> memcg has lockdep warnings (sleep inside rcu lock) From: Balbir Singh <balbir@linux.vnet.ibm.com> Recent move to get_online_cpus() ends up calling get_online_cpus() from mem_cgroup_read_stat(). However mem_cgroup_read_stat() is called under rcu lock. get_online_cpus() can sleep. The dirty limit patches expose this BUG more readily due to their usage of mem_cgroup_page_stat() This patch address this issue as identified by lockdep and moves the hotplug protection to a higher layer. This might increase the time required to hotplug, but not by much. Warning messages BUG: sleeping function called from invalid context at kernel/cpu.c:62 in_atomic(): 0, irqs_disabled(): 0, pid: 6325, name: pagetest 2 locks held by pagetest/6325: do_page_fault+0x27d/0x4a0 mem_cgroup_page_stat+0x0/0x23f Pid: 6325, comm: pagetest Not tainted 2.6.36-rc5-mm1+ #201 Call Trace: [<ffffffff81041224>] __might_sleep+0x12d/0x131 [<ffffffff8104f4af>] get_online_cpus+0x1c/0x51 [<ffffffff8110eedb>] mem_cgroup_read_stat+0x27/0xa3 [<ffffffff811125d2>] mem_cgroup_page_stat+0x131/0x23f [<ffffffff811124a1>] ? mem_cgroup_page_stat+0x0/0x23f [<ffffffff810d57c3>] global_dirty_limits+0x42/0xf8 [<ffffffff810d58b3>] throttle_vm_writeout+0x3a/0xb4 [<ffffffff810dc2f8>] shrink_zone+0x3e6/0x3f8 [<ffffffff81074a35>] ? ktime_get_ts+0xb2/0xbf [<ffffffff810dd1aa>] do_try_to_free_pages+0x106/0x478 [<ffffffff810dd601>] try_to_free_mem_cgroup_pages+0xe5/0x14c [<ffffffff8110f947>] mem_cgroup_hierarchical_reclaim+0x314/0x3a2 [<ffffffff81111b31>] __mem_cgroup_try_charge+0x29b/0x593 [<ffffffff8111194a>] ? __mem_cgroup_try_charge+0xb4/0x593 [<ffffffff81071258>] ? local_clock+0x40/0x59 [<ffffffff81009015>] ? sched_clock+0x9/0xd [<ffffffff810710d5>] ? sched_clock_local+0x1c/0x82 [<ffffffff8111398a>] mem_cgroup_charge_common+0x4b/0x76 [<ffffffff81141469>] ? bio_add_page+0x36/0x38 [<ffffffff81113ba9>] mem_cgroup_cache_charge+0x1f4/0x214 [<ffffffff810cd195>] add_to_page_cache_locked+0x4a/0x148 .... Acked-by: Greg Thelen <gthelen@google.com> Signed-off-by: Balbir Singh <balbir@linux.vnet.ibm.com> --- Changelog since v3: - Make use of new routine: __mem_cgroup_has_dirty_limit() mm/memcontrol.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 52d688d..35dc329 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -579,7 +579,6 @@ static s64 mem_cgroup_read_stat(struct mem_cgroup *mem, int cpu; s64 val = 0; - get_online_cpus(); for_each_online_cpu(cpu) val += per_cpu(mem->stat->count[idx], cpu); #ifdef CONFIG_HOTPLUG_CPU @@ -587,7 +586,6 @@ static s64 mem_cgroup_read_stat(struct mem_cgroup *mem, val += mem->nocpu_base.count[idx]; spin_unlock(&mem->pcp_counter_lock); #endif - put_online_cpus(); return val; } @@ -1345,6 +1343,7 @@ s64 mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item) struct mem_cgroup *iter; s64 value; + get_online_cpus(); rcu_read_lock(); mem = mem_cgroup_from_task(current); if (__mem_cgroup_has_dirty_limit(mem)) { @@ -1366,6 +1365,7 @@ s64 mem_cgroup_page_stat(enum mem_cgroup_nr_pages_item item) } else value = -EINVAL; rcu_read_unlock(); + put_online_cpus(); return value; } -- 1.7.3.1
next prev parent reply other threads:[~2010-10-29 7:09 UTC|newest] Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-10-29 7:09 [PATCH v4 00/11] memcg: per cgroup dirty page accounting Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:09 ` [PATCH v4 01/11] memcg: add page_cgroup flags for dirty page tracking Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:09 ` [PATCH v4 02/11] memcg: document cgroup dirty memory interfaces Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 11:03 ` Wu Fengguang 2010-10-29 11:03 ` Wu Fengguang 2010-10-29 21:35 ` Greg Thelen 2010-10-29 21:35 ` Greg Thelen 2010-10-30 3:02 ` Wu Fengguang 2010-10-30 3:02 ` Wu Fengguang 2010-10-29 20:19 ` Andrew Morton 2010-10-29 20:19 ` Andrew Morton 2010-10-29 21:37 ` Greg Thelen 2010-10-29 21:37 ` Greg Thelen 2010-10-29 7:09 ` [PATCH v4 03/11] memcg: create extensible page stat update routines Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-31 14:48 ` Ciju Rajan K 2010-10-31 14:48 ` Ciju Rajan K 2010-10-31 20:11 ` Greg Thelen 2010-10-31 20:11 ` Greg Thelen 2010-11-01 20:16 ` Ciju Rajan K 2010-11-01 20:16 ` Ciju Rajan K 2010-11-02 19:35 ` Ciju Rajan K 2010-11-02 19:35 ` Ciju Rajan K 2010-10-29 7:09 ` [PATCH v4 04/11] memcg: add lock to synchronize page accounting and migration Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:09 ` [PATCH v4 05/11] writeback: create dirty_info structure Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:50 ` KAMEZAWA Hiroyuki 2010-10-29 7:50 ` KAMEZAWA Hiroyuki 2010-11-18 0:49 ` Andrew Morton 2010-11-18 0:49 ` Andrew Morton 2010-11-18 0:50 ` Andrew Morton 2010-11-18 0:50 ` Andrew Morton 2010-11-18 0:50 ` Andrew Morton 2010-11-18 2:02 ` Greg Thelen 2010-11-18 2:02 ` Greg Thelen 2010-10-29 7:09 ` [PATCH v4 06/11] memcg: add dirty page accounting infrastructure Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 11:13 ` Wu Fengguang 2010-10-29 11:13 ` Wu Fengguang 2010-10-29 11:17 ` KAMEZAWA Hiroyuki 2010-10-29 11:17 ` KAMEZAWA Hiroyuki 2010-10-29 7:09 ` [PATCH v4 07/11] memcg: add kernel calls for memcg dirty page stats Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:09 ` [PATCH v4 08/11] memcg: add dirty limits to mem_cgroup Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:41 ` KAMEZAWA Hiroyuki 2010-10-29 7:41 ` KAMEZAWA Hiroyuki 2010-10-29 16:00 ` Greg Thelen 2010-10-29 16:00 ` Greg Thelen 2010-10-29 7:09 ` Greg Thelen [this message] 2010-10-29 7:09 ` [PATCH v4 09/11] memcg: CPU hotplug lockdep warning fix Greg Thelen 2010-10-29 20:19 ` Andrew Morton 2010-10-29 20:19 ` Andrew Morton 2010-10-29 7:09 ` [PATCH v4 10/11] memcg: add cgroupfs interface to memcg dirty limits Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:43 ` KAMEZAWA Hiroyuki 2010-10-29 7:43 ` KAMEZAWA Hiroyuki 2010-10-29 7:09 ` [PATCH v4 11/11] memcg: check memcg dirty limits in page writeback Greg Thelen 2010-10-29 7:09 ` Greg Thelen 2010-10-29 7:48 ` KAMEZAWA Hiroyuki 2010-10-29 7:48 ` KAMEZAWA Hiroyuki 2010-10-29 16:06 ` Greg Thelen 2010-10-29 16:06 ` Greg Thelen 2010-10-31 20:03 ` Wu Fengguang 2010-10-31 20:03 ` Wu Fengguang 2010-10-29 20:19 ` [PATCH v4 00/11] memcg: per cgroup dirty page accounting Andrew Morton 2010-10-29 20:19 ` Andrew Morton 2010-10-30 21:46 ` Greg Thelen 2010-10-30 21:46 ` Greg Thelen 2010-11-02 19:33 ` Ciju Rajan K 2010-11-02 19:33 ` Ciju Rajan K
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1288336154-23256-10-git-send-email-gthelen@google.com \ --to=gthelen@google.com \ --cc=akpm@linux-foundation.org \ --cc=arighi@develer.com \ --cc=balbir@linux.vnet.ibm.com \ --cc=ciju@linux.vnet.ibm.com \ --cc=containers@lists.osdl.org \ --cc=fengguang.wu@intel.com \ --cc=kamezawa.hiroyu@jp.fujitsu.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=minchan.kim@gmail.com \ --cc=nishimura@mxp.nes.nec.co.jp \ --cc=rientjes@google.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.