Commit 57244594 authored by Sergey Senozhatsky's avatar Sergey Senozhatsky Committed by Linus Torvalds
Browse files

zsmalloc: always keep per-class stats 



Always account per-class `zs_size_stat' stats.  This data will help us
make better decisions during compaction.  We are especially interested
in OBJ_ALLOCATED and OBJ_USED, which can tell us if class compaction
will result in any memory gain.

For instance, we know the number of allocated objects in the class, the
number of objects being used (so we also know how many objects are not
used) and the number of objects per-page.  So we can ensure if we have
enough unused objects to form at least one ZS_EMPTY zspage during
compaction.

We calculate this value on per-class basis so we can calculate a total
number of zspages that can be released.  Which is exactly what a
shrinker wants to know.

Signed-off-by: default avatarSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: default avatarMinchan Kim <minchan@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b430d1fd

mm/zsmalloc.c

+8 −32
Original line number Diff line number Diff line
@@ -169,14 +169,12 @@ enum zs_stat_type { 
	NR_ZS_STAT_TYPE,

};



#ifdef CONFIG_ZSMALLOC_STAT



static struct dentry *zs_stat_root;



struct zs_size_stat {

	unsigned long objs[NR_ZS_STAT_TYPE];

};



#ifdef CONFIG_ZSMALLOC_STAT

static struct dentry *zs_stat_root;

#endif



/*
@@ -201,6 +199,8 @@ static int zs_size_classes; 
static const int fullness_threshold_frac = 4;



struct size_class {

	spinlock_t lock;

	struct page *fullness_list[_ZS_NR_FULLNESS_GROUPS];

	/*

	 * Size of objects stored in this class. Must be multiple

	 * of ZS_ALIGN.
@@ -210,16 +210,10 @@ struct size_class { 


	/* Number of PAGE_SIZE sized pages to combine to form a 'zspage' */

	int pages_per_zspage;

	/* huge object: pages_per_zspage == 1 && maxobj_per_zspage == 1 */

	bool huge;



#ifdef CONFIG_ZSMALLOC_STAT

	struct zs_size_stat stats;

#endif



	spinlock_t lock;



	struct page *fullness_list[_ZS_NR_FULLNESS_GROUPS];

	/* huge object: pages_per_zspage == 1 && maxobj_per_zspage == 1 */

	bool huge;

};



/*
@@ -441,8 +435,6 @@ static int get_size_class_index(int size) 
	return min(zs_size_classes - 1, idx);

}



#ifdef CONFIG_ZSMALLOC_STAT



static inline void zs_stat_inc(struct size_class *class,

				enum zs_stat_type type, unsigned long cnt)

{
@@ -461,6 +453,8 @@ static inline unsigned long zs_stat_get(struct size_class *class, 
	return class->stats.objs[type];

}



#ifdef CONFIG_ZSMALLOC_STAT



static int __init zs_stat_init(void)

{

	if (!debugfs_initialized())
@@ -576,23 +570,6 @@ static void zs_pool_stat_destroy(struct zs_pool *pool) 
}



#else /* CONFIG_ZSMALLOC_STAT */



static inline void zs_stat_inc(struct size_class *class,

				enum zs_stat_type type, unsigned long cnt)

{

}



static inline void zs_stat_dec(struct size_class *class,

				enum zs_stat_type type, unsigned long cnt)

{

}



static inline unsigned long zs_stat_get(struct size_class *class,

				enum zs_stat_type type)

{

	return 0;

}



static int __init zs_stat_init(void)

{

	return 0;
@@ -610,7 +587,6 @@ static inline int zs_pool_stat_create(char *name, struct zs_pool *pool) 
static inline void zs_pool_stat_destroy(struct zs_pool *pool)

{

}



#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE