rxrpc: Move peer lookup from call-accept to new-incoming-conn

Move the lookup of a peer from a call that's being accepted into the
function that creates a new incoming connection.  This will allow us to
avoid incrementing the peer's usage count in some cases in future.

Note that I haven't bother to integrate rxrpc_get_addr_from_skb() with
rxrpc_extract_addr_from_skb() as I'm going to delete the former in the very
near future.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h
index e1af258a7ac97c70d3a4010490bb7e12bd6c9d3f..ad48f851b40cb2a1562a0bf96ba49c8362fe74be 100644 (file)
--- a/net/rxrpc/ar-internal.h
+++ b/net/rxrpc/ar-internal.h
@@ -607,7 +607,7 @@ static inline void rxrpc_queue_conn(struct rxrpc_connection *conn)
  * conn_service.c
  */
 struct rxrpc_connection *rxrpc_incoming_connection(struct rxrpc_local *,
-                                                  struct rxrpc_peer *,
+                                                  struct sockaddr_rxrpc *,
                                                   struct sk_buff *);
 
 /*
@@ -773,6 +773,7 @@ static inline void rxrpc_sysctl_exit(void) {}
  */
 void rxrpc_get_addr_from_skb(struct rxrpc_local *, const struct sk_buff *,
                             struct sockaddr_rxrpc *);
+int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *, struct sk_buff *);
 
 /*
  * debug tracing

diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
index 5367dbe9b96f1783d910378b5cf9eaba52872285..0b2832141bd079797deb27580dc3cbf59611b3fd 100644 (file)
--- a/net/rxrpc/call_accept.c
+++ b/net/rxrpc/call_accept.c
@@ -75,7 +75,6 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local,
 {
        struct rxrpc_connection *conn;
        struct rxrpc_skb_priv *sp, *nsp;
-       struct rxrpc_peer *peer;
        struct rxrpc_call *call;
        struct sk_buff *notification;
        int ret;
@@ -94,15 +93,7 @@ static int rxrpc_accept_incoming_call(struct rxrpc_local *local,
        rxrpc_new_skb(notification);
        notification->mark = RXRPC_SKB_MARK_NEW_CALL;
 
-       peer = rxrpc_lookup_peer(local, srx, GFP_NOIO);
-       if (!peer) {
-               _debug("no peer");
-               ret = -EBUSY;
-               goto error;
-       }
-
-       conn = rxrpc_incoming_connection(local, peer, skb);
-       rxrpc_put_peer(peer);
+       conn = rxrpc_incoming_connection(local, srx, skb);
        if (IS_ERR(conn)) {
                _debug("no conn");
                ret = PTR_ERR(conn);
@@ -226,20 +217,8 @@ void rxrpc_accept_incoming_calls(struct rxrpc_local *local)
        whdr._rsvd      = 0;
        whdr.serviceId  = htons(sp->hdr.serviceId);
 
-       /* determine the remote address */
-       memset(&srx, 0, sizeof(srx));
-       srx.srx_family = AF_RXRPC;
-       srx.transport.family = local->srx.transport.family;
-       srx.transport_type = local->srx.transport_type;
-       switch (srx.transport.family) {
-       case AF_INET:
-               srx.transport_len = sizeof(struct sockaddr_in);
-               srx.transport.sin.sin_port = udp_hdr(skb)->source;
-               srx.transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
-               break;
-       default:
-               goto busy;
-       }
+       if (rxrpc_extract_addr_from_skb(&srx, skb) < 0)
+               goto drop;
 
        /* get the socket providing the service */
        read_lock_bh(&local->services_lock);
@@ -285,6 +264,10 @@ busy:
        rxrpc_free_skb(skb);
        return;
 
+drop:
+       rxrpc_free_skb(skb);
+       return;
+
 invalid_service:
        skb->priority = RX_INVALID_OPERATION;
        rxrpc_reject_packet(local, skb);

diff --git a/net/rxrpc/conn_service.c b/net/rxrpc/conn_service.c
index cdcac50cd1a8832c69e98af63f4abec8dc6e9a20..a42b210c40a551a4fc2684903d251319055d495b 100644 (file)
--- a/net/rxrpc/conn_service.c
+++ b/net/rxrpc/conn_service.c
@@ -16,17 +16,24 @@
  * get a record of an incoming connection
  */
 struct rxrpc_connection *rxrpc_incoming_connection(struct rxrpc_local *local,
-                                                  struct rxrpc_peer *peer,
+                                                  struct sockaddr_rxrpc *srx,
                                                   struct sk_buff *skb)
 {
        struct rxrpc_connection *conn, *candidate = NULL;
        struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       struct rxrpc_peer *peer;
        struct rb_node *p, **pp;
        const char *new = "old";
        u32 epoch, cid;
 
        _enter("");
 
+       peer = rxrpc_lookup_peer(local, srx, GFP_NOIO);
+       if (!peer) {
+               _debug("no peer");
+               return ERR_PTR(-EBUSY);
+       }
+
        ASSERT(sp->hdr.flags & RXRPC_CLIENT_INITIATED);
 
        epoch = sp->hdr.epoch;
@@ -58,6 +65,7 @@ struct rxrpc_connection *rxrpc_incoming_connection(struct rxrpc_local *local,
         * redo the search */
        candidate = rxrpc_alloc_connection(GFP_NOIO);
        if (!candidate) {
+               rxrpc_put_peer(peer);
                _leave(" = -ENOMEM");
                return ERR_PTR(-ENOMEM);
        }
@@ -114,6 +122,7 @@ struct rxrpc_connection *rxrpc_incoming_connection(struct rxrpc_local *local,
 success:
        _net("CONNECTION %s %d {%x}", new, conn->debug_id, conn->proto.cid);
 
+       rxrpc_put_peer(peer);
        _leave(" = %p {u=%d}", conn, atomic_read(&conn->usage));
        return conn;
 

diff --git a/net/rxrpc/utils.c b/net/rxrpc/utils.c
index f28122a15a24b4db3df91361807b625a2ebfe7bd..d3db02ecc37f3b719cda4b712416bca4651082de 100644 (file)
--- a/net/rxrpc/utils.c
+++ b/net/rxrpc/utils.c
@@ -10,6 +10,7 @@
  */
 
 #include <linux/ip.h>
+#include <linux/ipv6.h>
 #include <linux/udp.h>
 #include "ar-internal.h"
 
@@ -39,3 +40,34 @@ void rxrpc_get_addr_from_skb(struct rxrpc_local *local,
                BUG();
        }
 }
+
+/*
+ * Fill out a peer address from a socket buffer containing a packet.
+ */
+int rxrpc_extract_addr_from_skb(struct sockaddr_rxrpc *srx, struct sk_buff *skb)
+{
+       memset(srx, 0, sizeof(*srx));
+
+       switch (ntohs(skb->protocol)) {
+       case ETH_P_IP:
+               srx->transport_type = SOCK_DGRAM;
+               srx->transport_len = sizeof(srx->transport.sin);
+               srx->transport.sin.sin_family = AF_INET;
+               srx->transport.sin.sin_port = udp_hdr(skb)->source;
+               srx->transport.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
+               return 0;
+
+       case ETH_P_IPV6:
+               srx->transport_type = SOCK_DGRAM;
+               srx->transport_len = sizeof(srx->transport.sin6);
+               srx->transport.sin6.sin6_family = AF_INET6;
+               srx->transport.sin6.sin6_port = udp_hdr(skb)->source;
+               srx->transport.sin6.sin6_addr = ipv6_hdr(skb)->saddr;
+               return 0;
+
+       default:
+               pr_warn_ratelimited("AF_RXRPC: Unknown eth protocol %u\n",
+                                   ntohs(skb->protocol));
+               return -EAFNOSUPPORT;
+       }
+}