p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mm/zsmalloc: simplify zs_max_alloc_size handling 

Commit 40f9fb8cff ("mm/zsmalloc: support allocating obj with size of
ZS_MAX_ALLOC_SIZE") fixes a size calculation error that prevented
zsmalloc to allocate an object of the maximal size (ZS_MAX_ALLOC_SIZE).
I think however the fix is unneededly complicated.

This patch replaces the dynamic calculation of zs_size_classes at init
time by a compile time calculation that uses the DIV_ROUND_UP() macro
already used in get_size_class_index().

[akpm@linux-foundation.org: use min_t]
Link: http://lkml.kernel.org/r/20170630114859.1979-1-jmarchan@redhat.com
Signed-off-by: Jerome Marchand <jmarchan@redhat.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
Cc: Mahendran Ganesh <opensource.ganesh@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jerome Marchand 2017-07-10 15:50:18 -07:00 committed by Linus Torvalds
parent bc1bb36233
commit cf8e0fedf0
1 changed files with 15 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mm/zsmalloc.c
View File

@ -116,6 +116,11 @@
#define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS - OBJ_TAG_BITS) #define OBJ_INDEX_BITS (BITS_PER_LONG - _PFN_BITS - OBJ_TAG_BITS)
#define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1) #define OBJ_INDEX_MASK ((_AC(1, UL) << OBJ_INDEX_BITS) - 1)
#define FULLNESS_BITS 2
#define CLASS_BITS 8
#define ISOLATED_BITS 3
#define MAGIC_VAL_BITS 8
#define MAX(a, b) ((a) >= (b) ? (a) : (b)) #define MAX(a, b) ((a) >= (b) ? (a) : (b))
/* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */ /* ZS_MIN_ALLOC_SIZE must be multiple of ZS_ALIGN */
#define ZS_MIN_ALLOC_SIZE \ #define ZS_MIN_ALLOC_SIZE \
@ -137,6 +142,8 @@
* (reason above) * (reason above)
*/ */
#define ZS_SIZE_CLASS_DELTA (PAGE_SIZE >> CLASS_BITS) #define ZS_SIZE_CLASS_DELTA (PAGE_SIZE >> CLASS_BITS)
#define ZS_SIZE_CLASSES (DIV_ROUND_UP(ZS_MAX_ALLOC_SIZE - ZS_MIN_ALLOC_SIZE, \
ZS_SIZE_CLASS_DELTA) + 1)
enum fullness_group { enum fullness_group {
ZS_EMPTY, ZS_EMPTY,
@ -168,11 +175,6 @@ static struct dentry *zs_stat_root;
static struct vfsmount *zsmalloc_mnt; static struct vfsmount *zsmalloc_mnt;
#endif #endif
/*
* number of size_classes
*/
static int zs_size_classes;
/* /*
* We assign a page to ZS_ALMOST_EMPTY fullness group when: * We assign a page to ZS_ALMOST_EMPTY fullness group when:
* n <= N / f, where * n <= N / f, where
@ -244,7 +246,7 @@ struct link_free {
struct zs_pool { struct zs_pool {
const char *name; const char *name;
struct size_class **size_class; struct size_class *size_class[ZS_SIZE_CLASSES];
struct kmem_cache *handle_cachep; struct kmem_cache *handle_cachep;
struct kmem_cache *zspage_cachep; struct kmem_cache *zspage_cachep;
@ -268,11 +270,6 @@ struct zs_pool {
#endif #endif
}; };
#define FULLNESS_BITS 2
#define CLASS_BITS 8
#define ISOLATED_BITS 3
#define MAGIC_VAL_BITS 8
struct zspage { struct zspage {
struct { struct {
unsigned int fullness:FULLNESS_BITS; unsigned int fullness:FULLNESS_BITS;
@ -551,7 +548,7 @@ static int get_size_class_index(int size)
idx = DIV_ROUND_UP(size - ZS_MIN_ALLOC_SIZE, idx = DIV_ROUND_UP(size - ZS_MIN_ALLOC_SIZE,
ZS_SIZE_CLASS_DELTA); ZS_SIZE_CLASS_DELTA);
return min(zs_size_classes - 1, idx); return min_t(int, ZS_SIZE_CLASSES - 1, idx);
} }
static inline void zs_stat_inc(struct size_class *class, static inline void zs_stat_inc(struct size_class *class,
@ -610,7 +607,7 @@ static int zs_stats_size_show(struct seq_file *s, void *v)
"obj_allocated", "obj_used", "pages_used", "obj_allocated", "obj_used", "pages_used",
"pages_per_zspage", "freeable"); "pages_per_zspage", "freeable");
for (i = 0; i < zs_size_classes; i++) { for (i = 0; i < ZS_SIZE_CLASSES; i++) {
class = pool->size_class[i]; class = pool->size_class[i];
if (class->index != i) if (class->index != i)
@ -1294,17 +1291,6 @@ static int zs_cpu_dead(unsigned int cpu)
return 0; return 0;
} }
static void __init init_zs_size_classes(void)
{
int nr;
nr = (ZS_MAX_ALLOC_SIZE - ZS_MIN_ALLOC_SIZE) / ZS_SIZE_CLASS_DELTA + 1;
if ((ZS_MAX_ALLOC_SIZE - ZS_MIN_ALLOC_SIZE) % ZS_SIZE_CLASS_DELTA)
nr += 1;
zs_size_classes = nr;
}
static bool can_merge(struct size_class *prev, int pages_per_zspage, static bool can_merge(struct size_class *prev, int pages_per_zspage,
int objs_per_zspage) int objs_per_zspage)
{ {
@ -2145,7 +2131,7 @@ static void async_free_zspage(struct work_struct *work)
struct zs_pool *pool = container_of(work, struct zs_pool, struct zs_pool *pool = container_of(work, struct zs_pool,
free_work); free_work);
for (i = 0; i < zs_size_classes; i++) { for (i = 0; i < ZS_SIZE_CLASSES; i++) {
class = pool->size_class[i]; class = pool->size_class[i];
if (class->index != i) if (class->index != i)
continue; continue;
@ -2263,7 +2249,7 @@ unsigned long zs_compact(struct zs_pool *pool)
int i; int i;
struct size_class *class; struct size_class *class;
for (i = zs_size_classes - 1; i >= 0; i--) { for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) {
class = pool->size_class[i]; class = pool->size_class[i];
if (!class) if (!class)
continue; continue;
@ -2309,7 +2295,7 @@ static unsigned long zs_shrinker_count(struct shrinker *shrinker,
struct zs_pool *pool = container_of(shrinker, struct zs_pool, struct zs_pool *pool = container_of(shrinker, struct zs_pool,
shrinker); shrinker);
for (i = zs_size_classes - 1; i >= 0; i--) { for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) {
class = pool->size_class[i]; class = pool->size_class[i];
if (!class) if (!class)
continue; continue;
@ -2361,12 +2347,6 @@ struct zs_pool *zs_create_pool(const char *name)
return NULL; return NULL;
init_deferred_free(pool); init_deferred_free(pool);
pool->size_class = kcalloc(zs_size_classes, sizeof(struct size_class *),
GFP_KERNEL);
if (!pool->size_class) {
kfree(pool);
return NULL;
}
pool->name = kstrdup(name, GFP_KERNEL); pool->name = kstrdup(name, GFP_KERNEL);
if (!pool->name) if (!pool->name)
@ -2379,7 +2359,7 @@ struct zs_pool *zs_create_pool(const char *name)
* Iterate reversely, because, size of size_class that we want to use * Iterate reversely, because, size of size_class that we want to use
* for merging should be larger or equal to current size. * for merging should be larger or equal to current size.
*/ */
for (i = zs_size_classes - 1; i >= 0; i--) { for (i = ZS_SIZE_CLASSES - 1; i >= 0; i--) {
int size; int size;
int pages_per_zspage; int pages_per_zspage;
int objs_per_zspage; int objs_per_zspage;
@ -2453,7 +2433,7 @@ void zs_destroy_pool(struct zs_pool *pool)
zs_unregister_migration(pool); zs_unregister_migration(pool);
zs_pool_stat_destroy(pool); zs_pool_stat_destroy(pool);
for (i = 0; i < zs_size_classes; i++) { for (i = 0; i < ZS_SIZE_CLASSES; i++) {
int fg; int fg;
struct size_class *class = pool->size_class[i]; struct size_class *class = pool->size_class[i];
@ -2492,8 +2472,6 @@ static int __init zs_init(void)
if (ret) if (ret)
goto hp_setup_fail; goto hp_setup_fail;
init_zs_size_classes();
#ifdef CONFIG_ZPOOL #ifdef CONFIG_ZPOOL
zpool_register_driver(&zs_zpool_driver); zpool_register_driver(&zs_zpool_driver);
#endif #endif