From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: Taekyung Kim <kim.tae.kyung@navercorp.com>,
dev@dpdk.org, Chenbo Xia <chenbo.xia@intel.com>,
Xiao Wang <xiao.w.wang@intel.com>
Subject: Re: [PATCH] vdpa/ifc: fix update_datapath error handling
Date: Wed, 2 Nov 2022 10:12:47 +0100 [thread overview]
Message-ID: <68eacb2c-4004-1f43-f14c-702bcec9fe6f@redhat.com> (raw)
In-Reply-To: <20221018072240.128791-1-kim.tae.kyung@navercorp.com>
Hi,
On 10/18/22 09:22, Taekyung Kim wrote:
> Stop and return the error code if update_datapath fails.
> update_datapath prepares resources for the vdpa device.
> The driver should not perform any further actions
> if update_datapath returns an error.
You need to add Fixes tag and Cc stable@dpdk.org, so that it is
backported to relevant LTS branches.
>
> Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
> ---
> drivers/vdpa/ifc/ifcvf_vdpa.c | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
> index d5ac583589..795967e998 100644
> --- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> @@ -1063,7 +1063,10 @@ ifcvf_dev_config(int vid)
> internal = list->internal;
> internal->vid = vid;
> rte_atomic32_set(&internal->dev_attached, 1);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %p", vdev);
> + return -1;
> + }
>
> if (rte_vhost_host_notifier_ctrl(vid, RTE_VHOST_QUEUE_ALL, true) != 0)
> DRV_LOG(NOTICE, "vDPA (%s): software relay is used.",
> @@ -1105,7 +1108,10 @@ ifcvf_dev_close(int vid)
> internal->sw_fallback_running = false;
> } else {
> rte_atomic32_set(&internal->dev_attached, 0);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %p", vdev);
> + return -1;
> + }
> }
>
> internal->configured = 0;
> @@ -1632,7 +1638,10 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
> pthread_mutex_unlock(&internal_list_lock);
>
> rte_atomic32_set(&internal->started, 1);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
> + return -1;
> + }
This is not enough, you need to free resources allocated before,
otherwise you introduce memory leaks.
Basically, you should goto error instead o directly returning -1.
>
> rte_kvargs_free(kvlist);
> return 0;
> @@ -1661,7 +1670,10 @@ ifcvf_pci_remove(struct rte_pci_device *pci_dev)
>
> internal = list->internal;
> rte_atomic32_set(&internal->started, 0);
> - update_datapath(internal);
> + if (update_datapath(internal) < 0) {
> + DRV_LOG(ERR, "failed to update datapath: %s", pci_dev->name);
> + return -1;
> + }
I think we should not return early here, because we still want to clean
as much as possible on remove. maybe just keep the error message.
> rte_pci_unmap_device(internal->pdev);
> rte_vfio_container_destroy(internal->vfio_container_fd);
Thanks,
Maxime
next prev parent reply other threads:[~2022-11-02 9:12 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 7:22 Taekyung Kim
2022-11-02 9:12 ` Maxime Coquelin [this message]
2022-11-07 5:34 ` [PATCH v2] " Taekyung Kim
2022-11-07 8:59 ` [PATCH v3] " Taekyung Kim
2022-11-08 1:46 ` Xia, Chenbo
2022-11-08 7:30 ` Taekyung Kim
2022-11-08 7:39 ` Pei, Andy
2022-11-08 7:56 ` Xia, Chenbo
2022-11-08 8:27 ` Taekyung Kim
2022-11-08 8:56 ` [PATCH v4] " Taekyung Kim
2022-11-08 13:49 ` Maxime Coquelin
2022-11-09 10:45 ` Taekyung Kim
2022-11-09 2:39 ` Pei, Andy
2022-11-09 10:47 ` Taekyung Kim
2022-11-10 1:53 ` Xia, Chenbo
2022-11-10 4:02 ` Taekyung Kim
2022-11-10 9:20 ` Maxime Coquelin
2022-11-10 9:34 ` Ali Alnubani
2022-11-10 9:38 ` David Marchand
2022-11-10 9:45 ` Taekyung Kim
2022-11-10 9:42 ` Maxime Coquelin
2022-11-10 4:09 ` [PATCH v5] " Taekyung Kim
2022-11-10 6:12 ` Xia, Chenbo
2022-11-10 7:02 ` Xia, Chenbo
-- strict thread matches above, loose matches on Subject: below --
2022-10-18 1:45 [PATCH] vdpa/ifc: fix update datapath " Taekyung Kim
2022-10-14 13:18 [PATCH] vdpa/ifc: fix update_datapath " Taekyung Kim
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=68eacb2c-4004-1f43-f14c-702bcec9fe6f@redhat.com \
--to=maxime.coquelin@redhat.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=kim.tae.kyung@navercorp.com \
--cc=xiao.w.wang@intel.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;
as well as URLs for NNTP newsgroup(s).