From: Jason Wang <jasowang@redhat.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: mst <mst@redhat.com>, Wu Zongyong <wuzongyong@linux.alibaba.com>,
Arnd Bergmann <arnd@arndb.de>,
virtualization <virtualization@lists.linux-foundation.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 1/2] eni_vdpa: Fix an error handling path in 'eni_vdpa_probe()'
Date: Mon, 8 Nov 2021 13:55:30 +0800 [thread overview]
Message-ID: <CACGkMEvN0cgFQhJmLF3xDXHt_EyZ-TnfBM8CnpNwA9sKcwpzBg@mail.gmail.com> (raw)
In-Reply-To: <f6b2d087ca3840604b4e711a208d35b5d6285cb4.1636301587.git.christophe.jaillet@wanadoo.fr>
On Mon, Nov 8, 2021 at 12:15 AM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> In the error handling path, a successful 'vp_legacy_probe()' should be
> balanced by a corresponding 'vp_legacy_remove()' call, as already done in
> the remove function.
>
> Add the missing call and update gotos accordingly.
>
> Fixes: e85087beedca ("eni_vdpa: add vDPA driver for Alibaba ENI")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
> 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 3f788794571a..12b3db6b4517 100644
> --- a/drivers/vdpa/alibaba/eni_vdpa.c
> +++ b/drivers/vdpa/alibaba/eni_vdpa.c
> @@ -501,7 +501,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++) {
> @@ -513,11 +513,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);
Won't vp_legacy_remove() be triggered by the put_devic() below?
Thanks
> err:
> put_device(&eni_vdpa->vdpa.dev);
> return ret;
> --
> 2.30.2
>
next prev parent reply other threads:[~2021-11-08 5:55 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-07 16:14 [PATCH 1/2] eni_vdpa: Fix an error handling path in 'eni_vdpa_probe()' Christophe JAILLET
2021-11-07 16:14 ` [PATCH 2/2] eni_vdpa: Simplify 'eni_vdpa_probe()' Christophe JAILLET
2021-11-09 2:56 ` Jason Wang
2021-11-08 5:55 ` Jason Wang [this message]
2021-11-08 19:32 ` [PATCH 1/2] eni_vdpa: Fix an error handling path in 'eni_vdpa_probe()' Christophe JAILLET
2021-11-09 2:54 ` Jason Wang
2021-11-09 21:21 ` Christophe JAILLET
2021-11-24 23:58 ` Michael S. Tsirkin
2021-11-25 6:34 ` Christophe JAILLET
2021-11-25 7:02 ` Michael S. Tsirkin
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=CACGkMEvN0cgFQhJmLF3xDXHt_EyZ-TnfBM8CnpNwA9sKcwpzBg@mail.gmail.com \
--to=jasowang@redhat.com \
--cc=arnd@arndb.de \
--cc=christophe.jaillet@wanadoo.fr \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=virtualization@lists.linux-foundation.org \
--cc=wuzongyong@linux.alibaba.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).