On Wed, Nov 03, 2010 at 04:28:03PM +0100, Andrea Arcangeli wrote: > From: Andrea Arcangeli <aarcange@xxxxxxxxxx> > > Transparent hugepage allocations must be allowed not to invoke kswapd or any > other kind of indirect reclaim (especially when the defrag sysfs is control > disabled). It's unacceptable to swap out anonymous pages (potentially > anonymous transparent hugepages) in order to create new transparent hugepages. > This is true for the MADV_HUGEPAGE areas too (swapping out a kvm virtual > machine and so having it suffer an unbearable slowdown, so another one with > guest physical memory marked MADV_HUGEPAGE can run 30% faster if it is running > memory intensive workloads, makes no sense). If a transparent hugepage > allocation fails the slowdown is minor and there is total fallback, so kswapd > should never be asked to swapout memory to allow the high order allocation to > succeed. > > Signed-off-by: Andrea Arcangeli <aarcange@xxxxxxxxxx> > Acked-by: Rik van Riel <riel@xxxxxxxxxx> > --- > > diff --git a/include/linux/gfp.h b/include/linux/gfp.h > --- a/include/linux/gfp.h > +++ b/include/linux/gfp.h > @@ -81,13 +81,15 @@ struct vm_area_struct; > #define __GFP_RECLAIMABLE ((__force gfp_t)___GFP_RECLAIMABLE) /* Page is reclaimable */ > #define __GFP_NOTRACK ((__force gfp_t)___GFP_NOTRACK) /* Don't track with kmemcheck */ > > +#define __GFP_NO_KSWAPD ((__force gfp_t)0x400000u) > + This is not an exact merge with what's currently in mm. Look at the top of gfp.h and see "Plain integer GFP bitmasks. Do not use this directly.". The 0x400000u definition needs to go there and this becomes #define __GFP_NO_KSWAPD ((__force_gfp_t)____0x400000u) What you have just generates sparse warnings (I believe) so it's harmless. > /* > * This may seem redundant, but it's a way of annotating false positives vs. > * allocations that simply cannot be supported (e.g. page tables). > */ > #define __GFP_NOTRACK_FALSE_POSITIVE (__GFP_NOTRACK) > > -#define __GFP_BITS_SHIFT 22 /* Room for 22 __GFP_FOO bits */ > +#define __GFP_BITS_SHIFT 23 /* Room for 23 __GFP_FOO bits */ > #define __GFP_BITS_MASK ((__force gfp_t)((1 << __GFP_BITS_SHIFT) - 1)) > > /* This equals 0, but use constants in case they ever change */ > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -1996,7 +1996,8 @@ __alloc_pages_slowpath(gfp_t gfp_mask, u > goto nopage; > > restart: > - wake_all_kswapd(order, zonelist, high_zoneidx); > + if (!(gfp_mask & __GFP_NO_KSWAPD)) > + wake_all_kswapd(order, zonelist, high_zoneidx); > Other than needing to define ____GFP_NO_KSWAPD Acked-by: Mel Gorman <mel@xxxxxxxxx> > /* > * OK, we're below the kswapd watermark and have kicked background > -- Mel Gorman Part-time Phd Student Linux Technology Center University of Limerick IBM Dublin Software Lab -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@xxxxxxxxxx For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom policy in Canada: sign http://dissolvethecrtc.ca/ Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>