failslab: add abitily to filter slab caches
Subsystems (2)
PATCH 1/1 failslab: add abitily to filter slab caches
Example:
echo 1 > /sys/kernel/slab/skbuff_head_cache/failslab echo 1 > /sys/kernel/debug/failslab/cache-filter
--- include/linux/fault-inject.h | 4 ++-- include/linux/slab.h | 4 +++- mm/failslab.c | 18 +++++++++++++++--- mm/slab.c | 2 +- mm/slub.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 50 insertions(+), 9 deletions(-)
include/linux/fault-inject.h +2 -2
@@ -82,9 +82,9 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)#endif /* CONFIG_FAULT_INJECTION */ #ifdef CONFIG_FAILSLAB -extern bool should_failslab (size_t size,gfp_t gfpflags); +extern bool should_failslab (size_t size,gfp_t gfpflags,unsigned long c_flags);#else -static inline bool should_failslab (size_t size,gfp_t gfpflags) +static inline bool should_failslab (size_t size,gfp_t gfpflags,unsigned long f) {return false; }
include/linux/slab.h +3 -1
@@ -70,7 +70,9 @@#else # define SLAB_NOTRACK 0x00000000UL#endif - +#ifdef CONFIG_FAILSLAB +# define SLAB_FAILSLAB 0x02000000UL/* Fault injection filter mark */ +#endif /* The following flags affect the page allocator grouping pages by mobility */ #define SLAB_RECLAIM_ACCOUNT 0x00020000UL/* Objects are reclaimable */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */
mm/failslab.c +15 -3
@@ -1,18 +1,22 @@#include <linux/fault-inject.h> #include <linux/gfp.h> +#include <linux/slab.h> static struct {struct fault_attr attr;u32 ignore_gfp_wait; +int cache_filter;#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS struct dentry *ignore_gfp_wait_file; +struct dentry *cache_filter_file;#endif } failslab = { .attr =FAULT_ATTR_INITIALIZER , .ignore_gfp_wait =1 , + .cache_filter =0 , }; -bool should_failslab (size_t size,gfp_t gfpflags) +bool should_failslab (size_t size,gfp_t gfpflags,unsigned long cache_flags) {if (gfpflags & __GFP_NOFAIL)return false;
@@ -20,6 +24,9 @@ bool should_failslab(size_t size, gfp_t gfpflags)if (failslab.ignore_gfp_wait && (gfpflags & __GFP_WAIT))return false; +if (failslab.cache_filter && !(cache_flags &SLAB_FAILSLAB )) +return false; +return should_fail (&failslab.attr, size); }
@@ -30,7 +37,6 @@ static int __init setup_failslab(char *str)__setup ("failslab=" , setup_failslab);#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS -static int __init failslab_debugfs_init (void ) {mode_t mode =S_IFREG |S_IRUSR |S_IWUSR ;
@@ -46,8 +52,14 @@ static int __init failslab_debugfs_init(void)debugfs_create_bool ("ignore-gfp-wait" , mode, dir, &failslab.ignore_gfp_wait); -if (!failslab.ignore_gfp_wait_file) { + failslab.cache_filter_file = +debugfs_create_bool ("cache-filter" , mode, dir, + &failslab.cache_filter); + +if (!failslab.ignore_gfp_wait_file || + !failslab.cache_filter_file) { err = -ENOMEM ; +debugfs_remove (failslab.cache_filter_file);debugfs_remove (failslab.ignore_gfp_wait_file);cleanup_fault_attr_dentries (&failslab.attr); }
mm/slab.c +1 -1
@@ -3101,7 +3101,7 @@ static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags)if (cachep == &cache_cache)return false; -return should_failslab (obj_size (cachep), flags); +return should_failslab (obj_size (cachep), flags, cachep->flags); }static inline void *____cache_alloc (struct kmem_cache *cachep,gfp_t flags)
mm/slub.c +29 -2
@@ -151,7 +151,8 @@* Set of flags that will prevent slab merging */ #define SLUB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ - SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE) + SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \ + SLAB_FAILSLAB)#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \ SLAB_CACHE_DMA | SLAB_NOTRACK)
@@ -1020,6 +1021,11 @@ static int __init setup_slub_debug(char *str)case 't' : slub_debug |=SLAB_TRACE ;break ; +#ifdef CONFIG_FAILSLAB +case 'a' : + slub_debug |=SLAB_FAILSLAB ; +break ; +#endif default :printk (KERN_ERR "slub_debug option '%c' " "unknown. skipped\n" , *str);
@@ -1718,7 +1724,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,lockdep_trace_alloc (gfpflags);might_sleep_if (gfpflags & __GFP_WAIT); -if (should_failslab (s->objsize, gfpflags)) +if (should_failslab (s->objsize, gfpflags, s->flags))return NULL ;local_irq_save (flags);
@@ -4171,6 +4177,23 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf, }SLAB_ATTR (trace); +#ifdef CONFIG_FAILSLAB +static ssize_t failslab_show (struct kmem_cache *s,char *buf) +{ +return sprintf (buf,"%d\n" , !!(s->flags &SLAB_FAILSLAB )); +} + +static ssize_t failslab_store (struct kmem_cache *s,const char *buf, +size_t length) +{ + s->flags &= ~SLAB_FAILSLAB ; +if (buf[0 ] =='1' ) + s->flags |=SLAB_FAILSLAB ; +return length; +} +SLAB_ATTR (failslab); +#endif +static ssize_t reclaim_account_show (struct kmem_cache *s,char *buf) {return sprintf (buf,"%d\n" , !!(s->flags &SLAB_RECLAIM_ACCOUNT ));
@@ -4467,6 +4490,10 @@ static struct attribute *slab_attrs[] = { &deactivate_remote_frees_attr.attr, &order_fallback_attr.attr, #endif +#ifdef CONFIG_FAILSLAB + &failslab_attr.attr, +#endif +NULL };
Signature · 1 line
1.6.6
2010/2/23 Dmitry Monakhov <[email protected]>:
Quoted 3 lines
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filter
Looks good.
.Should we also support clearing the flag by "echo 0 > /sys/kernel/slab/skbuff_head_cache/failslab" ?
Quoted 9 lines
mm/slub.c +9
-0+static ssize_t failslab_store (struct kmem_cache *s,const char *buf, + size_t length) +{ + s->flags &= ~SLAB_FAILSLAB; + if (buf[0] == '1') + s->flags |= SLAB_FAILSLAB; + return length; +} +SLAB_ATTR (failslab);
Quoted 9 lines · Akinobu Mita
2010/2/23 Dmitry Monakhov <[email protected]>:
Quoted 3 lines
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filterLooks good.
.Should we also support clearing the flag by "echo 0 >
/sys/kernel/slab/skbuff_head_cache/failslab" ?
But it already does this, any output except "1" treated as '0' I've snipped this from trace option.
Quoted 10 lines
Quoted 10 lines
mm/slub.c +9
-0+static ssize_t failslab_store (struct kmem_cache *s,const char *buf, + size_t length) +{ + s->flags &= ~SLAB_FAILSLAB; + if (buf[0] == '1') + s->flags |= SLAB_FAILSLAB; + return length; +} +SLAB_ATTR (failslab);
2010/2/23 Dmitry Monakhov <[email protected]>:
Quoted 7 lines
Quoted 5 lines · Akinobu Mita
2010/2/23 Dmitry Monakhov <[email protected]>:
Quoted 3 lines
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filter
Quoted 6 lines
Quoted 4 lines
Looks good.
.Should we also support clearing the flag by "echo 0 >
/sys/kernel/slab/skbuff_head_cache/failslab" ?But it already does this, any output except "1" treated as '0' I've snipped this from trace option.
Oops, you are right.
Quoted 11 lines
Quoted 10 lines
Quoted 10 lines
mm/slub.c +9
-0+static ssize_t failslab_store (struct kmem_cache *s,const char *buf, + size_t length) +{ + s->flags &= ~SLAB_FAILSLAB; + if (buf[0] == '1') + s->flags |= SLAB_FAILSLAB; + return length; +} +SLAB_ATTR (failslab);
David Rientjes
reviewerQuoted 4 lines · Dmitry Monakhov
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filter
Where's the changelog?
Quoted 15 lines
Signed-off-by Dmitry Monakhov <[email protected]>--- include/linux/fault-inject.h | 4 ++-- include/linux/slab.h | 4 +++- mm/failslab.c | 18 +++++++++++++++--- mm/slab.c | 2 +- mm/slub.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 50 insertions(+), 9 deletions(-)include/linux/fault-inject.h +0
-0@@ -82,9 +82,9 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)#endif /* CONFIG_FAULT_INJECTION */
include/linux/fault-inject.h static inline void cleanup_fault_attr_dentries(struct fault_attr *attr) · line 90
Quoted 10 lines
include/linux/fault-inject.h +2
-2#ifdef CONFIG_FAILSLAB -extern bool should_failslab (size_t size,gfp_t gfpflags); +extern bool should_failslab (size_t size,gfp_t gfpflags,unsigned long c_flags);#else -static inline bool should_failslab (size_t size,gfp_t gfpflags) +static inline bool should_failslab (size_t size,gfp_t gfpflags,unsigned long f) {return false; }
c_flags or f could be described better.
Quoted 95 lines
include/linux/slab.h +3
-1@@ -70,7 +70,9 @@#else # define SLAB_NOTRACK 0x00000000UL#endif - +#ifdef CONFIG_FAILSLAB +# define SLAB_FAILSLAB 0x02000000UL/* Fault injection filter mark */ +#endif /* The following flags affect the page allocator grouping pages by mobility */ #define SLAB_RECLAIM_ACCOUNT 0x00020000UL/* Objects are reclaimable */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */ mm/failslab.c +15
-3@@ -1,18 +1,22 @@#include <linux/fault-inject.h> #include <linux/gfp.h> +#include <linux/slab.h> static struct {struct fault_attr attr;u32 ignore_gfp_wait; +int cache_filter;#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS struct dentry *ignore_gfp_wait_file; +struct dentry *cache_filter_file;#endif } failslab = { .attr =FAULT_ATTR_INITIALIZER , .ignore_gfp_wait =1 , + .cache_filter =0 , }; -bool should_failslab (size_t size,gfp_t gfpflags) +bool should_failslab (size_t size,gfp_t gfpflags,unsigned long cache_flags) {if (gfpflags & __GFP_NOFAIL)return false;@@ -20,6 +24,9 @@ bool should_failslab(size_t size, gfp_t gfpflags)if (failslab.ignore_gfp_wait && (gfpflags & __GFP_WAIT))return false; +if (failslab.cache_filter && !(cache_flags &SLAB_FAILSLAB )) +return false; +return should_fail (&failslab.attr, size); }@@ -30,7 +37,6 @@ static int __init setup_failslab(char *str)__setup ("failslab=" , setup_failslab);#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS -static int __init failslab_debugfs_init (void ) {mode_t mode =S_IFREG |S_IRUSR |S_IWUSR ;@@ -46,8 +52,14 @@ static int __init failslab_debugfs_init(void)debugfs_create_bool ("ignore-gfp-wait" , mode, dir, &failslab.ignore_gfp_wait); -if (!failslab.ignore_gfp_wait_file) { + failslab.cache_filter_file = +debugfs_create_bool ("cache-filter" , mode, dir, + &failslab.cache_filter); + +if (!failslab.ignore_gfp_wait_file || + !failslab.cache_filter_file) { err = -ENOMEM ; +debugfs_remove (failslab.cache_filter_file);debugfs_remove (failslab.ignore_gfp_wait_file);cleanup_fault_attr_dentries (&failslab.attr); }mm/slab.c +1
-1@@ -3101,7 +3101,7 @@ static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags)if (cachep == &cache_cache)return false; -return should_failslab (obj_size (cachep), flags); +return should_failslab (obj_size (cachep), flags, cachep->flags); }static inline void *____cache_alloc (struct kmem_cache *cachep,gfp_t flags)mm/slub.c +0
-0
mm/slub.c line 155
Quoted 6 lines
mm/slub.c +2
-1@@ -151,7 +151,8 @@* Set of flags that will prevent slab merging */ #define SLUB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ - SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE) + SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \ + SLAB_FAILSLAB)
Does this work with CONFIG_FAILSLAB=n?
Quoted 68 lines
mm/slub.c +27
-1#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \ SLAB_CACHE_DMA | SLAB_NOTRACK)@@ -1020,6 +1021,11 @@ static int __init setup_slub_debug(char *str)case 't' : slub_debug |=SLAB_TRACE ;break ; +#ifdef CONFIG_FAILSLAB +case 'a' : + slub_debug |=SLAB_FAILSLAB ; +break ; +#endif default :printk (KERN_ERR "slub_debug option '%c' " "unknown. skipped\n" , *str);@@ -1718,7 +1724,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,lockdep_trace_alloc (gfpflags);might_sleep_if (gfpflags & __GFP_WAIT); -if (should_failslab (s->objsize, gfpflags)) +if (should_failslab (s->objsize, gfpflags, s->flags))return NULL ;local_irq_save (flags);@@ -4171,6 +4177,23 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf, }SLAB_ATTR (trace); +#ifdef CONFIG_FAILSLAB +static ssize_t failslab_show (struct kmem_cache *s,char *buf) +{ +return sprintf (buf,"%d\n" , !!(s->flags &SLAB_FAILSLAB )); +} + +static ssize_t failslab_store (struct kmem_cache *s,const char *buf, +size_t length) +{ + s->flags &= ~SLAB_FAILSLAB ; +if (buf[0 ] =='1' ) + s->flags |=SLAB_FAILSLAB ; +return length; +} +SLAB_ATTR (failslab); +#endif +static ssize_t reclaim_account_show (struct kmem_cache *s,char *buf) {return sprintf (buf,"%d\n" , !!(s->flags &SLAB_RECLAIM_ACCOUNT ));@@ -4467,6 +4490,10 @@ static struct attribute *slab_attrs[] = { &deactivate_remote_frees_attr.attr, &order_fallback_attr.attr, #endif +#ifdef CONFIG_FAILSLAB + &failslab_attr.attr, +#endif +NULL };Signature · 7 lines
1.6.6 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
PATCH 1/1 failslab: add ability to filter slab caches
Quoted 8 lines · David Rientjes
Quoted 4 lines · Dmitry Monakhov
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filterWhere's the changelog?
I've hoped than subject is enough. But if you want more verbose changelog, take following version.
Quoted 1 line
From
2decbe704aa0e4acfd7fd87437c28ca151e39b32Mon Sep 17 00:00:00 2001
From: Dmitry Monakhov <[email protected]>
Date: Tue, 23 Feb 2010 16:17:47 +0300
Subject: [PATCH] failslab: add ability to filter slab caches
This patch allow to inject faults only for specific slabs. In order to preserve default behavior cache filter is off by default (all caches are faulty).
One may define specific set of slabs like this:
# mark skbuff_head_cache as faulty echo 1 > /sys/kernel/slab/skbuff_head_cache/failslab # Turn on cache filter (off by default) echo 1 > /sys/kernel/debug/failslab/cache-filter # Turn on fault injection echo 1 > /sys/kernel/debug/failslab/times echo 1 > /sys/kernel/debug/failslab/probability
--- include/linux/fault-inject.h | 4 ++-- include/linux/slab.h | 4 +++- mm/failslab.c | 18 +++++++++++++++--- mm/slab.c | 2 +- mm/slub.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 50 insertions(+), 9 deletions(-)
include/linux/fault-inject.h +2 -2
@@ -82,9 +82,9 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)#endif /* CONFIG_FAULT_INJECTION */ #ifdef CONFIG_FAILSLAB -extern bool should_failslab (size_t size,gfp_t gfpflags); +extern bool should_failslab (size_t size,gfp_t gfpflags,unsigned long c_flags);#else -static inline bool should_failslab (size_t size,gfp_t gfpflags) +static inline bool should_failslab (size_t size,gfp_t gfpflags,unsigned long f) {return false; }
include/linux/slab.h +3 -1
@@ -70,7 +70,9 @@#else # define SLAB_NOTRACK 0x00000000UL#endif - +#ifdef CONFIG_FAILSLAB +# define SLAB_FAILSLAB 0x02000000UL/* Fault injection filter mark */ +#endif /* The following flags affect the page allocator grouping pages by mobility */ #define SLAB_RECLAIM_ACCOUNT 0x00020000UL/* Objects are reclaimable */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */
mm/failslab.c +15 -3
@@ -1,18 +1,22 @@#include <linux/fault-inject.h> #include <linux/gfp.h> +#include <linux/slab.h> static struct {struct fault_attr attr;u32 ignore_gfp_wait; +int cache_filter;#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS struct dentry *ignore_gfp_wait_file; +struct dentry *cache_filter_file;#endif } failslab = { .attr =FAULT_ATTR_INITIALIZER , .ignore_gfp_wait =1 , + .cache_filter =0 , }; -bool should_failslab (size_t size,gfp_t gfpflags) +bool should_failslab (size_t size,gfp_t gfpflags,unsigned long cache_flags) {if (gfpflags & __GFP_NOFAIL)return false;
@@ -20,6 +24,9 @@ bool should_failslab(size_t size, gfp_t gfpflags)if (failslab.ignore_gfp_wait && (gfpflags & __GFP_WAIT))return false; +if (failslab.cache_filter && !(cache_flags &SLAB_FAILSLAB )) +return false; +return should_fail (&failslab.attr, size); }
@@ -30,7 +37,6 @@ static int __init setup_failslab(char *str)__setup ("failslab=" , setup_failslab);#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS -static int __init failslab_debugfs_init (void ) {mode_t mode =S_IFREG |S_IRUSR |S_IWUSR ;
@@ -46,8 +52,14 @@ static int __init failslab_debugfs_init(void)debugfs_create_bool ("ignore-gfp-wait" , mode, dir, &failslab.ignore_gfp_wait); -if (!failslab.ignore_gfp_wait_file) { + failslab.cache_filter_file = +debugfs_create_bool ("cache-filter" , mode, dir, + &failslab.cache_filter); + +if (!failslab.ignore_gfp_wait_file || + !failslab.cache_filter_file) { err = -ENOMEM ; +debugfs_remove (failslab.cache_filter_file);debugfs_remove (failslab.ignore_gfp_wait_file);cleanup_fault_attr_dentries (&failslab.attr); }
mm/slab.c +1 -1
@@ -3101,7 +3101,7 @@ static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags)if (cachep == &cache_cache)return false; -return should_failslab (obj_size (cachep), flags); +return should_failslab (obj_size (cachep), flags, cachep->flags); }static inline void *____cache_alloc (struct kmem_cache *cachep,gfp_t flags)
mm/slub.c +29 -2
@@ -151,7 +151,8 @@* Set of flags that will prevent slab merging */ #define SLUB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ - SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE) + SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \ + SLAB_FAILSLAB)#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \ SLAB_CACHE_DMA | SLAB_NOTRACK)
@@ -1020,6 +1021,11 @@ static int __init setup_slub_debug(char *str)case 't' : slub_debug |=SLAB_TRACE ;break ; +#ifdef CONFIG_FAILSLAB +case 'a' : + slub_debug |=SLAB_FAILSLAB ; +break ; +#endif default :printk (KERN_ERR "slub_debug option '%c' " "unknown. skipped\n" , *str);
@@ -1718,7 +1724,7 @@ static __always_inline void *slab_alloc(struct kmem_cache *s,lockdep_trace_alloc (gfpflags);might_sleep_if (gfpflags & __GFP_WAIT); -if (should_failslab (s->objsize, gfpflags)) +if (should_failslab (s->objsize, gfpflags, s->flags))return NULL ;local_irq_save (flags);
@@ -4171,6 +4177,23 @@ static ssize_t trace_store(struct kmem_cache *s, const char *buf, }SLAB_ATTR (trace); +#ifdef CONFIG_FAILSLAB +static ssize_t failslab_show (struct kmem_cache *s,char *buf) +{ +return sprintf (buf,"%d\n" , !!(s->flags &SLAB_FAILSLAB )); +} + +static ssize_t failslab_store (struct kmem_cache *s,const char *buf, +size_t length) +{ + s->flags &= ~SLAB_FAILSLAB ; +if (buf[0 ] =='1' ) + s->flags |=SLAB_FAILSLAB ; +return length; +} +SLAB_ATTR (failslab); +#endif +static ssize_t reclaim_account_show (struct kmem_cache *s,char *buf) {return sprintf (buf,"%d\n" , !!(s->flags &SLAB_RECLAIM_ACCOUNT ));
@@ -4467,6 +4490,10 @@ static struct attribute *slab_attrs[] = { &deactivate_remote_frees_attr.attr, &order_fallback_attr.attr, #endif +#ifdef CONFIG_FAILSLAB + &failslab_attr.attr, +#endif +NULL };
Signature · 1 line
1.6.6
David Rientjes
reviewerRe: [PATCH] failslab: add ability to filter slab caches
Quoted 9 lines · Dmitry Monakhov
Quoted 6 lines
Quoted 4 lines
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filterWhere's the changelog?
I've hoped than subject is enough. But if you want more verbose changelog, take following version.
Please do not attach patches to emails when sending to LKML, they are preferred to be inline. See Documentation/SubmittingPatches.
Quoted 4 lines
This patch allow to inject faults only for specific slabs. In order to preserve default behavior cache filter is off by default (all caches are faulty).
Quoted 9 lines
One may define specific set of slabs like this:
# mark skbuff_head_cache as faulty echo 1 > /sys/kernel/slab/skbuff_head_cache/failslab # Turn on cache filter (off by default) echo 1 > /sys/kernel/debug/failslab/cache-filter # Turn on fault injection echo 1 > /sys/kernel/debug/failslab/times echo 1 > /sys/kernel/debug/failslab/probability
Please describe your new slub_debug=a option here as well as in an update to Documentation/vm/slub.txt.
Quoted 15 lines
Signed-off-by Dmitry Monakhov <[email protected]>--- include/linux/fault-inject.h | 4 ++-- include/linux/slab.h | 4 +++- mm/failslab.c | 18 +++++++++++++++--- mm/slab.c | 2 +- mm/slub.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 50 insertions(+), 9 deletions(-)include/linux/fault-inject.h +0
-0@@ -82,9 +82,9 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)#endif /* CONFIG_FAULT_INJECTION */
include/linux/fault-inject.h static inline void cleanup_fault_attr_dentries(struct fault_attr *attr) · line 90
Quoted 10 lines
include/linux/fault-inject.h +2
-2#ifdef CONFIG_FAILSLAB -extern bool should_failslab (size_t size,gfp_t gfpflags); +extern bool should_failslab (size_t size,gfp_t gfpflags,unsigned long c_flags);#else -static inline bool should_failslab (size_t size,gfp_t gfpflags) +static inline bool should_failslab (size_t size,gfp_t gfpflags,unsigned long f) {return false; }
As I said in the first review, these need to be more descriptive: 'flags' would be better.
include/linux/slab.h line 75
Quoted 12 lines
include/linux/slab.h +3
-1@@ -70,7 +70,9 @@#else # define SLAB_NOTRACK 0x00000000UL#endif - +#ifdef CONFIG_FAILSLAB +# define SLAB_FAILSLAB 0x02000000UL/* Fault injection filter mark */ +#endif
Trailing whitespace on your #endif.
Quoted 70 lines
include/linux/slab.h +0
-0/* The following flags affect the page allocator grouping pages by mobility */ #define SLAB_RECLAIM_ACCOUNT 0x00020000UL/* Objects are reclaimable */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */ mm/failslab.c +15
-3@@ -1,18 +1,22 @@#include <linux/fault-inject.h> #include <linux/gfp.h> +#include <linux/slab.h> static struct {struct fault_attr attr;u32 ignore_gfp_wait; +int cache_filter;#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS struct dentry *ignore_gfp_wait_file; +struct dentry *cache_filter_file;#endif } failslab = { .attr =FAULT_ATTR_INITIALIZER , .ignore_gfp_wait =1 , + .cache_filter =0 , }; -bool should_failslab (size_t size,gfp_t gfpflags) +bool should_failslab (size_t size,gfp_t gfpflags,unsigned long cache_flags) {if (gfpflags & __GFP_NOFAIL)return false;@@ -20,6 +24,9 @@ bool should_failslab(size_t size, gfp_t gfpflags)if (failslab.ignore_gfp_wait && (gfpflags & __GFP_WAIT))return false; +if (failslab.cache_filter && !(cache_flags &SLAB_FAILSLAB )) +return false; +return should_fail (&failslab.attr, size); }@@ -30,7 +37,6 @@ static int __init setup_failslab(char *str)__setup ("failslab=" , setup_failslab);#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS -static int __init failslab_debugfs_init (void ) {mode_t mode =S_IFREG |S_IRUSR |S_IWUSR ;@@ -46,8 +52,14 @@ static int __init failslab_debugfs_init(void)debugfs_create_bool ("ignore-gfp-wait" , mode, dir, &failslab.ignore_gfp_wait); -if (!failslab.ignore_gfp_wait_file) { + failslab.cache_filter_file = +debugfs_create_bool ("cache-filter" , mode, dir, + &failslab.cache_filter); + +if (!failslab.ignore_gfp_wait_file || + !failslab.cache_filter_file) { err = -ENOMEM ; +debugfs_remove (failslab.cache_filter_file);debugfs_remove (failslab.ignore_gfp_wait_file);cleanup_fault_attr_dentries (&failslab.attr); }mm/slab.c +0
-0
mm/slab.c static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags) · line 3106
Quoted 7 lines
mm/slab.c +1
-1@@ -3101,7 +3101,7 @@ static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags)if (cachep == &cache_cache)return false; -return should_failslab (obj_size (cachep), flags); +return should_failslab (obj_size (cachep), flags, cachep->flags); }
cachep->flags for CONFIG_SLAB is of type unsigned int and should_failslab() takes an unsigned long.
Quoted 6 lines
mm/slab.c +0
-0static inline void *____cache_alloc (struct kmem_cache *cachep,gfp_t flags)mm/slub.c +0
-0
mm/slub.c line 158
Quoted 9 lines
mm/slub.c +2
-1@@ -151,7 +151,8 @@* Set of flags that will prevent slab merging */ #define SLUB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ - SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE) + SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \ + SLAB_FAILSLAB)#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \ SLAB_CACHE_DMA | SLAB_NOTRACK)
As I mentioned in my first review of your patch, this breaks for CONFIG_FAILSLAB=n. Please make sure your patch compiles for the defconfig.
Re: [PATCH] failslab: add ability to filter slab caches
Quoted 11 lines · David Rientjes
Quoted 9 lines · Dmitry Monakhov
Quoted 6 lines
Quoted 4 lines
Example:
echo 1 >/sys/kernel/slab/skbuff_head_cache/failslabecho 1 >/sys/kernel/debug/failslab/cache-filterWhere's the changelog?
I've hoped than subject is enough. But if you want more verbose changelog, take following version.
Ohh... i'm sorry i've missed other comments in your previous review. It will be fixed in second version. Also see major note about slab flags later in the text.
Quoted 3 lines
Please do not attach patches to emails when sending to LKML, they are preferred to be inline. See
Documentation/SubmittingPatches.
Yeah, In fact i've chose inline option but my mailer by unknown reason change it.
Quoted 15 lines
Quoted 5 lines
This patch allow to inject faults only for specific slabs. In order to preserve default behavior cache filter is off by default (all caches are faulty).
Quoted 9 lines
One may define specific set of slabs like this:
# mark skbuff_head_cache as faulty echo 1 > /sys/kernel/slab/skbuff_head_cache/failslab # Turn on cache filter (off by default) echo 1 > /sys/kernel/debug/failslab/cache-filter # Turn on fault injection echo 1 > /sys/kernel/debug/failslab/times echo 1 > /sys/kernel/debug/failslab/probability
Quoted 2 lines
Please describe your new slub_debug=a option here as well as in an update to
Documentation/vm/slub.txt.
Done
Quoted 17 lines
Quoted 17 lines
Signed-off-by Dmitry Monakhov <[email protected]>--- include/linux/fault-inject.h | 4 ++-- include/linux/slab.h | 4 +++- mm/failslab.c | 18 +++++++++++++++--- mm/slab.c | 2 +- mm/slub.c | 31 +++++++++++++++++++++++++++++-- 5 files changed, 50 insertions(+), 9 deletions(-)include/linux/fault-inject.h +0
-0@@ -82,9 +82,9 @@ static inline void cleanup_fault_attr_dentries(struct fault_attr *attr)#endif /* CONFIG_FAULT_INJECTION */
Quoted 12 lines
include/linux/fault-inject.h static inline void cleanup_fault_attr_dentries(struct fault_attr *attr) · line 90
Quoted 9 lines
include/linux/fault-inject.h +2
-2#ifdef CONFIG_FAILSLAB -extern bool should_failslab (size_t size,gfp_t gfpflags); +extern bool should_failslab (size_t size,gfp_t gfpflags,unsigned long c_flags);#else -static inline bool should_failslab (size_t size,gfp_t gfpflags) +static inline bool should_failslab (size_t size,gfp_t gfpflags,unsigned long f) {return false; }As I said in the first review, these need to be more descriptive: 'flags' would be better.
done
Quoted 15 lines
include/linux/slab.h line 75
Quoted 13 lines
include/linux/slab.h +3
-1@@ -70,7 +70,9 @@#else # define SLAB_NOTRACK 0x00000000UL#endif - +#ifdef CONFIG_FAILSLAB +# define SLAB_FAILSLAB 0x02000000UL/* Fault injection filter mark */ +#endif Trailing whitespace on your #endif.
Sorry. fixed
Quoted 74 lines
Quoted 74 lines
include/linux/slab.h +0
-0/* The following flags affect the page allocator grouping pages by mobility */ #define SLAB_RECLAIM_ACCOUNT 0x00020000UL/* Objects are reclaimable */ #define SLAB_TEMPORARY SLAB_RECLAIM_ACCOUNT/* Objects are short-lived */ mm/failslab.c +15
-3@@ -1,18 +1,22 @@#include <linux/fault-inject.h> #include <linux/gfp.h> +#include <linux/slab.h> static struct {struct fault_attr attr;u32 ignore_gfp_wait; +int cache_filter;#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS struct dentry *ignore_gfp_wait_file; +struct dentry *cache_filter_file;#endif } failslab = { .attr =FAULT_ATTR_INITIALIZER , .ignore_gfp_wait =1 , + .cache_filter =0 , }; -bool should_failslab (size_t size,gfp_t gfpflags) +bool should_failslab (size_t size,gfp_t gfpflags,unsigned long cache_flags) {if (gfpflags & __GFP_NOFAIL)return false;@@ -20,6 +24,9 @@ bool should_failslab(size_t size, gfp_t gfpflags)if (failslab.ignore_gfp_wait && (gfpflags & __GFP_WAIT))return false; +if (failslab.cache_filter && !(cache_flags &SLAB_FAILSLAB )) +return false; +return should_fail (&failslab.attr, size); }@@ -30,7 +37,6 @@ static int __init setup_failslab(char *str)__setup ("failslab=" , setup_failslab);#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS -static int __init failslab_debugfs_init (void ) {mode_t mode =S_IFREG |S_IRUSR |S_IWUSR ;@@ -46,8 +52,14 @@ static int __init failslab_debugfs_init(void)debugfs_create_bool ("ignore-gfp-wait" , mode, dir, &failslab.ignore_gfp_wait); -if (!failslab.ignore_gfp_wait_file) { + failslab.cache_filter_file = +debugfs_create_bool ("cache-filter" , mode, dir, + &failslab.cache_filter); + +if (!failslab.ignore_gfp_wait_file || + !failslab.cache_filter_file) { err = -ENOMEM ; +debugfs_remove (failslab.cache_filter_file);debugfs_remove (failslab.ignore_gfp_wait_file);cleanup_fault_attr_dentries (&failslab.attr); }mm/slab.c +0
-0@@ -3101,7 +3101,7 @@ static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags)if (cachep == &cache_cache)return false;
Quoted 7 lines
mm/slab.c static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags) · line 3106
Quoted 4 lines
mm/slab.c +1
-1-return should_failslab (obj_size (cachep), flags); +return should_failslab (obj_size (cachep), flags, cachep->flags); }
cachep->flagsforCONFIG_SLABis of type unsigned int andshould_failslab()takes an unsigned long.
Strange story, seems that flag definition in slab_def.h is differ from slub_def.h and slob_def.h (unsigned long long) Need to be fixed. Will send as separate patch.
Quoted 14 lines
Quoted 14 lines
mm/slab.c +0
-0static inline void *____cache_alloc (struct kmem_cache *cachep,gfp_t flags)mm/slub.c +2
-1@@ -151,7 +151,8 @@* Set of flags that will prevent slab merging */ #define SLUB_NEVER_MERGE (SLAB_RED_ZONE | SLAB_POISON | SLAB_STORE_USER | \ - SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE) + SLAB_TRACE | SLAB_DESTROY_BY_RCU | SLAB_NOLEAKTRACE | \ + SLAB_FAILSLAB)
Quoted 6 lines
mm/slub.c line 158
Quoted 2 lines
mm/slub.c +0
-0#define SLUB_MERGE_SAME (SLAB_DEBUG_FREE | SLAB_RECLAIM_ACCOUNT | \ SLAB_CACHE_DMA | SLAB_NOTRACK)As I mentioned in my first review of your patch, this breaks for
CONFIG_FAILSLAB=n. Please make sure your patch compiles for the defconfig.
fixed.