diff mbox series

[net-next] net/mlx5: Fix some error messages

Message ID YIKywXhusLj4cDFM@mwanda (mailing list archive)
State Not Applicable
Headers show
Series [net-next] net/mlx5: Fix some error messages | expand

Commit Message

Dan Carpenter April 23, 2021, 11:42 a.m. UTC
This code was using IS_ERR() instead of PTR_ERR() so it prints 1 instead
of the correct error code.

Fixes: 25cb31768042 ("net/mlx5: E-Switch, Improve error messages in term table creation")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 .../mellanox/mlx5/core/eswitch_offloads_termtbl.c    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

Comments

Leon Romanovsky April 25, 2021, 6:39 a.m. UTC | #1
On Fri, Apr 23, 2021 at 02:42:57PM +0300, Dan Carpenter wrote:
> This code was using IS_ERR() instead of PTR_ERR() so it prints 1 instead
> of the correct error code.
> 
> Fixes: 25cb31768042 ("net/mlx5: E-Switch, Improve error messages in term table creation")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
>  .../mellanox/mlx5/core/eswitch_offloads_termtbl.c    | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
>

It should go through netdev@.

Thanks,
Reviewed-by: Leon Romanovsky <leonro@nvidia.com> 


> diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
> index a81ece94f599..95f5c1a27718 100644
> --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
> +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
> @@ -83,16 +83,16 @@ mlx5_eswitch_termtbl_create(struct mlx5_core_dev *dev,
>  	ft_attr.autogroup.max_num_groups = 1;
>  	tt->termtbl = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
>  	if (IS_ERR(tt->termtbl)) {
> -		esw_warn(dev, "Failed to create termination table (error %d)\n",
> -			 IS_ERR(tt->termtbl));
> +		esw_warn(dev, "Failed to create termination table (error %ld)\n",
> +			 PTR_ERR(tt->termtbl));
>  		return -EOPNOTSUPP;
>  	}
>  
>  	tt->rule = mlx5_add_flow_rules(tt->termtbl, NULL, flow_act,
>  				       &tt->dest, 1);
>  	if (IS_ERR(tt->rule)) {
> -		esw_warn(dev, "Failed to create termination table rule (error %d)\n",
> -			 IS_ERR(tt->rule));
> +		esw_warn(dev, "Failed to create termination table rule (error %ld)\n",
> +			 PTR_ERR(tt->rule));
>  		goto add_flow_err;
>  	}
>  	return 0;
> @@ -283,8 +283,8 @@ mlx5_eswitch_add_termtbl_rule(struct mlx5_eswitch *esw,
>  		tt = mlx5_eswitch_termtbl_get_create(esw, &term_tbl_act,
>  						     &dest[i], attr);
>  		if (IS_ERR(tt)) {
> -			esw_warn(esw->dev, "Failed to get termination table (error %d)\n",
> -				 IS_ERR(tt));
> +			esw_warn(esw->dev, "Failed to get termination table (error %ld)\n",
> +				 PTR_ERR(tt));
>  			goto revert_changes;
>  		}
>  		attr->dests[num_vport_dests].termtbl = tt;
> -- 
> 2.30.2
>
Jakub Kicinski April 26, 2021, 4:33 p.m. UTC | #2
On Sun, 25 Apr 2021 09:39:29 +0300 Leon Romanovsky wrote:
> > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
> > index a81ece94f599..95f5c1a27718 100644
> > --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
> > +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
> > @@ -83,16 +83,16 @@ mlx5_eswitch_termtbl_create(struct mlx5_core_dev *dev,
> >  	ft_attr.autogroup.max_num_groups = 1;
> >  	tt->termtbl = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
> >  	if (IS_ERR(tt->termtbl)) {
> > -		esw_warn(dev, "Failed to create termination table (error %d)\n",
> > -			 IS_ERR(tt->termtbl));
> > +		esw_warn(dev, "Failed to create termination table (error %ld)\n",
> > +			 PTR_ERR(tt->termtbl));

If these are error pointers - perhaps %pe?
Saeed Mahameed April 26, 2021, 6:47 p.m. UTC | #3
On Mon, 2021-04-26 at 09:33 -0700, Jakub Kicinski wrote:
> On Sun, 25 Apr 2021 09:39:29 +0300 Leon Romanovsky wrote:
> > > diff --git
> > > a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > l.c
> > > b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > l.c
> > > index a81ece94f599..95f5c1a27718 100644
> > > ---
> > > a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > l.c
> > > +++
> > > b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > l.c
> > > @@ -83,16 +83,16 @@ mlx5_eswitch_termtbl_create(struct
> > > mlx5_core_dev *dev,
> > >         ft_attr.autogroup.max_num_groups = 1;
> > >         tt->termtbl =
> > > mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
> > >         if (IS_ERR(tt->termtbl)) {
> > > -               esw_warn(dev, "Failed to create termination table
> > > (error %d)\n",
> > > -                        IS_ERR(tt->termtbl));
> > > +               esw_warn(dev, "Failed to create termination table
> > > (error %ld)\n",
> > > +                        PTR_ERR(tt->termtbl));
> 
> If these are error pointers - perhaps %pe?

no reason to use %pe, we know it is an err ptr at this point so just
report PTR_ERR()
Leon Romanovsky April 27, 2021, 5:08 a.m. UTC | #4
On Mon, Apr 26, 2021 at 11:47:03AM -0700, Saeed Mahameed wrote:
> On Mon, 2021-04-26 at 09:33 -0700, Jakub Kicinski wrote:
> > On Sun, 25 Apr 2021 09:39:29 +0300 Leon Romanovsky wrote:
> > > > diff --git
> > > > a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > > l.c
> > > > b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > > l.c
> > > > index a81ece94f599..95f5c1a27718 100644
> > > > ---
> > > > a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > > l.c
> > > > +++
> > > > b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtb
> > > > l.c
> > > > @@ -83,16 +83,16 @@ mlx5_eswitch_termtbl_create(struct
> > > > mlx5_core_dev *dev,
> > > >         ft_attr.autogroup.max_num_groups = 1;
> > > >         tt->termtbl =
> > > > mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
> > > >         if (IS_ERR(tt->termtbl)) {
> > > > -               esw_warn(dev, "Failed to create termination table
> > > > (error %d)\n",
> > > > -                        IS_ERR(tt->termtbl));
> > > > +               esw_warn(dev, "Failed to create termination table
> > > > (error %ld)\n",
> > > > +                        PTR_ERR(tt->termtbl));
> > 
> > If these are error pointers - perhaps %pe?
> 
> no reason to use %pe, we know it is an err ptr at this point so just
> report PTR_ERR() 

Saeed,

%pe prints string "-EINVAL" instead of "22", which is better.

I didn't know about such format specifier.

Thanks
diff mbox series

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
index a81ece94f599..95f5c1a27718 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
@@ -83,16 +83,16 @@  mlx5_eswitch_termtbl_create(struct mlx5_core_dev *dev,
 	ft_attr.autogroup.max_num_groups = 1;
 	tt->termtbl = mlx5_create_auto_grouped_flow_table(root_ns, &ft_attr);
 	if (IS_ERR(tt->termtbl)) {
-		esw_warn(dev, "Failed to create termination table (error %d)\n",
-			 IS_ERR(tt->termtbl));
+		esw_warn(dev, "Failed to create termination table (error %ld)\n",
+			 PTR_ERR(tt->termtbl));
 		return -EOPNOTSUPP;
 	}
 
 	tt->rule = mlx5_add_flow_rules(tt->termtbl, NULL, flow_act,
 				       &tt->dest, 1);
 	if (IS_ERR(tt->rule)) {
-		esw_warn(dev, "Failed to create termination table rule (error %d)\n",
-			 IS_ERR(tt->rule));
+		esw_warn(dev, "Failed to create termination table rule (error %ld)\n",
+			 PTR_ERR(tt->rule));
 		goto add_flow_err;
 	}
 	return 0;
@@ -283,8 +283,8 @@  mlx5_eswitch_add_termtbl_rule(struct mlx5_eswitch *esw,
 		tt = mlx5_eswitch_termtbl_get_create(esw, &term_tbl_act,
 						     &dest[i], attr);
 		if (IS_ERR(tt)) {
-			esw_warn(esw->dev, "Failed to get termination table (error %d)\n",
-				 IS_ERR(tt));
+			esw_warn(esw->dev, "Failed to get termination table (error %ld)\n",
+				 PTR_ERR(tt));
 			goto revert_changes;
 		}
 		attr->dests[num_vport_dests].termtbl = tt;