From: Haiyang Zhang <haiyangz@microsoft.com>
To: Dexuan Cui <decui@microsoft.com>,
"davem@davemloft.net" <davem@davemloft.net>,
"kuba@kernel.org" <kuba@kernel.org>,
"gustavoars@kernel.org" <gustavoars@kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>
Cc: KY Srinivasan <kys@microsoft.com>,
"stephen@networkplumber.org" <stephen@networkplumber.org>,
"wei.liu@kernel.org" <wei.liu@kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
Shachar Raindel <shacharr@microsoft.com>,
Paul Rosswurm <paulros@microsoft.com>,
"olaf@aepfle.de" <olaf@aepfle.de>, vkuznets <vkuznets@redhat.com>
Subject: RE: [PATCH net-next 3/4] net: mana: Improve the HWC error handling
Date: Sat, 30 Oct 2021 15:36:54 +0000 [thread overview]
Message-ID: <BN8PR21MB1284C84F87CF19FA60E52B71CA889@BN8PR21MB1284.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20211030005408.13932-4-decui@microsoft.com>
> -----Original Message-----
> From: Dexuan Cui <decui@microsoft.com>
> Sent: Friday, October 29, 2021 8:54 PM
> To: davem@davemloft.net; kuba@kernel.org; gustavoars@kernel.org; Haiyang
> Zhang <haiyangz@microsoft.com>; netdev@vger.kernel.org
> Cc: KY Srinivasan <kys@microsoft.com>; stephen@networkplumber.org;
> wei.liu@kernel.org; linux-kernel@vger.kernel.org; linux-
> hyperv@vger.kernel.org; Shachar Raindel <shacharr@microsoft.com>; Paul
> Rosswurm <paulros@microsoft.com>; olaf@aepfle.de; vkuznets
> <vkuznets@redhat.com>; Dexuan Cui <decui@microsoft.com>
> Subject: [PATCH net-next 3/4] net: mana: Improve the HWC error handling
>
> Currently when the HWC creation fails, the error handling is flawed, e.g.
> if mana_hwc_create_channel() -> mana_hwc_establish_channel() fails, the
> resources acquired in mana_hwc_init_queues() is not released.
>
> Enhance mana_hwc_destroy_channel() to do the proper cleanup work and
> call it accordingly.
>
> Signed-off-by: Dexuan Cui <decui@microsoft.com>
> ---
> .../net/ethernet/microsoft/mana/gdma_main.c | 4 --
> .../net/ethernet/microsoft/mana/hw_channel.c | 71 ++++++++-----------
> 2 files changed, 31 insertions(+), 44 deletions(-)
>
> diff --git a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> index 8a9ee2885f8c..599dfd5e6090 100644
> --- a/drivers/net/ethernet/microsoft/mana/gdma_main.c
> +++ b/drivers/net/ethernet/microsoft/mana/gdma_main.c
> @@ -1330,8 +1330,6 @@ static int mana_gd_probe(struct pci_dev *pdev,
> const struct pci_device_id *ent)
>
> clean_up_gdma:
> mana_hwc_destroy_channel(gc);
> - vfree(gc->cq_table);
> - gc->cq_table = NULL;
> remove_irq:
> mana_gd_remove_irqs(pdev);
> unmap_bar:
> @@ -1354,8 +1352,6 @@ static void mana_gd_remove(struct pci_dev *pdev)
> mana_remove(&gc->mana);
>
> mana_hwc_destroy_channel(gc);
> - vfree(gc->cq_table);
> - gc->cq_table = NULL;
>
> mana_gd_remove_irqs(pdev);
>
> diff --git a/drivers/net/ethernet/microsoft/mana/hw_channel.c
> b/drivers/net/ethernet/microsoft/mana/hw_channel.c
> index c1310ea1c216..851de2b81fa4 100644
> --- a/drivers/net/ethernet/microsoft/mana/hw_channel.c
> +++ b/drivers/net/ethernet/microsoft/mana/hw_channel.c
> @@ -309,9 +309,6 @@ static void mana_hwc_comp_event(void *ctx, struct
> gdma_queue *q_self)
>
> static void mana_hwc_destroy_cq(struct gdma_context *gc, struct hwc_cq
> *hwc_cq) {
> - if (!hwc_cq)
> - return;
> -
> kfree(hwc_cq->comp_buf);
>
> if (hwc_cq->gdma_cq)
> @@ -448,9 +445,6 @@ static void mana_hwc_dealloc_dma_buf(struct
> hw_channel_context *hwc, static void mana_hwc_destroy_wq(struct
> hw_channel_context *hwc,
> struct hwc_wq *hwc_wq)
> {
> - if (!hwc_wq)
> - return;
> -
> mana_hwc_dealloc_dma_buf(hwc, hwc_wq->msg_buf);
>
> if (hwc_wq->gdma_wq)
> @@ -623,6 +617,7 @@ static int mana_hwc_establish_channel(struct
> gdma_context *gc, u16 *q_depth,
> *max_req_msg_size = hwc->hwc_init_max_req_msg_size;
> *max_resp_msg_size = hwc->hwc_init_max_resp_msg_size;
>
> + /* Both were set in mana_hwc_init_event_handler(). */
> if (WARN_ON(cq->id >= gc->max_num_cqs))
> return -EPROTO;
>
> @@ -638,9 +633,6 @@ static int mana_hwc_establish_channel(struct
> gdma_context *gc, u16 *q_depth, static int mana_hwc_init_queues(struct
> hw_channel_context *hwc, u16 q_depth,
> u32 max_req_msg_size, u32 max_resp_msg_size) {
> - struct hwc_wq *hwc_rxq = NULL;
> - struct hwc_wq *hwc_txq = NULL;
> - struct hwc_cq *hwc_cq = NULL;
> int err;
>
> err = mana_hwc_init_inflight_msg(hwc, q_depth); @@ -653,44 +645,32
> @@ static int mana_hwc_init_queues(struct hw_channel_context *hwc, u16
> q_depth,
> err = mana_hwc_create_cq(hwc, q_depth * 2,
> mana_hwc_init_event_handler, hwc,
> mana_hwc_rx_event_handler, hwc,
> - mana_hwc_tx_event_handler, hwc, &hwc_cq);
> + mana_hwc_tx_event_handler, hwc, &hwc->cq);
> if (err) {
> dev_err(hwc->dev, "Failed to create HWC CQ: %d\n", err);
> goto out;
> }
> - hwc->cq = hwc_cq;
>
> err = mana_hwc_create_wq(hwc, GDMA_RQ, q_depth, max_req_msg_size,
> - hwc_cq, &hwc_rxq);
> + hwc->cq, &hwc->rxq);
> if (err) {
> dev_err(hwc->dev, "Failed to create HWC RQ: %d\n", err);
> goto out;
> }
> - hwc->rxq = hwc_rxq;
>
> err = mana_hwc_create_wq(hwc, GDMA_SQ, q_depth, max_resp_msg_size,
> - hwc_cq, &hwc_txq);
> + hwc->cq, &hwc->txq);
> if (err) {
> dev_err(hwc->dev, "Failed to create HWC SQ: %d\n", err);
> goto out;
> }
> - hwc->txq = hwc_txq;
>
> hwc->num_inflight_msg = q_depth;
> hwc->max_req_msg_size = max_req_msg_size;
>
> return 0;
> out:
> - if (hwc_txq)
> - mana_hwc_destroy_wq(hwc, hwc_txq);
> -
> - if (hwc_rxq)
> - mana_hwc_destroy_wq(hwc, hwc_rxq);
> -
> - if (hwc_cq)
> - mana_hwc_destroy_cq(hwc->gdma_dev->gdma_context, hwc_cq);
> -
> - mana_gd_free_res_map(&hwc->inflight_msg_res);
> + /* mana_hwc_create_channel() will do the cleanup.*/
> return err;
> }
>
> @@ -718,6 +698,9 @@ int mana_hwc_create_channel(struct gdma_context *gc)
> gd->pdid = INVALID_PDID;
> gd->doorbell = INVALID_DOORBELL;
>
> + /* mana_hwc_init_queues() only creates the required data structures,
> + * and doesn't touch the HWC device.
> + */
> err = mana_hwc_init_queues(hwc, HW_CHANNEL_VF_BOOTSTRAP_QUEUE_DEPTH,
> HW_CHANNEL_MAX_REQUEST_SIZE,
> HW_CHANNEL_MAX_RESPONSE_SIZE);
> @@ -743,42 +726,50 @@ int mana_hwc_create_channel(struct gdma_context
> *gc)
>
> return 0;
> out:
> - kfree(hwc);
> + mana_hwc_destroy_channel(gc);
> return err;
> }
>
> void mana_hwc_destroy_channel(struct gdma_context *gc) {
> struct hw_channel_context *hwc = gc->hwc.driver_data;
> - struct hwc_caller_ctx *ctx;
>
> - mana_smc_teardown_hwc(&gc->shm_channel, false);
> + if (!hwc)
> + return;
> +
> + /* gc->max_num_cqs is set in mana_hwc_init_event_handler(). If it's
> + * non-zero, the HWC worked and we should tear down the HWC here.
> + */
> + if (gc->max_num_cqs > 0) {
> + mana_smc_teardown_hwc(&gc->shm_channel, false);
> + gc->max_num_cqs = 0;
> + }
>
> - ctx = hwc->caller_ctx;
> - kfree(ctx);
> + kfree(hwc->caller_ctx);
> hwc->caller_ctx = NULL;
>
> - mana_hwc_destroy_wq(hwc, hwc->txq);
> - hwc->txq = NULL;
> + if (hwc->txq)
> + mana_hwc_destroy_wq(hwc, hwc->txq);
>
> - mana_hwc_destroy_wq(hwc, hwc->rxq);
> - hwc->rxq = NULL;
> + if (hwc->rxq)
> + mana_hwc_destroy_wq(hwc, hwc->rxq);
>
> - mana_hwc_destroy_cq(hwc->gdma_dev->gdma_context, hwc->cq);
> - hwc->cq = NULL;
> + if (hwc->cq)
> + mana_hwc_destroy_cq(hwc->gdma_dev->gdma_context, hwc->cq);
>
> mana_gd_free_res_map(&hwc->inflight_msg_res);
>
> hwc->num_inflight_msg = 0;
>
> - if (hwc->gdma_dev->pdid != INVALID_PDID) {
> - hwc->gdma_dev->doorbell = INVALID_DOORBELL;
> - hwc->gdma_dev->pdid = INVALID_PDID;
> - }
> + hwc->gdma_dev->doorbell = INVALID_DOORBELL;
> + hwc->gdma_dev->pdid = INVALID_PDID;
>
> kfree(hwc);
> gc->hwc.driver_data = NULL;
> gc->hwc.gdma_context = NULL;
> +
> + vfree(gc->cq_table);
> + gc->cq_table = NULL;
> }
>
> int mana_hwc_send_request(struct hw_channel_context *hwc, u32 req_len,
> --
> 2.17.1
Reviewed-by: Haiyang Zhang <haiyangz@microsoft.com>
next prev parent reply other threads:[~2021-10-30 15:36 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-30 0:54 [PATCH net-next 0/4] net: mana: some misc patches Dexuan Cui
2021-10-30 0:54 ` [PATCH net-next 1/4] net: mana: Fix the netdev_err()'s vPort argument in mana_init_port() Dexuan Cui
2021-10-30 15:30 ` Haiyang Zhang
2021-10-30 20:07 ` Stephen Hemminger
2021-11-01 5:59 ` Dexuan Cui
2021-10-30 0:54 ` [PATCH net-next 2/4] net: mana: Report OS info to the PF driver Dexuan Cui
2021-10-30 15:35 ` Haiyang Zhang
2021-11-01 6:07 ` Dexuan Cui
2021-10-30 0:54 ` [PATCH net-next 3/4] net: mana: Improve the HWC error handling Dexuan Cui
2021-10-30 15:36 ` Haiyang Zhang [this message]
2021-10-30 0:54 ` [PATCH net-next 4/4] net: mana: Support hibernation and kexec Dexuan Cui
2021-10-30 15:54 ` Haiyang Zhang
2021-11-01 7:03 ` Dexuan Cui
2021-11-01 15:12 ` Haiyang Zhang
2021-11-01 16:41 ` Dexuan Cui
2021-11-01 13:30 ` [PATCH net-next 0/4] net: mana: some misc patches patchwork-bot+netdevbpf
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=BN8PR21MB1284C84F87CF19FA60E52B71CA889@BN8PR21MB1284.namprd21.prod.outlook.com \
--to=haiyangz@microsoft.com \
--cc=davem@davemloft.net \
--cc=decui@microsoft.com \
--cc=gustavoars@kernel.org \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=olaf@aepfle.de \
--cc=paulros@microsoft.com \
--cc=shacharr@microsoft.com \
--cc=stephen@networkplumber.org \
--cc=vkuznets@redhat.com \
--cc=wei.liu@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).