crypto: hisilicon - Adjust debugfs creation and release order

There is a scenario where the file directory is created but the
file memory is not set. In this case, if a user accesses the
file, an error occurs.

So during the creation process of debugfs, memory should be
allocated first before creating the directory. In the release
process, the directory should be deleted first before releasing
the memory to avoid the situation where the memory does not
exist when accessing the directory.

In addition, the directory released by the debugfs is a global
variable. When the debugfs of an accelerator fails to be
initialized, releasing the directory of the global variable
affects the debugfs initialization of other accelerators.
The debugfs root directory released by debugfs init should be a
member of qm, not a global variable.

Signed-off-by: Chenghai Huang <huangchenghai2@huawei.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/hisilicon/hpre/hpre_main.c b/drivers/crypto/hisilicon/hpre/hpre_main.c
index d93aa6630a578323b8a180a0c09c9413ceb63c06..25b44416da45434eb6a3b9a8118edd7011c05af4 100644 (file)
--- a/drivers/crypto/hisilicon/hpre/hpre_main.c
+++ b/drivers/crypto/hisilicon/hpre/hpre_main.c
@@ -1074,41 +1074,40 @@ static int hpre_debugfs_init(struct hisi_qm *qm)
        struct device *dev = &qm->pdev->dev;
        int ret;
 
-       qm->debug.debug_root = debugfs_create_dir(dev_name(dev),
-                                                 hpre_debugfs_root);
-
-       qm->debug.sqe_mask_offset = HPRE_SQE_MASK_OFFSET;
-       qm->debug.sqe_mask_len = HPRE_SQE_MASK_LEN;
        ret = hisi_qm_regs_debugfs_init(qm, hpre_diff_regs, ARRAY_SIZE(hpre_diff_regs));
        if (ret) {
                dev_warn(dev, "Failed to init HPRE diff regs!\n");
-               goto debugfs_remove;
+               return ret;
        }
 
+       qm->debug.debug_root = debugfs_create_dir(dev_name(dev),
+                                                       hpre_debugfs_root);
+       qm->debug.sqe_mask_offset = HPRE_SQE_MASK_OFFSET;
+       qm->debug.sqe_mask_len = HPRE_SQE_MASK_LEN;
+
        hisi_qm_debug_init(qm);
 
        if (qm->pdev->device == PCI_DEVICE_ID_HUAWEI_HPRE_PF) {
                ret = hpre_ctrl_debug_init(qm);
                if (ret)
-                       goto failed_to_create;
+                       goto debugfs_remove;
        }
 
        hpre_dfx_debug_init(qm);
 
        return 0;
 
-failed_to_create:
-       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));
 debugfs_remove:
        debugfs_remove_recursive(qm->debug.debug_root);
+       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));
        return ret;
 }
 
 static void hpre_debugfs_exit(struct hisi_qm *qm)
 {
-       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));
-
        debugfs_remove_recursive(qm->debug.debug_root);
+
+       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hpre_diff_regs));
 }
 
 static int hpre_pre_store_cap_reg(struct hisi_qm *qm)

diff --git a/drivers/crypto/hisilicon/sec2/sec_main.c b/drivers/crypto/hisilicon/sec2/sec_main.c
index f4e10741610f7d1501421889ad1351d61877dbf8..853b1cb850165c937790d9e7e4b0b4c53586ea54 100644 (file)
--- a/drivers/crypto/hisilicon/sec2/sec_main.c
+++ b/drivers/crypto/hisilicon/sec2/sec_main.c
@@ -901,37 +901,36 @@ static int sec_debugfs_init(struct hisi_qm *qm)
        struct device *dev = &qm->pdev->dev;
        int ret;
 
-       qm->debug.debug_root = debugfs_create_dir(dev_name(dev),
-                                                 sec_debugfs_root);
-       qm->debug.sqe_mask_offset = SEC_SQE_MASK_OFFSET;
-       qm->debug.sqe_mask_len = SEC_SQE_MASK_LEN;
-
        ret = hisi_qm_regs_debugfs_init(qm, sec_diff_regs, ARRAY_SIZE(sec_diff_regs));
        if (ret) {
                dev_warn(dev, "Failed to init SEC diff regs!\n");
-               goto debugfs_remove;
+               return ret;
        }
 
+       qm->debug.debug_root = debugfs_create_dir(dev_name(dev),
+                                                       sec_debugfs_root);
+       qm->debug.sqe_mask_offset = SEC_SQE_MASK_OFFSET;
+       qm->debug.sqe_mask_len = SEC_SQE_MASK_LEN;
+
        hisi_qm_debug_init(qm);
 
        ret = sec_debug_init(qm);
        if (ret)
-               goto failed_to_create;
+               goto debugfs_remove;
 
        return 0;
 
-failed_to_create:
-       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(sec_diff_regs));
 debugfs_remove:
-       debugfs_remove_recursive(sec_debugfs_root);
+       debugfs_remove_recursive(qm->debug.debug_root);
+       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(sec_diff_regs));
        return ret;
 }
 
 static void sec_debugfs_exit(struct hisi_qm *qm)
 {
-       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(sec_diff_regs));
-
        debugfs_remove_recursive(qm->debug.debug_root);
+
+       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(sec_diff_regs));
 }
 
 static int sec_show_last_regs_init(struct hisi_qm *qm)

diff --git a/drivers/crypto/hisilicon/zip/zip_main.c b/drivers/crypto/hisilicon/zip/zip_main.c
index c065fd867161dcd04f0d90d21adcd1f346cc33fe..c94a7b20d07e6c8c971bfa1bf2f1cafa5d054f40 100644 (file)
--- a/drivers/crypto/hisilicon/zip/zip_main.c
+++ b/drivers/crypto/hisilicon/zip/zip_main.c
@@ -887,36 +887,34 @@ static int hisi_zip_ctrl_debug_init(struct hisi_qm *qm)
 static int hisi_zip_debugfs_init(struct hisi_qm *qm)
 {
        struct device *dev = &qm->pdev->dev;
-       struct dentry *dev_d;
        int ret;
 
-       dev_d = debugfs_create_dir(dev_name(dev), hzip_debugfs_root);
-
-       qm->debug.sqe_mask_offset = HZIP_SQE_MASK_OFFSET;
-       qm->debug.sqe_mask_len = HZIP_SQE_MASK_LEN;
-       qm->debug.debug_root = dev_d;
        ret = hisi_qm_regs_debugfs_init(qm, hzip_diff_regs, ARRAY_SIZE(hzip_diff_regs));
        if (ret) {
                dev_warn(dev, "Failed to init ZIP diff regs!\n");
-               goto debugfs_remove;
+               return ret;
        }
 
+       qm->debug.sqe_mask_offset = HZIP_SQE_MASK_OFFSET;
+       qm->debug.sqe_mask_len = HZIP_SQE_MASK_LEN;
+       qm->debug.debug_root = debugfs_create_dir(dev_name(dev),
+                                                       hzip_debugfs_root);
+
        hisi_qm_debug_init(qm);
 
        if (qm->fun_type == QM_HW_PF) {
                ret = hisi_zip_ctrl_debug_init(qm);
                if (ret)
-                       goto failed_to_create;
+                       goto debugfs_remove;
        }
 
        hisi_zip_dfx_debug_init(qm);
 
        return 0;
 
-failed_to_create:
-       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));
 debugfs_remove:
-       debugfs_remove_recursive(hzip_debugfs_root);
+       debugfs_remove_recursive(qm->debug.debug_root);
+       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));
        return ret;
 }
 
@@ -940,10 +938,10 @@ static void hisi_zip_debug_regs_clear(struct hisi_qm *qm)
 
 static void hisi_zip_debugfs_exit(struct hisi_qm *qm)
 {
-       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));
-
        debugfs_remove_recursive(qm->debug.debug_root);
 
+       hisi_qm_regs_debugfs_uninit(qm, ARRAY_SIZE(hzip_diff_regs));
+
        if (qm->fun_type == QM_HW_PF) {
                hisi_zip_debug_regs_clear(qm);
                qm->debug.curr_qm_qp_num = 0;