From: Yuyu Li <liyuyu6@huawei.com> driver inclusion category: bugfix bugzilla: https://gitee.com/openeuler/kernel/issues/IBV8UW ---------------------------------------------------------------------- hns_roce_unregister_device() will be problematic if it is in front of hns_roce_unregister_debugfs(), hns_roce_unregister_device() will free up ib_deivce, and there will be a risk if debugfs uses ib_deivce. Conversely, if hns_roce_unregister_debugfs() is in front of hns_roce_unregister_device(), when the driver is uninstalled, the former will delete the entire debugfs directory, and the latter will destroy all the debugfs subdirectories of uctx, and an error will occur because the debugfs directory of uctx no longer exists. Now put hns_roce_unregister_debugfs() in front of hns_roce_unregister_device () and leave the all debugfs root NULL after hns_roce_unregister_debugfs(), so that call hns_roce_unregister_device () again, if the debugfs directory of uctx is determined to be empty, return it directly without throwing an error. The above problems can be solved in this patch. Fixes: 640cb0880216 ("RDMA/hns: Add debugfs support for DCA") Signed-off-by: Yuyu Li <liyuyu6@huawei.com> Signed-off-by: Xinghai Cen <cenxinghai@h-partners.com> --- drivers/infiniband/hw/hns/hns_roce_debugfs.c | 10 ++++++++-- drivers/infiniband/hw/hns/hns_roce_debugfs.h | 3 ++- drivers/infiniband/hw/hns/hns_roce_main.c | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_debugfs.c b/drivers/infiniband/hw/hns/hns_roce_debugfs.c index 7023c3cefaa7..756e43cace43 100644 --- a/drivers/infiniband/hw/hns/hns_roce_debugfs.c +++ b/drivers/infiniband/hw/hns/hns_roce_debugfs.c @@ -486,9 +486,14 @@ void hns_roce_register_uctx_debugfs(struct hns_roce_dev *hr_dev, hr_dev, uctx); } -void hns_roce_unregister_uctx_debugfs(struct hns_roce_ucontext *uctx) +void hns_roce_unregister_uctx_debugfs(struct hns_roce_dev *hr_dev, + struct hns_roce_ucontext *uctx) { - debugfs_remove_recursive(uctx->dca_dbgfs.root); + struct hns_dca_debugfs *dca_dbgfs = &hr_dev->dbgfs.dca_root; + char name[DCA_CTX_PID_LEN]; + + snprintf(name, sizeof(name), "%d", uctx->pid); + debugfs_lookup_and_remove(name, dca_dbgfs->root); } /* debugfs for device */ @@ -508,6 +513,7 @@ void hns_roce_register_debugfs(struct hns_roce_dev *hr_dev) void hns_roce_unregister_debugfs(struct hns_roce_dev *hr_dev) { debugfs_remove_recursive(hr_dev->dbgfs.root); + memset(&hr_dev->dbgfs, 0, sizeof(hr_dev->dbgfs)); } /* debugfs for hns module */ diff --git a/drivers/infiniband/hw/hns/hns_roce_debugfs.h b/drivers/infiniband/hw/hns/hns_roce_debugfs.h index 7fff3aa98ad2..f5bdc1e99e0c 100644 --- a/drivers/infiniband/hw/hns/hns_roce_debugfs.h +++ b/drivers/infiniband/hw/hns/hns_roce_debugfs.h @@ -47,6 +47,7 @@ void hns_roce_register_debugfs(struct hns_roce_dev *hr_dev); void hns_roce_unregister_debugfs(struct hns_roce_dev *hr_dev); void hns_roce_register_uctx_debugfs(struct hns_roce_dev *hr_dev, struct hns_roce_ucontext *uctx); -void hns_roce_unregister_uctx_debugfs(struct hns_roce_ucontext *uctx); +void hns_roce_unregister_uctx_debugfs(struct hns_roce_dev *hr_dev, + struct hns_roce_ucontext *uctx); #endif diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c index 187bf1bf1bfc..a77dc1d70a1c 100644 --- a/drivers/infiniband/hw/hns/hns_roce_main.c +++ b/drivers/infiniband/hw/hns/hns_roce_main.c @@ -633,7 +633,7 @@ static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext) struct hns_roce_dev *hr_dev = to_hr_dev(ibcontext->device); hns_roce_put_cq_bankid_for_uctx(context); - hns_roce_unregister_uctx_debugfs(context); + hns_roce_unregister_uctx_debugfs(hr_dev, context); mutex_lock(&hr_dev->uctx_list_mutex); list_del(&context->list); @@ -1494,9 +1494,9 @@ int hns_roce_init(struct hns_roce_dev *hr_dev) void hns_roce_exit(struct hns_roce_dev *hr_dev, bool bond_cleanup) { + hns_roce_unregister_debugfs(hr_dev); hns_roce_unregister_device(hr_dev, bond_cleanup); hns_roce_dealloc_scc_param(hr_dev); - hns_roce_unregister_debugfs(hr_dev); hns_roce_free_dca_safe_buf(hr_dev); -- 2.33.0