Patch "mlx4: Disable HA for SRIOV PF RoCE devices" has been added to the 4.1-stable tree

Patch "mlx4: Disable HA for SRIOV PF RoCE devices" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    mlx4: Disable HA for SRIOV PF RoCE devices

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     mlx4-disable-ha-for-sriov-pf-roce-devices.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From foo@baz Fri Jul  3 20:00:25 PDT 2015
From: Or Gerlitz <ogerlitz@mellanox.com>
Date: Thu, 25 Jun 2015 11:29:44 +0300
Subject: mlx4: Disable HA for SRIOV PF RoCE devices

From: Or Gerlitz <ogerlitz@mellanox.com>

[ Upstream commit 7254acffeeec3c0a75b9c5364c29a6eb00014930 ]

When in HA mode, the driver exposes an IB (RoCE) device instance with only
one port. Under SRIOV, the existing implementation doesn't go well with
the PF RoCE driver's role of Special QPs Para-Virtualization, etc.

As such, disable HA for the mlx4 PF RoCE device in SRIOV mode.

Fixes: a57500903093 ('IB/mlx4: Add port aggregation support')
Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/net/ethernet/mellanox/mlx4/intf.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

--- a/drivers/net/ethernet/mellanox/mlx4/intf.c
+++ b/drivers/net/ethernet/mellanox/mlx4/intf.c
@@ -93,8 +93,14 @@ int mlx4_register_interface(struct mlx4_
 	mutex_lock(&intf_mutex);
 
 	list_add_tail(&intf->list, &intf_list);
-	list_for_each_entry(priv, &dev_list, dev_list)
+	list_for_each_entry(priv, &dev_list, dev_list) {
+		if (mlx4_is_mfunc(&priv->dev) && (intf->flags & MLX4_INTFF_BONDING)) {
+			mlx4_dbg(&priv->dev,
+				 "SRIOV, disabling HA mode for intf proto %d\n", intf->protocol);
+			intf->flags &= ~MLX4_INTFF_BONDING;
+		}
 		mlx4_add_device(intf, priv);
+	}
 
 	mutex_unlock(&intf_mutex);
 


Patches currently in stable-queue which might be from ogerlitz@mellanox.com are

queue-4.1/net-mlx4_en-wake-tx-queues-only-when-there-s-enough-room.patch
queue-4.1/net-mlx4_en-release-tx-qp-when-destroying-tx-ring.patch
queue-4.1/mlx4-disable-ha-for-sriov-pf-roce-devices.patch
queue-4.1/net-mlx4_en-fix-wrong-csum-complete-report-when-rxvlan-offload-is-disabled.patch