]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
rxrpc: Fix client call queueing, waiting for channel
authorDavid Howells <dhowells@redhat.com>
Sat, 9 Mar 2019 00:29:58 +0000 (00:29 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 9 Mar 2019 02:24:53 +0000 (18:24 -0800)
rxrpc_get_client_conn() adds a new call to the front of the waiting_calls
queue if the connection it's going to use already exists.  This is bad as
it allows calls to get starved out.

Fix this by adding to the tail instead.

Also change the other enqueue point in the same function to put it on the
front (ie. when we have a new connection).  This makes the point that in
the case of a new connection the new call goes at the front (though it
doesn't actually matter since the queue should be unoccupied).

Fixes: 45025bceef17 ("rxrpc: Improve management and caching of client connection objects")
Signed-off-by: David Howells <dhowells@redhat.com>
Reviewed-by: Marc Dionne <marc.dionne@auristor.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/rxrpc/conn_client.c

index f307a05076e150b34ddec3e3b196d670ac776aa5..83797b3949e2f0122d87d15a48651b3b540ab156 100644 (file)
@@ -353,7 +353,7 @@ static int rxrpc_get_client_conn(struct rxrpc_sock *rx,
         * normally have to take channel_lock but we do this before anyone else
         * can see the connection.
         */
-       list_add_tail(&call->chan_wait_link, &candidate->waiting_calls);
+       list_add(&call->chan_wait_link, &candidate->waiting_calls);
 
        if (cp->exclusive) {
                call->conn = candidate;
@@ -432,7 +432,7 @@ found_extant_conn:
        call->conn = conn;
        call->security_ix = conn->security_ix;
        call->service_id = conn->service_id;
-       list_add(&call->chan_wait_link, &conn->waiting_calls);
+       list_add_tail(&call->chan_wait_link, &conn->waiting_calls);
        spin_unlock(&conn->channel_lock);
        _leave(" = 0 [extant %d]", conn->debug_id);
        return 0;