2021-09-12 19:16:59

by Adrian Bunk

[permalink] [raw]
Subject: [PATCH] bnx2x: Fix enabling network interfaces without VFs

This function is called to enable SR-IOV when available,
not enabling interfaces without VFs was a regression.

Fixes: 65161c35554f ("bnx2x: Fix missing error code in bnx2x_iov_init_one()")
Signed-off-by: Adrian Bunk <[email protected]>
Reported-by: YunQiang Su <[email protected]>
Tested-by: YunQiang Su <[email protected]>
Cc: [email protected]
---
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index f255fd0b16db..6fbf735fca31 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -1224,7 +1224,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int int_mode_param,

/* SR-IOV capability was enabled but there are no VFs*/
if (iov->total == 0) {
- err = -EINVAL;
+ err = 0;
goto failed;
}

--
2.20.1


2021-09-13 08:16:15

by Shai Malin

[permalink] [raw]
Subject: RE: [PATCH] bnx2x: Fix enabling network interfaces without VFs

On 9/12/2021 at 10:08PM, Adrian Bunk Wrote:
> This function is called to enable SR-IOV when available,
> not enabling interfaces without VFs was a regression.
>
> Fixes: 65161c35554f ("bnx2x: Fix missing error code in bnx2x_iov_init_one()")
> Signed-off-by: Adrian Bunk <[email protected]>
> Reported-by: YunQiang Su <[email protected]>
> Tested-by: YunQiang Su <[email protected]>
> Cc: [email protected]
> ---
> drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> index f255fd0b16db..6fbf735fca31 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> @@ -1224,7 +1224,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int
> int_mode_param,
>
> /* SR-IOV capability was enabled but there are no VFs*/
> if (iov->total == 0) {
> - err = -EINVAL;
> + err = 0;
> goto failed;
> }

Thanks for reporting this issue!
But the complete fix should also not use "goto failed".
Instead, please create a new "goto skip_vfs" so it will skip
the log of "Failed err=".

>
> --
> 2.20.1

2021-09-13 11:31:40

by Shai Malin

[permalink] [raw]
Subject: RE: [PATCH] bnx2x: Fix enabling network interfaces without VFs


On 9/12/2021 at 1:42PM, Adrian Bunk Wrote:
> On Mon, Sep 13, 2021 at 08:14:33AM +0000, Shai Malin wrote:
> > On 9/12/2021 at 10:08PM, Adrian Bunk Wrote:
> > > This function is called to enable SR-IOV when available,
> > > not enabling interfaces without VFs was a regression.
> > >
> > > Fixes: 65161c35554f ("bnx2x: Fix missing error code in bnx2x_iov_init_one()")
> > > Signed-off-by: Adrian Bunk <[email protected]>
> > > Reported-by: YunQiang Su <[email protected]>
> > > Tested-by: YunQiang Su <[email protected]>
> > > Cc: [email protected]
> > > ---
> > > drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > > b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > > index f255fd0b16db..6fbf735fca31 100644
> > > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > > @@ -1224,7 +1224,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int
> > > int_mode_param,
> > >
> > > /* SR-IOV capability was enabled but there are no VFs*/
> > > if (iov->total == 0) {
> > > - err = -EINVAL;
> > > + err = 0;
> > > goto failed;
> > > }
> >
> > Thanks for reporting this issue!
> > But the complete fix should also not use "goto failed".
> > Instead, please create a new "goto skip_vfs" so it will skip
> > the log of "Failed err=".
>
> Is this really desirable?
> It is a debug print not enabled by default,
> and trying to enable SR-IOV did fail.

I agree.

Acked-by: Shai Malin <[email protected]>

>
> cu
> Adrian

2021-09-13 12:48:39

by Adrian Bunk

[permalink] [raw]
Subject: Re: [PATCH] bnx2x: Fix enabling network interfaces without VFs

On Mon, Sep 13, 2021 at 08:14:33AM +0000, Shai Malin wrote:
> On 9/12/2021 at 10:08PM, Adrian Bunk Wrote:
> > This function is called to enable SR-IOV when available,
> > not enabling interfaces without VFs was a regression.
> >
> > Fixes: 65161c35554f ("bnx2x: Fix missing error code in bnx2x_iov_init_one()")
> > Signed-off-by: Adrian Bunk <[email protected]>
> > Reported-by: YunQiang Su <[email protected]>
> > Tested-by: YunQiang Su <[email protected]>
> > Cc: [email protected]
> > ---
> > drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > index f255fd0b16db..6fbf735fca31 100644
> > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
> > @@ -1224,7 +1224,7 @@ int bnx2x_iov_init_one(struct bnx2x *bp, int
> > int_mode_param,
> >
> > /* SR-IOV capability was enabled but there are no VFs*/
> > if (iov->total == 0) {
> > - err = -EINVAL;
> > + err = 0;
> > goto failed;
> > }
>
> Thanks for reporting this issue!
> But the complete fix should also not use "goto failed".
> Instead, please create a new "goto skip_vfs" so it will skip
> the log of "Failed err=".

Is this really desirable?
It is a debug print not enabled by default,
and trying to enable SR-IOV did fail.

cu
Adrian

2021-09-15 02:30:38

by Jakub Kicinski

[permalink] [raw]
Subject: Re: [PATCH] bnx2x: Fix enabling network interfaces without VFs

On Mon, 13 Sep 2021 11:18:33 +0000 Shai Malin wrote:
> On 9/12/2021 at 1:42PM, Adrian Bunk Wrote:
> > On Mon, Sep 13, 2021 at 08:14:33AM +0000, Shai Malin wrote:
> > > Thanks for reporting this issue!
> > > But the complete fix should also not use "goto failed".
> > > Instead, please create a new "goto skip_vfs" so it will skip
> > > the log of "Failed err=".
> >
> > Is this really desirable?
> > It is a debug print not enabled by default,
> > and trying to enable SR-IOV did fail.
>
> I agree.
>
> Acked-by: Shai Malin <[email protected]>

Applied, thanks!