2022-10-20 19:44:33

by Christophe JAILLET

Subject: [PATCH] vdpa: Fix an error handling path in eni_vdpa_probe()

After a successful vp_legacy_probe() call, vp_legacy_remove() should be
called in the error handling path, as already done in the remove function.

Add the missing call.

Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI")
Signed-off-by: Christophe JAILLET <[email protected]>
---
drivers/vdpa/alibaba/eni_vdpa.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c
index 5a09a09cca70..cce3d1837104 100644
--- a/drivers/vdpa/alibaba/eni_vdpa.c
+++ b/drivers/vdpa/alibaba/eni_vdpa.c
@@ -497,7 +497,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
if (!eni_vdpa->vring) {
ret = -ENOMEM;
ENI_ERR(pdev, "failed to allocate virtqueues\n");
- goto err;
+ goto err_remove_vp_legacy;
}

for (i = 0; i < eni_vdpa->queues; i++) {
@@ -509,11 +509,13 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
ret = vdpa_register_device(&eni_vdpa->vdpa, eni_vdpa->queues);
if (ret) {
ENI_ERR(pdev, "failed to register to vdpa bus\n");
- goto err;
+ goto err_remove_vp_legacy;
}

return 0;

+err_remove_vp_legacy:
+ vp_legacy_remove(&eni_vdpa->ldev);
err:
put_device(&eni_vdpa->vdpa.dev);
return ret;
--
2.34.1

2023-12-07 21:14:10

by Christophe JAILLET

Subject: Re: [PATCH] vdpa: Fix an error handling path in eni_vdpa_probe()

Le 20/10/2022 à 21:21, Christophe JAILLET a écrit :
> After a successful vp_legacy_probe() call, vp_legacy_remove() should be
> called in the error handling path, as already done in the remove function.
>
> Add the missing call.
>
> Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI")
> Signed-off-by: Christophe JAILLET <[email protected]>
> ---
> drivers/vdpa/alibaba/eni_vdpa.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c
> index 5a09a09cca70..cce3d1837104 100644
> --- a/drivers/vdpa/alibaba/eni_vdpa.c
> +++ b/drivers/vdpa/alibaba/eni_vdpa.c
> @@ -497,7 +497,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> if (!eni_vdpa->vring) {
> ret = -ENOMEM;
> ENI_ERR(pdev, "failed to allocate virtqueues\n");
> - goto err;
> + goto err_remove_vp_legacy;
> }
>
> for (i = 0; i < eni_vdpa->queues; i++) {
> @@ -509,11 +509,13 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> ret = vdpa_register_device(&eni_vdpa->vdpa, eni_vdpa->queues);
> if (ret) {
> ENI_ERR(pdev, "failed to register to vdpa bus\n");
> - goto err;
> + goto err_remove_vp_legacy;
> }
>
> return 0;
>
> +err_remove_vp_legacy:
> + vp_legacy_remove(&eni_vdpa->ldev);
> err:
> put_device(&eni_vdpa->vdpa.dev);
> return ret;

Polite reminder on a (very) old patch.

CJ

2023-12-08 11:36:15

by Michael S. Tsirkin

Subject: Re: [PATCH] vdpa: Fix an error handling path in eni_vdpa_probe()

On Thu, Dec 07, 2023 at 10:13:51PM +0100, Christophe JAILLET wrote:
> Le 20/10/2022 ? 21:21, Christophe JAILLET a ?crit?:
> > After a successful vp_legacy_probe() call, vp_legacy_remove() should be
> > called in the error handling path, as already done in the remove function.
> >
> > Add the missing call.
> >
> > Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI")
> > Signed-off-by: Christophe JAILLET <[email protected]>
> > ---
> > drivers/vdpa/alibaba/eni_vdpa.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c
> > index 5a09a09cca70..cce3d1837104 100644
> > --- a/drivers/vdpa/alibaba/eni_vdpa.c
> > +++ b/drivers/vdpa/alibaba/eni_vdpa.c
> > @@ -497,7 +497,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > if (!eni_vdpa->vring) {
> > ret = -ENOMEM;
> > ENI_ERR(pdev, "failed to allocate virtqueues\n");
> > - goto err;
> > + goto err_remove_vp_legacy;
> > }
> > for (i = 0; i < eni_vdpa->queues; i++) {
> > @@ -509,11 +509,13 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > ret = vdpa_register_device(&eni_vdpa->vdpa, eni_vdpa->queues);
> > if (ret) {
> > ENI_ERR(pdev, "failed to register to vdpa bus\n");
> > - goto err;
> > + goto err_remove_vp_legacy;
> > }
> > return 0;
> > +err_remove_vp_legacy:
> > + vp_legacy_remove(&eni_vdpa->ldev);
> > err:
> > put_device(&eni_vdpa->vdpa.dev);
> > return ret;
>
> Polite reminder on a (very) old patch.
>
> CJ


Tagged now, thanks!

2023-12-20 04:02:24

by Jason Wang

Subject: Re: [PATCH] vdpa: Fix an error handling path in eni_vdpa_probe()

On Fri, Dec 8, 2023 at 5:14 AM Christophe JAILLET
<[email protected]> wrote:
>
> Le 20/10/2022 à 21:21, Christophe JAILLET a écrit :
> > After a successful vp_legacy_probe() call, vp_legacy_remove() should be
> > called in the error handling path, as already done in the remove function.
> >
> > Add the missing call.
> >
> > Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI")
> > Signed-off-by: Christophe JAILLET <[email protected]>
> > ---
> > drivers/vdpa/alibaba/eni_vdpa.c | 6 ++++--
> > 1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/vdpa/alibaba/eni_vdpa.c b/drivers/vdpa/alibaba/eni_vdpa.c
> > index 5a09a09cca70..cce3d1837104 100644
> > --- a/drivers/vdpa/alibaba/eni_vdpa.c
> > +++ b/drivers/vdpa/alibaba/eni_vdpa.c
> > @@ -497,7 +497,7 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > if (!eni_vdpa->vring) {
> > ret = -ENOMEM;
> > ENI_ERR(pdev, "failed to allocate virtqueues\n");
> > - goto err;
> > + goto err_remove_vp_legacy;
> > }
> >
> > for (i = 0; i < eni_vdpa->queues; i++) {
> > @@ -509,11 +509,13 @@ static int eni_vdpa_probe(struct pci_dev *pdev, const struct pci_device_id *id)
> > ret = vdpa_register_device(&eni_vdpa->vdpa, eni_vdpa->queues);
> > if (ret) {
> > ENI_ERR(pdev, "failed to register to vdpa bus\n");
> > - goto err;
> > + goto err_remove_vp_legacy;
> > }
> >
> > return 0;
> >
> > +err_remove_vp_legacy:
> > + vp_legacy_remove(&eni_vdpa->ldev);
> > err:
> > put_device(&eni_vdpa->vdpa.dev);
> > return ret;
>
> Polite reminder on a (very) old patch.

Acked-by: Jason Wang <[email protected]>

Thanks

>
> CJ
>