[PATCH] net/mlx4: Handle return codes in mlx4_qp_attach_common

[PATCH] net/mlx4: Handle return codes in mlx4_qp_attach_common

[Robb Manes]

Both new_steering_entry() and existing_steering_entry() return values
based on their success or failure, but currently they fall through
silently.  This can make troubleshooting difficult, as we were unable
to tell which one of these two functions returned errors or
specifically what code was returned.  This patch remedies that
situation by passing the return codes to err, which is returned by
mlx4_qp_attach_common() itself.

This also addresses a leak in the call to mlx4_bitmap_free() as well.

Signed-off-by: Robb Manes <rmanes@redhat.com>
---
 drivers/net/ethernet/mellanox/mlx4/mcg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c
b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index bd9ea0d..1d4e2e0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -1184,10 +1184,11 @@ out:
     if (prot == MLX4_PROT_ETH) {
         /* manage the steering entry for promisc mode */
         if (new_entry)
-            new_steering_entry(dev, port, steer, index, qp->qpn);
+            err = new_steering_entry(dev, port, steer,
+                         index, qp->qpn);
         else
-            existing_steering_entry(dev, port, steer,
-                        index, qp->qpn);
+            err = existing_steering_entry(dev, port, steer,
+                              index, qp->qpn);
     }
     if (err && link && index != -1) {
         if (index < dev->caps.num_mgms)
-- 
2.4.3

Re: [PATCH] net/mlx4: Handle return codes in mlx4_qp_attach_common

[Or Gerlitz]

On Fri, Sep 25, 2015 at 5:39 PM, Robb Manes <rmanes@redhat.com> wrote:
> Both new_steering_entry() and existing_steering_entry() return values
> based on their success or failure, but currently they fall through
> silently.  This can make troubleshooting difficult, as we were unable
> to tell which one of these two functions returned errors or
> specifically what code was returned.  This patch remedies that
> situation by passing the return codes to err, which is returned by
> mlx4_qp_attach_common() itself.
>
> This also addresses a leak in the call to mlx4_bitmap_free() as well.
>
> Signed-off-by: Robb Manes <rmanes@redhat.com>

looks correct.

Acked-by: Or Gerlitz <ogerlitz@mellanox.com>

Re: [PATCH] net/mlx4: Handle return codes in mlx4_qp_attach_common

[David Miller]

From: Robb Manes <rmanes@redhat.com>
Date: Fri, 25 Sep 2015 10:39:21 -0400

> @@ -1184,10 +1184,11 @@ out:
>      if (prot == MLX4_PROT_ETH) {
>          /* manage the steering entry for promisc mode */
>          if (new_entry)
> -            new_steering_entry(dev, port, steer, index, qp->qpn);
> +            err = new_steering_entry(dev, port, steer,
> +                         index, qp->qpn);
>          else
> -            existing_steering_entry(dev, port, steer,
> -                        index, qp->qpn);
> +            err = existing_steering_entry(dev, port, steer,
> +                              index, qp->qpn);

Please indent this properly.

When a function call spans multiple lines, the second and
subsequent lines must start precisely at the first column
after the openning parenthesis of the first line.  You must
use the appropriate number of TAB then SPACE characters
necessary to achieve this.

Thanks.

[PATCH v2] net/mlx4: Handle return codes in mlx4_qp_attach_common

[Robb Manes]

Both new_steering_entry() and existing_steering_entry() return values
based on their success or failure, but currently they fall through
silently.  This can make troubleshooting difficult, as we were unable
to tell which one of these two functions returned errors or
specifically what code was returned.  This patch remedies that
situation by passing the return codes to err, which is returned by
mlx4_qp_attach_common() itself.

This also addresses a leak in the call to mlx4_bitmap_free() as well.

Signed-off-by: Robb Manes <rmanes@redhat.com>
---
Sorry about the poor formatting; I should have used git-send properly.

 drivers/net/ethernet/mellanox/mlx4/mcg.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/mellanox/mlx4/mcg.c b/drivers/net/ethernet/mellanox/mlx4/mcg.c
index bd9ea0d..1d4e2e0 100644
--- a/drivers/net/ethernet/mellanox/mlx4/mcg.c
+++ b/drivers/net/ethernet/mellanox/mlx4/mcg.c
@@ -1184,10 +1184,11 @@ out:
 	if (prot == MLX4_PROT_ETH) {
 		/* manage the steering entry for promisc mode */
 		if (new_entry)
-			new_steering_entry(dev, port, steer, index, qp->qpn);
+			err = new_steering_entry(dev, port, steer,
+						 index, qp->qpn);
 		else
-			existing_steering_entry(dev, port, steer,
-						index, qp->qpn);
+			err = existing_steering_entry(dev, port, steer,
+						      index, qp->qpn);
 	}
 	if (err && link && index != -1) {
 		if (index < dev->caps.num_mgms)
-- 
2.4.3

Re: [PATCH v2] net/mlx4: Handle return codes in mlx4_qp_attach_common

[David Miller]

From: Robb Manes <rmanes@redhat.com>
Date: Tue, 29 Sep 2015 11:03:37 -0400

> Both new_steering_entry() and existing_steering_entry() return values
> based on their success or failure, but currently they fall through
> silently.  This can make troubleshooting difficult, as we were unable
> to tell which one of these two functions returned errors or
> specifically what code was returned.  This patch remedies that
> situation by passing the return codes to err, which is returned by
> mlx4_qp_attach_common() itself.
> 
> This also addresses a leak in the call to mlx4_bitmap_free() as well.
> 
> Signed-off-by: Robb Manes <rmanes@redhat.com>

Applied, thank you.