Commit 543d5f3d authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Remove memory allocation fault injection framework 



Lustre memory allocation wrappers also included a fault injection
framework that's totally redundant, since in-kernel offering is
actually superior to what we had.
So let's remove it.

Signed-off-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e1708ad7

drivers/staging/lustre/lustre/include/obd_support.h

+1 −19
Original line number Diff line number Diff line
@@ -66,13 +66,8 @@ extern unsigned int obd_sync_filter; 
extern unsigned int obd_max_dirty_pages;

extern atomic_t obd_dirty_pages;

extern atomic_t obd_dirty_transit_pages;

extern unsigned int obd_alloc_fail_rate;

extern char obd_jobid_var[];



/* lvfs.c */

int obd_alloc_fail(const void *ptr, const char *name, const char *type,

		   size_t size, const char *file, int line);



/* Some hash init argument constants */

#define HASH_POOLS_BKT_BITS 3

#define HASH_POOLS_CUR_BITS 3
@@ -428,8 +423,6 @@ int obd_alloc_fail(const void *ptr, const char *name, const char *type, 


#define OBD_FAIL_LPROC_REMOVE	    0xB00



#define OBD_FAIL_GENERAL_ALLOC	   0xC00



#define OBD_FAIL_SEQ		     0x1000

#define OBD_FAIL_SEQ_QUERY_NET	   0x1001

#define OBD_FAIL_SEQ_EXHAUST		 0x1002
@@ -545,12 +538,6 @@ __u64 obd_pages_max(void); 


#endif /* !OBD_DEBUG_MEMUSAGE */



#define HAS_FAIL_ALLOC_FLAG OBD_FAIL_CHECK(OBD_FAIL_GENERAL_ALLOC)



#define OBD_ALLOC_FAIL_BITS 24

#define OBD_ALLOC_FAIL_MASK ((1 << OBD_ALLOC_FAIL_BITS) - 1)

#define OBD_ALLOC_FAIL_MULT (OBD_ALLOC_FAIL_MASK / 100)



#ifdef CONFIG_DEBUG_SLAB

#define POISON(ptr, c, s) do {} while (0)

#define POISON_PTR(ptr)  ((void)0)
@@ -596,13 +583,8 @@ do { \ 
		kmem_cache_alloc(slab, type | __GFP_ZERO) :		\

		kmem_cache_alloc_node(slab, type | __GFP_ZERO,		\

				      cfs_cpt_spread_node(cptab, cpt));	\

	if (likely((ptr) != NULL &&					   \

		   (!HAS_FAIL_ALLOC_FLAG || obd_alloc_fail_rate == 0 ||       \

		    !obd_alloc_fail(ptr, #ptr, "slab-", size,		 \

				    __FILE__, __LINE__) ||		    \

		    OBD_SLAB_FREE_RTN0(ptr, slab)))) {			\

	if (likely(ptr))						\

		OBD_ALLOC_POST(ptr, size, "slab-alloced");		    \

	}								     \

} while (0)



#define OBD_SLAB_ALLOC_GFP(ptr, slab, size, flags)			      \

drivers/staging/lustre/lustre/obdclass/class_obd.c

+0 −21
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ EXPORT_SYMBOL(obd_pages); 
static DEFINE_SPINLOCK(obd_updatemax_lock);



/* The following are visible and mutable through /proc/sys/lustre/. */

unsigned int obd_alloc_fail_rate;

EXPORT_SYMBOL(obd_alloc_fail_rate);

unsigned int obd_debug_peer_on_timeout;

EXPORT_SYMBOL(obd_debug_peer_on_timeout);

unsigned int obd_dump_on_timeout;
@@ -132,25 +130,6 @@ int lustre_get_jobid(char *jobid) 
}

EXPORT_SYMBOL(lustre_get_jobid);



int obd_alloc_fail(const void *ptr, const char *name, const char *type,

		   size_t size, const char *file, int line)

{

	if (ptr == NULL ||

	    (cfs_rand() & OBD_ALLOC_FAIL_MASK) < obd_alloc_fail_rate) {

		CERROR("%s%salloc of %s (%llu bytes) failed at %s:%d\n",

		       ptr ? "force " : "", type, name, (__u64)size, file,

		       line);

		CERROR("%llu total bytes and %llu total pages"

			" (%llu bytes) allocated by Lustre\n",

		       obd_memory_sum(),

		       obd_pages_sum() << PAGE_CACHE_SHIFT,

		       obd_pages_sum());

		return 1;

	}

	return 0;

}

EXPORT_SYMBOL(obd_alloc_fail);



static inline void obd_data2conn(struct lustre_handle *conn,

				 struct obd_ioctl_data *data)

{