Hi Andy,
Thanks for your review.
On Wed, Nov 09, 2022 at 02:39:09AM +0000, Pei, Andy wrote:
>
>
> > -----Original Message-----
> > From: Taekyung Kim <kim.tae.ky...@navercorp.com>
> > Sent: Tuesday, November 8, 2022 4:56 PM
> > To: dev@dpdk.org
> > Cc: Xia, Chenbo <chenbo....@intel.com>; Pei, Andy <andy....@intel.com>;
> > kim.tae.ky...@navercorp.com; maxime.coque...@redhat.com;
> > sta...@dpdk.org; Wang, Xiao W <xiao.w.w...@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: sta...@dpdk.org
> >
> > Signed-off-by: Taekyung Kim <kim.tae.ky...@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....@intel.com>
