From: "Pei, Andy" <andy.pei@intel.com>
To: Taekyung Kim <kim.tae.kyung@navercorp.com>,
"dev@dpdk.org" <dev@dpdk.org>
Cc: "Xia, Chenbo" <chenbo.xia@intel.com>,
"maxime.coquelin@redhat.com" <maxime.coquelin@redhat.com>,
"stable@dpdk.org" <stable@dpdk.org>,
"Wang, Xiao W" <xiao.w.wang@intel.com>
Subject: RE: [PATCH v4] vdpa/ifc: fix update_datapath error handling
Date: Wed, 9 Nov 2022 02:39:09 +0000 [thread overview]
Message-ID: <DM5PR11MB1739731485795A5FE49A58618F3E9@DM5PR11MB1739.namprd11.prod.outlook.com> (raw)
In-Reply-To: <20221108085624.53989-1-kim.tae.kyung@navercorp.com>
> -----Original Message-----
> From: Taekyung Kim <kim.tae.kyung@navercorp.com>
> Sent: Tuesday, November 8, 2022 4:56 PM
> To: dev@dpdk.org
> Cc: Xia, Chenbo <Chenbo.Xia@intel.com>; Pei, Andy <andy.pei@intel.com>;
> kim.tae.kyung@navercorp.com; maxime.coquelin@redhat.com;
> stable@dpdk.org; Wang, Xiao W <xiao.w.wang@intel.com>
> Subject: [PATCH v4] vdpa/ifc: fix update_datapath error handling
>
> Stop and return the error code when 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.
>
> Fixes: a3f8150eac6d ("net/ifcvf: add ifcvf vDPA driver")
> Cc: stable@dpdk.org
>
> Signed-off-by: Taekyung Kim <kim.tae.kyung@navercorp.com>
> ---
> v4:
> * Add rte_vdpa_unregister_device in ifcvf_pci_probe
>
> v3:
> * Fix coding style
>
> v2:
> * Revert the prepared resources before returning an error
> * Rebase to 22.11 rc2
> * Add fixes and cc for backport
>
> ---
> drivers/vdpa/ifc/ifcvf_vdpa.c | 27 +++++++++++++++++++++++----
> 1 file changed, 23 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c index
> 8dfd49336e..49d68ad1b1 100644
> --- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> @@ -1098,7 +1098,12 @@ 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 for vDPA device %s",
> + vdev->device->name);
> + rte_atomic32_set(&internal->dev_attached, 0);
> + return -1;
> + }
>
> hw = &internal->hw;
> for (i = 0; i < hw->nr_vring; i++) {
> @@ -1146,7 +1151,12 @@ 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 for vDPA
> device %s",
> + vdev->device->name);
> + internal->configured = 0;
> + return -1;
> + }
> }
>
> internal->configured = 0;
> @@ -1752,7 +1762,15 @@ ifcvf_pci_probe(struct rte_pci_driver *pci_drv
> __rte_unused,
> }
>
> 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);
> + rte_atomic32_set(&internal->started, 0);
> + rte_vdpa_unregister_device(internal->vdev);
> + pthread_mutex_lock(&internal_list_lock);
> + TAILQ_REMOVE(&internal_list, list, next);
> + pthread_mutex_unlock(&internal_list_lock);
> + goto error;
> + }
>
> rte_kvargs_free(kvlist);
> return 0;
> @@ -1781,7 +1799,8 @@ 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);
>
> rte_pci_unmap_device(internal->pdev);
> rte_vfio_container_destroy(internal->vfio_container_fd);
> --
> 2.34.1
Acked-by: Andy Pei <andy.pei@intel.com>
next prev parent reply other threads:[~2022-11-09 2:39 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <68eacb2c-4004-1f43-f14c-702bcec9fe6f@redhat.com>
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 [this message]
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
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=DM5PR11MB1739731485795A5FE49A58618F3E9@DM5PR11MB1739.namprd11.prod.outlook.com \
--to=andy.pei@intel.com \
--cc=chenbo.xia@intel.com \
--cc=dev@dpdk.org \
--cc=kim.tae.kyung@navercorp.com \
--cc=maxime.coquelin@redhat.com \
--cc=stable@dpdk.org \
--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).