Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 479305fd authored by Dan Streetman's avatar Dan Streetman Committed by Linus Torvalds
Browse files

zpool: remove zpool_evict() 



Remove zpool_evict() helper function.  As zbud is currently the only
zpool implementation that supports eviction, add zpool and zpool_ops
references to struct zbud_pool and directly call zpool_ops->evict(zpool,
handle) on eviction.

Currently zpool provides the zpool_evict helper which locks the zpool
list lock and searches through all pools to find the specific one
matching the caller, and call the corresponding zpool_ops->evict
function.  However, this is unnecessary, as the zbud pool can simply
keep a reference to the zpool that created it, as well as the zpool_ops,
and directly call the zpool_ops->evict function, when it needs to evict
a page.  This avoids a spinlock and list search in zpool for each
eviction.

Signed-off-by: default avatarDan Streetman <ddstreet@ieee.org>
Cc: Seth Jennings <sjennings@variantweb.net>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf41f5f4

include/linux/zpool.h

+2 −3
Original line number Original line Diff line number Diff line
@@ -81,7 +81,8 @@ struct zpool_driver { 
	atomic_t refcount;

	atomic_t refcount;

	struct list_head list;

	struct list_head list;





	void *(*create)(char *name, gfp_t gfp, struct zpool_ops *ops);

	void *(*create)(char *name, gfp_t gfp, struct zpool_ops *ops,

			struct zpool *zpool);

	void (*destroy)(void *pool);

	void (*destroy)(void *pool);





	int (*malloc)(void *pool, size_t size, gfp_t gfp,

	int (*malloc)(void *pool, size_t size, gfp_t gfp,
@@ -102,6 +103,4 @@ void zpool_register_driver(struct zpool_driver *driver); 




int zpool_unregister_driver(struct zpool_driver *driver);

int zpool_unregister_driver(struct zpool_driver *driver);





int zpool_evict(void *pool, unsigned long handle);



#endif
 
#endif

mm/zbud.c

+19 −4
Original line number Original line Diff line number Diff line
@@ -97,6 +97,10 @@ struct zbud_pool { 
	struct list_head lru;

	struct list_head lru;

	u64 pages_nr;

	u64 pages_nr;

	struct zbud_ops *ops;

	struct zbud_ops *ops;

#ifdef CONFIG_ZPOOL

	struct zpool *zpool;

	struct zpool_ops *zpool_ops;

#endif

};

};





/*

/*
@@ -123,7 +127,10 @@ struct zbud_header { 




static int zbud_zpool_evict(struct zbud_pool *pool, unsigned long handle)

static int zbud_zpool_evict(struct zbud_pool *pool, unsigned long handle)

{

{

	return zpool_evict(pool, handle);

	if (pool->zpool && pool->zpool_ops && pool->zpool_ops->evict)

		return pool->zpool_ops->evict(pool->zpool, handle);

	else

		return -ENOENT;

}

}





static struct zbud_ops zbud_zpool_ops = {

static struct zbud_ops zbud_zpool_ops = {
@@ -131,9 +138,17 @@ static struct zbud_ops zbud_zpool_ops = { 
};

};





static void *zbud_zpool_create(char *name, gfp_t gfp,

static void *zbud_zpool_create(char *name, gfp_t gfp,

			struct zpool_ops *zpool_ops)

			       struct zpool_ops *zpool_ops,

			       struct zpool *zpool)

{

{

	return zbud_create_pool(gfp, zpool_ops ? &zbud_zpool_ops : NULL);

	struct zbud_pool *pool;



	pool = zbud_create_pool(gfp, zpool_ops ? &zbud_zpool_ops : NULL);

	if (pool) {

		pool->zpool = zpool;

		pool->zpool_ops = zpool_ops;

	}

	return pool;

}

}





static void zbud_zpool_destroy(void *pool)

static void zbud_zpool_destroy(void *pool)
@@ -292,7 +307,7 @@ struct zbud_pool *zbud_create_pool(gfp_t gfp, struct zbud_ops *ops) 
	struct zbud_pool *pool;

	struct zbud_pool *pool;

	int i;

	int i;





	pool = kmalloc(sizeof(struct zbud_pool), gfp);

	pool = kzalloc(sizeof(struct zbud_pool), gfp);

	if (!pool)

	if (!pool)

		return NULL;

		return NULL;

	spin_lock_init(&pool->lock);

	spin_lock_init(&pool->lock);

mm/zpool.c

+1 −28
Original line number Original line Diff line number Diff line
@@ -73,33 +73,6 @@ int zpool_unregister_driver(struct zpool_driver *driver) 
}

}

EXPORT_SYMBOL(zpool_unregister_driver);

EXPORT_SYMBOL(zpool_unregister_driver);





/**

 * zpool_evict() - evict callback from a zpool implementation.

 * @pool:	pool to evict from.

 * @handle:	handle to evict.

 *

 * This can be used by zpool implementations to call the

 * user's evict zpool_ops struct evict callback.

 */

int zpool_evict(void *pool, unsigned long handle)

{

	struct zpool *zpool;



	spin_lock(&pools_lock);

	list_for_each_entry(zpool, &pools_head, list) {

		if (zpool->pool == pool) {

			spin_unlock(&pools_lock);

			if (!zpool->ops || !zpool->ops->evict)

				return -EINVAL;

			return zpool->ops->evict(zpool, handle);

		}

	}

	spin_unlock(&pools_lock);



	return -ENOENT;

}

EXPORT_SYMBOL(zpool_evict);



static struct zpool_driver *zpool_get_driver(char *type)

static struct zpool_driver *zpool_get_driver(char *type)

{

{

	struct zpool_driver *driver;

	struct zpool_driver *driver;
@@ -170,7 +143,7 @@ struct zpool *zpool_create_pool(char *type, char *name, gfp_t gfp, 




	zpool->type = driver->type;

	zpool->type = driver->type;

	zpool->driver = driver;

	zpool->driver = driver;

	zpool->pool = driver->create(name, gfp, ops);

	zpool->pool = driver->create(name, gfp, ops, zpool);

	zpool->ops = ops;

	zpool->ops = ops;





	if (!zpool->pool) {

	if (!zpool->pool) {

mm/zsmalloc.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,8 @@ static void record_obj(unsigned long handle, unsigned long obj) 




#ifdef CONFIG_ZPOOL

#ifdef CONFIG_ZPOOL





static void *zs_zpool_create(char *name, gfp_t gfp, struct zpool_ops *zpool_ops)

static void *zs_zpool_create(char *name, gfp_t gfp, struct zpool_ops *zpool_ops,

			     struct zpool *zpool)

{

{

	return zs_create_pool(name, gfp);

	return zs_create_pool(name, gfp);

}

}