netdev - [PATCH v2 3/8] net/rds: Re-factor queuing of shutdown work

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250411180207.450312-4-allison.henderson@oracle.com>
Date: Fri, 11 Apr 2025 11:02:02 -0700
From: allison.henderson@...cle.com
To: netdev@...r.kernel.org
Subject: [PATCH v2 3/8] net/rds: Re-factor queuing of shutdown work

From: Håkon Bugge <haakon.bugge@...cle.com>

When RDS receives an RDMA_CM_EVENT_ESTABLISHED in close proximity in
time with a reconnect timeout, shutdown worker may be queued twice.

The reconnect timeout calls rds_conn_path_drop() which sets the
connection state to RDS_CONN_ERROR, before rds_connect_path_complete()
is able to set it to RDS_CONN_UP.

Fixed by conditionally queue the shutdown worker.

Signed-off-by: Håkon Bugge <haakon.bugge@...cle.com>
Signed-off-by: Allison Henderson <allison.henderson@...cle.com>
---
 net/rds/connection.c | 5 +++--
 net/rds/rds.h        | 1 +
 net/rds/threads.c    | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/rds/connection.c b/net/rds/connection.c
index f7f48abf7233..17fd7f34ebbd 100644
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -693,7 +693,6 @@ void rds_for_each_conn_info(struct socket *sock, unsigned int len,
 	rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(rds_for_each_conn_info);
-
 static void rds_walk_conn_path_info(struct socket *sock, unsigned int len,
 				    struct rds_info_iterator *iter,
 				    struct rds_info_lengths *lens,
@@ -892,7 +891,9 @@ void rds_conn_path_drop(struct rds_conn_path *cp, bool destroy)
 		rcu_read_unlock();
 		return;
 	}
-	queue_work(cp->cp_wq, &cp->cp_down_w);
+	if (!test_and_set_bit(RDS_SHUTDOWN_WORK_QUEUED, &cp->cp_flags))
+		queue_work(cp->cp_wq, &cp->cp_down_w);
+
 	rcu_read_unlock();
 }
 EXPORT_SYMBOL_GPL(rds_conn_path_drop);
diff --git a/net/rds/rds.h b/net/rds/rds.h
index 71a0020fe41d..d8d3abb2d5a6 100644
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -93,6 +93,7 @@ enum {
 #define RDS_IN_XMIT		2
 #define RDS_RECV_REFILL		3
 #define	RDS_DESTROY_PENDING	4
+#define RDS_SHUTDOWN_WORK_QUEUED 7
 
 /* Max number of multipaths per RDS connection. Must be a power of 2 */
 #define	RDS_MPATH_WORKERS	8
diff --git a/net/rds/threads.c b/net/rds/threads.c
index f713c6d9cd32..915e57b06d73 100644
--- a/net/rds/threads.c
+++ b/net/rds/threads.c
@@ -250,6 +250,7 @@ void rds_shutdown_worker(struct work_struct *work)
 						cp_down_w);
 
 	rds_conn_shutdown(cp);
+	clear_bit(RDS_SHUTDOWN_WORK_QUEUED, &cp->cp_flags);
 }
 
 void rds_threads_exit(void)
-- 
2.43.0