Commit 9ea9d665 authored by Oleg Drokin's avatar Oleg Drokin Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Remove lustre used memory tracking framework 



Lustre memory allocation framework has a feature to track amount
of allocated memory, but since it's not being used consistently anymore
and is on the way out in general, just remove it.

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

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

+1 −59
Original line number Diff line number Diff line
@@ -494,50 +494,6 @@ extern char obd_jobid_var[]; 
#define OBD_FAIL_ONCE			   CFS_FAIL_ONCE

#define OBD_FAILED			      CFS_FAILED



void obd_update_maxusage(void);



#define obd_memory_add(size)						  \

	lprocfs_counter_add(obd_memory, OBD_MEMORY_STAT, (long)(size))

#define obd_memory_sub(size)						  \

	lprocfs_counter_sub(obd_memory, OBD_MEMORY_STAT, (long)(size))

#define obd_memory_sum()						      \

	lprocfs_stats_collector(obd_memory, OBD_MEMORY_STAT,		  \

				LPROCFS_FIELDS_FLAGS_SUM)

#define obd_pages_add(order)						  \

	lprocfs_counter_add(obd_memory, OBD_MEMORY_PAGES_STAT,		\

			    (long)(1 << (order)))

#define obd_pages_sub(order)						  \

	lprocfs_counter_sub(obd_memory, OBD_MEMORY_PAGES_STAT,		\

			    (long)(1 << (order)))

#define obd_pages_sum()						       \

	lprocfs_stats_collector(obd_memory, OBD_MEMORY_PAGES_STAT,	    \

				LPROCFS_FIELDS_FLAGS_SUM)



__u64 obd_memory_max(void);

__u64 obd_pages_max(void);



#define OBD_DEBUG_MEMUSAGE (1)



#if OBD_DEBUG_MEMUSAGE

#define OBD_ALLOC_POST(ptr, size, name)				 \

		obd_memory_add(size);				   \

		CDEBUG(D_MALLOC, name " '" #ptr "': %d at %p.\n",       \

		       (int)(size), ptr)



#define OBD_FREE_PRE(ptr, size, name)				   \

	LASSERT(ptr);						   \

	obd_memory_sub(size);					   \

	CDEBUG(D_MALLOC, name " '" #ptr "': %d at %p.\n",	       \

	       (int)(size), ptr);				       \

	POISON(ptr, 0x5a, size)



#else /* !OBD_DEBUG_MEMUSAGE */



#define OBD_ALLOC_POST(ptr, size, name) ((void)0)

#define OBD_FREE_PRE(ptr, size, name)   ((void)0)



#endif /* !OBD_DEBUG_MEMUSAGE */



#ifdef CONFIG_DEBUG_SLAB

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

#define POISON_PTR(ptr)  ((void)0)
@@ -583,8 +539,6 @@ 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))						\

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

} while (0)



#define OBD_SLAB_ALLOC_GFP(ptr, slab, size, flags)			      \
@@ -594,7 +548,6 @@ do { \ 


#define OBD_SLAB_FREE(ptr, slab, size)					\

do {									  \

	OBD_FREE_PRE(ptr, size, "slab-freed");				\

	kmem_cache_free(slab, ptr);					\

	POISON_PTR(ptr);						      \

} while (0)
@@ -629,17 +582,7 @@ do { \ 
	(ptr) = (cptab) == NULL ?					      \

		alloc_page(gfp_mask) :				      \

		alloc_pages_node(cfs_cpt_spread_node(cptab, cpt), gfp_mask, 0);\

	if (unlikely((ptr) == NULL)) {					\

		CERROR("alloc_pages of '" #ptr "' %d page(s) / %llu bytes "\

		       "failed\n", (int)1,				    \

		       (__u64)(1 << PAGE_CACHE_SHIFT));			 \

		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());				       \

	} else {							      \

		obd_pages_add(0);					     \

	if (ptr) {					\

		CDEBUG(D_MALLOC, "alloc_pages '" #ptr "': %d page(s) / "      \

		       "%llu bytes at %p.\n",				\

		       (int)1,						\
@@ -655,7 +598,6 @@ do { \ 
#define OBD_PAGE_FREE(ptr)						    \

do {									  \

	LASSERT(ptr);							 \

	obd_pages_sub(0);						     \

	CDEBUG(D_MALLOC, "free_pages '" #ptr "': %d page(s) / %llu bytes " \

	       "at %p.\n",						    \

	       (int)1, (__u64)(1 << PAGE_CACHE_SHIFT),			  \

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

+0 −64
Original line number Diff line number Diff line
@@ -53,16 +53,6 @@ EXPORT_SYMBOL(obd_devs); 
struct list_head obd_types;

DEFINE_RWLOCK(obd_dev_lock);



__u64 obd_max_pages;

EXPORT_SYMBOL(obd_max_pages);

__u64 obd_max_alloc;

EXPORT_SYMBOL(obd_max_alloc);

__u64 obd_alloc;

EXPORT_SYMBOL(obd_alloc);

__u64 obd_pages;

EXPORT_SYMBOL(obd_pages);

static DEFINE_SPINLOCK(obd_updatemax_lock);



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

unsigned int obd_debug_peer_on_timeout;

EXPORT_SYMBOL(obd_debug_peer_on_timeout);
@@ -572,54 +562,12 @@ static int __init init_obdclass(void) 
	return err;

}



void obd_update_maxusage(void)

{

	__u64 max1, max2;



	max1 = obd_pages_sum();

	max2 = obd_memory_sum();



	spin_lock(&obd_updatemax_lock);

	if (max1 > obd_max_pages)

		obd_max_pages = max1;

	if (max2 > obd_max_alloc)

		obd_max_alloc = max2;

	spin_unlock(&obd_updatemax_lock);

}

EXPORT_SYMBOL(obd_update_maxusage);



__u64 obd_memory_max(void)

{

	__u64 ret;



	spin_lock(&obd_updatemax_lock);

	ret = obd_max_alloc;

	spin_unlock(&obd_updatemax_lock);



	return ret;

}

EXPORT_SYMBOL(obd_memory_max);



__u64 obd_pages_max(void)

{

	__u64 ret;



	spin_lock(&obd_updatemax_lock);

	ret = obd_max_pages;

	spin_unlock(&obd_updatemax_lock);



	return ret;

}

EXPORT_SYMBOL(obd_pages_max);



/* liblustre doesn't call cleanup_obdclass, apparently.  we carry on in this

 * ifdef to the end of the file to cover module and versioning goo.*/

static void cleanup_obdclass(void)

{

	int i;

	int lustre_unregister_fs(void);

	__u64 memory_leaked, pages_leaked;

	__u64 memory_max, pages_max;



	lustre_unregister_fs();
@@ -645,19 +593,7 @@ static void cleanup_obdclass(void) 
	class_exit_uuidlist();

	obd_zombie_impexp_stop();



	memory_leaked = obd_memory_sum();

	pages_leaked = obd_pages_sum();



	memory_max = obd_memory_max();

	pages_max = obd_pages_max();



	lprocfs_free_stats(&obd_memory);

	CDEBUG((memory_leaked) ? D_ERROR : D_INFO,

	       "obd_memory max: %llu, leaked: %llu\n",

	       memory_max, memory_leaked);

	CDEBUG((pages_leaked) ? D_ERROR : D_INFO,

	       "obd_memory_pages max: %llu, leaked: %llu\n",

	       pages_max, pages_leaked);

}



MODULE_AUTHOR("Sun Microsystems, Inc. <http://www.lustre.org/>");

drivers/staging/lustre/lustre/ptlrpc/pinger.c

+0 −2
Original line number Diff line number Diff line
@@ -266,8 +266,6 @@ static int ptlrpc_pinger_main(void *arg) 
				ptlrpc_update_next_ping(imp, 0);

		}

		mutex_unlock(&pinger_mutex);

		/* update memory usage info */

		obd_update_maxusage();



		/* Wait until the next ping time, or until we're stopped. */

		time_to_next_wake = pinger_check_timeout(this_ping);