Commit db5e53fb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6:
  slub: avoid leaking caches or refcounts on sysfs error
  slab: Fix comment on #endif
  slab: remove GFP_THISNODE clearing from alloc_slabmgmt()
  slub: Add might_sleep_if() to slab_alloc()
  SLUB: failslab support
  slub: Fix incorrect use of loose
  slab: Update the kmem_cache_create documentation regarding the name parameter
  slub: make early_kmem_cache_node_alloc void
  slab: unsigned slabp->inuse cannot be less than 0
  slub - fix get_object_page comment
  SLUB: Replace __builtin_return_address(0) with _RET_IP_.
  SLUB: cleanup - define macros instead of hardcoded numbers
parents 3f4b5c5d 3c506efd

include/linux/fault-inject.h

+9 −0
Original line number Diff line number Diff line
@@ -81,4 +81,13 @@ 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);

#else

static inline bool should_failslab(size_t size, gfp_t gfpflags)

{

	return false;

}

#endif /* CONFIG_FAILSLAB */



#endif /* _LINUX_FAULT_INJECT_H */

include/linux/slab.h

+5 −5
Original line number Diff line number Diff line
@@ -253,9 +253,9 @@ static inline void *kmem_cache_alloc_node(struct kmem_cache *cachep, 
 * request comes from.

 */

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB)

extern void *__kmalloc_track_caller(size_t, gfp_t, void*);

extern void *__kmalloc_track_caller(size_t, gfp_t, unsigned long);

#define kmalloc_track_caller(size, flags) \

	__kmalloc_track_caller(size, flags, __builtin_return_address(0))

	__kmalloc_track_caller(size, flags, _RET_IP_)

#else

#define kmalloc_track_caller(size, flags) \

	__kmalloc(size, flags)
@@ -271,10 +271,10 @@ extern void *__kmalloc_track_caller(size_t, gfp_t, void*); 
 * allocation request comes from.

 */

#if defined(CONFIG_DEBUG_SLAB) || defined(CONFIG_SLUB)

extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *);

extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, unsigned long);

#define kmalloc_node_track_caller(size, flags, node) \

	__kmalloc_node_track_caller(size, flags, node, \

			__builtin_return_address(0))

			_RET_IP_)

#else

#define kmalloc_node_track_caller(size, flags, node) \

	__kmalloc_node(size, flags, node)
@@ -285,7 +285,7 @@ extern void *__kmalloc_node_track_caller(size_t, gfp_t, int, void *); 
#define kmalloc_node_track_caller(size, flags, node) \

	kmalloc_track_caller(size, flags)



#endif /* DEBUG_SLAB */

#endif /* CONFIG_NUMA */



/*

 * Shortcuts

lib/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -730,6 +730,7 @@ config FAULT_INJECTION 
config FAILSLAB

	bool "Fault-injection capability for kmalloc"

	depends on FAULT_INJECTION

	depends on SLAB || SLUB

	help

	  Provide fault-injection capability for kmalloc.

mm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_SLOB) += slob.o 
obj-$(CONFIG_MMU_NOTIFIER) += mmu_notifier.o

obj-$(CONFIG_SLAB) += slab.o

obj-$(CONFIG_SLUB) += slub.o

obj-$(CONFIG_FAILSLAB) += failslab.o

obj-$(CONFIG_MEMORY_HOTPLUG) += memory_hotplug.o

obj-$(CONFIG_FS_XIP) += filemap_xip.o

obj-$(CONFIG_MIGRATION) += migrate.o

mm/failslab.c

0 → 100644
+59 −0
Original line number Diff line number Diff line 
#include <linux/fault-inject.h>



static struct {

	struct fault_attr attr;

	u32 ignore_gfp_wait;

#ifdef CONFIG_FAULT_INJECTION_DEBUG_FS

	struct dentry *ignore_gfp_wait_file;

#endif

} failslab = {

	.attr = FAULT_ATTR_INITIALIZER,

	.ignore_gfp_wait = 1,

};



bool should_failslab(size_t size, gfp_t gfpflags)

{

	if (gfpflags & __GFP_NOFAIL)

		return false;



        if (failslab.ignore_gfp_wait && (gfpflags & __GFP_WAIT))

		return false;



	return should_fail(&failslab.attr, size);

}



static int __init setup_failslab(char *str)

{

	return setup_fault_attr(&failslab.attr, 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;

	struct dentry *dir;

	int err;



	err = init_fault_attr_dentries(&failslab.attr, "failslab");

	if (err)

		return err;

	dir = failslab.attr.dentries.dir;



	failslab.ignore_gfp_wait_file =

		debugfs_create_bool("ignore-gfp-wait", mode, dir,

				      &failslab.ignore_gfp_wait);



	if (!failslab.ignore_gfp_wait_file) {

		err = -ENOMEM;

		debugfs_remove(failslab.ignore_gfp_wait_file);

		cleanup_fault_attr_dentries(&failslab.attr);

	}



	return err;

}



late_initcall(failslab_debugfs_init);



#endif /* CONFIG_FAULT_INJECTION_DEBUG_FS */

CRA Git | Maintained and supported by SUSTech CRA and CCSE