Re: [PATCH] implement __GFP_REPEAT, __GFP_NOFAIL, __GFP_NORETRY

[Andrew Morton]

Alexey Mahotkin <[e-mail]> wrote:
>
> 
> 
> Maybe I am wrong, but recent patch added 
> 
> +#define __GFP_NORETRY	0x1000	/* Do not retry.  Might fail */
> 
> 
> which conflicts numerically with 
> 
> #define	SLAB_NO_GROW		0x00001000UL	/* don't grow a cache */
> 
> 
> e.g., mm/slab.c contains the following snippet:
> 
>         if (flags & ~(SLAB_DMA|SLAB_LEVEL_MASK|SLAB_NO_GROW))
>                 BUG();
>         if (flags & SLAB_NO_GROW)
>                 return 0;
> 

Well spotted, thanks.  This should fix it up:

diff -puN include/linux/slab.h~SLAB_NO_GROW-fix include/linux/slab.h
--- 25/include/linux/slab.h~SLAB_NO_GROW-fix	Tue Apr 22 13:07:12 2003
+++ 25-akpm/include/linux/slab.h	Tue Apr 22 13:08:01 2003
@@ -22,8 +22,11 @@ typedef struct kmem_cache_s kmem_cache_t
 #define	SLAB_KERNEL		GFP_KERNEL
 #define	SLAB_DMA		GFP_DMA
 
-#define SLAB_LEVEL_MASK		(__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|__GFP_NORETRY)
-#define	SLAB_NO_GROW		0x00001000UL	/* don't grow a cache */
+#define SLAB_LEVEL_MASK		(__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\
+				__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT|\
+				__GFP_NOFAIL|__GFP_NORETRY)
+
+#define	SLAB_NO_GROW		__GFP_NO_GROW	/* don't grow a cache */
 
 /* flags to pass to kmem_cache_create().
  * The first 3 are only valid when the allocator as been build
diff -puN include/linux/gfp.h~SLAB_NO_GROW-fix include/linux/gfp.h
--- 25/include/linux/gfp.h~SLAB_NO_GROW-fix	Tue Apr 22 13:07:12 2003
+++ 25-akpm/include/linux/gfp.h	Tue Apr 22 13:08:57 2003
@@ -31,6 +31,7 @@
 #define __GFP_REPEAT	0x400	/* Retry the allocation.  Might fail */
 #define __GFP_NOFAIL	0x800	/* Retry for ever.  Cannot fail */
 #define __GFP_NORETRY	0x1000	/* Do not retry.  Might fail */
+#define __GFP_NO_GROW	0x2000	/* Internal slab usage */
 
 #define GFP_ATOMIC	(__GFP_HIGH)
 #define GFP_NOIO	(__GFP_WAIT)

_