Revert "net/rds: Use per-namespace loopback connection lists"

This reverts commit 0c215cfe7df9c670d2a10d90294d94b4f36e33f7.

Orabug: 35811116

Signed-off-by: Greg Jumper <[email protected]>
Reviewed-by: Sharath Srinivasan <[email protected]>

Author: Greg Jumper

net/rds/connection.c

@@ -1193,6 +1193,8 @@ int rds_conn_init(void)
 
 void rds_conn_exit(void)
 {
+	rds_loop_exit();
+
 	kmem_cache_destroy(rds_conn_slab);
 
 	rds_info_deregister_func(RDS_INFO_CONNECTIONS, rds_conn_info);

net/rds/loop.c

@@ -38,6 +38,9 @@
 #include "loop.h"
 #include "rds_single_path.h"
 
+static DEFINE_SPINLOCK(loop_conns_lock);
+static LIST_HEAD(loop_conns);
+
 /*
  * This 'loopback' transport is a special case for flows that originate
  * and terminate on the same machine.
@@ -109,7 +112,6 @@ static int rds_loop_recv_path(struct rds_conn_path *cp)
 struct rds_loop_connection {
 	struct list_head loop_node;
 	struct rds_connection *conn;
-	struct rds_net	*rns;
 };
 
 /*
@@ -130,11 +132,10 @@ static int rds_loop_conn_alloc(struct rds_connection *conn, gfp_t gfp)
 	INIT_LIST_HEAD(&lc->loop_node);
 	lc->conn = conn;
 	conn->c_transport_data = lc;
-	lc->rns = conn->c_rns;
 
-	spin_lock_irqsave(&lc->rns->rns_loop_conns_lock, flags);
-	list_add_tail(&lc->loop_node, &lc->rns->rns_loop_conns);
-	spin_unlock_irqrestore(&lc->rns->rns_loop_conns_lock, flags);
+	spin_lock_irqsave(&loop_conns_lock, flags);
+	list_add_tail(&lc->loop_node, &loop_conns);
+	spin_unlock_irqrestore(&loop_conns_lock, flags);
 
 	return 0;
 }
@@ -145,9 +146,9 @@ static void rds_loop_conn_free(void *arg)
 	unsigned long flags;
 
 	rdsdebug("lc %p\n", lc);
-	spin_lock_irqsave(&lc->rns->rns_loop_conns_lock, flags);
+	spin_lock_irqsave(&loop_conns_lock, flags);
 	list_del(&lc->loop_node);
-	spin_unlock_irqrestore(&lc->rns->rns_loop_conns_lock, flags);
+	spin_unlock_irqrestore(&loop_conns_lock, flags);
 	kfree(lc);
 }
 
@@ -161,23 +162,16 @@ static void rds_loop_conn_path_shutdown(struct rds_conn_path *cp)
 {
 }
 
-int rds_loop_net_init(struct rds_net *rns)
-{
-	spin_lock_init(&rns->rns_loop_conns_lock);
-	INIT_LIST_HEAD(&rns->rns_loop_conns);
-	return 0;
-}
-
-void rds_loop_net_exit(struct rds_net *rns)
+void rds_loop_exit(void)
 {
 	struct rds_loop_connection *lc, *_lc;
 	LIST_HEAD(tmp_list);
 
 	/* avoid calling conn_destroy with irqs off */
-	spin_lock_irq(&rns->rns_loop_conns_lock);
-	list_splice(&rns->rns_loop_conns, &tmp_list);
-	INIT_LIST_HEAD(&rns->rns_loop_conns);
-	spin_unlock_irq(&rns->rns_loop_conns_lock);
+	spin_lock_irq(&loop_conns_lock);
+	list_splice(&loop_conns, &tmp_list);
+	INIT_LIST_HEAD(&loop_conns);
+	spin_unlock_irq(&loop_conns_lock);
 
 	list_for_each_entry_safe(lc, _lc, &tmp_list, loop_node) {
 		WARN_ON(lc->conn->c_passive);

net/rds/loop.h

@@ -4,7 +4,6 @@
 /* loop.c */
 extern struct rds_transport rds_loop_transport;
 
-int rds_loop_net_init(struct rds_net *rns);
-void rds_loop_net_exit(struct rds_net *rns);
+void rds_loop_exit(void);
 
 #endif

net/rds/rds.h

@@ -289,9 +289,6 @@ struct rds_net {
 	spinlock_t		rns_cong_lock;	/* protect congestion maps */
 	struct rb_root		rns_cong_tree;
 
-	spinlock_t		rns_loop_conns_lock;	/* protect loopback conns */
-	struct list_head	rns_loop_conns;
-
 	struct mutex		rns_mod_mutex;	/* protect rns_mod_stats */
 
 	/* Array storing different modules' information.  It is indexed

net/rds/rds_ns.c

@@ -33,7 +33,6 @@
 #include <net/net_namespace.h>
 #include <net/netns/generic.h>
 #include "rds.h"
-#include "loop.h"
 
 static int rds_netid;
 
@@ -71,19 +70,12 @@ static __net_init int rds_init_net(struct net *net)
 	if (ret)
 		goto err_conn;
 
-	ret = rds_cong_net_init(rns);
+	ret =  rds_cong_net_init(rns);
 	if (ret)
 		goto err_cong;
 
-	ret = rds_loop_net_init(rns);
-	if (ret)
-		goto err_loop;
-
 	return 0;
 
-err_loop:
-	rds_cong_net_exit(rns);
-
 err_cong:
 	rds_conn_tbl_net_exit(rns);
 
@@ -103,10 +95,8 @@ static void rds_exit_net(struct net *net)
 {
 	struct rds_net *rns = rds_ns(net);
 
-	rds_loop_net_exit(rns);
 	rds_bind_tbl_net_exit(rns);
 	rds_cong_net_exit(rns);
-	rds_conn_tbl_net_exit(rns);
 	rds_stats_net_exit(net);
 	mutex_destroy(&rns->rns_sock_lock);
 	mutex_destroy(&rns->rns_mod_mutex);