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: Allison Henderson <allison.henderson@oracle.com>
Link: https://patch.msgid.link/20260109224843.128076-2-achender@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/net/rds/cong.c b/net/rds/cong.c
index 8b689eb..ac1f120 100644 (file)
--- a/net/rds/cong.c
+++ b/net/rds/cong.c
@@ -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();
        }

diff --git a/net/rds/connection.c b/net/rds/connection.c
index 68bc88c..dc73237 100644 (file)
--- a/net/rds/connection.c
+++ b/net/rds/connection.c
@@ -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);

diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c
index 4248dfa..357128d 100644 (file)
--- a/net/rds/ib_recv.c
+++ b/net/rds/ib_recv.c
@@ -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();

diff --git a/net/rds/ib_send.c b/net/rds/ib_send.c
index 4190b90..f9d28dd 100644 (file)
--- a/net/rds/ib_send.c
+++ b/net/rds/ib_send.c
@@ -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);
 

diff --git a/net/rds/rds.h b/net/rds/rds.h
index a029e5f..b35afa2 100644 (file)
--- a/net/rds/rds.h
+++ b/net/rds/rds.h
@@ -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;

diff --git a/net/rds/send.c b/net/rds/send.c
index 0b3d0ef..3e3d028 100644 (file)
--- a/net/rds/send.c
+++ b/net/rds/send.c
@@ -458,7 +458,8 @@ over_batch:
                        if (rds_destroy_pending(cp->cp_conn))
                                ret = -ENETUNREACH;
                        else
-                               queue_delayed_work(rds_wq, &cp->cp_send_w, 1);
+                               queue_delayed_work(cp->cp_wq,
+                                                  &cp->cp_send_w, 1);
                        rcu_read_unlock();
                } else if (raced) {
                        rds_stats_inc(s_send_lock_queue_raced);
@@ -1380,7 +1381,7 @@ int rds_sendmsg(struct socket *sock, struct msghdr *msg, size_t payload_len)
                if (rds_destroy_pending(cpath->cp_conn))
                        ret = -ENETUNREACH;
                else
-                       queue_delayed_work(rds_wq, &cpath->cp_send_w, 1);
+                       queue_delayed_work(cpath->cp_wq, &cpath->cp_send_w, 1);
                rcu_read_unlock();
        }
        if (ret)
@@ -1470,10 +1471,10 @@ rds_send_probe(struct rds_conn_path *cp, __be16 sport,
        rds_stats_inc(s_send_queued);
        rds_stats_inc(s_send_pong);
 
-       /* schedule the send work on rds_wq */
+       /* schedule the send work on cp_wq */
        rcu_read_lock();
        if (!rds_destroy_pending(cp->cp_conn))
-               queue_delayed_work(rds_wq, &cp->cp_send_w, 1);
+               queue_delayed_work(cp->cp_wq, &cp->cp_send_w, 1);
        rcu_read_unlock();
 
        rds_message_put(rm);

diff --git a/net/rds/tcp_recv.c b/net/rds/tcp_recv.c
index 7997a19..b7cf7f4 100644 (file)
--- a/net/rds/tcp_recv.c
+++ b/net/rds/tcp_recv.c
@@ -327,7 +327,7 @@ void rds_tcp_data_ready(struct sock *sk)
        if (rds_tcp_read_sock(cp, GFP_ATOMIC) == -ENOMEM) {
                rcu_read_lock();
                if (!rds_destroy_pending(cp->cp_conn))
-                       queue_delayed_work(rds_wq, &cp->cp_recv_w, 0);
+                       queue_delayed_work(cp->cp_wq, &cp->cp_recv_w, 0);
                rcu_read_unlock();
        }
 out:

diff --git a/net/rds/tcp_send.c b/net/rds/tcp_send.c
index 7d284ac..4e82c96 100644 (file)
--- a/net/rds/tcp_send.c
+++ b/net/rds/tcp_send.c
@@ -201,7 +201,7 @@ void rds_tcp_write_space(struct sock *sk)
        rcu_read_lock();
        if ((refcount_read(&sk->sk_wmem_alloc) << 1) <= sk->sk_sndbuf &&
            !rds_destroy_pending(cp->cp_conn))
-               queue_delayed_work(rds_wq, &cp->cp_send_w, 0);
+               queue_delayed_work(cp->cp_wq, &cp->cp_send_w, 0);
        rcu_read_unlock();
 
 out:

diff --git a/net/rds/threads.c b/net/rds/threads.c
index 1f424cb..639302b 100644 (file)
--- a/net/rds/threads.c
+++ b/net/rds/threads.c
@@ -89,8 +89,8 @@ void rds_connect_path_complete(struct rds_conn_path *cp, int curr)
        set_bit(0, &cp->cp_conn->c_map_queued);
        rcu_read_lock();
        if (!rds_destroy_pending(cp->cp_conn)) {
-               queue_delayed_work(rds_wq, &cp->cp_send_w, 0);
-               queue_delayed_work(rds_wq, &cp->cp_recv_w, 0);
+               queue_delayed_work(cp->cp_wq, &cp->cp_send_w, 0);
+               queue_delayed_work(cp->cp_wq, &cp->cp_recv_w, 0);
        }
        rcu_read_unlock();
        cp->cp_conn->c_proposed_version = RDS_PROTOCOL_VERSION;
@@ -140,7 +140,7 @@ void rds_queue_reconnect(struct rds_conn_path *cp)
                cp->cp_reconnect_jiffies = rds_sysctl_reconnect_min_jiffies;
                rcu_read_lock();
                if (!rds_destroy_pending(cp->cp_conn))
-                       queue_delayed_work(rds_wq, &cp->cp_conn_w, 0);
+                       queue_delayed_work(cp->cp_wq, &cp->cp_conn_w, 0);
                rcu_read_unlock();
                return;
        }
@@ -151,7 +151,7 @@ void rds_queue_reconnect(struct rds_conn_path *cp)
                 conn, &conn->c_laddr, &conn->c_faddr);
        rcu_read_lock();
        if (!rds_destroy_pending(cp->cp_conn))
-               queue_delayed_work(rds_wq, &cp->cp_conn_w,
+               queue_delayed_work(cp->cp_wq, &cp->cp_conn_w,
                                   rand % cp->cp_reconnect_jiffies);
        rcu_read_unlock();
 
@@ -203,11 +203,11 @@ void rds_send_worker(struct work_struct *work)
                switch (ret) {
                case -EAGAIN:
                        rds_stats_inc(s_send_immediate_retry);
-                       queue_delayed_work(rds_wq, &cp->cp_send_w, 0);
+                       queue_delayed_work(cp->cp_wq, &cp->cp_send_w, 0);
                        break;
                case -ENOMEM:
                        rds_stats_inc(s_send_delayed_retry);
-                       queue_delayed_work(rds_wq, &cp->cp_send_w, 2);
+                       queue_delayed_work(cp->cp_wq, &cp->cp_send_w, 2);
                        break;
                default:
                        break;
@@ -228,11 +228,11 @@ void rds_recv_worker(struct work_struct *work)
                switch (ret) {
                case -EAGAIN:
                        rds_stats_inc(s_recv_immediate_retry);
-                       queue_delayed_work(rds_wq, &cp->cp_recv_w, 0);
+                       queue_delayed_work(cp->cp_wq, &cp->cp_recv_w, 0);
                        break;
                case -ENOMEM:
                        rds_stats_inc(s_recv_delayed_retry);
-                       queue_delayed_work(rds_wq, &cp->cp_recv_w, 2);
+                       queue_delayed_work(cp->cp_wq, &cp->cp_recv_w, 2);
                        break;
                default:
                        break;