From: Leon Romanovsky <leon@kernel.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Mike Marciniszyn <mike.marciniszyn@intel.com>,
Grzegorz Andrejczuk <grzegorz.andrejczuk@intel.com>,
Dennis Dalessandro <dennis.dalessandro@intel.com>,
Doug Ledford <dledford@redhat.com>,
Jason Gunthorpe <jgg@ziepe.ca>,
linux-rdma@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH v2] IB/hfi1: Fix hfi1_netdev_rx_init() error handling
Date: Sun, 31 May 2020 13:05:12 +0300 [thread overview]
Message-ID: <20200531100512.GH66309@unreal> (raw)
In-Reply-To: <20200530140224.GA1330098@mwanda>
On Sat, May 30, 2020 at 05:02:24PM +0300, Dan Carpenter wrote:
> The hfi1_vnic_up() function doesn't check whether hfi1_netdev_rx_init()
> returns errors. In hfi1_vnic_init() we need to change the code to
> preserve the error code instead of returning success.
>
> Fixes: 2280740f01ae ("IB/hfi1: Virtual Network Interface Controller (VNIC) HW support")
> Fixes: 4730f4a6c6b2 ("IB/hfi1: Activate the dummy netdev")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> v2: Add error handling in hfi1_vnic_up() and add second fixes tag
>
> drivers/infiniband/hw/hfi1/vnic_main.c | 11 +++++++++--
> 1 file changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/hw/hfi1/vnic_main.c b/drivers/infiniband/hw/hfi1/vnic_main.c
> index b183c56b7b6a4..03f8be8e9488e 100644
> --- a/drivers/infiniband/hw/hfi1/vnic_main.c
> +++ b/drivers/infiniband/hw/hfi1/vnic_main.c
> @@ -457,13 +457,19 @@ static int hfi1_vnic_up(struct hfi1_vnic_vport_info *vinfo)
> if (rc < 0)
> return rc;
>
> - hfi1_netdev_rx_init(dd);
> + rc = hfi1_netdev_rx_init(dd);
> + if (rc < 0)
> + goto err_remove;
Why did you check for the negative value here and didn't check below?
Thanks
>
> netif_carrier_on(netdev);
> netif_tx_start_all_queues(netdev);
> set_bit(HFI1_VNIC_UP, &vinfo->flags);
>
> return 0;
> +
> +err_remove:
> + hfi1_netdev_remove_data(dd, VNIC_ID(vinfo->vesw_id));
> + return rc;
> }
>
> static void hfi1_vnic_down(struct hfi1_vnic_vport_info *vinfo)
> @@ -512,7 +518,8 @@ static int hfi1_vnic_init(struct hfi1_vnic_vport_info *vinfo)
> goto txreq_fail;
> }
>
> - if (hfi1_netdev_rx_init(dd)) {
> + rc = hfi1_netdev_rx_init(dd);
> + if (rc) {
> dd_dev_err(dd, "Unable to initialize netdev contexts\n");
> goto alloc_fail;
> }
> --
> 2.26.2
>
next prev parent reply other threads:[~2020-05-31 10:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 10:03 [PATCH] IB/hfi1: Fix an error code in hfi1_vnic_init() Dan Carpenter
2020-05-29 13:34 ` Marciniszyn, Mike
2020-05-30 14:02 ` [PATCH v2] IB/hfi1: Fix hfi1_netdev_rx_init() error handling Dan Carpenter
2020-05-31 10:05 ` Leon Romanovsky [this message]
2020-05-31 17:36 ` Dan Carpenter
2020-06-01 4:24 ` Leon Romanovsky
2020-06-01 12:27 ` Jason Gunthorpe
2020-06-01 12:49 ` Wan, Kaike
2020-06-01 14:14 ` Jason Gunthorpe
2020-06-01 18:01 ` Dan Carpenter
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=20200531100512.GH66309@unreal \
--to=leon@kernel.org \
--cc=dan.carpenter@oracle.com \
--cc=dennis.dalessandro@intel.com \
--cc=dledford@redhat.com \
--cc=grzegorz.andrejczuk@intel.com \
--cc=jgg@ziepe.ca \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=mike.marciniszyn@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).