RDMA/hns: Solve the problem that dma_pool is used during the reset
Subsystems (2)
PATCH RESEND 1/1 RDMA/hns: Solve the problem that dma_pool is used during the reset
From: Jiaran Zhang <[email protected]>
During the reset, the driver calls dma_pool_destroy() to release the dma_pool resources. If the dma_pool_free interface is called during the modify_qp operation, an exception will occur. The completion synchronization mechanism is used to ensure that dma_pool_destroy() is executed after the dma_pool_free operation is complete.
--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 24 +++++++++++++++++++++++- drivers/infiniband/hw/hns/hns_roce_device.h | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_cmd.c +23 -1
@@ -198,11 +198,20 @@ int hns_roce_cmd_init(struct hns_roce_dev *hr_dev)if (!hr_dev->cmd.pool)return -ENOMEM ; +init_completion (&hr_dev->cmd.can_free); + +refcount_set (&hr_dev->cmd.refcnt,1 ); +return 0 ; }void hns_roce_cmd_cleanup (struct hns_roce_dev *hr_dev) { +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); + +wait_for_completion (&hr_dev->cmd.can_free); +dma_pool_destroy (hr_dev->cmd.pool); }
@@ -248,13 +257,22 @@ hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev) {struct hns_roce_cmd_mailbox *mailbox; - mailbox =kmalloc (sizeof (*mailbox),GFP_KERNEL ); + mailbox =kzalloc (sizeof (*mailbox),GFP_KERNEL );if (!mailbox)return ERR_PTR (-ENOMEM ); +/* If refcnt is 0, it means dma_pool has been destroyed. */ +if (!refcount_inc_not_zero (&hr_dev->cmd.refcnt)) { +kfree (mailbox); +return ERR_PTR (-ENOMEM ); + } + mailbox->buf =dma_pool_alloc (hr_dev->cmd.pool,GFP_KERNEL , &mailbox->dma);if (!mailbox->buf) { +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); +kfree (mailbox);return ERR_PTR (-ENOMEM ); }
@@ -269,5 +287,9 @@ void hns_roce_free_cmd_mailbox(struct hns_roce_dev *hr_dev,return ;dma_pool_free (hr_dev->cmd.pool, mailbox->buf, mailbox->dma); + +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); +kfree (mailbox); }
drivers/infiniband/hw/hns/hns_roce_device.h +2 -0
@@ -570,6 +570,8 @@ struct hns_roce_cmdq {* close device, switch into poll mode(non event mode) */ u8 use_events; +refcount_t refcnt; +struct completion can_free; };struct hns_roce_cmd_mailbox {
Signature · 1 line
2.7.4
Quoted 31 lines · Weihang Li
From: Jiaran Zhang <[email protected]>
During the reset, the driver calls
dma_pool_destroy()to release thedma_poolresources. If thedma_pool_freeinterface is called during themodify_qpoperation, an exception will occur. The completion synchronization mechanism is used to ensure thatdma_pool_destroy()is executed after thedma_pool_freeoperation is complete.Fixes 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")Signed-off-by Jiaran Zhang <[email protected]>Signed-off-by Lang Cheng <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 24 +++++++++++++++++++++++- drivers/infiniband/hw/hns/hns_roce_device.h | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-)drivers/infiniband/hw/hns/hns_roce_cmd.c +4
-0@@ -198,11 +198,20 @@ int hns_roce_cmd_init(struct hns_roce_dev *hr_dev)if (!hr_dev->cmd.pool)return -ENOMEM ; +init_completion (&hr_dev->cmd.can_free); + +refcount_set (&hr_dev->cmd.refcnt,1 ); +return 0 ; }
drivers/infiniband/hw/hns/hns_roce_cmd.c int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) · line 216
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_cmd.c +5
-0void hns_roce_cmd_cleanup (struct hns_roce_dev *hr_dev) { +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); + +wait_for_completion (&hr_dev->cmd.can_free); +dma_pool_destroy (hr_dev->cmd.pool); }
Did you observe any failures, kernel panics e.t.c?
At this stage, you are not supposed to issue any mailbox commands and if you do, you have a bug in some other place, for example didn't flush workqueue ...
Thanks
Quoted 51 lines
drivers/infiniband/hw/hns/hns_roce_cmd.c +14
-1@@ -248,13 +257,22 @@ hns_roce_alloc_cmd_mailbox(struct hns_roce_dev *hr_dev) {struct hns_roce_cmd_mailbox *mailbox; - mailbox =kmalloc (sizeof (*mailbox),GFP_KERNEL ); + mailbox =kzalloc (sizeof (*mailbox),GFP_KERNEL );if (!mailbox)return ERR_PTR (-ENOMEM ); +/* If refcnt is 0, it means dma_pool has been destroyed. */ +if (!refcount_inc_not_zero (&hr_dev->cmd.refcnt)) { +kfree (mailbox); +return ERR_PTR (-ENOMEM ); + } + mailbox->buf =dma_pool_alloc (hr_dev->cmd.pool,GFP_KERNEL , &mailbox->dma);if (!mailbox->buf) { +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); +kfree (mailbox);return ERR_PTR (-ENOMEM ); }@@ -269,5 +287,9 @@ void hns_roce_free_cmd_mailbox(struct hns_roce_dev *hr_dev,return ;dma_pool_free (hr_dev->cmd.pool, mailbox->buf, mailbox->dma); + +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); +kfree (mailbox); }drivers/infiniband/hw/hns/hns_roce_device.h +2
-0@@ -570,6 +570,8 @@ struct hns_roce_cmdq {* close device, switch into poll mode(non event mode) */ u8 use_events; +refcount_t refcnt; +struct completion can_free; };struct hns_roce_cmd_mailbox {Signature · 1 line
2.7.4
Quoted 47 lines · Leon Romanovsky
Quoted 31 lines · Weihang Li
From: Jiaran Zhang <[email protected]>
During the reset, the driver calls
dma_pool_destroy()to release thedma_poolresources. If thedma_pool_freeinterface is called during themodify_qpoperation, an exception will occur. The completion synchronization mechanism is used to ensure thatdma_pool_destroy()is executed after thedma_pool_freeoperation is complete.Fixes 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")Signed-off-by Jiaran Zhang <[email protected]>Signed-off-by Lang Cheng <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_cmd.c | 24 +++++++++++++++++++++++- drivers/infiniband/hw/hns/hns_roce_device.h | 2 ++ 2 files changed, 25 insertions(+), 1 deletion(-)drivers/infiniband/hw/hns/hns_roce_cmd.c +4
-0@@ -198,11 +198,20 @@ int hns_roce_cmd_init(struct hns_roce_dev *hr_dev)if (!hr_dev->cmd.pool)return -ENOMEM ; +init_completion (&hr_dev->cmd.can_free); + +refcount_set (&hr_dev->cmd.refcnt,1 ); +return 0 ; }drivers/infiniband/hw/hns/hns_roce_cmd.c int hns_roce_cmd_init(struct hns_roce_dev *hr_dev) · line 216
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_cmd.c +5
-0void hns_roce_cmd_cleanup (struct hns_roce_dev *hr_dev) { +if (refcount_dec_and_test (&hr_dev->cmd.refcnt)) +complete (&hr_dev->cmd.can_free); + +wait_for_completion (&hr_dev->cmd.can_free); +dma_pool_destroy (hr_dev->cmd.pool); }Did you observe any failures, kernel panics
e.t.c?
At this stage, you are not supposed to issue any mailbox commands and if you do, you have a bug in some other place, for example didn't flush workqueue ...
Quoted 2 lines
Thanks
We get following errors with high probability when IMP reset and modify QP happens at the same time:
[15834.440744] Unable to handle kernel paging request at virtual address ffffa2cfc7725678 ... [15834.660596] Call trace: [15834.663033] queued_spin_lock_slowpath+0x224/0x308 [15834.667802] _raw_spin_lock_irqsave+0x78/0x88 [15834.672140] dma_pool_free+0x34/0x118 [15834.675799] hns_roce_free_cmd_mailbox+0x54/0x88 [hns_roce_hw_v2] [15834.681872] hns_roce_v2_qp_modify.isra.57+0xcc/0x120 [hns_roce_hw_v2] [15834.688376] hns_roce_v2_modify_qp+0x4d4/0x1ef8 [hns_roce_hw_v2] [15834.694362] hns_roce_modify_qp+0x214/0x5a8 [hns_roce_hw_v2] [15834.699996] _ib_modify_qp+0xf0/0x308 [15834.703642] ib_modify_qp+0x38/0x48 [15834.707118] rt_ktest_modify_qp+0x14c/0x998 [rdma_test]
...
[15837.269216] Unable to handle kernel paging request at virtual address 000197c995a1d1b4 ... [15837.480898] Call trace: [15837.483335] __free_pages+0x28/0x78 [15837.486807] dma_direct_free_pages+0xa0/0xe8 [15837.491058] dma_direct_free+0x48/0x60 [15837.494790] dma_free_attrs+0xa4/0xe8 [15837.498449] hns_roce_buf_free+0xb0/0x150 [hns_roce_hw_v2] [15837.503918] mtr_free_bufs.isra.1+0x88/0xc0 [hns_roce_hw_v2] [15837.509558] hns_roce_mtr_destroy+0x60/0x80 [hns_roce_hw_v2] [15837.515198] hns_roce_v2_cleanup_eq_table+0x1d0/0x2a0 [hns_roce_hw_v2] [15837.521701] hns_roce_exit+0x108/0x1e0 [hns_roce_hw_v2] [15837.526908] __hns_roce_hw_v2_uninit_instance.isra.75+0x70/0xb8 [hns_roce_hw_v2] [15837.534276] hns_roce_hw_v2_uninit_instance+0x64/0x80 [hns_roce_hw_v2] [15837.540786] hclge_uninit_client_instance+0xe8/0x1e8 [hclge] [15837.546419] hnae3_uninit_client_instance+0xc4/0x118 [hnae3] [15837.552052] hnae3_unregister_client+0x16c/0x1f0 [hnae3] [15837.557346] hns_roce_hw_v2_exit+0x34/0x50 [hns_roce_hw_v2] [15837.562895] __arm64_sys_delete_module+0x208/0x268 [15837.567665] el0_svc_common.constprop.4+0x110/0x200 [15837.572520] do_el0_svc+0x34/0x98 [15837.575821] el0_svc+0x14/0x40 [15837.578862] el0_sync_handler+0xb0/0x2d0 [15837.582766] el0_sync+0x140/0x180
It is caused by two concurrent processes:
uninit_instance->dma_pool_destroy(cmdq) modify_qp->dma_poll_free(cmdq)
So we want the dma_poll_destroy() to be called after all dma_poll_free() is complete.
Thanks
Weihang
Jason Gunthorpe
maintainerQuoted 7 lines · Weihang Li
From: Jiaran Zhang <[email protected]>
During the reset, the driver calls
dma_pool_destroy()to release thedma_poolresources. If thedma_pool_freeinterface is called during themodify_qpoperation, an exception will occur. The completion synchronization mechanism is used to ensure thatdma_pool_destroy()is executed after thedma_pool_freeoperation is complete.
This should probably be a simple rwsem instead of faking one up with a refcount and completion.
The only time you need this pattern is if the code is returning to userspace, which didn't look like was happening here.
Jason
Quoted 9 lines · Jason Gunthorpe
Quoted 7 lines · Weihang Li
From: Jiaran Zhang <[email protected]>
During the reset, the driver calls
dma_pool_destroy()to release thedma_poolresources. If thedma_pool_freeinterface is called during themodify_qpoperation, an exception will occur. The completion synchronization mechanism is used to ensure thatdma_pool_destroy()is executed after thedma_pool_freeoperation is complete.
Quoted 8 lines
This should probably be a simple rwsem instead of faking one up with a refcount and completion.
The only time you need this pattern is if the code is returning to userspace, which didn't look like was happening here.
Jason
Thank you, we'll think about how to use rwsem to fix this.
Weihang