Revert "net/rds: use different workqueue for base_conn"

This reverts commit ad7312b ("net/rds: use different workqueue for
base_conn"). The RDS path record caching will be replaced by ibacm. Thus,
all the TOS connections do not rely on its base connection to perform SA
query.  As a result, RDS does not need a separate "priority" workqueue for
the base connection.

Orabug: 26497333

Signed-off-by: Wei Lin Guay <[email protected]>
Reviewed-by: Håkon Bugge <[email protected]>
Reviewed-by: Avinash Repaka <[email protected]>
Reviewed-by: Ajaykumar Hotchandani <[email protected]>

Author: Wei Lin Guay

net/rds/connection.c

@@ -251,6 +251,7 @@ static struct rds_connection *__rds_conn_create(struct net *net,
 	}
 
 	conn->c_trans = trans;
+
 	init_waitqueue_head(&conn->c_hs_waitq);
 	for (i = 0; i < npaths; i++) {
 		struct rds_conn_path *cp;
@@ -262,7 +263,7 @@ static struct rds_connection *__rds_conn_create(struct net *net,
 		if (conn->c_loopback)
 			cp->cp_wq = rds_local_wq;
 		else
-			cp->cp_wq = tos ? rds_wq : rds_tos_wq;
+			cp->cp_wq = rds_wq;
 	}
 	ret = trans->conn_alloc(conn, gfp);
 	if (ret) {

net/rds/ib.c

@@ -2100,8 +2100,6 @@ static void rds_ib_unregister_client(void)
 	ib_unregister_client(&rds_ib_client);
 	/* wait for rds_ib_dev_free() to complete */
 	flush_workqueue(rds_ip_wq);
-	flush_workqueue(rds_wq);
-	flush_workqueue(rds_tos_wq);
 	flush_workqueue(rds_local_wq);
 }
 

net/rds/rds.h

@@ -1141,7 +1141,6 @@ extern unsigned int  rds_sysctl_shutdown_trace_end_time;
 int rds_threads_init(void);
 void rds_threads_exit(void);
 extern struct workqueue_struct *rds_wq;
-extern struct workqueue_struct *rds_tos_wq;
 extern struct workqueue_struct *rds_local_wq;
 void rds_queue_reconnect(struct rds_conn_path *cp, int reason);
 void rds_connect_worker(struct work_struct *);

net/rds/threads.c

@@ -74,8 +74,6 @@ MODULE_PARM_DESC(rds_conn_hb_timeout, " Connection heartbeat timeout");
  */
 struct workqueue_struct *rds_wq;
 EXPORT_SYMBOL_GPL(rds_wq);
-struct workqueue_struct *rds_tos_wq;
-EXPORT_SYMBOL_GPL(rds_tos_wq);
 struct workqueue_struct *rds_local_wq;
 EXPORT_SYMBOL_GPL(rds_local_wq);
 
@@ -365,7 +363,6 @@ void rds_shutdown_worker(struct work_struct *work)
 void rds_threads_exit(void)
 {
 	destroy_workqueue(rds_wq);
-	destroy_workqueue(rds_tos_wq);
 	destroy_workqueue(rds_local_wq);
 }
 
@@ -375,10 +372,6 @@ int rds_threads_init(void)
 	if (!rds_wq)
 		return -ENOMEM;
 
-	rds_tos_wq = create_singlethread_workqueue("krdsd_tos");
-	if (!rds_wq)
-		return -ENOMEM;
-
 	rds_local_wq = create_singlethread_workqueue("krdsd_local");
 	if (!rds_local_wq)
 		return -ENOMEM;