staging: zcache: don't limit number of pools per client

Currently the amount of pools each client can use is limited to 16, this is
and arbitrary limit which isn't really required by current implementation.

This places and arbitrary limit on the number of mounted filesystems that
can use cleancache.

This patch removes that limit and uses IDR to do sparse mapping of pools
in each client.

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/zcache/zcache-main.c b/drivers/staging/zcache/zcache-main.c
index d0141fbc649eed3eb968aac549fbcc889dc5efee..174861f93b421c4c8dec1bcded0e7b2d4fe3b5eb 100644 (file)
--- a/drivers/staging/zcache/zcache-main.c
+++ b/drivers/staging/zcache/zcache-main.c
@@ -31,6 +31,7 @@
 #include <linux/math64.h>
 #include <linux/crypto.h>
 #include <linux/string.h>
+#include <linux/idr.h>
 #include "tmem.h"
 
 #include "../zsmalloc/zsmalloc.h"
@@ -53,15 +54,13 @@
        (__GFP_FS | __GFP_NORETRY | __GFP_NOWARN | __GFP_NOMEMALLOC)
 #endif
 
-#define MAX_POOLS_PER_CLIENT 16
-
 #define MAX_CLIENTS 16
 #define LOCAL_CLIENT ((uint16_t)-1)
 
 MODULE_LICENSE("GPL");
 
 struct zcache_client {
-       struct tmem_pool *tmem_pools[MAX_POOLS_PER_CLIENT];
+       struct idr tmem_pools;
        struct zs_pool *zspool;
        bool allocated;
        atomic_t refcount;
@@ -949,11 +948,9 @@ static struct tmem_pool *zcache_get_pool_by_id(uint16_t cli_id, uint16_t poolid)
                        goto out;
                atomic_inc(&cli->refcount);
        }
-       if (poolid < MAX_POOLS_PER_CLIENT) {
-               pool = cli->tmem_pools[poolid];
-               if (pool != NULL)
-                       atomic_inc(&pool->refcount);
-       }
+       pool = idr_find(&cli->tmem_pools, poolid);
+       if (pool != NULL)
+               atomic_inc(&pool->refcount);
 out:
        return pool;
 }
@@ -987,6 +984,7 @@ int zcache_new_client(uint16_t cli_id)
        cli->zspool = zs_create_pool("zcache", ZCACHE_GFP_MASK);
        if (cli->zspool == NULL)
                goto out;
+       idr_init(&cli->tmem_pools);
 #endif
        ret = 0;
 out:
@@ -1673,10 +1671,10 @@ static int zcache_destroy_pool(int cli_id, int pool_id)
        if (cli == NULL)
                goto out;
        atomic_inc(&cli->refcount);
-       pool = cli->tmem_pools[pool_id];
+       pool = idr_find(&cli->tmem_pools, pool_id);
        if (pool == NULL)
                goto out;
-       cli->tmem_pools[pool_id] = NULL;
+       idr_remove(&cli->tmem_pools, pool_id);
        /* wait for pool activity on other cpus to quiesce */
        while (atomic_read(&pool->refcount) != 0)
                ;
@@ -1696,6 +1694,7 @@ static int zcache_new_pool(uint16_t cli_id, uint32_t flags)
        int poolid = -1;
        struct tmem_pool *pool;
        struct zcache_client *cli = NULL;
+       int r;
 
        if (cli_id == LOCAL_CLIENT)
                cli = &zcache_host;
@@ -1710,20 +1709,25 @@ static int zcache_new_pool(uint16_t cli_id, uint32_t flags)
                goto out;
        }
 
-       for (poolid = 0; poolid < MAX_POOLS_PER_CLIENT; poolid++)
-               if (cli->tmem_pools[poolid] == NULL)
-                       break;
-       if (poolid >= MAX_POOLS_PER_CLIENT) {
-               pr_info("zcache: pool creation failed: max exceeded\n");
+       do {
+               r = idr_pre_get(&cli->tmem_pools, GFP_ATOMIC);
+               if (r != 1) {
+                       kfree(pool);
+                       pr_info("zcache: pool creation failed: out of memory\n");
+                       goto out;
+               }
+               r = idr_get_new(&cli->tmem_pools, pool, &poolid);
+       } while (r == -EAGAIN);
+       if (r) {
+               pr_info("zcache: pool creation failed: error %d\n", r);
                kfree(pool);
-               poolid = -1;
                goto out;
        }
+
        atomic_set(&pool->refcount, 0);
        pool->client = cli;
        pool->pool_id = poolid;
        tmem_new_pool(pool, flags);
-       cli->tmem_pools[poolid] = pool;
        pr_info("zcache: created %s tmem pool, id=%d, client=%d\n",
                flags & TMEM_POOL_PERSIST ? "persistent" : "ephemeral",
                poolid, cli_id);