1 files changed, 11 insertions, 41 deletions

diff --git a/net/rxrpc/peer_object.c b/net/rxrpc/peer_object.c
index 1dc7648e3eff..01a9febfa367 100644
--- a/net/rxrpc/peer_object.c
+++ b/net/rxrpc/peer_object.c
@@ -124,11 +124,9 @@ static struct rxrpc_peer *__rxrpc_lookup_peer_rcu(
         struct rxrpc_net *rxnet = local->rxnet;
 
         hash_for_each_possible_rcu(rxnet->peer_hash, peer, hash_link, hash_key) {
-                if (rxrpc_peer_cmp_key(peer, local, srx, hash_key) == 0) {
-                        if (atomic_read(&peer->usage) == 0)
-                                return NULL;
+                if (rxrpc_peer_cmp_key(peer, local, srx, hash_key) == 0 &&
+                    atomic_read(&peer->usage) > 0)
                         return peer;
-                }
         }
 
         return NULL;
@@ -222,8 +220,6 @@ struct rxrpc_peer *rxrpc_alloc_peer(struct rxrpc_local *local, gfp_t gfp)
                 atomic_set(&peer->usage, 1);
                 peer->local = local;
                 INIT_HLIST_HEAD(&peer->error_targets);
-                INIT_WORK(&peer->error_distributor,
-                          &rxrpc_peer_error_distributor);
                 peer->service_conns = RB_ROOT;
                 seqlock_init(&peer->service_conn_lock);
                 spin_lock_init(&peer->lock);
@@ -299,34 +295,23 @@ static struct rxrpc_peer *rxrpc_create_peer(struct rxrpc_local *local,
 }
 
 /*
- * Set up a new incoming peer.  The address is prestored in the preallocated
- * peer.
+ * Set up a new incoming peer.  There shouldn't be any other matching peers
+ * since we've already done a search in the list from the non-reentrant context
+ * (the data_ready handler) that is the only place we can add new peers.
  */
-struct rxrpc_peer *rxrpc_lookup_incoming_peer(struct rxrpc_local *local,
-                                              struct rxrpc_peer *prealloc)
+void rxrpc_new_incoming_peer(struct rxrpc_local *local, struct rxrpc_peer *peer)
 {
-        struct rxrpc_peer *peer;
         struct rxrpc_net *rxnet = local->rxnet;
         unsigned long hash_key;
 
-        hash_key = rxrpc_peer_hash_key(local, &prealloc->srx);
-        prealloc->local = local;
-        rxrpc_init_peer(prealloc, hash_key);
+        hash_key = rxrpc_peer_hash_key(local, &peer->srx);
+        peer->local = local;
+        rxrpc_init_peer(peer, hash_key);
 
         spin_lock(&rxnet->peer_hash_lock);
-
-        /* Need to check that we aren't racing with someone else */
-        peer = __rxrpc_lookup_peer_rcu(local, &prealloc->srx, hash_key);
-        if (peer && !rxrpc_get_peer_maybe(peer))
-                peer = NULL;
-        if (!peer) {
-                peer = prealloc;
-                hash_add_rcu(rxnet->peer_hash, &peer->hash_link, hash_key);
-                list_add_tail(&peer->keepalive_link, &rxnet->peer_keepalive_new);
-        }
-
+        hash_add_rcu(rxnet->peer_hash, &peer->hash_link, hash_key);
+        list_add_tail(&peer->keepalive_link, &rxnet->peer_keepalive_new);
         spin_unlock(&rxnet->peer_hash_lock);
-        return peer;
 }
 
 /*
@@ -416,21 +401,6 @@ struct rxrpc_peer *rxrpc_get_peer_maybe(struct rxrpc_peer *peer)
 }
 
 /*
- * Queue a peer record.  This passes the caller's ref to the workqueue.
- */
-void __rxrpc_queue_peer_error(struct rxrpc_peer *peer)
-{
-        const void *here = __builtin_return_address(0);
-        int n;
-
-        n = atomic_read(&peer->usage);
-        if (rxrpc_queue_work(&peer->error_distributor))
-                trace_rxrpc_peer(peer, rxrpc_peer_queued_error, n, here);
-        else
-                rxrpc_put_peer(peer);
-}
-
-/*
  * Discard a peer record.
  */
 static void __rxrpc_put_peer(struct rxrpc_peer *peer)