From: Leon Romanovsky <leon@kernel.org>
To: Weihang Li <liweihang@huawei.com>
Cc: dledford@redhat.com, jgg@nvidia.com, linux-rdma@vger.kernel.org,
linuxarm@huawei.com, Jiaran Zhang <zhangjiaran@huawei.com>,
Lang Cheng <chenglang@huawei.com>
Subject: Re: [PATCH RESEND for-next] RDMA/hns: Solve the problem that dma_pool is used during the reset
Date: Sat, 12 Jun 2021 10:00:46 +0300 [thread overview]
Message-ID: <YMRbnjyO0VxhYojL@unreal> (raw)
In-Reply-To: <1623404156-50317-1-git-send-email-liweihang@huawei.com>
On Fri, Jun 11, 2021 at 05:35:56PM +0800, Weihang Li 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.
>
> Fixes: 9a4435375cd1 ("IB/hns: Add driver files for hns RoCE driver")
> 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);
> }
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
>
> @@ -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
>
next prev parent reply other threads:[~2021-06-12 7:00 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 9:35 [PATCH RESEND for-next] RDMA/hns: Solve the problem that dma_pool is used during the reset Weihang Li
2021-06-12 7:00 ` Leon Romanovsky [this message]
2021-06-22 7:42 ` liweihang
2021-06-21 23:24 ` Jason Gunthorpe
2021-06-22 7:43 ` liweihang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YMRbnjyO0VxhYojL@unreal \
--to=leon@kernel.org \
--cc=chenglang@huawei.com \
--cc=dledford@redhat.com \
--cc=jgg@nvidia.com \
--cc=linux-rdma@vger.kernel.org \
--cc=linuxarm@huawei.com \
--cc=liweihang@huawei.com \
--cc=zhangjiaran@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox