* [PATCH for-next] RDMA/hns: Solve the problem that dma_pool is used during the reset
@ 2021-06-11 9:30 Weihang Li
2021-06-11 9:33 ` liweihang
0 siblings, 1 reply; 2+ messages in thread
From: Weihang Li @ 2021-06-11 9:30 UTC (permalink / raw)
To: dledford, jgg
Cc: leon, linux-rdma, linuxarm, Jiaran Zhang, Lang Cheng, Weihang Li
From: Jiaran Zhang <zhangjiaran@huawei.com>
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.
Signed-off-by: Jiaran Zhang <zhangjiaran@huawei.com>
Signed-off-by: Lang Cheng <chenglang@huawei.com>
Signed-off-by: Weihang Li <liweihang@huawei.com>
---
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(-)
diff --git a/drivers/infiniband/hw/hns/hns_roce_cmd.c b/drivers/infiniband/hw/hns/hns_roce_cmd.c
index 8f68cc3..e7293ca 100644
--- a/drivers/infiniband/hw/hns/hns_roce_cmd.c
+++ b/drivers/infiniband/hw/hns/hns_roce_cmd.c
@@ -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);
}
diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 7d00d4c..5187e3f 100644
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -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 {
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH for-next] RDMA/hns: Solve the problem that dma_pool is used during the reset
2021-06-11 9:30 [PATCH for-next] RDMA/hns: Solve the problem that dma_pool is used during the reset Weihang Li
@ 2021-06-11 9:33 ` liweihang
0 siblings, 0 replies; 2+ messages in thread
From: liweihang @ 2021-06-11 9:33 UTC (permalink / raw)
To: dledford, jgg; +Cc: leon, linux-rdma, Linuxarm, zhangjiaran, chenglang
On 2021/6/11 17:30, liweihang wrote:
> From: Jiaran Zhang <zhangjiaran@huawei.com>
>
> 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.
Sorry, I forgot to add fixes tag, will send v2 soon.
Weihang
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-11 9:33 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-11 9:30 [PATCH for-next] RDMA/hns: Solve the problem that dma_pool is used during the reset Weihang Li
2021-06-11 9:33 ` liweihang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.