Commit d327e2e7 authored by Allison Henderson's avatar Allison Henderson Committed by Paolo Abeni
Browse files

net/rds: Add per cp work queue 



This patch adds a per connection workqueue which can be initialized
and used independently of the globally shared rds_wq.

This patch is the first in a series that aims to address tcp ack
timeouts during the tcp socket shutdown sequence.

This initial refactoring lays the ground work needed to alleviate
queue congestion during heavy reads and writes.  The independently
managed queues will allow shutdowns and reconnects respond more quickly
before the peer(s) timeout waiting for the proper acks.

Signed-off-by: default avatarAllison Henderson <allison.henderson@oracle.com>
Link: https://patch.msgid.link/20260109224843.128076-2-achender@kernel.org


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent ff420c56

net/rds/cong.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ void rds_cong_queue_updates(struct rds_cong_map *map) 
			 *    therefore trigger warnings.

			 * Defer the xmit to rds_send_worker() instead.

			 */

			queue_delayed_work(rds_wq, &cp->cp_send_w, 0);

			queue_delayed_work(cp->cp_wq, &cp->cp_send_w, 0);

		}

		rcu_read_unlock();

	}

net/rds/connection.c

+3 −2
Original line number Diff line number Diff line
@@ -269,6 +269,7 @@ static struct rds_connection *__rds_conn_create(struct net *net, 
		__rds_conn_path_init(conn, &conn->c_path[i],

				     is_outgoing);

		conn->c_path[i].cp_index = i;

		conn->c_path[i].cp_wq = rds_wq;

	}

	rcu_read_lock();

	if (rds_destroy_pending(conn))
@@ -884,7 +885,7 @@ void rds_conn_path_drop(struct rds_conn_path *cp, bool destroy) 
		rcu_read_unlock();

		return;

	}

	queue_work(rds_wq, &cp->cp_down_w);

	queue_work(cp->cp_wq, &cp->cp_down_w);

	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(rds_conn_path_drop);
@@ -909,7 +910,7 @@ void rds_conn_path_connect_if_down(struct rds_conn_path *cp) 
	}

	if (rds_conn_path_state(cp) == RDS_CONN_DOWN &&

	    !test_and_set_bit(RDS_RECONNECT_PENDING, &cp->cp_flags))

		queue_delayed_work(rds_wq, &cp->cp_conn_w, 0);

		queue_delayed_work(cp->cp_wq, &cp->cp_conn_w, 0);

	rcu_read_unlock();

}

EXPORT_SYMBOL_GPL(rds_conn_path_connect_if_down);

net/rds/ib_recv.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ void rds_ib_recv_refill(struct rds_connection *conn, int prefill, gfp_t gfp) 
	    (must_wake ||

	    (can_wait && rds_ib_ring_low(&ic->i_recv_ring)) ||

	    rds_ib_ring_empty(&ic->i_recv_ring))) {

		queue_delayed_work(rds_wq, &conn->c_recv_w, 1);

		queue_delayed_work(conn->c_path->cp_wq, &conn->c_recv_w, 1);

	}

	if (can_wait)

		cond_resched();

net/rds/ib_send.c

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ void rds_ib_send_cqe_handler(struct rds_ib_connection *ic, struct ib_wc *wc) 


	if (test_and_clear_bit(RDS_LL_SEND_FULL, &conn->c_flags) ||

	    test_bit(0, &conn->c_map_queued))

		queue_delayed_work(rds_wq, &conn->c_send_w, 0);

		queue_delayed_work(conn->c_path->cp_wq, &conn->c_send_w, 0);



	/* We expect errors as the qp is drained during shutdown */

	if (wc->status != IB_WC_SUCCESS && rds_conn_up(conn)) {
@@ -419,7 +419,7 @@ void rds_ib_send_add_credits(struct rds_connection *conn, unsigned int credits) 


	atomic_add(IB_SET_SEND_CREDITS(credits), &ic->i_credits);

	if (test_and_clear_bit(RDS_LL_SEND_FULL, &conn->c_flags))

		queue_delayed_work(rds_wq, &conn->c_send_w, 0);

		queue_delayed_work(conn->c_path->cp_wq, &conn->c_send_w, 0);



	WARN_ON(IB_GET_SEND_CREDITS(credits) >= 16384);

net/rds/rds.h

+1 −0
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ struct rds_conn_path { 


	void			*cp_transport_data;



	struct workqueue_struct	*cp_wq;

	atomic_t		cp_state;

	unsigned long		cp_send_gen;

	unsigned long		cp_flags;