From: Mukesh Kacker <mukesh.kacker@oracle.com>
Date: Wed, 13 Aug 2014 20:02:06 +0000 (-0700)
Subject: RDS:active bonding: disable failover across HCAs(failover groups)
X-Git-Tag: v4.1.12-92~293^2^2~23
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5535192e4604ccc429a27bb0a80a44e1357df02e;p=users%2Fjedix%2Flinux-maple.git

RDS:active bonding: disable failover across HCAs(failover groups)

Disable experimental code in RDS active bonding which performs
failovers across "failover groups" (HCAs). It causes
instabilities for some applications.

Orabug: 19430773

Signed-off-by: Mukesh Kacker <mukesh.kacker@oracle.com>
Acked-by: Rama Nichanamatlu <rama.nichanamatlu@oracle.com>
Signed-off-by: Guangyu Sun <guangyu.sun@oracle.com>
(cherry picked from commit 38d6d011e4757e38781830cc4eebd8d7a8b690fc)
---

diff --git a/net/rds/ib.c b/net/rds/ib.c
index b2223f702bf66..e950745838c90 100644
--- a/net/rds/ib.c
+++ b/net/rds/ib.c
@@ -449,6 +449,14 @@ static u8 rds_ib_get_failover_port(u8 port)
 		}
 	}
 
+	/*
+	 * Note: Failover across HCAs/Failover groups
+	 * is experimental code that causes instabilities
+	 * in some applications and disabled by
+	 * default.
+	 */
+#define RDS_EXPERIMENTAL_FAILOVER_ACROSS_HCAS_FAILOVER_GROUPS 0
+#if RDS_EXPERIMENTAL_FAILOVER_ACROSS_HCAS_FAILOVER_GROUPS
 	for (i = 1; i <= ip_port_cnt; i++) {
 		if ((i != port) &&
 		    (ip_config[i].pkey == ip_config[port].pkey) &&
@@ -456,7 +464,7 @@ static u8 rds_ib_get_failover_port(u8 port)
 			return i;
 		}
 	}
-
+#endif
 	return 0;
 }