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 b2223f702bf663ae516987ba2a7ace14d41c1e80..e950745838c90196616d4cb15541dbe56c7b182c 100644 (file)
--- 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;
 }