[PATCH] mm: bugfix: set current->reclaim_state to NULL while returning from kswapd()

2012-11-05 Thread Aaditya Kumar
From: Takamori Yamaguchi 

In kswapd(), set current->reclaim_state to NULL before returning, as
current->reclaim_state holds reference to variable on kswapd()'s stack.

In rare cases, while returning from kswapd() during memory off lining,
__free_slab() can access dangling pointer of current->reclaim_state.

Signed-off-by: Takamori Yamaguchi 
Signed-off-by: Aaditya Kumar 

---
diff --git a/mm/vmscan.c b/mm/vmscan.c
index 2624edc..8b055e9 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3017,6 +3017,8 @@ static int kswapd(void *p)
&balanced_classzone_idx);
}
}
+
+   current->reclaim_state = NULL;
return 0;
 }
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


[RFC][RT][PATCH RESEND] mm: Do not use stop_machine() for __zone_pcp_udpate() for CONFIG_PREEMPT_RT_FULL

2013-03-05 Thread Aaditya Kumar
The code path of __zone_pcp_update() has following locks, which in
CONFIG_PREEMPT_RT_FULL=y are rt-mutex.
  - pa_lock locked by cpu_lock_irqsave()
  - zone->lock locked by free_pcppages_bulk()

Since __zone_pcp_update() is called from stop_machine(), so with
CONFIG_PREEMPT_RT_FULL=y
we get following backtrace when __zone_pcp_update() is called during
memory hot plugging while
doing heavy file I/O.

stop_machine() may not be required for calling __zone_pcp_update()
in case of CONFIG_PREEMPT_RT_FULL=y as acquiring pa_lock in __zone_pcp_update()
should be sufficient to isolate pcp pages and to setup per cpu pagesets.


The backtrace that this patch fixes:
 BUG: scheduling while atomic: migration/0/7/0x0002
 Modules linked in: v2p
 Backtrace:
 [<800111a0>] (dump_backtrace+0x0/0x10c) from [<802d7b7c>]
(dump_stack+0x18/0x1c)
  r6:80c8fc28 r5:80c8f9a0 r4: r3:6013
 [<802d7b64>] (dump_stack+0x0/0x1c) from [<8001e81c>] (__schedule_bug+0x64/0x74)
 [<8001e7b8>] (__schedule_bug+0x0/0x74) from [<802d7fa0>]
(__schedule+0x68/0x604)
  r4:8051bf00 r3:
 [<802d7f38>] (__schedule+0x0/0x604) from [<802d8a78>] (schedule+0x98/0xbc)
 [<802d89e0>] (schedule+0x0/0xbc) from [<802d9e14>]
(rt_spin_lock_slowlock+0x168/0x240)
  r4:805228f4 r3:
 [<802d9cac>] (rt_spin_lock_slowlock+0x0/0x240) from [<802da234>]
(rt_spin_lock+0x10/0x14)
 [<802da224>] (rt_spin_lock+0x0/0x14) from [<8008694c>]
(__zone_pcp_update+0x58/0xd8)
 [<800868f4>] (__zone_pcp_update+0x0/0xd8) from [<800603ec>]
(stop_machine_cpu_stop+0xb0/0x104)
 [<8006033c>] (stop_machine_cpu_stop+0x0/0x104) from [<80060200>]
(cpu_stopper_thread+0xd4/0x188)


Signed-off-by: Aaditya Kumar 

---
 mm/page_alloc.c |4 4 + 0 - 0 !
 1 file changed, 4 insertions(+)

Index: b/mm/page_alloc.c
===
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -3868,7 +3868,11 @@ static int __zone_pcp_update(void *data)

 void zone_pcp_update(struct zone *zone)
 {
+#ifndef CONFIG_PREEMPT_RT_FULL
stop_machine(__zone_pcp_update, zone, NULL);
+#else
+   __zone_pcp_update(zone);
+#endif
 }

 static __meminit void zone_pcp_init(struct zone *zone)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/


Re: [PATCH 2/2 v2] memory-hotplug: fix kswapd looping forever problem

2012-07-09 Thread Aaditya Kumar
On Wed, Jun 27, 2012 at 1:21 PM, Minchan Kim  wrote:
> When hotplug offlining happens on zone A, it starts to mark freed page
> as MIGRATE_ISOLATE type in buddy for preventing further allocation.
> (MIGRATE_ISOLATE is very irony type because it's apparently on buddy
> but we can't allocate them).
> When the memory shortage happens during hotplug offlining,
> current task starts to reclaim, then wake up kswapd.
> Kswapd checks watermark, then go sleep because current zone_watermark_ok_safe
> doesn't consider MIGRATE_ISOLATE freed page count.
> Current task continue to reclaim in direct reclaim path without kswapd's 
> helping.
> The problem is that zone->all_unreclaimable is set by only kswapd
> so that current task would be looping forever like below.
>
> __alloc_pages_slowpath
> restart:
> wake_all_kswapd
> rebalance:
> __alloc_pages_direct_reclaim
> do_try_to_free_pages
> if global_reclaim && !all_unreclaimable
> return 1; /* It means we did 
> did_some_progress */
> skip __alloc_pages_may_oom
> should_alloc_retry
> goto rebalance;
>
> If we apply KOSAKI's patch[1] which doesn't depends on kswapd
> about setting zone->all_unreclaimable, we can solve this problem
> by killing some task in direct reclaim path. But it doesn't wake up kswapd, 
> still.
> It could be a problem still if other subsystem needs GFP_ATOMIC request.
> So kswapd should consider MIGRATE_ISOLATE when it calculate free pages
> BEFORE going sleep.
>
> This patch counts the number of MIGRATE_ISOLATE page block and
> zone_watermark_ok_safe will consider it if the system has such blocks
> (fortunately, it's very rare so no problem in POV overhead and kswapd is never
> hotpath).
>
> Copy/modify from Mel's quote
> "
> Ideal solution would be "allocating" the pageblock.
> It would keep the free space accounting as it is but historically,
> memory hotplug didn't allocate pages because it would be difficult to
> detect if a pageblock was isolated or if part of some balloon.
> Allocating just full pageblocks would work around this, However,
> it would play very badly with CMA.
> "
>
> [1] http://lkml.org/lkml/2012/6/14/74
>
> * from v1
>  - add changelog
>  - make functions simple
>  - remove atomic variable
>  - discard exact isolated free page accounting.
>  - rebased on next-20120626
>
> Suggested-by: KOSAKI Motohiro 
> Cc: KAMEZAWA Hiroyuki 
> Cc: Aaditya Kumar 
> Cc: Mel Gorman 
> Signed-off-by: Minchan Kim 
> ---
>
> Aaditya, coul you confirm this patch solve your problem and
> make sure nr_pageblock_isolate is zero after hotplug end?

I am really sorry for the delay.
I  just tried this patch on my ARM setup.


>
> +#ifdef CONFIG_MEMORY_ISOLATION
> +static inline unsigned long nr_zone_isolate_freepages(struct zone *zone)
> +{
> +   unsigned long nr_pages = 0;
> +
> +   if (unlikely(zone->nr_pageblock_isolate)) {
> +   nr_pages = zone->nr_pageblock_isolate * pageblock_nr_pages;
> +   }
> +   return nr_pages;
> +}
> +#else
> +static inline unsigned long nr_zone_isolate_freepages(struct zone *zone)
> +{
> +   return 0;
> +}
> +#endif
> +
>  bool zone_watermark_ok(struct zone *z, int order, unsigned long mark,
>   int classzone_idx, int alloc_flags)
>  {
> @@ -1629,6 +1651,14 @@ bool zone_watermark_ok_safe(struct zone *z, int order, 
> unsigned long mark,
> if (z->percpu_drift_mark && free_pages < z->percpu_drift_mark)
> free_pages = zone_page_state_snapshot(z, NR_FREE_PAGES);
>
> +   /*
> +* If the zone has MIGRATE_ISOLATE type free page,
> +* we should consider it. nr_zone_isolate_freepages is never
> +* accurate so kswapd might not sleep although she can.
> +* But it's more desirable for memory hotplug rather than
> +* forever sleep which cause livelock in direct reclaim path.
> +*/
> +   free_pages -= nr_zone_isolate_freepages(z);
> return __zone_watermark_ok(z, order, mark, classzone_idx, alloc_flags,
> free_pages);

For my test case, pages to be off lined span the whole node.
With this setup the free_pages become negative. (As you and Kamezawa-san
already expected.)

BUT because of free_pages going negative the memory off lining still livelocks
as __zone_watermark_ok() returns true.

This is because in below if comparison, because of an unsigned value
(z->lowmem_reserve[classzone_idx])
all the longs are

Re: [PATCH 2/2 v2] memory-hotplug: fix kswapd looping forever problem

2012-07-09 Thread Aaditya Kumar
On Mon, Jul 9, 2012 at 7:59 PM, Minchan Kim  wrote:

Hello Minchan,

> May I add your tested-by in next spin which will include automatic type 
> conversion
> problem ?

Yeah sure.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/