The patch titled
Subject: mm: fault-inject take over bootstrap kmem_cache check
has been added to the -mm tree. Its filename is
mm-fault-inject-take-over-bootstrap-kmem_cache-check.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/mm-fault-inject-take-over-bootstrap-kmem_cache-check.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/mm-fault-inject-take-over-bootstrap-kmem_cache-check.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>
Subject: mm: fault-inject take over bootstrap kmem_cache check
Remove the SLAB specific function slab_should_failslab(), by moving
the check against fault-injection for the bootstrap slab, into the
shared function should_failslab() (used by both SLAB and SLUB).
This is a step towards sharing alloc_hook's between SLUB and SLAB.
This bootstrap slab "kmem_cache" is used for allocating struct
kmem_cache objects to the allocator itself.
Signed-off-by: Jesper Dangaard Brouer <brouer@xxxxxxxxxx>
---
index 3159a7dba034..9f4956d8601c 100644
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
include/linux/fault-inject.h | 5 ++---
mm/failslab.c | 11 ++++++++---
mm/slab.c | 12 ++----------
mm/slab.h | 2 +-
4 files changed, 13 insertions(+), 17 deletions(-)
diff -puN include/linux/fault-inject.h~mm-fault-inject-take-over-bootstrap-kmem_cache-check include/linux/fault-inject.h
--- a/include/linux/fault-inject.h~mm-fault-inject-take-over-bootstrap-kmem_cache-check
+++ a/include/linux/fault-inject.h
@@ -62,10 +62,9 @@ static inline struct dentry *fault_creat
#endif /* CONFIG_FAULT_INJECTION */
#ifdef CONFIG_FAILSLAB
-extern bool should_failslab(size_t size, gfp_t gfpflags, unsigned long flags);
+extern bool should_failslab(struct kmem_cache *s, gfp_t gfpflags);
#else
-static inline bool should_failslab(size_t size, gfp_t gfpflags,
- unsigned long flags)
+static inline bool should_failslab(struct kmem_cache *s, gfp_t gfpflags)
{
return false;
}
diff -puN mm/failslab.c~mm-fault-inject-take-over-bootstrap-kmem_cache-check mm/failslab.c
--- a/mm/failslab.c~mm-fault-inject-take-over-bootstrap-kmem_cache-check
+++ a/mm/failslab.c
@@ -1,5 +1,6 @@
#include <linux/fault-inject.h>
#include <linux/slab.h>
+#include "slab.h"
static struct {
struct fault_attr attr;
@@ -11,18 +12,22 @@ static struct {
.cache_filter = false,
};
-bool should_failslab(size_t size, gfp_t gfpflags, unsigned long cache_flags)
+bool should_failslab(struct kmem_cache *s, gfp_t gfpflags)
{
+ /* No fault-injection for bootstrap cache */
+ if (unlikely(s == kmem_cache))
+ return false;
+
if (gfpflags & __GFP_NOFAIL)
return false;
if (failslab.ignore_gfp_reclaim && (gfpflags & __GFP_RECLAIM))
return false;
- if (failslab.cache_filter && !(cache_flags & SLAB_FAILSLAB))
+ if (failslab.cache_filter && !(s->flags & SLAB_FAILSLAB))
return false;
- return should_fail(&failslab.attr, size);
+ return should_fail(&failslab.attr, s->object_size);
}
static int __init setup_failslab(char *str)
diff -puN mm/slab.c~mm-fault-inject-take-over-bootstrap-kmem_cache-check mm/slab.c
--- a/mm/slab.c~mm-fault-inject-take-over-bootstrap-kmem_cache-check
+++ a/mm/slab.c
@@ -2926,14 +2926,6 @@ static void *cache_alloc_debugcheck_afte
#define cache_alloc_debugcheck_after(a,b,objp,d) (objp)
#endif
-static bool slab_should_failslab(struct kmem_cache *cachep, gfp_t flags)
-{
- if (unlikely(cachep == kmem_cache))
- return false;
-
- return should_failslab(cachep->object_size, flags, cachep->flags);
-}
-
static inline void *____cache_alloc(struct kmem_cache *cachep, gfp_t flags)
{
void *objp;
@@ -3155,7 +3147,7 @@ slab_alloc_node(struct kmem_cache *cache
lockdep_trace_alloc(flags);
- if (slab_should_failslab(cachep, flags))
+ if (should_failslab(cachep, flags))
return NULL;
cachep = memcg_kmem_get_cache(cachep, flags);
@@ -3243,7 +3235,7 @@ slab_alloc(struct kmem_cache *cachep, gf
lockdep_trace_alloc(flags);
- if (slab_should_failslab(cachep, flags))
+ if (should_failslab(cachep, flags))
return NULL;
cachep = memcg_kmem_get_cache(cachep, flags);
diff -puN mm/slab.h~mm-fault-inject-take-over-bootstrap-kmem_cache-check mm/slab.h
--- a/mm/slab.h~mm-fault-inject-take-over-bootstrap-kmem_cache-check
+++ a/mm/slab.h
@@ -359,7 +359,7 @@ static inline struct kmem_cache *slab_pr
lockdep_trace_alloc(flags);
might_sleep_if(gfpflags_allow_blocking(flags));
- if (should_failslab(s->object_size, flags, s->flags))
+ if (should_failslab(s, flags))
return NULL;
return memcg_kmem_get_cache(s, flags);
_
Patches currently in -mm which might be from brouer@xxxxxxxxxx are
slub-cleanup-code-for-kmem-cgroup-support-to-kmem_cache_free_bulk.patch
mm-slab-move-slub-alloc-hooks-to-common-mm-slabh.patch
mm-fault-inject-take-over-bootstrap-kmem_cache-check.patch
slab-use-slab_pre_alloc_hook-in-slab-allocator-shared-with-slub.patch
mm-kmemcheck-skip-object-if-slab-allocation-failed.patch
slab-use-slab_post_alloc_hook-in-slab-allocator-shared-with-slub.patch
slab-implement-bulk-alloc-in-slab-allocator.patch
slab-avoid-running-debug-slab-code-with-irqs-disabled-for-alloc_bulk.patch
slab-implement-bulk-free-in-slab-allocator.patch
mm-new-api-kfree_bulk-for-slabslub-allocators.patch
mm-fix-some-spelling.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
