nvme-auth: guarantee dhchap buffers under memory pressure

We want to guarantee that we have chap buffers when a controller
reconnects under memory pressure. Add a mempool specifically
for that.

Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/auth.c b/drivers/nvme/host/auth.c
index 0812eb9a5d0b380cee08f8c5a35bce2e4c94ffba..1b44676b6155305d5ebecefaf78be874500a89f1 100644 (file)
--- a/drivers/nvme/host/auth.c
+++ b/drivers/nvme/host/auth.c
@@ -14,6 +14,8 @@
 #include <linux/nvme-auth.h>
 
 #define CHAP_BUF_SIZE 4096
+static struct kmem_cache *nvme_chap_buf_cache;
+static mempool_t *nvme_chap_buf_pool;
 
 struct nvme_dhchap_queue_context {
        struct list_head entry;
@@ -675,7 +677,7 @@ static void nvme_auth_reset_dhchap(struct nvme_dhchap_queue_context *chap)
        chap->transaction = 0;
        memset(chap->c1, 0, sizeof(chap->c1));
        memset(chap->c2, 0, sizeof(chap->c2));
-       kfree(chap->buf);
+       mempool_free(chap->buf, nvme_chap_buf_pool);
        chap->buf = NULL;
 }
 
@@ -701,7 +703,7 @@ static void nvme_queue_auth_work(struct work_struct *work)
         * Allocate a large enough buffer for the entire negotiation:
         * 4k is enough to ffdhe8192.
         */
-       chap->buf = kmalloc(CHAP_BUF_SIZE, GFP_KERNEL);
+       chap->buf = mempool_alloc(nvme_chap_buf_pool, GFP_KERNEL);
        if (!chap->buf) {
                chap->error = -ENOMEM;
                return;
@@ -1029,3 +1031,27 @@ void nvme_auth_free(struct nvme_ctrl *ctrl)
        }
 }
 EXPORT_SYMBOL_GPL(nvme_auth_free);
+
+int __init nvme_init_auth(void)
+{
+       nvme_chap_buf_cache = kmem_cache_create("nvme-chap-buf-cache",
+                               CHAP_BUF_SIZE, 0, SLAB_HWCACHE_ALIGN, NULL);
+       if (!nvme_chap_buf_cache)
+               return -ENOMEM;
+
+       nvme_chap_buf_pool = mempool_create(16, mempool_alloc_slab,
+                       mempool_free_slab, nvme_chap_buf_cache);
+       if (!nvme_chap_buf_pool)
+               goto err_destroy_chap_buf_cache;
+
+       return 0;
+err_destroy_chap_buf_cache:
+       kmem_cache_destroy(nvme_chap_buf_cache);
+       return -ENOMEM;
+}
+
+void __exit nvme_exit_auth(void)
+{
+       mempool_destroy(nvme_chap_buf_pool);
+       kmem_cache_destroy(nvme_chap_buf_cache);
+}

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index bad55fe0de7d38944058bbac4e2d248eea9f4806..cb5e6d07a5f8321979a00e1d78e6a25907274a25 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -5347,8 +5347,13 @@ static int __init nvme_core_init(void)
                goto unregister_generic_ns;
        }
 
+       result = nvme_init_auth();
+       if (result)
+               goto destroy_ns_chr;
        return 0;
 
+destroy_ns_chr:
+       class_destroy(nvme_ns_chr_class);
 unregister_generic_ns:
        unregister_chrdev_region(nvme_ns_chr_devt, NVME_MINORS);
 destroy_subsys_class:
@@ -5369,6 +5374,7 @@ out:
 
 static void __exit nvme_core_exit(void)
 {
+       nvme_exit_auth();
        class_destroy(nvme_ns_chr_class);
        class_destroy(nvme_subsys_class);
        class_destroy(nvme_class);

diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index 47f96ab14c6a3d5a083680f823906db649e56cf5..ebd67e7dc11ef3816b94d1a3ed68a60fa1eb758d 100644 (file)
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -1018,6 +1018,8 @@ static inline bool nvme_ctrl_sgl_supported(struct nvme_ctrl *ctrl)
 }
 
 #ifdef CONFIG_NVME_AUTH
+int __init nvme_init_auth(void);
+void __exit nvme_exit_auth(void);
 int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl);
 void nvme_auth_stop(struct nvme_ctrl *ctrl);
 int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid);
@@ -1029,6 +1031,13 @@ static inline int nvme_auth_init_ctrl(struct nvme_ctrl *ctrl)
 {
        return 0;
 }
+static inline int __init nvme_init_auth(void)
+{
+       return 0;
+}
+static inline void __exit nvme_exit_auth(void)
+{
+}
 static inline void nvme_auth_stop(struct nvme_ctrl *ctrl) {};
 static inline int nvme_auth_negotiate(struct nvme_ctrl *ctrl, int qid)
 {