From: Catherine Sullivan <csully@google.com>
To: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Sagi Shahar <sagis@google.com>, Jon Olson <jonolson@google.com>,
David Miller <davem@davemloft.net>,
kuba@kernel.org, David Awogbemila <awogbemila@google.com>,
Willem de Bruijn <willemb@google.com>,
Yangchun Fu <yangchun@google.com>,
Bailey Forrest <bcf@google.com>, Kuo Zhao <kuozhao@google.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH net v2 2/2] gve: Propagate error codes to caller
Date: Thu, 1 Jul 2021 13:33:37 -0700 [thread overview]
Message-ID: <CAH_-1qwt9qjUhrs0nkvu6cg+0K26XR1on2pHf0Q7jLc2V46U7A@mail.gmail.com> (raw)
In-Reply-To: <2a1bcfa7f84f63ab2076175c6a5c0a5a181d3bcb.1625170569.git.christophe.jaillet@wanadoo.fr>
On Thu, Jul 1, 2021 at 1:18 PM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> If 'gve_probe()' fails, we should propagate the error code, instead of
> hard coding a -ENXIO value.
> Make sure that all error handling paths set a correct value for 'err'.
>
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Catherine Sullivan <csully@google.com>
> ---
> v2: Unchanged
> The previous serie had 3 patches. Now their are only 2
> ---
> drivers/net/ethernet/google/gve/gve_main.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/google/gve/gve_main.c b/drivers/net/ethernet/google/gve/gve_main.c
> index 44262c9f9ec2..c03984b26db4 100644
> --- a/drivers/net/ethernet/google/gve/gve_main.c
> +++ b/drivers/net/ethernet/google/gve/gve_main.c
> @@ -1469,7 +1469,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> err = pci_enable_device(pdev);
> if (err)
> - return -ENXIO;
> + return err;
>
> err = pci_request_regions(pdev, "gvnic-cfg");
> if (err)
> @@ -1512,6 +1512,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
> dev = alloc_etherdev_mqs(sizeof(*priv), max_tx_queues, max_rx_queues);
> if (!dev) {
> dev_err(&pdev->dev, "could not allocate netdev\n");
> + err = -ENOMEM;
> goto abort_with_db_bar;
> }
> SET_NETDEV_DEV(dev, &pdev->dev);
> @@ -1593,7 +1594,7 @@ static int gve_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
>
> abort_with_enabled:
> pci_disable_device(pdev);
> - return -ENXIO;
> + return err;
> }
>
> static void gve_remove(struct pci_dev *pdev)
> --
> 2.30.2
>
Thanks for the fix!
next prev parent reply other threads:[~2021-07-01 20:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-01 20:18 [PATCH net v2 1/2] gve: Fix an error handling path in 'gve_probe()' Christophe JAILLET
2021-07-01 20:18 ` [PATCH net v2 2/2] gve: Propagate error codes to caller Christophe JAILLET
2021-07-01 20:33 ` Catherine Sullivan [this message]
2021-07-01 20:30 ` [PATCH net v2 1/2] gve: Fix an error handling path in 'gve_probe()' Catherine Sullivan
2021-07-01 22:50 ` patchwork-bot+netdevbpf
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=CAH_-1qwt9qjUhrs0nkvu6cg+0K26XR1on2pHf0Q7jLc2V46U7A@mail.gmail.com \
--to=csully@google.com \
--cc=awogbemila@google.com \
--cc=bcf@google.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=davem@davemloft.net \
--cc=jonolson@google.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=kuba@kernel.org \
--cc=kuozhao@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sagis@google.com \
--cc=willemb@google.com \
--cc=yangchun@google.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).