rxrpc: Rename files matching ar-*.c to git rid of the "ar-" prefix
authorDavid Howells <dhowells@redhat.com>
Mon, 13 Jun 2016 11:16:05 +0000 (12:16 +0100)
committerDavid Howells <dhowells@redhat.com>
Mon, 13 Jun 2016 11:16:05 +0000 (12:16 +0100)
Rename files matching net/rxrpc/ar-*.c to get rid of the "ar-" prefix.
This will aid splitting those files by making easier to come up with new
names.

Note that the not all files are simply renamed from ar-X.c to X.c.  The
following exceptions are made:

 (*) ar-call.c -> call_object.c
     ar-ack.c -> call_event.c

     call_object.c is going to contain the core of the call object
     handling.  Call event handling is all going to be in call_event.c.

 (*) ar-accept.c -> call_accept.c

     Incoming call handling is going to be here.

 (*) ar-connection.c -> conn_object.c
     ar-connevent.c -> conn_event.c

     The former file is going to have the basic connection object handling,
     but there will likely be some differentiation between client
     connections and service connections in additional files later.  The
     latter file will have all the connection-level event handling.

 (*) ar-local.c -> local_object.c

     This will have the local endpoint object handling code.  The local
     endpoint event handling code will later be split out into
     local_event.c.

 (*) ar-peer.c -> peer_object.c

     This will have the peer endpoint object handling code.  Peer event
     handling code will be placed in peer_event.c (for the moment, there is
     none).

 (*) ar-error.c -> peer_event.c

     This will become the peer event handling code, though for the moment
     it's actually driven from the local endpoint's perspective.

Note that I haven't renamed ar-transport.c to transport_object.c as the
intention is to delete it when the rxrpc_transport struct is excised.

The only file that actually has its contents changed is net/rxrpc/Makefile.

net/rxrpc/ar-internal.h will need its section marker comments updating, but
I'll do that in a separate patch to make it easier for git to follow the
history across the rename.  I may also want to rename ar-internal.h at some
point - but that would mean updating all the #includes and I'd rather do
that in a separate step.

Signed-off-by: David Howells <dhowells@redhat.com.
33 files changed:
net/rxrpc/Makefile
net/rxrpc/ar-accept.c [deleted file]
net/rxrpc/ar-ack.c [deleted file]
net/rxrpc/ar-call.c [deleted file]
net/rxrpc/ar-connection.c [deleted file]
net/rxrpc/ar-connevent.c [deleted file]
net/rxrpc/ar-error.c [deleted file]
net/rxrpc/ar-input.c [deleted file]
net/rxrpc/ar-key.c [deleted file]
net/rxrpc/ar-local.c [deleted file]
net/rxrpc/ar-output.c [deleted file]
net/rxrpc/ar-peer.c [deleted file]
net/rxrpc/ar-proc.c [deleted file]
net/rxrpc/ar-recvmsg.c [deleted file]
net/rxrpc/ar-security.c [deleted file]
net/rxrpc/ar-skbuff.c [deleted file]
net/rxrpc/ar-transport.c [deleted file]
net/rxrpc/call_accept.c [new file with mode: 0644]
net/rxrpc/call_event.c [new file with mode: 0644]
net/rxrpc/call_object.c [new file with mode: 0644]
net/rxrpc/conn_event.c [new file with mode: 0644]
net/rxrpc/conn_object.c [new file with mode: 0644]
net/rxrpc/input.c [new file with mode: 0644]
net/rxrpc/key.c [new file with mode: 0644]
net/rxrpc/local_object.c [new file with mode: 0644]
net/rxrpc/output.c [new file with mode: 0644]
net/rxrpc/peer_event.c [new file with mode: 0644]
net/rxrpc/peer_object.c [new file with mode: 0644]
net/rxrpc/proc.c [new file with mode: 0644]
net/rxrpc/recvmsg.c [new file with mode: 0644]
net/rxrpc/security.c [new file with mode: 0644]
net/rxrpc/skbuff.c [new file with mode: 0644]
net/rxrpc/transport.c [new file with mode: 0644]

index e05a06ef2254248519616b06dd9dac6c6bf2a2fb..7e1006a3bfa5d66c56a696b49fbe9a66ec2e7ab2 100644 (file)
@@ -4,25 +4,25 @@
 
 af-rxrpc-y := \
        af_rxrpc.o \
-       ar-accept.o \
-       ar-ack.o \
-       ar-call.o \
-       ar-connection.o \
-       ar-connevent.o \
-       ar-error.o \
-       ar-input.o \
-       ar-key.o \
-       ar-local.o \
-       ar-output.o \
-       ar-peer.o \
-       ar-recvmsg.o \
-       ar-security.o \
-       ar-skbuff.o \
-       ar-transport.o \
+       call_accept.o \
+       call_event.o \
+       call_object.o \
+       conn_event.o \
+       conn_object.o \
+       input.o \
        insecure.o \
-       misc.o
+       key.o \
+       local_object.o \
+       misc.o \
+       output.o \
+       peer_event.o \
+       peer_object.o \
+       recvmsg.o \
+       security.o \
+       skbuff.o \
+       transport.o
 
-af-rxrpc-$(CONFIG_PROC_FS) += ar-proc.o
+af-rxrpc-$(CONFIG_PROC_FS) += proc.o
 af-rxrpc-$(CONFIG_RXKAD) += rxkad.o
 af-rxrpc-$(CONFIG_SYSCTL) += sysctl.o
 
diff --git a/net/rxrpc/ar-accept.c b/net/rxrpc/ar-accept.c
deleted file mode 100644 (file)
index eea5f4a..0000000
+++ /dev/null
@@ -1,518 +0,0 @@
-/* incoming call handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/errqueue.h>
-#include <linux/udp.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/icmp.h>
-#include <linux/gfp.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <net/ip.h>
-#include "ar-internal.h"
-
-/*
- * generate a connection-level abort
- */
-static int rxrpc_busy(struct rxrpc_local *local, struct sockaddr_rxrpc *srx,
-                     struct rxrpc_wire_header *whdr)
-{
-       struct msghdr msg;
-       struct kvec iov[1];
-       size_t len;
-       int ret;
-
-       _enter("%d,,", local->debug_id);
-
-       whdr->type      = RXRPC_PACKET_TYPE_BUSY;
-       whdr->serial    = htonl(1);
-
-       msg.msg_name    = &srx->transport.sin;
-       msg.msg_namelen = sizeof(srx->transport.sin);
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags   = 0;
-
-       iov[0].iov_base = whdr;
-       iov[0].iov_len  = sizeof(*whdr);
-
-       len = iov[0].iov_len;
-
-       _proto("Tx BUSY %%1");
-
-       ret = kernel_sendmsg(local->socket, &msg, iov, 1, len);
-       if (ret < 0) {
-               _leave(" = -EAGAIN [sendmsg failed: %d]", ret);
-               return -EAGAIN;
-       }
-
-       _leave(" = 0");
-       return 0;
-}
-
-/*
- * accept an incoming call that needs peer, transport and/or connection setting
- * up
- */
-static int rxrpc_accept_incoming_call(struct rxrpc_local *local,
-                                     struct rxrpc_sock *rx,
-                                     struct sk_buff *skb,
-                                     struct sockaddr_rxrpc *srx)
-{
-       struct rxrpc_connection *conn;
-       struct rxrpc_transport *trans;
-       struct rxrpc_skb_priv *sp, *nsp;
-       struct rxrpc_peer *peer;
-       struct rxrpc_call *call;
-       struct sk_buff *notification;
-       int ret;
-
-       _enter("");
-
-       sp = rxrpc_skb(skb);
-
-       /* get a notification message to send to the server app */
-       notification = alloc_skb(0, GFP_NOFS);
-       if (!notification) {
-               _debug("no memory");
-               ret = -ENOMEM;
-               goto error_nofree;
-       }
-       rxrpc_new_skb(notification);
-       notification->mark = RXRPC_SKB_MARK_NEW_CALL;
-
-       peer = rxrpc_get_peer(srx, GFP_NOIO);
-       if (IS_ERR(peer)) {
-               _debug("no peer");
-               ret = -EBUSY;
-               goto error;
-       }
-
-       trans = rxrpc_get_transport(local, peer, GFP_NOIO);
-       rxrpc_put_peer(peer);
-       if (IS_ERR(trans)) {
-               _debug("no trans");
-               ret = -EBUSY;
-               goto error;
-       }
-
-       conn = rxrpc_incoming_connection(trans, &sp->hdr);
-       rxrpc_put_transport(trans);
-       if (IS_ERR(conn)) {
-               _debug("no conn");
-               ret = PTR_ERR(conn);
-               goto error;
-       }
-
-       call = rxrpc_incoming_call(rx, conn, &sp->hdr);
-       rxrpc_put_connection(conn);
-       if (IS_ERR(call)) {
-               _debug("no call");
-               ret = PTR_ERR(call);
-               goto error;
-       }
-
-       /* attach the call to the socket */
-       read_lock_bh(&local->services_lock);
-       if (rx->sk.sk_state == RXRPC_CLOSE)
-               goto invalid_service;
-
-       write_lock(&rx->call_lock);
-       if (!test_and_set_bit(RXRPC_CALL_INIT_ACCEPT, &call->flags)) {
-               rxrpc_get_call(call);
-
-               spin_lock(&call->conn->state_lock);
-               if (sp->hdr.securityIndex > 0 &&
-                   call->conn->state == RXRPC_CONN_SERVER_UNSECURED) {
-                       _debug("await conn sec");
-                       list_add_tail(&call->accept_link, &rx->secureq);
-                       call->conn->state = RXRPC_CONN_SERVER_CHALLENGING;
-                       atomic_inc(&call->conn->usage);
-                       set_bit(RXRPC_CONN_CHALLENGE, &call->conn->events);
-                       rxrpc_queue_conn(call->conn);
-               } else {
-                       _debug("conn ready");
-                       call->state = RXRPC_CALL_SERVER_ACCEPTING;
-                       list_add_tail(&call->accept_link, &rx->acceptq);
-                       rxrpc_get_call(call);
-                       nsp = rxrpc_skb(notification);
-                       nsp->call = call;
-
-                       ASSERTCMP(atomic_read(&call->usage), >=, 3);
-
-                       _debug("notify");
-                       spin_lock(&call->lock);
-                       ret = rxrpc_queue_rcv_skb(call, notification, true,
-                                                 false);
-                       spin_unlock(&call->lock);
-                       notification = NULL;
-                       BUG_ON(ret < 0);
-               }
-               spin_unlock(&call->conn->state_lock);
-
-               _debug("queued");
-       }
-       write_unlock(&rx->call_lock);
-
-       _debug("process");
-       rxrpc_fast_process_packet(call, skb);
-
-       _debug("done");
-       read_unlock_bh(&local->services_lock);
-       rxrpc_free_skb(notification);
-       rxrpc_put_call(call);
-       _leave(" = 0");
-       return 0;
-
-invalid_service:
-       _debug("invalid");
-       read_unlock_bh(&local->services_lock);
-
-       read_lock_bh(&call->state_lock);
-       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
-               rxrpc_get_call(call);
-               rxrpc_queue_call(call);
-       }
-       read_unlock_bh(&call->state_lock);
-       rxrpc_put_call(call);
-       ret = -ECONNREFUSED;
-error:
-       rxrpc_free_skb(notification);
-error_nofree:
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * accept incoming calls that need peer, transport and/or connection setting up
- * - the packets we get are all incoming client DATA packets that have seq == 1
- */
-void rxrpc_accept_incoming_calls(struct work_struct *work)
-{
-       struct rxrpc_local *local =
-               container_of(work, struct rxrpc_local, acceptor);
-       struct rxrpc_skb_priv *sp;
-       struct sockaddr_rxrpc srx;
-       struct rxrpc_sock *rx;
-       struct rxrpc_wire_header whdr;
-       struct sk_buff *skb;
-       int ret;
-
-       _enter("%d", local->debug_id);
-
-       read_lock_bh(&rxrpc_local_lock);
-       if (atomic_read(&local->usage) > 0)
-               rxrpc_get_local(local);
-       else
-               local = NULL;
-       read_unlock_bh(&rxrpc_local_lock);
-       if (!local) {
-               _leave(" [local dead]");
-               return;
-       }
-
-process_next_packet:
-       skb = skb_dequeue(&local->accept_queue);
-       if (!skb) {
-               rxrpc_put_local(local);
-               _leave("\n");
-               return;
-       }
-
-       _net("incoming call skb %p", skb);
-
-       sp = rxrpc_skb(skb);
-
-       /* Set up a response packet header in case we need it */
-       whdr.epoch      = htonl(sp->hdr.epoch);
-       whdr.cid        = htonl(sp->hdr.cid);
-       whdr.callNumber = htonl(sp->hdr.callNumber);
-       whdr.seq        = htonl(sp->hdr.seq);
-       whdr.serial     = 0;
-       whdr.flags      = 0;
-       whdr.type       = 0;
-       whdr.userStatus = 0;
-       whdr.securityIndex = sp->hdr.securityIndex;
-       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;
-       }
-
-       /* get the socket providing the service */
-       read_lock_bh(&local->services_lock);
-       list_for_each_entry(rx, &local->services, listen_link) {
-               if (rx->srx.srx_service == sp->hdr.serviceId &&
-                   rx->sk.sk_state != RXRPC_CLOSE)
-                       goto found_service;
-       }
-       read_unlock_bh(&local->services_lock);
-       goto invalid_service;
-
-found_service:
-       _debug("found service %hd", rx->srx.srx_service);
-       if (sk_acceptq_is_full(&rx->sk))
-               goto backlog_full;
-       sk_acceptq_added(&rx->sk);
-       sock_hold(&rx->sk);
-       read_unlock_bh(&local->services_lock);
-
-       ret = rxrpc_accept_incoming_call(local, rx, skb, &srx);
-       if (ret < 0)
-               sk_acceptq_removed(&rx->sk);
-       sock_put(&rx->sk);
-       switch (ret) {
-       case -ECONNRESET: /* old calls are ignored */
-       case -ECONNABORTED: /* aborted calls are reaborted or ignored */
-       case 0:
-               goto process_next_packet;
-       case -ECONNREFUSED:
-               goto invalid_service;
-       case -EBUSY:
-               goto busy;
-       case -EKEYREJECTED:
-               goto security_mismatch;
-       default:
-               BUG();
-       }
-
-backlog_full:
-       read_unlock_bh(&local->services_lock);
-busy:
-       rxrpc_busy(local, &srx, &whdr);
-       rxrpc_free_skb(skb);
-       goto process_next_packet;
-
-invalid_service:
-       skb->priority = RX_INVALID_OPERATION;
-       rxrpc_reject_packet(local, skb);
-       goto process_next_packet;
-
-       /* can't change connection security type mid-flow */
-security_mismatch:
-       skb->priority = RX_PROTOCOL_ERROR;
-       rxrpc_reject_packet(local, skb);
-       goto process_next_packet;
-}
-
-/*
- * handle acceptance of a call by userspace
- * - assign the user call ID to the call at the front of the queue
- */
-struct rxrpc_call *rxrpc_accept_call(struct rxrpc_sock *rx,
-                                    unsigned long user_call_ID)
-{
-       struct rxrpc_call *call;
-       struct rb_node *parent, **pp;
-       int ret;
-
-       _enter(",%lx", user_call_ID);
-
-       ASSERT(!irqs_disabled());
-
-       write_lock(&rx->call_lock);
-
-       ret = -ENODATA;
-       if (list_empty(&rx->acceptq))
-               goto out;
-
-       /* check the user ID isn't already in use */
-       ret = -EBADSLT;
-       pp = &rx->calls.rb_node;
-       parent = NULL;
-       while (*pp) {
-               parent = *pp;
-               call = rb_entry(parent, struct rxrpc_call, sock_node);
-
-               if (user_call_ID < call->user_call_ID)
-                       pp = &(*pp)->rb_left;
-               else if (user_call_ID > call->user_call_ID)
-                       pp = &(*pp)->rb_right;
-               else
-                       goto out;
-       }
-
-       /* dequeue the first call and check it's still valid */
-       call = list_entry(rx->acceptq.next, struct rxrpc_call, accept_link);
-       list_del_init(&call->accept_link);
-       sk_acceptq_removed(&rx->sk);
-
-       write_lock_bh(&call->state_lock);
-       switch (call->state) {
-       case RXRPC_CALL_SERVER_ACCEPTING:
-               call->state = RXRPC_CALL_SERVER_RECV_REQUEST;
-               break;
-       case RXRPC_CALL_REMOTELY_ABORTED:
-       case RXRPC_CALL_LOCALLY_ABORTED:
-               ret = -ECONNABORTED;
-               goto out_release;
-       case RXRPC_CALL_NETWORK_ERROR:
-               ret = call->conn->error;
-               goto out_release;
-       case RXRPC_CALL_DEAD:
-               ret = -ETIME;
-               goto out_discard;
-       default:
-               BUG();
-       }
-
-       /* formalise the acceptance */
-       call->user_call_ID = user_call_ID;
-       rb_link_node(&call->sock_node, parent, pp);
-       rb_insert_color(&call->sock_node, &rx->calls);
-       if (test_and_set_bit(RXRPC_CALL_HAS_USERID, &call->flags))
-               BUG();
-       if (test_and_set_bit(RXRPC_CALL_EV_ACCEPTED, &call->events))
-               BUG();
-       rxrpc_queue_call(call);
-
-       rxrpc_get_call(call);
-       write_unlock_bh(&call->state_lock);
-       write_unlock(&rx->call_lock);
-       _leave(" = %p{%d}", call, call->debug_id);
-       return call;
-
-       /* if the call is already dying or dead, then we leave the socket's ref
-        * on it to be released by rxrpc_dead_call_expired() as induced by
-        * rxrpc_release_call() */
-out_release:
-       _debug("release %p", call);
-       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
-               rxrpc_queue_call(call);
-out_discard:
-       write_unlock_bh(&call->state_lock);
-       _debug("discard %p", call);
-out:
-       write_unlock(&rx->call_lock);
-       _leave(" = %d", ret);
-       return ERR_PTR(ret);
-}
-
-/*
- * Handle rejection of a call by userspace
- * - reject the call at the front of the queue
- */
-int rxrpc_reject_call(struct rxrpc_sock *rx)
-{
-       struct rxrpc_call *call;
-       int ret;
-
-       _enter("");
-
-       ASSERT(!irqs_disabled());
-
-       write_lock(&rx->call_lock);
-
-       ret = -ENODATA;
-       if (list_empty(&rx->acceptq))
-               goto out;
-
-       /* dequeue the first call and check it's still valid */
-       call = list_entry(rx->acceptq.next, struct rxrpc_call, accept_link);
-       list_del_init(&call->accept_link);
-       sk_acceptq_removed(&rx->sk);
-
-       write_lock_bh(&call->state_lock);
-       switch (call->state) {
-       case RXRPC_CALL_SERVER_ACCEPTING:
-               call->state = RXRPC_CALL_SERVER_BUSY;
-               if (test_and_set_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events))
-                       rxrpc_queue_call(call);
-               ret = 0;
-               goto out_release;
-       case RXRPC_CALL_REMOTELY_ABORTED:
-       case RXRPC_CALL_LOCALLY_ABORTED:
-               ret = -ECONNABORTED;
-               goto out_release;
-       case RXRPC_CALL_NETWORK_ERROR:
-               ret = call->conn->error;
-               goto out_release;
-       case RXRPC_CALL_DEAD:
-               ret = -ETIME;
-               goto out_discard;
-       default:
-               BUG();
-       }
-
-       /* if the call is already dying or dead, then we leave the socket's ref
-        * on it to be released by rxrpc_dead_call_expired() as induced by
-        * rxrpc_release_call() */
-out_release:
-       _debug("release %p", call);
-       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
-               rxrpc_queue_call(call);
-out_discard:
-       write_unlock_bh(&call->state_lock);
-       _debug("discard %p", call);
-out:
-       write_unlock(&rx->call_lock);
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/**
- * rxrpc_kernel_accept_call - Allow a kernel service to accept an incoming call
- * @sock: The socket on which the impending call is waiting
- * @user_call_ID: The tag to attach to the call
- *
- * Allow a kernel service to accept an incoming call, assuming the incoming
- * call is still valid.
- */
-struct rxrpc_call *rxrpc_kernel_accept_call(struct socket *sock,
-                                           unsigned long user_call_ID)
-{
-       struct rxrpc_call *call;
-
-       _enter(",%lx", user_call_ID);
-       call = rxrpc_accept_call(rxrpc_sk(sock->sk), user_call_ID);
-       _leave(" = %p", call);
-       return call;
-}
-EXPORT_SYMBOL(rxrpc_kernel_accept_call);
-
-/**
- * rxrpc_kernel_reject_call - Allow a kernel service to reject an incoming call
- * @sock: The socket on which the impending call is waiting
- *
- * Allow a kernel service to reject an incoming call with a BUSY message,
- * assuming the incoming call is still valid.
- */
-int rxrpc_kernel_reject_call(struct socket *sock)
-{
-       int ret;
-
-       _enter("");
-       ret = rxrpc_reject_call(rxrpc_sk(sock->sk));
-       _leave(" = %d", ret);
-       return ret;
-}
-EXPORT_SYMBOL(rxrpc_kernel_reject_call);
diff --git a/net/rxrpc/ar-ack.c b/net/rxrpc/ar-ack.c
deleted file mode 100644 (file)
index 1838178..0000000
+++ /dev/null
@@ -1,1288 +0,0 @@
-/* Management of Tx window, Tx resend, ACKs and out-of-sequence reception
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/circ_buf.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <linux/udp.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * propose an ACK be sent
- */
-void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
-                        u32 serial, bool immediate)
-{
-       unsigned long expiry;
-       s8 prior = rxrpc_ack_priority[ack_reason];
-
-       ASSERTCMP(prior, >, 0);
-
-       _enter("{%d},%s,%%%x,%u",
-              call->debug_id, rxrpc_acks(ack_reason), serial, immediate);
-
-       if (prior < rxrpc_ack_priority[call->ackr_reason]) {
-               if (immediate)
-                       goto cancel_timer;
-               return;
-       }
-
-       /* update DELAY, IDLE, REQUESTED and PING_RESPONSE ACK serial
-        * numbers */
-       if (prior == rxrpc_ack_priority[call->ackr_reason]) {
-               if (prior <= 4)
-                       call->ackr_serial = serial;
-               if (immediate)
-                       goto cancel_timer;
-               return;
-       }
-
-       call->ackr_reason = ack_reason;
-       call->ackr_serial = serial;
-
-       switch (ack_reason) {
-       case RXRPC_ACK_DELAY:
-               _debug("run delay timer");
-               expiry = rxrpc_soft_ack_delay;
-               goto run_timer;
-
-       case RXRPC_ACK_IDLE:
-               if (!immediate) {
-                       _debug("run defer timer");
-                       expiry = rxrpc_idle_ack_delay;
-                       goto run_timer;
-               }
-               goto cancel_timer;
-
-       case RXRPC_ACK_REQUESTED:
-               expiry = rxrpc_requested_ack_delay;
-               if (!expiry)
-                       goto cancel_timer;
-               if (!immediate || serial == 1) {
-                       _debug("run defer timer");
-                       goto run_timer;
-               }
-
-       default:
-               _debug("immediate ACK");
-               goto cancel_timer;
-       }
-
-run_timer:
-       expiry += jiffies;
-       if (!timer_pending(&call->ack_timer) ||
-           time_after(call->ack_timer.expires, expiry))
-               mod_timer(&call->ack_timer, expiry);
-       return;
-
-cancel_timer:
-       _debug("cancel timer %%%u", serial);
-       try_to_del_timer_sync(&call->ack_timer);
-       read_lock_bh(&call->state_lock);
-       if (call->state <= RXRPC_CALL_COMPLETE &&
-           !test_and_set_bit(RXRPC_CALL_EV_ACK, &call->events))
-               rxrpc_queue_call(call);
-       read_unlock_bh(&call->state_lock);
-}
-
-/*
- * propose an ACK be sent, locking the call structure
- */
-void rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
-                      u32 serial, bool immediate)
-{
-       s8 prior = rxrpc_ack_priority[ack_reason];
-
-       if (prior > rxrpc_ack_priority[call->ackr_reason]) {
-               spin_lock_bh(&call->lock);
-               __rxrpc_propose_ACK(call, ack_reason, serial, immediate);
-               spin_unlock_bh(&call->lock);
-       }
-}
-
-/*
- * set the resend timer
- */
-static void rxrpc_set_resend(struct rxrpc_call *call, u8 resend,
-                            unsigned long resend_at)
-{
-       read_lock_bh(&call->state_lock);
-       if (call->state >= RXRPC_CALL_COMPLETE)
-               resend = 0;
-
-       if (resend & 1) {
-               _debug("SET RESEND");
-               set_bit(RXRPC_CALL_EV_RESEND, &call->events);
-       }
-
-       if (resend & 2) {
-               _debug("MODIFY RESEND TIMER");
-               set_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-               mod_timer(&call->resend_timer, resend_at);
-       } else {
-               _debug("KILL RESEND TIMER");
-               del_timer_sync(&call->resend_timer);
-               clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
-               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-       }
-       read_unlock_bh(&call->state_lock);
-}
-
-/*
- * resend packets
- */
-static void rxrpc_resend(struct rxrpc_call *call)
-{
-       struct rxrpc_wire_header *whdr;
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *txb;
-       unsigned long *p_txb, resend_at;
-       bool stop;
-       int loop;
-       u8 resend;
-
-       _enter("{%d,%d,%d,%d},",
-              call->acks_hard, call->acks_unacked,
-              atomic_read(&call->sequence),
-              CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
-
-       stop = false;
-       resend = 0;
-       resend_at = 0;
-
-       for (loop = call->acks_tail;
-            loop != call->acks_head || stop;
-            loop = (loop + 1) &  (call->acks_winsz - 1)
-            ) {
-               p_txb = call->acks_window + loop;
-               smp_read_barrier_depends();
-               if (*p_txb & 1)
-                       continue;
-
-               txb = (struct sk_buff *) *p_txb;
-               sp = rxrpc_skb(txb);
-
-               if (sp->need_resend) {
-                       sp->need_resend = false;
-
-                       /* each Tx packet has a new serial number */
-                       sp->hdr.serial = atomic_inc_return(&call->conn->serial);
-
-                       whdr = (struct rxrpc_wire_header *)txb->head;
-                       whdr->serial = htonl(sp->hdr.serial);
-
-                       _proto("Tx DATA %%%u { #%d }",
-                              sp->hdr.serial, sp->hdr.seq);
-                       if (rxrpc_send_packet(call->conn->trans, txb) < 0) {
-                               stop = true;
-                               sp->resend_at = jiffies + 3;
-                       } else {
-                               sp->resend_at =
-                                       jiffies + rxrpc_resend_timeout;
-                       }
-               }
-
-               if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                       sp->need_resend = true;
-                       resend |= 1;
-               } else if (resend & 2) {
-                       if (time_before(sp->resend_at, resend_at))
-                               resend_at = sp->resend_at;
-               } else {
-                       resend_at = sp->resend_at;
-                       resend |= 2;
-               }
-       }
-
-       rxrpc_set_resend(call, resend, resend_at);
-       _leave("");
-}
-
-/*
- * handle resend timer expiry
- */
-static void rxrpc_resend_timer(struct rxrpc_call *call)
-{
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *txb;
-       unsigned long *p_txb, resend_at;
-       int loop;
-       u8 resend;
-
-       _enter("%d,%d,%d",
-              call->acks_tail, call->acks_unacked, call->acks_head);
-
-       if (call->state >= RXRPC_CALL_COMPLETE)
-               return;
-
-       resend = 0;
-       resend_at = 0;
-
-       for (loop = call->acks_unacked;
-            loop != call->acks_head;
-            loop = (loop + 1) &  (call->acks_winsz - 1)
-            ) {
-               p_txb = call->acks_window + loop;
-               smp_read_barrier_depends();
-               txb = (struct sk_buff *) (*p_txb & ~1);
-               sp = rxrpc_skb(txb);
-
-               ASSERT(!(*p_txb & 1));
-
-               if (sp->need_resend) {
-                       ;
-               } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                       sp->need_resend = true;
-                       resend |= 1;
-               } else if (resend & 2) {
-                       if (time_before(sp->resend_at, resend_at))
-                               resend_at = sp->resend_at;
-               } else {
-                       resend_at = sp->resend_at;
-                       resend |= 2;
-               }
-       }
-
-       rxrpc_set_resend(call, resend, resend_at);
-       _leave("");
-}
-
-/*
- * process soft ACKs of our transmitted packets
- * - these indicate packets the peer has or has not received, but hasn't yet
- *   given to the consumer, and so can still be discarded and re-requested
- */
-static int rxrpc_process_soft_ACKs(struct rxrpc_call *call,
-                                  struct rxrpc_ackpacket *ack,
-                                  struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *txb;
-       unsigned long *p_txb, resend_at;
-       int loop;
-       u8 sacks[RXRPC_MAXACKS], resend;
-
-       _enter("{%d,%d},{%d},",
-              call->acks_hard,
-              CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz),
-              ack->nAcks);
-
-       if (skb_copy_bits(skb, 0, sacks, ack->nAcks) < 0)
-               goto protocol_error;
-
-       resend = 0;
-       resend_at = 0;
-       for (loop = 0; loop < ack->nAcks; loop++) {
-               p_txb = call->acks_window;
-               p_txb += (call->acks_tail + loop) & (call->acks_winsz - 1);
-               smp_read_barrier_depends();
-               txb = (struct sk_buff *) (*p_txb & ~1);
-               sp = rxrpc_skb(txb);
-
-               switch (sacks[loop]) {
-               case RXRPC_ACK_TYPE_ACK:
-                       sp->need_resend = false;
-                       *p_txb |= 1;
-                       break;
-               case RXRPC_ACK_TYPE_NACK:
-                       sp->need_resend = true;
-                       *p_txb &= ~1;
-                       resend = 1;
-                       break;
-               default:
-                       _debug("Unsupported ACK type %d", sacks[loop]);
-                       goto protocol_error;
-               }
-       }
-
-       smp_mb();
-       call->acks_unacked = (call->acks_tail + loop) & (call->acks_winsz - 1);
-
-       /* anything not explicitly ACK'd is implicitly NACK'd, but may just not
-        * have been received or processed yet by the far end */
-       for (loop = call->acks_unacked;
-            loop != call->acks_head;
-            loop = (loop + 1) &  (call->acks_winsz - 1)
-            ) {
-               p_txb = call->acks_window + loop;
-               smp_read_barrier_depends();
-               txb = (struct sk_buff *) (*p_txb & ~1);
-               sp = rxrpc_skb(txb);
-
-               if (*p_txb & 1) {
-                       /* packet must have been discarded */
-                       sp->need_resend = true;
-                       *p_txb &= ~1;
-                       resend |= 1;
-               } else if (sp->need_resend) {
-                       ;
-               } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
-                       sp->need_resend = true;
-                       resend |= 1;
-               } else if (resend & 2) {
-                       if (time_before(sp->resend_at, resend_at))
-                               resend_at = sp->resend_at;
-               } else {
-                       resend_at = sp->resend_at;
-                       resend |= 2;
-               }
-       }
-
-       rxrpc_set_resend(call, resend, resend_at);
-       _leave(" = 0");
-       return 0;
-
-protocol_error:
-       _leave(" = -EPROTO");
-       return -EPROTO;
-}
-
-/*
- * discard hard-ACK'd packets from the Tx window
- */
-static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
-{
-       unsigned long _skb;
-       int tail = call->acks_tail, old_tail;
-       int win = CIRC_CNT(call->acks_head, tail, call->acks_winsz);
-
-       _enter("{%u,%u},%u", call->acks_hard, win, hard);
-
-       ASSERTCMP(hard - call->acks_hard, <=, win);
-
-       while (call->acks_hard < hard) {
-               smp_read_barrier_depends();
-               _skb = call->acks_window[tail] & ~1;
-               rxrpc_free_skb((struct sk_buff *) _skb);
-               old_tail = tail;
-               tail = (tail + 1) & (call->acks_winsz - 1);
-               call->acks_tail = tail;
-               if (call->acks_unacked == old_tail)
-                       call->acks_unacked = tail;
-               call->acks_hard++;
-       }
-
-       wake_up(&call->tx_waitq);
-}
-
-/*
- * clear the Tx window in the event of a failure
- */
-static void rxrpc_clear_tx_window(struct rxrpc_call *call)
-{
-       rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
-}
-
-/*
- * drain the out of sequence received packet queue into the packet Rx queue
- */
-static int rxrpc_drain_rx_oos_queue(struct rxrpc_call *call)
-{
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *skb;
-       bool terminal;
-       int ret;
-
-       _enter("{%d,%d}", call->rx_data_post, call->rx_first_oos);
-
-       spin_lock_bh(&call->lock);
-
-       ret = -ECONNRESET;
-       if (test_bit(RXRPC_CALL_RELEASED, &call->flags))
-               goto socket_unavailable;
-
-       skb = skb_dequeue(&call->rx_oos_queue);
-       if (skb) {
-               sp = rxrpc_skb(skb);
-
-               _debug("drain OOS packet %d [%d]",
-                      sp->hdr.seq, call->rx_first_oos);
-
-               if (sp->hdr.seq != call->rx_first_oos) {
-                       skb_queue_head(&call->rx_oos_queue, skb);
-                       call->rx_first_oos = rxrpc_skb(skb)->hdr.seq;
-                       _debug("requeue %p {%u}", skb, call->rx_first_oos);
-               } else {
-                       skb->mark = RXRPC_SKB_MARK_DATA;
-                       terminal = ((sp->hdr.flags & RXRPC_LAST_PACKET) &&
-                               !(sp->hdr.flags & RXRPC_CLIENT_INITIATED));
-                       ret = rxrpc_queue_rcv_skb(call, skb, true, terminal);
-                       BUG_ON(ret < 0);
-                       _debug("drain #%u", call->rx_data_post);
-                       call->rx_data_post++;
-
-                       /* find out what the next packet is */
-                       skb = skb_peek(&call->rx_oos_queue);
-                       if (skb)
-                               call->rx_first_oos = rxrpc_skb(skb)->hdr.seq;
-                       else
-                               call->rx_first_oos = 0;
-                       _debug("peek %p {%u}", skb, call->rx_first_oos);
-               }
-       }
-
-       ret = 0;
-socket_unavailable:
-       spin_unlock_bh(&call->lock);
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * insert an out of sequence packet into the buffer
- */
-static void rxrpc_insert_oos_packet(struct rxrpc_call *call,
-                                   struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp, *psp;
-       struct sk_buff *p;
-       u32 seq;
-
-       sp = rxrpc_skb(skb);
-       seq = sp->hdr.seq;
-       _enter(",,{%u}", seq);
-
-       skb->destructor = rxrpc_packet_destructor;
-       ASSERTCMP(sp->call, ==, NULL);
-       sp->call = call;
-       rxrpc_get_call(call);
-
-       /* insert into the buffer in sequence order */
-       spin_lock_bh(&call->lock);
-
-       skb_queue_walk(&call->rx_oos_queue, p) {
-               psp = rxrpc_skb(p);
-               if (psp->hdr.seq > seq) {
-                       _debug("insert oos #%u before #%u", seq, psp->hdr.seq);
-                       skb_insert(p, skb, &call->rx_oos_queue);
-                       goto inserted;
-               }
-       }
-
-       _debug("append oos #%u", seq);
-       skb_queue_tail(&call->rx_oos_queue, skb);
-inserted:
-
-       /* we might now have a new front to the queue */
-       if (call->rx_first_oos == 0 || seq < call->rx_first_oos)
-               call->rx_first_oos = seq;
-
-       read_lock(&call->state_lock);
-       if (call->state < RXRPC_CALL_COMPLETE &&
-           call->rx_data_post == call->rx_first_oos) {
-               _debug("drain rx oos now");
-               set_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events);
-       }
-       read_unlock(&call->state_lock);
-
-       spin_unlock_bh(&call->lock);
-       _leave(" [stored #%u]", call->rx_first_oos);
-}
-
-/*
- * clear the Tx window on final ACK reception
- */
-static void rxrpc_zap_tx_window(struct rxrpc_call *call)
-{
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *skb;
-       unsigned long _skb, *acks_window;
-       u8 winsz = call->acks_winsz;
-       int tail;
-
-       acks_window = call->acks_window;
-       call->acks_window = NULL;
-
-       while (CIRC_CNT(call->acks_head, call->acks_tail, winsz) > 0) {
-               tail = call->acks_tail;
-               smp_read_barrier_depends();
-               _skb = acks_window[tail] & ~1;
-               smp_mb();
-               call->acks_tail = (call->acks_tail + 1) & (winsz - 1);
-
-               skb = (struct sk_buff *) _skb;
-               sp = rxrpc_skb(skb);
-               _debug("+++ clear Tx %u", sp->hdr.seq);
-               rxrpc_free_skb(skb);
-       }
-
-       kfree(acks_window);
-}
-
-/*
- * process the extra information that may be appended to an ACK packet
- */
-static void rxrpc_extract_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,
-                                 unsigned int latest, int nAcks)
-{
-       struct rxrpc_ackinfo ackinfo;
-       struct rxrpc_peer *peer;
-       unsigned int mtu;
-
-       if (skb_copy_bits(skb, nAcks + 3, &ackinfo, sizeof(ackinfo)) < 0) {
-               _leave(" [no ackinfo]");
-               return;
-       }
-
-       _proto("Rx ACK %%%u Info { rx=%u max=%u rwin=%u jm=%u }",
-              latest,
-              ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU),
-              ntohl(ackinfo.rwind), ntohl(ackinfo.jumbo_max));
-
-       mtu = min(ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU));
-
-       peer = call->conn->trans->peer;
-       if (mtu < peer->maxdata) {
-               spin_lock_bh(&peer->lock);
-               peer->maxdata = mtu;
-               peer->mtu = mtu + peer->hdrsize;
-               spin_unlock_bh(&peer->lock);
-               _net("Net MTU %u (maxdata %u)", peer->mtu, peer->maxdata);
-       }
-}
-
-/*
- * process packets in the reception queue
- */
-static int rxrpc_process_rx_queue(struct rxrpc_call *call,
-                                 u32 *_abort_code)
-{
-       struct rxrpc_ackpacket ack;
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *skb;
-       bool post_ACK;
-       int latest;
-       u32 hard, tx;
-
-       _enter("");
-
-process_further:
-       skb = skb_dequeue(&call->rx_queue);
-       if (!skb)
-               return -EAGAIN;
-
-       _net("deferred skb %p", skb);
-
-       sp = rxrpc_skb(skb);
-
-       _debug("process %s [st %d]", rxrpc_pkts[sp->hdr.type], call->state);
-
-       post_ACK = false;
-
-       switch (sp->hdr.type) {
-               /* data packets that wind up here have been received out of
-                * order, need security processing or are jumbo packets */
-       case RXRPC_PACKET_TYPE_DATA:
-               _proto("OOSQ DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq);
-
-               /* secured packets must be verified and possibly decrypted */
-               if (call->conn->security->verify_packet(call, skb,
-                                                       _abort_code) < 0)
-                       goto protocol_error;
-
-               rxrpc_insert_oos_packet(call, skb);
-               goto process_further;
-
-               /* partial ACK to process */
-       case RXRPC_PACKET_TYPE_ACK:
-               if (skb_copy_bits(skb, 0, &ack, sizeof(ack)) < 0) {
-                       _debug("extraction failure");
-                       goto protocol_error;
-               }
-               if (!skb_pull(skb, sizeof(ack)))
-                       BUG();
-
-               latest = sp->hdr.serial;
-               hard = ntohl(ack.firstPacket);
-               tx = atomic_read(&call->sequence);
-
-               _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
-                      latest,
-                      ntohs(ack.maxSkew),
-                      hard,
-                      ntohl(ack.previousPacket),
-                      ntohl(ack.serial),
-                      rxrpc_acks(ack.reason),
-                      ack.nAcks);
-
-               rxrpc_extract_ackinfo(call, skb, latest, ack.nAcks);
-
-               if (ack.reason == RXRPC_ACK_PING) {
-                       _proto("Rx ACK %%%u PING Request", latest);
-                       rxrpc_propose_ACK(call, RXRPC_ACK_PING_RESPONSE,
-                                         sp->hdr.serial, true);
-               }
-
-               /* discard any out-of-order or duplicate ACKs */
-               if (latest - call->acks_latest <= 0) {
-                       _debug("discard ACK %d <= %d",
-                              latest, call->acks_latest);
-                       goto discard;
-               }
-               call->acks_latest = latest;
-
-               if (call->state != RXRPC_CALL_CLIENT_SEND_REQUEST &&
-                   call->state != RXRPC_CALL_CLIENT_AWAIT_REPLY &&
-                   call->state != RXRPC_CALL_SERVER_SEND_REPLY &&
-                   call->state != RXRPC_CALL_SERVER_AWAIT_ACK)
-                       goto discard;
-
-               _debug("Tx=%d H=%u S=%d", tx, call->acks_hard, call->state);
-
-               if (hard > 0) {
-                       if (hard - 1 > tx) {
-                               _debug("hard-ACK'd packet %d not transmitted"
-                                      " (%d top)",
-                                      hard - 1, tx);
-                               goto protocol_error;
-                       }
-
-                       if ((call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY ||
-                            call->state == RXRPC_CALL_SERVER_AWAIT_ACK) &&
-                           hard > tx) {
-                               call->acks_hard = tx;
-                               goto all_acked;
-                       }
-
-                       smp_rmb();
-                       rxrpc_rotate_tx_window(call, hard - 1);
-               }
-
-               if (ack.nAcks > 0) {
-                       if (hard - 1 + ack.nAcks > tx) {
-                               _debug("soft-ACK'd packet %d+%d not"
-                                      " transmitted (%d top)",
-                                      hard - 1, ack.nAcks, tx);
-                               goto protocol_error;
-                       }
-
-                       if (rxrpc_process_soft_ACKs(call, &ack, skb) < 0)
-                               goto protocol_error;
-               }
-               goto discard;
-
-               /* complete ACK to process */
-       case RXRPC_PACKET_TYPE_ACKALL:
-               goto all_acked;
-
-               /* abort and busy are handled elsewhere */
-       case RXRPC_PACKET_TYPE_BUSY:
-       case RXRPC_PACKET_TYPE_ABORT:
-               BUG();
-
-               /* connection level events - also handled elsewhere */
-       case RXRPC_PACKET_TYPE_CHALLENGE:
-       case RXRPC_PACKET_TYPE_RESPONSE:
-       case RXRPC_PACKET_TYPE_DEBUG:
-               BUG();
-       }
-
-       /* if we've had a hard ACK that covers all the packets we've sent, then
-        * that ends that phase of the operation */
-all_acked:
-       write_lock_bh(&call->state_lock);
-       _debug("ack all %d", call->state);
-
-       switch (call->state) {
-       case RXRPC_CALL_CLIENT_AWAIT_REPLY:
-               call->state = RXRPC_CALL_CLIENT_RECV_REPLY;
-               break;
-       case RXRPC_CALL_SERVER_AWAIT_ACK:
-               _debug("srv complete");
-               call->state = RXRPC_CALL_COMPLETE;
-               post_ACK = true;
-               break;
-       case RXRPC_CALL_CLIENT_SEND_REQUEST:
-       case RXRPC_CALL_SERVER_RECV_REQUEST:
-               goto protocol_error_unlock; /* can't occur yet */
-       default:
-               write_unlock_bh(&call->state_lock);
-               goto discard; /* assume packet left over from earlier phase */
-       }
-
-       write_unlock_bh(&call->state_lock);
-
-       /* if all the packets we sent are hard-ACK'd, then we can discard
-        * whatever we've got left */
-       _debug("clear Tx %d",
-              CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
-
-       del_timer_sync(&call->resend_timer);
-       clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-       clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
-
-       if (call->acks_window)
-               rxrpc_zap_tx_window(call);
-
-       if (post_ACK) {
-               /* post the final ACK message for userspace to pick up */
-               _debug("post ACK");
-               skb->mark = RXRPC_SKB_MARK_FINAL_ACK;
-               sp->call = call;
-               rxrpc_get_call(call);
-               spin_lock_bh(&call->lock);
-               if (rxrpc_queue_rcv_skb(call, skb, true, true) < 0)
-                       BUG();
-               spin_unlock_bh(&call->lock);
-               goto process_further;
-       }
-
-discard:
-       rxrpc_free_skb(skb);
-       goto process_further;
-
-protocol_error_unlock:
-       write_unlock_bh(&call->state_lock);
-protocol_error:
-       rxrpc_free_skb(skb);
-       _leave(" = -EPROTO");
-       return -EPROTO;
-}
-
-/*
- * post a message to the socket Rx queue for recvmsg() to pick up
- */
-static int rxrpc_post_message(struct rxrpc_call *call, u32 mark, u32 error,
-                             bool fatal)
-{
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *skb;
-       int ret;
-
-       _enter("{%d,%lx},%u,%u,%d",
-              call->debug_id, call->flags, mark, error, fatal);
-
-       /* remove timers and things for fatal messages */
-       if (fatal) {
-               del_timer_sync(&call->resend_timer);
-               del_timer_sync(&call->ack_timer);
-               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-       }
-
-       if (mark != RXRPC_SKB_MARK_NEW_CALL &&
-           !test_bit(RXRPC_CALL_HAS_USERID, &call->flags)) {
-               _leave("[no userid]");
-               return 0;
-       }
-
-       if (!test_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags)) {
-               skb = alloc_skb(0, GFP_NOFS);
-               if (!skb)
-                       return -ENOMEM;
-
-               rxrpc_new_skb(skb);
-
-               skb->mark = mark;
-
-               sp = rxrpc_skb(skb);
-               memset(sp, 0, sizeof(*sp));
-               sp->error = error;
-               sp->call = call;
-               rxrpc_get_call(call);
-
-               spin_lock_bh(&call->lock);
-               ret = rxrpc_queue_rcv_skb(call, skb, true, fatal);
-               spin_unlock_bh(&call->lock);
-               BUG_ON(ret < 0);
-       }
-
-       return 0;
-}
-
-/*
- * handle background processing of incoming call packets and ACK / abort
- * generation
- */
-void rxrpc_process_call(struct work_struct *work)
-{
-       struct rxrpc_call *call =
-               container_of(work, struct rxrpc_call, processor);
-       struct rxrpc_wire_header whdr;
-       struct rxrpc_ackpacket ack;
-       struct rxrpc_ackinfo ackinfo;
-       struct msghdr msg;
-       struct kvec iov[5];
-       enum rxrpc_call_event genbit;
-       unsigned long bits;
-       __be32 data, pad;
-       size_t len;
-       int loop, nbit, ioc, ret, mtu;
-       u32 serial, abort_code = RX_PROTOCOL_ERROR;
-       u8 *acks = NULL;
-
-       //printk("\n--------------------\n");
-       _enter("{%d,%s,%lx} [%lu]",
-              call->debug_id, rxrpc_call_states[call->state], call->events,
-              (jiffies - call->creation_jif) / (HZ / 10));
-
-       if (test_and_set_bit(RXRPC_CALL_PROC_BUSY, &call->flags)) {
-               _debug("XXXXXXXXXXXXX RUNNING ON MULTIPLE CPUS XXXXXXXXXXXXX");
-               return;
-       }
-
-       /* there's a good chance we're going to have to send a message, so set
-        * one up in advance */
-       msg.msg_name    = &call->conn->trans->peer->srx.transport;
-       msg.msg_namelen = call->conn->trans->peer->srx.transport_len;
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags   = 0;
-
-       whdr.epoch      = htonl(call->conn->epoch);
-       whdr.cid        = htonl(call->cid);
-       whdr.callNumber = htonl(call->call_id);
-       whdr.seq        = 0;
-       whdr.type       = RXRPC_PACKET_TYPE_ACK;
-       whdr.flags      = call->conn->out_clientflag;
-       whdr.userStatus = 0;
-       whdr.securityIndex = call->conn->security_ix;
-       whdr._rsvd      = 0;
-       whdr.serviceId  = htons(call->service_id);
-
-       memset(iov, 0, sizeof(iov));
-       iov[0].iov_base = &whdr;
-       iov[0].iov_len  = sizeof(whdr);
-
-       /* deal with events of a final nature */
-       if (test_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
-               rxrpc_release_call(call);
-               clear_bit(RXRPC_CALL_EV_RELEASE, &call->events);
-       }
-
-       if (test_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events)) {
-               int error;
-
-               clear_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
-               clear_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events);
-               clear_bit(RXRPC_CALL_EV_ABORT, &call->events);
-
-               error = call->conn->trans->peer->net_error;
-               _debug("post net error %d", error);
-
-               if (rxrpc_post_message(call, RXRPC_SKB_MARK_NET_ERROR,
-                                      error, true) < 0)
-                       goto no_mem;
-               clear_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events);
-               goto kill_ACKs;
-       }
-
-       if (test_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events)) {
-               ASSERTCMP(call->state, >, RXRPC_CALL_COMPLETE);
-
-               clear_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events);
-               clear_bit(RXRPC_CALL_EV_ABORT, &call->events);
-
-               _debug("post conn abort");
-
-               if (rxrpc_post_message(call, RXRPC_SKB_MARK_LOCAL_ERROR,
-                                      call->conn->error, true) < 0)
-                       goto no_mem;
-               clear_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
-               goto kill_ACKs;
-       }
-
-       if (test_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events)) {
-               whdr.type = RXRPC_PACKET_TYPE_BUSY;
-               genbit = RXRPC_CALL_EV_REJECT_BUSY;
-               goto send_message;
-       }
-
-       if (test_bit(RXRPC_CALL_EV_ABORT, &call->events)) {
-               ASSERTCMP(call->state, >, RXRPC_CALL_COMPLETE);
-
-               if (rxrpc_post_message(call, RXRPC_SKB_MARK_LOCAL_ERROR,
-                                      ECONNABORTED, true) < 0)
-                       goto no_mem;
-               whdr.type = RXRPC_PACKET_TYPE_ABORT;
-               data = htonl(call->local_abort);
-               iov[1].iov_base = &data;
-               iov[1].iov_len = sizeof(data);
-               genbit = RXRPC_CALL_EV_ABORT;
-               goto send_message;
-       }
-
-       if (test_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events)) {
-               genbit = RXRPC_CALL_EV_ACK_FINAL;
-
-               ack.bufferSpace = htons(8);
-               ack.maxSkew     = 0;
-               ack.serial      = 0;
-               ack.reason      = RXRPC_ACK_IDLE;
-               ack.nAcks       = 0;
-               call->ackr_reason = 0;
-
-               spin_lock_bh(&call->lock);
-               ack.serial      = htonl(call->ackr_serial);
-               ack.previousPacket = htonl(call->ackr_prev_seq);
-               ack.firstPacket = htonl(call->rx_data_eaten + 1);
-               spin_unlock_bh(&call->lock);
-
-               pad = 0;
-
-               iov[1].iov_base = &ack;
-               iov[1].iov_len  = sizeof(ack);
-               iov[2].iov_base = &pad;
-               iov[2].iov_len  = 3;
-               iov[3].iov_base = &ackinfo;
-               iov[3].iov_len  = sizeof(ackinfo);
-               goto send_ACK;
-       }
-
-       if (call->events & ((1 << RXRPC_CALL_EV_RCVD_BUSY) |
-                           (1 << RXRPC_CALL_EV_RCVD_ABORT))
-           ) {
-               u32 mark;
-
-               if (test_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events))
-                       mark = RXRPC_SKB_MARK_REMOTE_ABORT;
-               else
-                       mark = RXRPC_SKB_MARK_BUSY;
-
-               _debug("post abort/busy");
-               rxrpc_clear_tx_window(call);
-               if (rxrpc_post_message(call, mark, ECONNABORTED, true) < 0)
-                       goto no_mem;
-
-               clear_bit(RXRPC_CALL_EV_RCVD_BUSY, &call->events);
-               clear_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
-               goto kill_ACKs;
-       }
-
-       if (test_and_clear_bit(RXRPC_CALL_EV_RCVD_ACKALL, &call->events)) {
-               _debug("do implicit ackall");
-               rxrpc_clear_tx_window(call);
-       }
-
-       if (test_bit(RXRPC_CALL_EV_LIFE_TIMER, &call->events)) {
-               write_lock_bh(&call->state_lock);
-               if (call->state <= RXRPC_CALL_COMPLETE) {
-                       call->state = RXRPC_CALL_LOCALLY_ABORTED;
-                       call->local_abort = RX_CALL_TIMEOUT;
-                       set_bit(RXRPC_CALL_EV_ABORT, &call->events);
-               }
-               write_unlock_bh(&call->state_lock);
-
-               _debug("post timeout");
-               if (rxrpc_post_message(call, RXRPC_SKB_MARK_LOCAL_ERROR,
-                                      ETIME, true) < 0)
-                       goto no_mem;
-
-               clear_bit(RXRPC_CALL_EV_LIFE_TIMER, &call->events);
-               goto kill_ACKs;
-       }
-
-       /* deal with assorted inbound messages */
-       if (!skb_queue_empty(&call->rx_queue)) {
-               switch (rxrpc_process_rx_queue(call, &abort_code)) {
-               case 0:
-               case -EAGAIN:
-                       break;
-               case -ENOMEM:
-                       goto no_mem;
-               case -EKEYEXPIRED:
-               case -EKEYREJECTED:
-               case -EPROTO:
-                       rxrpc_abort_call(call, abort_code);
-                       goto kill_ACKs;
-               }
-       }
-
-       /* handle resending */
-       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events))
-               rxrpc_resend_timer(call);
-       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND, &call->events))
-               rxrpc_resend(call);
-
-       /* consider sending an ordinary ACK */
-       if (test_bit(RXRPC_CALL_EV_ACK, &call->events)) {
-               _debug("send ACK: window: %d - %d { %lx }",
-                      call->rx_data_eaten, call->ackr_win_top,
-                      call->ackr_window[0]);
-
-               if (call->state > RXRPC_CALL_SERVER_ACK_REQUEST &&
-                   call->ackr_reason != RXRPC_ACK_PING_RESPONSE) {
-                       /* ACK by sending reply DATA packet in this state */
-                       clear_bit(RXRPC_CALL_EV_ACK, &call->events);
-                       goto maybe_reschedule;
-               }
-
-               genbit = RXRPC_CALL_EV_ACK;
-
-               acks = kzalloc(call->ackr_win_top - call->rx_data_eaten,
-                              GFP_NOFS);
-               if (!acks)
-                       goto no_mem;
-
-               //hdr.flags     = RXRPC_SLOW_START_OK;
-               ack.bufferSpace = htons(8);
-               ack.maxSkew     = 0;
-
-               spin_lock_bh(&call->lock);
-               ack.reason      = call->ackr_reason;
-               ack.serial      = htonl(call->ackr_serial);
-               ack.previousPacket = htonl(call->ackr_prev_seq);
-               ack.firstPacket = htonl(call->rx_data_eaten + 1);
-
-               ack.nAcks = 0;
-               for (loop = 0; loop < RXRPC_ACKR_WINDOW_ASZ; loop++) {
-                       nbit = loop * BITS_PER_LONG;
-                       for (bits = call->ackr_window[loop]; bits; bits >>= 1
-                            ) {
-                               _debug("- l=%d n=%d b=%lx", loop, nbit, bits);
-                               if (bits & 1) {
-                                       acks[nbit] = RXRPC_ACK_TYPE_ACK;
-                                       ack.nAcks = nbit + 1;
-                               }
-                               nbit++;
-                       }
-               }
-               call->ackr_reason = 0;
-               spin_unlock_bh(&call->lock);
-
-               pad = 0;
-
-               iov[1].iov_base = &ack;
-               iov[1].iov_len  = sizeof(ack);
-               iov[2].iov_base = acks;
-               iov[2].iov_len  = ack.nAcks;
-               iov[3].iov_base = &pad;
-               iov[3].iov_len  = 3;
-               iov[4].iov_base = &ackinfo;
-               iov[4].iov_len  = sizeof(ackinfo);
-
-               switch (ack.reason) {
-               case RXRPC_ACK_REQUESTED:
-               case RXRPC_ACK_DUPLICATE:
-               case RXRPC_ACK_OUT_OF_SEQUENCE:
-               case RXRPC_ACK_EXCEEDS_WINDOW:
-               case RXRPC_ACK_NOSPACE:
-               case RXRPC_ACK_PING:
-               case RXRPC_ACK_PING_RESPONSE:
-                       goto send_ACK_with_skew;
-               case RXRPC_ACK_DELAY:
-               case RXRPC_ACK_IDLE:
-                       goto send_ACK;
-               }
-       }
-
-       /* handle completion of security negotiations on an incoming
-        * connection */
-       if (test_and_clear_bit(RXRPC_CALL_EV_SECURED, &call->events)) {
-               _debug("secured");
-               spin_lock_bh(&call->lock);
-
-               if (call->state == RXRPC_CALL_SERVER_SECURING) {
-                       _debug("securing");
-                       write_lock(&call->conn->lock);
-                       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-                           !test_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
-                               _debug("not released");
-                               call->state = RXRPC_CALL_SERVER_ACCEPTING;
-                               list_move_tail(&call->accept_link,
-                                              &call->socket->acceptq);
-                       }
-                       write_unlock(&call->conn->lock);
-                       read_lock(&call->state_lock);
-                       if (call->state < RXRPC_CALL_COMPLETE)
-                               set_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events);
-                       read_unlock(&call->state_lock);
-               }
-
-               spin_unlock_bh(&call->lock);
-               if (!test_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events))
-                       goto maybe_reschedule;
-       }
-
-       /* post a notification of an acceptable connection to the app */
-       if (test_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events)) {
-               _debug("post accept");
-               if (rxrpc_post_message(call, RXRPC_SKB_MARK_NEW_CALL,
-                                      0, false) < 0)
-                       goto no_mem;
-               clear_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events);
-               goto maybe_reschedule;
-       }
-
-       /* handle incoming call acceptance */
-       if (test_and_clear_bit(RXRPC_CALL_EV_ACCEPTED, &call->events)) {
-               _debug("accepted");
-               ASSERTCMP(call->rx_data_post, ==, 0);
-               call->rx_data_post = 1;
-               read_lock_bh(&call->state_lock);
-               if (call->state < RXRPC_CALL_COMPLETE)
-                       set_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events);
-               read_unlock_bh(&call->state_lock);
-       }
-
-       /* drain the out of sequence received packet queue into the packet Rx
-        * queue */
-       if (test_and_clear_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events)) {
-               while (call->rx_data_post == call->rx_first_oos)
-                       if (rxrpc_drain_rx_oos_queue(call) < 0)
-                               break;
-               goto maybe_reschedule;
-       }
-
-       /* other events may have been raised since we started checking */
-       goto maybe_reschedule;
-
-send_ACK_with_skew:
-       ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
-                           ntohl(ack.serial));
-send_ACK:
-       mtu = call->conn->trans->peer->if_mtu;
-       mtu -= call->conn->trans->peer->hdrsize;
-       ackinfo.maxMTU  = htonl(mtu);
-       ackinfo.rwind   = htonl(rxrpc_rx_window_size);
-
-       /* permit the peer to send us jumbo packets if it wants to */
-       ackinfo.rxMTU   = htonl(rxrpc_rx_mtu);
-       ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
-
-       serial = atomic_inc_return(&call->conn->serial);
-       whdr.serial = htonl(serial);
-       _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
-              serial,
-              ntohs(ack.maxSkew),
-              ntohl(ack.firstPacket),
-              ntohl(ack.previousPacket),
-              ntohl(ack.serial),
-              rxrpc_acks(ack.reason),
-              ack.nAcks);
-
-       del_timer_sync(&call->ack_timer);
-       if (ack.nAcks > 0)
-               set_bit(RXRPC_CALL_TX_SOFT_ACK, &call->flags);
-       goto send_message_2;
-
-send_message:
-       _debug("send message");
-
-       serial = atomic_inc_return(&call->conn->serial);
-       whdr.serial = htonl(serial);
-       _proto("Tx %s %%%u", rxrpc_pkts[whdr.type], serial);
-send_message_2:
-
-       len = iov[0].iov_len;
-       ioc = 1;
-       if (iov[4].iov_len) {
-               ioc = 5;
-               len += iov[4].iov_len;
-               len += iov[3].iov_len;
-               len += iov[2].iov_len;
-               len += iov[1].iov_len;
-       } else if (iov[3].iov_len) {
-               ioc = 4;
-               len += iov[3].iov_len;
-               len += iov[2].iov_len;
-               len += iov[1].iov_len;
-       } else if (iov[2].iov_len) {
-               ioc = 3;
-               len += iov[2].iov_len;
-               len += iov[1].iov_len;
-       } else if (iov[1].iov_len) {
-               ioc = 2;
-               len += iov[1].iov_len;
-       }
-
-       ret = kernel_sendmsg(call->conn->trans->local->socket,
-                            &msg, iov, ioc, len);
-       if (ret < 0) {
-               _debug("sendmsg failed: %d", ret);
-               read_lock_bh(&call->state_lock);
-               if (call->state < RXRPC_CALL_DEAD)
-                       rxrpc_queue_call(call);
-               read_unlock_bh(&call->state_lock);
-               goto error;
-       }
-
-       switch (genbit) {
-       case RXRPC_CALL_EV_ABORT:
-               clear_bit(genbit, &call->events);
-               clear_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
-               goto kill_ACKs;
-
-       case RXRPC_CALL_EV_ACK_FINAL:
-               write_lock_bh(&call->state_lock);
-               if (call->state == RXRPC_CALL_CLIENT_FINAL_ACK)
-                       call->state = RXRPC_CALL_COMPLETE;
-               write_unlock_bh(&call->state_lock);
-               goto kill_ACKs;
-
-       default:
-               clear_bit(genbit, &call->events);
-               switch (call->state) {
-               case RXRPC_CALL_CLIENT_AWAIT_REPLY:
-               case RXRPC_CALL_CLIENT_RECV_REPLY:
-               case RXRPC_CALL_SERVER_RECV_REQUEST:
-               case RXRPC_CALL_SERVER_ACK_REQUEST:
-                       _debug("start ACK timer");
-                       rxrpc_propose_ACK(call, RXRPC_ACK_DELAY,
-                                         call->ackr_serial, false);
-               default:
-                       break;
-               }
-               goto maybe_reschedule;
-       }
-
-kill_ACKs:
-       del_timer_sync(&call->ack_timer);
-       if (test_and_clear_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events))
-               rxrpc_put_call(call);
-       clear_bit(RXRPC_CALL_EV_ACK, &call->events);
-
-maybe_reschedule:
-       if (call->events || !skb_queue_empty(&call->rx_queue)) {
-               read_lock_bh(&call->state_lock);
-               if (call->state < RXRPC_CALL_DEAD)
-                       rxrpc_queue_call(call);
-               read_unlock_bh(&call->state_lock);
-       }
-
-       /* don't leave aborted connections on the accept queue */
-       if (call->state >= RXRPC_CALL_COMPLETE &&
-           !list_empty(&call->accept_link)) {
-               _debug("X unlinking once-pending call %p { e=%lx f=%lx c=%x }",
-                      call, call->events, call->flags, call->conn->cid);
-
-               read_lock_bh(&call->state_lock);
-               if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-                   !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
-                       rxrpc_queue_call(call);
-               read_unlock_bh(&call->state_lock);
-       }
-
-error:
-       clear_bit(RXRPC_CALL_PROC_BUSY, &call->flags);
-       kfree(acks);
-
-       /* because we don't want two CPUs both processing the work item for one
-        * call at the same time, we use a flag to note when it's busy; however
-        * this means there's a race between clearing the flag and setting the
-        * work pending bit and the work item being processed again */
-       if (call->events && !work_pending(&call->processor)) {
-               _debug("jumpstart %x", call->conn->cid);
-               rxrpc_queue_call(call);
-       }
-
-       _leave("");
-       return;
-
-no_mem:
-       _debug("out of memory");
-       goto maybe_reschedule;
-}
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c
deleted file mode 100644 (file)
index 68125dc..0000000
+++ /dev/null
@@ -1,980 +0,0 @@
-/* RxRPC individual remote procedure call handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/circ_buf.h>
-#include <linux/hashtable.h>
-#include <linux/spinlock_types.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * Maximum lifetime of a call (in jiffies).
- */
-unsigned int rxrpc_max_call_lifetime = 60 * HZ;
-
-/*
- * Time till dead call expires after last use (in jiffies).
- */
-unsigned int rxrpc_dead_call_expiry = 2 * HZ;
-
-const char *const rxrpc_call_states[NR__RXRPC_CALL_STATES] = {
-       [RXRPC_CALL_CLIENT_SEND_REQUEST]        = "ClSndReq",
-       [RXRPC_CALL_CLIENT_AWAIT_REPLY]         = "ClAwtRpl",
-       [RXRPC_CALL_CLIENT_RECV_REPLY]          = "ClRcvRpl",
-       [RXRPC_CALL_CLIENT_FINAL_ACK]           = "ClFnlACK",
-       [RXRPC_CALL_SERVER_SECURING]            = "SvSecure",
-       [RXRPC_CALL_SERVER_ACCEPTING]           = "SvAccept",
-       [RXRPC_CALL_SERVER_RECV_REQUEST]        = "SvRcvReq",
-       [RXRPC_CALL_SERVER_ACK_REQUEST]         = "SvAckReq",
-       [RXRPC_CALL_SERVER_SEND_REPLY]          = "SvSndRpl",
-       [RXRPC_CALL_SERVER_AWAIT_ACK]           = "SvAwtACK",
-       [RXRPC_CALL_COMPLETE]                   = "Complete",
-       [RXRPC_CALL_SERVER_BUSY]                = "SvBusy  ",
-       [RXRPC_CALL_REMOTELY_ABORTED]           = "RmtAbort",
-       [RXRPC_CALL_LOCALLY_ABORTED]            = "LocAbort",
-       [RXRPC_CALL_NETWORK_ERROR]              = "NetError",
-       [RXRPC_CALL_DEAD]                       = "Dead    ",
-};
-
-struct kmem_cache *rxrpc_call_jar;
-LIST_HEAD(rxrpc_calls);
-DEFINE_RWLOCK(rxrpc_call_lock);
-
-static void rxrpc_destroy_call(struct work_struct *work);
-static void rxrpc_call_life_expired(unsigned long _call);
-static void rxrpc_dead_call_expired(unsigned long _call);
-static void rxrpc_ack_time_expired(unsigned long _call);
-static void rxrpc_resend_time_expired(unsigned long _call);
-
-static DEFINE_SPINLOCK(rxrpc_call_hash_lock);
-static DEFINE_HASHTABLE(rxrpc_call_hash, 10);
-
-/*
- * Hash function for rxrpc_call_hash
- */
-static unsigned long rxrpc_call_hashfunc(
-       u8              in_clientflag,
-       u32             cid,
-       u32             call_id,
-       u32             epoch,
-       u16             service_id,
-       sa_family_t     proto,
-       void            *localptr,
-       unsigned int    addr_size,
-       const u8        *peer_addr)
-{
-       const u16 *p;
-       unsigned int i;
-       unsigned long key;
-
-       _enter("");
-
-       key = (unsigned long)localptr;
-       /* We just want to add up the __be32 values, so forcing the
-        * cast should be okay.
-        */
-       key += epoch;
-       key += service_id;
-       key += call_id;
-       key += (cid & RXRPC_CIDMASK) >> RXRPC_CIDSHIFT;
-       key += cid & RXRPC_CHANNELMASK;
-       key += in_clientflag;
-       key += proto;
-       /* Step through the peer address in 16-bit portions for speed */
-       for (i = 0, p = (const u16 *)peer_addr; i < addr_size >> 1; i++, p++)
-               key += *p;
-       _leave(" key = 0x%lx", key);
-       return key;
-}
-
-/*
- * Add a call to the hashtable
- */
-static void rxrpc_call_hash_add(struct rxrpc_call *call)
-{
-       unsigned long key;
-       unsigned int addr_size = 0;
-
-       _enter("");
-       switch (call->proto) {
-       case AF_INET:
-               addr_size = sizeof(call->peer_ip.ipv4_addr);
-               break;
-       case AF_INET6:
-               addr_size = sizeof(call->peer_ip.ipv6_addr);
-               break;
-       default:
-               break;
-       }
-       key = rxrpc_call_hashfunc(call->in_clientflag, call->cid,
-                                 call->call_id, call->epoch,
-                                 call->service_id, call->proto,
-                                 call->conn->trans->local, addr_size,
-                                 call->peer_ip.ipv6_addr);
-       /* Store the full key in the call */
-       call->hash_key = key;
-       spin_lock(&rxrpc_call_hash_lock);
-       hash_add_rcu(rxrpc_call_hash, &call->hash_node, key);
-       spin_unlock(&rxrpc_call_hash_lock);
-       _leave("");
-}
-
-/*
- * Remove a call from the hashtable
- */
-static void rxrpc_call_hash_del(struct rxrpc_call *call)
-{
-       _enter("");
-       spin_lock(&rxrpc_call_hash_lock);
-       hash_del_rcu(&call->hash_node);
-       spin_unlock(&rxrpc_call_hash_lock);
-       _leave("");
-}
-
-/*
- * Find a call in the hashtable and return it, or NULL if it
- * isn't there.
- */
-struct rxrpc_call *rxrpc_find_call_hash(
-       struct rxrpc_host_header *hdr,
-       void            *localptr,
-       sa_family_t     proto,
-       const void      *peer_addr)
-{
-       unsigned long key;
-       unsigned int addr_size = 0;
-       struct rxrpc_call *call = NULL;
-       struct rxrpc_call *ret = NULL;
-       u8 in_clientflag = hdr->flags & RXRPC_CLIENT_INITIATED;
-
-       _enter("");
-       switch (proto) {
-       case AF_INET:
-               addr_size = sizeof(call->peer_ip.ipv4_addr);
-               break;
-       case AF_INET6:
-               addr_size = sizeof(call->peer_ip.ipv6_addr);
-               break;
-       default:
-               break;
-       }
-
-       key = rxrpc_call_hashfunc(in_clientflag, hdr->cid, hdr->callNumber,
-                                 hdr->epoch, hdr->serviceId,
-                                 proto, localptr, addr_size,
-                                 peer_addr);
-       hash_for_each_possible_rcu(rxrpc_call_hash, call, hash_node, key) {
-               if (call->hash_key == key &&
-                   call->call_id == hdr->callNumber &&
-                   call->cid == hdr->cid &&
-                   call->in_clientflag == in_clientflag &&
-                   call->service_id == hdr->serviceId &&
-                   call->proto == proto &&
-                   call->local == localptr &&
-                   memcmp(call->peer_ip.ipv6_addr, peer_addr,
-                          addr_size) == 0 &&
-                   call->epoch == hdr->epoch) {
-                       ret = call;
-                       break;
-               }
-       }
-       _leave(" = %p", ret);
-       return ret;
-}
-
-/*
- * find an extant server call
- * - called in process context with IRQs enabled
- */
-struct rxrpc_call *rxrpc_find_call_by_user_ID(struct rxrpc_sock *rx,
-                                             unsigned long user_call_ID)
-{
-       struct rxrpc_call *call;
-       struct rb_node *p;
-
-       _enter("%p,%lx", rx, user_call_ID);
-
-       read_lock(&rx->call_lock);
-
-       p = rx->calls.rb_node;
-       while (p) {
-               call = rb_entry(p, struct rxrpc_call, sock_node);
-
-               if (user_call_ID < call->user_call_ID)
-                       p = p->rb_left;
-               else if (user_call_ID > call->user_call_ID)
-                       p = p->rb_right;
-               else
-                       goto found_extant_call;
-       }
-
-       read_unlock(&rx->call_lock);
-       _leave(" = NULL");
-       return NULL;
-
-found_extant_call:
-       rxrpc_get_call(call);
-       read_unlock(&rx->call_lock);
-       _leave(" = %p [%d]", call, atomic_read(&call->usage));
-       return call;
-}
-
-/*
- * allocate a new call
- */
-static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
-{
-       struct rxrpc_call *call;
-
-       call = kmem_cache_zalloc(rxrpc_call_jar, gfp);
-       if (!call)
-               return NULL;
-
-       call->acks_winsz = 16;
-       call->acks_window = kmalloc(call->acks_winsz * sizeof(unsigned long),
-                                   gfp);
-       if (!call->acks_window) {
-               kmem_cache_free(rxrpc_call_jar, call);
-               return NULL;
-       }
-
-       setup_timer(&call->lifetimer, &rxrpc_call_life_expired,
-                   (unsigned long) call);
-       setup_timer(&call->deadspan, &rxrpc_dead_call_expired,
-                   (unsigned long) call);
-       setup_timer(&call->ack_timer, &rxrpc_ack_time_expired,
-                   (unsigned long) call);
-       setup_timer(&call->resend_timer, &rxrpc_resend_time_expired,
-                   (unsigned long) call);
-       INIT_WORK(&call->destroyer, &rxrpc_destroy_call);
-       INIT_WORK(&call->processor, &rxrpc_process_call);
-       INIT_LIST_HEAD(&call->accept_link);
-       skb_queue_head_init(&call->rx_queue);
-       skb_queue_head_init(&call->rx_oos_queue);
-       init_waitqueue_head(&call->tx_waitq);
-       spin_lock_init(&call->lock);
-       rwlock_init(&call->state_lock);
-       atomic_set(&call->usage, 1);
-       call->debug_id = atomic_inc_return(&rxrpc_debug_id);
-       call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
-
-       memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-
-       call->rx_data_expect = 1;
-       call->rx_data_eaten = 0;
-       call->rx_first_oos = 0;
-       call->ackr_win_top = call->rx_data_eaten + 1 + rxrpc_rx_window_size;
-       call->creation_jif = jiffies;
-       return call;
-}
-
-/*
- * allocate a new client call and attempt to get a connection slot for it
- */
-static struct rxrpc_call *rxrpc_alloc_client_call(
-       struct rxrpc_sock *rx,
-       struct rxrpc_transport *trans,
-       struct rxrpc_conn_bundle *bundle,
-       gfp_t gfp)
-{
-       struct rxrpc_call *call;
-       int ret;
-
-       _enter("");
-
-       ASSERT(rx != NULL);
-       ASSERT(trans != NULL);
-       ASSERT(bundle != NULL);
-
-       call = rxrpc_alloc_call(gfp);
-       if (!call)
-               return ERR_PTR(-ENOMEM);
-
-       sock_hold(&rx->sk);
-       call->socket = rx;
-       call->rx_data_post = 1;
-
-       ret = rxrpc_connect_call(rx, trans, bundle, call, gfp);
-       if (ret < 0) {
-               kmem_cache_free(rxrpc_call_jar, call);
-               return ERR_PTR(ret);
-       }
-
-       /* Record copies of information for hashtable lookup */
-       call->proto = rx->proto;
-       call->local = trans->local;
-       switch (call->proto) {
-       case AF_INET:
-               call->peer_ip.ipv4_addr =
-                       trans->peer->srx.transport.sin.sin_addr.s_addr;
-               break;
-       case AF_INET6:
-               memcpy(call->peer_ip.ipv6_addr,
-                      trans->peer->srx.transport.sin6.sin6_addr.in6_u.u6_addr8,
-                      sizeof(call->peer_ip.ipv6_addr));
-               break;
-       }
-       call->epoch = call->conn->epoch;
-       call->service_id = call->conn->service_id;
-       call->in_clientflag = call->conn->in_clientflag;
-       /* Add the new call to the hashtable */
-       rxrpc_call_hash_add(call);
-
-       spin_lock(&call->conn->trans->peer->lock);
-       list_add(&call->error_link, &call->conn->trans->peer->error_targets);
-       spin_unlock(&call->conn->trans->peer->lock);
-
-       call->lifetimer.expires = jiffies + rxrpc_max_call_lifetime;
-       add_timer(&call->lifetimer);
-
-       _leave(" = %p", call);
-       return call;
-}
-
-/*
- * set up a call for the given data
- * - called in process context with IRQs enabled
- */
-struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,
-                                        struct rxrpc_transport *trans,
-                                        struct rxrpc_conn_bundle *bundle,
-                                        unsigned long user_call_ID,
-                                        gfp_t gfp)
-{
-       struct rxrpc_call *call, *xcall;
-       struct rb_node *parent, **pp;
-
-       _enter("%p,%d,%d,%lx",
-              rx, trans->debug_id, bundle ? bundle->debug_id : -1,
-              user_call_ID);
-
-       call = rxrpc_alloc_client_call(rx, trans, bundle, gfp);
-       if (IS_ERR(call)) {
-               _leave(" = %ld", PTR_ERR(call));
-               return call;
-       }
-
-       call->user_call_ID = user_call_ID;
-       __set_bit(RXRPC_CALL_HAS_USERID, &call->flags);
-
-       write_lock(&rx->call_lock);
-
-       pp = &rx->calls.rb_node;
-       parent = NULL;
-       while (*pp) {
-               parent = *pp;
-               xcall = rb_entry(parent, struct rxrpc_call, sock_node);
-
-               if (user_call_ID < xcall->user_call_ID)
-                       pp = &(*pp)->rb_left;
-               else if (user_call_ID > xcall->user_call_ID)
-                       pp = &(*pp)->rb_right;
-               else
-                       goto found_user_ID_now_present;
-       }
-
-       rxrpc_get_call(call);
-
-       rb_link_node(&call->sock_node, parent, pp);
-       rb_insert_color(&call->sock_node, &rx->calls);
-       write_unlock(&rx->call_lock);
-
-       write_lock_bh(&rxrpc_call_lock);
-       list_add_tail(&call->link, &rxrpc_calls);
-       write_unlock_bh(&rxrpc_call_lock);
-
-       _net("CALL new %d on CONN %d", call->debug_id, call->conn->debug_id);
-
-       _leave(" = %p [new]", call);
-       return call;
-
-       /* We unexpectedly found the user ID in the list after taking
-        * the call_lock.  This shouldn't happen unless the user races
-        * with itself and tries to add the same user ID twice at the
-        * same time in different threads.
-        */
-found_user_ID_now_present:
-       write_unlock(&rx->call_lock);
-       rxrpc_put_call(call);
-       _leave(" = -EEXIST [%p]", call);
-       return ERR_PTR(-EEXIST);
-}
-
-/*
- * set up an incoming call
- * - called in process context with IRQs enabled
- */
-struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *rx,
-                                      struct rxrpc_connection *conn,
-                                      struct rxrpc_host_header *hdr)
-{
-       struct rxrpc_call *call, *candidate;
-       struct rb_node **p, *parent;
-       u32 call_id;
-
-       _enter(",%d", conn->debug_id);
-
-       ASSERT(rx != NULL);
-
-       candidate = rxrpc_alloc_call(GFP_NOIO);
-       if (!candidate)
-               return ERR_PTR(-EBUSY);
-
-       candidate->socket = rx;
-       candidate->conn = conn;
-       candidate->cid = hdr->cid;
-       candidate->call_id = hdr->callNumber;
-       candidate->channel = hdr->cid & RXRPC_CHANNELMASK;
-       candidate->rx_data_post = 0;
-       candidate->state = RXRPC_CALL_SERVER_ACCEPTING;
-       if (conn->security_ix > 0)
-               candidate->state = RXRPC_CALL_SERVER_SECURING;
-
-       write_lock_bh(&conn->lock);
-
-       /* set the channel for this call */
-       call = conn->channels[candidate->channel];
-       _debug("channel[%u] is %p", candidate->channel, call);
-       if (call && call->call_id == hdr->callNumber) {
-               /* already set; must've been a duplicate packet */
-               _debug("extant call [%d]", call->state);
-               ASSERTCMP(call->conn, ==, conn);
-
-               read_lock(&call->state_lock);
-               switch (call->state) {
-               case RXRPC_CALL_LOCALLY_ABORTED:
-                       if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events))
-                               rxrpc_queue_call(call);
-               case RXRPC_CALL_REMOTELY_ABORTED:
-                       read_unlock(&call->state_lock);
-                       goto aborted_call;
-               default:
-                       rxrpc_get_call(call);
-                       read_unlock(&call->state_lock);
-                       goto extant_call;
-               }
-       }
-
-       if (call) {
-               /* it seems the channel is still in use from the previous call
-                * - ditch the old binding if its call is now complete */
-               _debug("CALL: %u { %s }",
-                      call->debug_id, rxrpc_call_states[call->state]);
-
-               if (call->state >= RXRPC_CALL_COMPLETE) {
-                       conn->channels[call->channel] = NULL;
-               } else {
-                       write_unlock_bh(&conn->lock);
-                       kmem_cache_free(rxrpc_call_jar, candidate);
-                       _leave(" = -EBUSY");
-                       return ERR_PTR(-EBUSY);
-               }
-       }
-
-       /* check the call number isn't duplicate */
-       _debug("check dup");
-       call_id = hdr->callNumber;
-       p = &conn->calls.rb_node;
-       parent = NULL;
-       while (*p) {
-               parent = *p;
-               call = rb_entry(parent, struct rxrpc_call, conn_node);
-
-               /* The tree is sorted in order of the __be32 value without
-                * turning it into host order.
-                */
-               if (call_id < call->call_id)
-                       p = &(*p)->rb_left;
-               else if (call_id > call->call_id)
-                       p = &(*p)->rb_right;
-               else
-                       goto old_call;
-       }
-
-       /* make the call available */
-       _debug("new call");
-       call = candidate;
-       candidate = NULL;
-       rb_link_node(&call->conn_node, parent, p);
-       rb_insert_color(&call->conn_node, &conn->calls);
-       conn->channels[call->channel] = call;
-       sock_hold(&rx->sk);
-       atomic_inc(&conn->usage);
-       write_unlock_bh(&conn->lock);
-
-       spin_lock(&conn->trans->peer->lock);
-       list_add(&call->error_link, &conn->trans->peer->error_targets);
-       spin_unlock(&conn->trans->peer->lock);
-
-       write_lock_bh(&rxrpc_call_lock);
-       list_add_tail(&call->link, &rxrpc_calls);
-       write_unlock_bh(&rxrpc_call_lock);
-
-       /* Record copies of information for hashtable lookup */
-       call->proto = rx->proto;
-       call->local = conn->trans->local;
-       switch (call->proto) {
-       case AF_INET:
-               call->peer_ip.ipv4_addr =
-                       conn->trans->peer->srx.transport.sin.sin_addr.s_addr;
-               break;
-       case AF_INET6:
-               memcpy(call->peer_ip.ipv6_addr,
-                      conn->trans->peer->srx.transport.sin6.sin6_addr.in6_u.u6_addr8,
-                      sizeof(call->peer_ip.ipv6_addr));
-               break;
-       default:
-               break;
-       }
-       call->epoch = conn->epoch;
-       call->service_id = conn->service_id;
-       call->in_clientflag = conn->in_clientflag;
-       /* Add the new call to the hashtable */
-       rxrpc_call_hash_add(call);
-
-       _net("CALL incoming %d on CONN %d", call->debug_id, call->conn->debug_id);
-
-       call->lifetimer.expires = jiffies + rxrpc_max_call_lifetime;
-       add_timer(&call->lifetimer);
-       _leave(" = %p {%d} [new]", call, call->debug_id);
-       return call;
-
-extant_call:
-       write_unlock_bh(&conn->lock);
-       kmem_cache_free(rxrpc_call_jar, candidate);
-       _leave(" = %p {%d} [extant]", call, call ? call->debug_id : -1);
-       return call;
-
-aborted_call:
-       write_unlock_bh(&conn->lock);
-       kmem_cache_free(rxrpc_call_jar, candidate);
-       _leave(" = -ECONNABORTED");
-       return ERR_PTR(-ECONNABORTED);
-
-old_call:
-       write_unlock_bh(&conn->lock);
-       kmem_cache_free(rxrpc_call_jar, candidate);
-       _leave(" = -ECONNRESET [old]");
-       return ERR_PTR(-ECONNRESET);
-}
-
-/*
- * detach a call from a socket and set up for release
- */
-void rxrpc_release_call(struct rxrpc_call *call)
-{
-       struct rxrpc_connection *conn = call->conn;
-       struct rxrpc_sock *rx = call->socket;
-
-       _enter("{%d,%d,%d,%d}",
-              call->debug_id, atomic_read(&call->usage),
-              atomic_read(&call->ackr_not_idle),
-              call->rx_first_oos);
-
-       spin_lock_bh(&call->lock);
-       if (test_and_set_bit(RXRPC_CALL_RELEASED, &call->flags))
-               BUG();
-       spin_unlock_bh(&call->lock);
-
-       /* dissociate from the socket
-        * - the socket's ref on the call is passed to the death timer
-        */
-       _debug("RELEASE CALL %p (%d CONN %p)", call, call->debug_id, conn);
-
-       write_lock_bh(&rx->call_lock);
-       if (!list_empty(&call->accept_link)) {
-               _debug("unlinking once-pending call %p { e=%lx f=%lx }",
-                      call, call->events, call->flags);
-               ASSERT(!test_bit(RXRPC_CALL_HAS_USERID, &call->flags));
-               list_del_init(&call->accept_link);
-               sk_acceptq_removed(&rx->sk);
-       } else if (test_bit(RXRPC_CALL_HAS_USERID, &call->flags)) {
-               rb_erase(&call->sock_node, &rx->calls);
-               memset(&call->sock_node, 0xdd, sizeof(call->sock_node));
-               clear_bit(RXRPC_CALL_HAS_USERID, &call->flags);
-       }
-       write_unlock_bh(&rx->call_lock);
-
-       /* free up the channel for reuse */
-       spin_lock(&conn->trans->client_lock);
-       write_lock_bh(&conn->lock);
-       write_lock(&call->state_lock);
-
-       if (conn->channels[call->channel] == call)
-               conn->channels[call->channel] = NULL;
-
-       if (conn->out_clientflag && conn->bundle) {
-               conn->avail_calls++;
-               switch (conn->avail_calls) {
-               case 1:
-                       list_move_tail(&conn->bundle_link,
-                                      &conn->bundle->avail_conns);
-               case 2 ... RXRPC_MAXCALLS - 1:
-                       ASSERT(conn->channels[0] == NULL ||
-                              conn->channels[1] == NULL ||
-                              conn->channels[2] == NULL ||
-                              conn->channels[3] == NULL);
-                       break;
-               case RXRPC_MAXCALLS:
-                       list_move_tail(&conn->bundle_link,
-                                      &conn->bundle->unused_conns);
-                       ASSERT(conn->channels[0] == NULL &&
-                              conn->channels[1] == NULL &&
-                              conn->channels[2] == NULL &&
-                              conn->channels[3] == NULL);
-                       break;
-               default:
-                       pr_err("conn->avail_calls=%d\n", conn->avail_calls);
-                       BUG();
-               }
-       }
-
-       spin_unlock(&conn->trans->client_lock);
-
-       if (call->state < RXRPC_CALL_COMPLETE &&
-           call->state != RXRPC_CALL_CLIENT_FINAL_ACK) {
-               _debug("+++ ABORTING STATE %d +++\n", call->state);
-               call->state = RXRPC_CALL_LOCALLY_ABORTED;
-               call->local_abort = RX_CALL_DEAD;
-               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
-               rxrpc_queue_call(call);
-       }
-       write_unlock(&call->state_lock);
-       write_unlock_bh(&conn->lock);
-
-       /* clean up the Rx queue */
-       if (!skb_queue_empty(&call->rx_queue) ||
-           !skb_queue_empty(&call->rx_oos_queue)) {
-               struct rxrpc_skb_priv *sp;
-               struct sk_buff *skb;
-
-               _debug("purge Rx queues");
-
-               spin_lock_bh(&call->lock);
-               while ((skb = skb_dequeue(&call->rx_queue)) ||
-                      (skb = skb_dequeue(&call->rx_oos_queue))) {
-                       sp = rxrpc_skb(skb);
-                       if (sp->call) {
-                               ASSERTCMP(sp->call, ==, call);
-                               rxrpc_put_call(call);
-                               sp->call = NULL;
-                       }
-                       skb->destructor = NULL;
-                       spin_unlock_bh(&call->lock);
-
-                       _debug("- zap %s %%%u #%u",
-                              rxrpc_pkts[sp->hdr.type],
-                              sp->hdr.serial, sp->hdr.seq);
-                       rxrpc_free_skb(skb);
-                       spin_lock_bh(&call->lock);
-               }
-               spin_unlock_bh(&call->lock);
-
-               ASSERTCMP(call->state, !=, RXRPC_CALL_COMPLETE);
-       }
-
-       del_timer_sync(&call->resend_timer);
-       del_timer_sync(&call->ack_timer);
-       del_timer_sync(&call->lifetimer);
-       call->deadspan.expires = jiffies + rxrpc_dead_call_expiry;
-       add_timer(&call->deadspan);
-
-       _leave("");
-}
-
-/*
- * handle a dead call being ready for reaping
- */
-static void rxrpc_dead_call_expired(unsigned long _call)
-{
-       struct rxrpc_call *call = (struct rxrpc_call *) _call;
-
-       _enter("{%d}", call->debug_id);
-
-       write_lock_bh(&call->state_lock);
-       call->state = RXRPC_CALL_DEAD;
-       write_unlock_bh(&call->state_lock);
-       rxrpc_put_call(call);
-}
-
-/*
- * mark a call as to be released, aborting it if it's still in progress
- * - called with softirqs disabled
- */
-static void rxrpc_mark_call_released(struct rxrpc_call *call)
-{
-       bool sched;
-
-       write_lock(&call->state_lock);
-       if (call->state < RXRPC_CALL_DEAD) {
-               sched = false;
-               if (call->state < RXRPC_CALL_COMPLETE) {
-                       _debug("abort call %p", call);
-                       call->state = RXRPC_CALL_LOCALLY_ABORTED;
-                       call->local_abort = RX_CALL_DEAD;
-                       if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events))
-                               sched = true;
-               }
-               if (!test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
-                       sched = true;
-               if (sched)
-                       rxrpc_queue_call(call);
-       }
-       write_unlock(&call->state_lock);
-}
-
-/*
- * release all the calls associated with a socket
- */
-void rxrpc_release_calls_on_socket(struct rxrpc_sock *rx)
-{
-       struct rxrpc_call *call;
-       struct rb_node *p;
-
-       _enter("%p", rx);
-
-       read_lock_bh(&rx->call_lock);
-
-       /* mark all the calls as no longer wanting incoming packets */
-       for (p = rb_first(&rx->calls); p; p = rb_next(p)) {
-               call = rb_entry(p, struct rxrpc_call, sock_node);
-               rxrpc_mark_call_released(call);
-       }
-
-       /* kill the not-yet-accepted incoming calls */
-       list_for_each_entry(call, &rx->secureq, accept_link) {
-               rxrpc_mark_call_released(call);
-       }
-
-       list_for_each_entry(call, &rx->acceptq, accept_link) {
-               rxrpc_mark_call_released(call);
-       }
-
-       read_unlock_bh(&rx->call_lock);
-       _leave("");
-}
-
-/*
- * release a call
- */
-void __rxrpc_put_call(struct rxrpc_call *call)
-{
-       ASSERT(call != NULL);
-
-       _enter("%p{u=%d}", call, atomic_read(&call->usage));
-
-       ASSERTCMP(atomic_read(&call->usage), >, 0);
-
-       if (atomic_dec_and_test(&call->usage)) {
-               _debug("call %d dead", call->debug_id);
-               ASSERTCMP(call->state, ==, RXRPC_CALL_DEAD);
-               rxrpc_queue_work(&call->destroyer);
-       }
-       _leave("");
-}
-
-/*
- * clean up a call
- */
-static void rxrpc_cleanup_call(struct rxrpc_call *call)
-{
-       _net("DESTROY CALL %d", call->debug_id);
-
-       ASSERT(call->socket);
-
-       memset(&call->sock_node, 0xcd, sizeof(call->sock_node));
-
-       del_timer_sync(&call->lifetimer);
-       del_timer_sync(&call->deadspan);
-       del_timer_sync(&call->ack_timer);
-       del_timer_sync(&call->resend_timer);
-
-       ASSERT(test_bit(RXRPC_CALL_RELEASED, &call->flags));
-       ASSERTCMP(call->events, ==, 0);
-       if (work_pending(&call->processor)) {
-               _debug("defer destroy");
-               rxrpc_queue_work(&call->destroyer);
-               return;
-       }
-
-       if (call->conn) {
-               spin_lock(&call->conn->trans->peer->lock);
-               list_del(&call->error_link);
-               spin_unlock(&call->conn->trans->peer->lock);
-
-               write_lock_bh(&call->conn->lock);
-               rb_erase(&call->conn_node, &call->conn->calls);
-               write_unlock_bh(&call->conn->lock);
-               rxrpc_put_connection(call->conn);
-       }
-
-       /* Remove the call from the hash */
-       rxrpc_call_hash_del(call);
-
-       if (call->acks_window) {
-               _debug("kill Tx window %d",
-                      CIRC_CNT(call->acks_head, call->acks_tail,
-                               call->acks_winsz));
-               smp_mb();
-               while (CIRC_CNT(call->acks_head, call->acks_tail,
-                               call->acks_winsz) > 0) {
-                       struct rxrpc_skb_priv *sp;
-                       unsigned long _skb;
-
-                       _skb = call->acks_window[call->acks_tail] & ~1;
-                       sp = rxrpc_skb((struct sk_buff *)_skb);
-                       _debug("+++ clear Tx %u", sp->hdr.seq);
-                       rxrpc_free_skb((struct sk_buff *)_skb);
-                       call->acks_tail =
-                               (call->acks_tail + 1) & (call->acks_winsz - 1);
-               }
-
-               kfree(call->acks_window);
-       }
-
-       rxrpc_free_skb(call->tx_pending);
-
-       rxrpc_purge_queue(&call->rx_queue);
-       ASSERT(skb_queue_empty(&call->rx_oos_queue));
-       sock_put(&call->socket->sk);
-       kmem_cache_free(rxrpc_call_jar, call);
-}
-
-/*
- * destroy a call
- */
-static void rxrpc_destroy_call(struct work_struct *work)
-{
-       struct rxrpc_call *call =
-               container_of(work, struct rxrpc_call, destroyer);
-
-       _enter("%p{%d,%d,%p}",
-              call, atomic_read(&call->usage), call->channel, call->conn);
-
-       ASSERTCMP(call->state, ==, RXRPC_CALL_DEAD);
-
-       write_lock_bh(&rxrpc_call_lock);
-       list_del_init(&call->link);
-       write_unlock_bh(&rxrpc_call_lock);
-
-       rxrpc_cleanup_call(call);
-       _leave("");
-}
-
-/*
- * preemptively destroy all the call records from a transport endpoint rather
- * than waiting for them to time out
- */
-void __exit rxrpc_destroy_all_calls(void)
-{
-       struct rxrpc_call *call;
-
-       _enter("");
-       write_lock_bh(&rxrpc_call_lock);
-
-       while (!list_empty(&rxrpc_calls)) {
-               call = list_entry(rxrpc_calls.next, struct rxrpc_call, link);
-               _debug("Zapping call %p", call);
-
-               list_del_init(&call->link);
-
-               switch (atomic_read(&call->usage)) {
-               case 0:
-                       ASSERTCMP(call->state, ==, RXRPC_CALL_DEAD);
-                       break;
-               case 1:
-                       if (del_timer_sync(&call->deadspan) != 0 &&
-                           call->state != RXRPC_CALL_DEAD)
-                               rxrpc_dead_call_expired((unsigned long) call);
-                       if (call->state != RXRPC_CALL_DEAD)
-                               break;
-               default:
-                       pr_err("Call %p still in use (%d,%d,%s,%lx,%lx)!\n",
-                              call, atomic_read(&call->usage),
-                              atomic_read(&call->ackr_not_idle),
-                              rxrpc_call_states[call->state],
-                              call->flags, call->events);
-                       if (!skb_queue_empty(&call->rx_queue))
-                               pr_err("Rx queue occupied\n");
-                       if (!skb_queue_empty(&call->rx_oos_queue))
-                               pr_err("OOS queue occupied\n");
-                       break;
-               }
-
-               write_unlock_bh(&rxrpc_call_lock);
-               cond_resched();
-               write_lock_bh(&rxrpc_call_lock);
-       }
-
-       write_unlock_bh(&rxrpc_call_lock);
-       _leave("");
-}
-
-/*
- * handle call lifetime being exceeded
- */
-static void rxrpc_call_life_expired(unsigned long _call)
-{
-       struct rxrpc_call *call = (struct rxrpc_call *) _call;
-
-       if (call->state >= RXRPC_CALL_COMPLETE)
-               return;
-
-       _enter("{%d}", call->debug_id);
-       read_lock_bh(&call->state_lock);
-       if (call->state < RXRPC_CALL_COMPLETE) {
-               set_bit(RXRPC_CALL_EV_LIFE_TIMER, &call->events);
-               rxrpc_queue_call(call);
-       }
-       read_unlock_bh(&call->state_lock);
-}
-
-/*
- * handle resend timer expiry
- * - may not take call->state_lock as this can deadlock against del_timer_sync()
- */
-static void rxrpc_resend_time_expired(unsigned long _call)
-{
-       struct rxrpc_call *call = (struct rxrpc_call *) _call;
-
-       _enter("{%d}", call->debug_id);
-
-       if (call->state >= RXRPC_CALL_COMPLETE)
-               return;
-
-       clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-       if (!test_and_set_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events))
-               rxrpc_queue_call(call);
-}
-
-/*
- * handle ACK timer expiry
- */
-static void rxrpc_ack_time_expired(unsigned long _call)
-{
-       struct rxrpc_call *call = (struct rxrpc_call *) _call;
-
-       _enter("{%d}", call->debug_id);
-
-       if (call->state >= RXRPC_CALL_COMPLETE)
-               return;
-
-       read_lock_bh(&call->state_lock);
-       if (call->state < RXRPC_CALL_COMPLETE &&
-           !test_and_set_bit(RXRPC_CALL_EV_ACK, &call->events))
-               rxrpc_queue_call(call);
-       read_unlock_bh(&call->state_lock);
-}
diff --git a/net/rxrpc/ar-connection.c b/net/rxrpc/ar-connection.c
deleted file mode 100644 (file)
index 8ecde4b..0000000
+++ /dev/null
@@ -1,912 +0,0 @@
-/* RxRPC virtual connection handler
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/crypto.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * Time till a connection expires after last use (in seconds).
- */
-unsigned int rxrpc_connection_expiry = 10 * 60;
-
-static void rxrpc_connection_reaper(struct work_struct *work);
-
-LIST_HEAD(rxrpc_connections);
-DEFINE_RWLOCK(rxrpc_connection_lock);
-static DECLARE_DELAYED_WORK(rxrpc_connection_reap, rxrpc_connection_reaper);
-
-/*
- * allocate a new client connection bundle
- */
-static struct rxrpc_conn_bundle *rxrpc_alloc_bundle(gfp_t gfp)
-{
-       struct rxrpc_conn_bundle *bundle;
-
-       _enter("");
-
-       bundle = kzalloc(sizeof(struct rxrpc_conn_bundle), gfp);
-       if (bundle) {
-               INIT_LIST_HEAD(&bundle->unused_conns);
-               INIT_LIST_HEAD(&bundle->avail_conns);
-               INIT_LIST_HEAD(&bundle->busy_conns);
-               init_waitqueue_head(&bundle->chanwait);
-               atomic_set(&bundle->usage, 1);
-       }
-
-       _leave(" = %p", bundle);
-       return bundle;
-}
-
-/*
- * compare bundle parameters with what we're looking for
- * - return -ve, 0 or +ve
- */
-static inline
-int rxrpc_cmp_bundle(const struct rxrpc_conn_bundle *bundle,
-                    struct key *key, u16 service_id)
-{
-       return (bundle->service_id - service_id) ?:
-               ((unsigned long)bundle->key - (unsigned long)key);
-}
-
-/*
- * get bundle of client connections that a client socket can make use of
- */
-struct rxrpc_conn_bundle *rxrpc_get_bundle(struct rxrpc_sock *rx,
-                                          struct rxrpc_transport *trans,
-                                          struct key *key,
-                                          u16 service_id,
-                                          gfp_t gfp)
-{
-       struct rxrpc_conn_bundle *bundle, *candidate;
-       struct rb_node *p, *parent, **pp;
-
-       _enter("%p{%x},%x,%hx,",
-              rx, key_serial(key), trans->debug_id, service_id);
-
-       /* search the extant bundles first for one that matches the specified
-        * user ID */
-       spin_lock(&trans->client_lock);
-
-       p = trans->bundles.rb_node;
-       while (p) {
-               bundle = rb_entry(p, struct rxrpc_conn_bundle, node);
-
-               if (rxrpc_cmp_bundle(bundle, key, service_id) < 0)
-                       p = p->rb_left;
-               else if (rxrpc_cmp_bundle(bundle, key, service_id) > 0)
-                       p = p->rb_right;
-               else
-                       goto found_extant_bundle;
-       }
-
-       spin_unlock(&trans->client_lock);
-
-       /* not yet present - create a candidate for a new record and then
-        * redo the search */
-       candidate = rxrpc_alloc_bundle(gfp);
-       if (!candidate) {
-               _leave(" = -ENOMEM");
-               return ERR_PTR(-ENOMEM);
-       }
-
-       candidate->key = key_get(key);
-       candidate->service_id = service_id;
-
-       spin_lock(&trans->client_lock);
-
-       pp = &trans->bundles.rb_node;
-       parent = NULL;
-       while (*pp) {
-               parent = *pp;
-               bundle = rb_entry(parent, struct rxrpc_conn_bundle, node);
-
-               if (rxrpc_cmp_bundle(bundle, key, service_id) < 0)
-                       pp = &(*pp)->rb_left;
-               else if (rxrpc_cmp_bundle(bundle, key, service_id) > 0)
-                       pp = &(*pp)->rb_right;
-               else
-                       goto found_extant_second;
-       }
-
-       /* second search also failed; add the new bundle */
-       bundle = candidate;
-       candidate = NULL;
-
-       rb_link_node(&bundle->node, parent, pp);
-       rb_insert_color(&bundle->node, &trans->bundles);
-       spin_unlock(&trans->client_lock);
-       _net("BUNDLE new on trans %d", trans->debug_id);
-       _leave(" = %p [new]", bundle);
-       return bundle;
-
-       /* we found the bundle in the list immediately */
-found_extant_bundle:
-       atomic_inc(&bundle->usage);
-       spin_unlock(&trans->client_lock);
-       _net("BUNDLE old on trans %d", trans->debug_id);
-       _leave(" = %p [extant %d]", bundle, atomic_read(&bundle->usage));
-       return bundle;
-
-       /* we found the bundle on the second time through the list */
-found_extant_second:
-       atomic_inc(&bundle->usage);
-       spin_unlock(&trans->client_lock);
-       kfree(candidate);
-       _net("BUNDLE old2 on trans %d", trans->debug_id);
-       _leave(" = %p [second %d]", bundle, atomic_read(&bundle->usage));
-       return bundle;
-}
-
-/*
- * release a bundle
- */
-void rxrpc_put_bundle(struct rxrpc_transport *trans,
-                     struct rxrpc_conn_bundle *bundle)
-{
-       _enter("%p,%p{%d}",trans, bundle, atomic_read(&bundle->usage));
-
-       if (atomic_dec_and_lock(&bundle->usage, &trans->client_lock)) {
-               _debug("Destroy bundle");
-               rb_erase(&bundle->node, &trans->bundles);
-               spin_unlock(&trans->client_lock);
-               ASSERT(list_empty(&bundle->unused_conns));
-               ASSERT(list_empty(&bundle->avail_conns));
-               ASSERT(list_empty(&bundle->busy_conns));
-               ASSERTCMP(bundle->num_conns, ==, 0);
-               key_put(bundle->key);
-               kfree(bundle);
-       }
-
-       _leave("");
-}
-
-/*
- * allocate a new connection
- */
-static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
-{
-       struct rxrpc_connection *conn;
-
-       _enter("");
-
-       conn = kzalloc(sizeof(struct rxrpc_connection), gfp);
-       if (conn) {
-               INIT_WORK(&conn->processor, &rxrpc_process_connection);
-               INIT_LIST_HEAD(&conn->bundle_link);
-               conn->calls = RB_ROOT;
-               skb_queue_head_init(&conn->rx_queue);
-               conn->security = &rxrpc_no_security;
-               rwlock_init(&conn->lock);
-               spin_lock_init(&conn->state_lock);
-               atomic_set(&conn->usage, 1);
-               conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
-               conn->avail_calls = RXRPC_MAXCALLS;
-               conn->size_align = 4;
-               conn->header_size = sizeof(struct rxrpc_wire_header);
-       }
-
-       _leave(" = %p{%d}", conn, conn ? conn->debug_id : 0);
-       return conn;
-}
-
-/*
- * assign a connection ID to a connection and add it to the transport's
- * connection lookup tree
- * - called with transport client lock held
- */
-static void rxrpc_assign_connection_id(struct rxrpc_connection *conn)
-{
-       struct rxrpc_connection *xconn;
-       struct rb_node *parent, **p;
-       __be32 epoch;
-       u32 cid;
-
-       _enter("");
-
-       epoch = conn->epoch;
-
-       write_lock_bh(&conn->trans->conn_lock);
-
-       conn->trans->conn_idcounter += RXRPC_CID_INC;
-       if (conn->trans->conn_idcounter < RXRPC_CID_INC)
-               conn->trans->conn_idcounter = RXRPC_CID_INC;
-       cid = conn->trans->conn_idcounter;
-
-attempt_insertion:
-       parent = NULL;
-       p = &conn->trans->client_conns.rb_node;
-
-       while (*p) {
-               parent = *p;
-               xconn = rb_entry(parent, struct rxrpc_connection, node);
-
-               if (epoch < xconn->epoch)
-                       p = &(*p)->rb_left;
-               else if (epoch > xconn->epoch)
-                       p = &(*p)->rb_right;
-               else if (cid < xconn->cid)
-                       p = &(*p)->rb_left;
-               else if (cid > xconn->cid)
-                       p = &(*p)->rb_right;
-               else
-                       goto id_exists;
-       }
-
-       /* we've found a suitable hole - arrange for this connection to occupy
-        * it */
-       rb_link_node(&conn->node, parent, p);
-       rb_insert_color(&conn->node, &conn->trans->client_conns);
-
-       conn->cid = cid;
-       write_unlock_bh(&conn->trans->conn_lock);
-       _leave(" [CID %x]", cid);
-       return;
-
-       /* we found a connection with the proposed ID - walk the tree from that
-        * point looking for the next unused ID */
-id_exists:
-       for (;;) {
-               cid += RXRPC_CID_INC;
-               if (cid < RXRPC_CID_INC) {
-                       cid = RXRPC_CID_INC;
-                       conn->trans->conn_idcounter = cid;
-                       goto attempt_insertion;
-               }
-
-               parent = rb_next(parent);
-               if (!parent)
-                       goto attempt_insertion;
-
-               xconn = rb_entry(parent, struct rxrpc_connection, node);
-               if (epoch < xconn->epoch ||
-                   cid < xconn->cid)
-                       goto attempt_insertion;
-       }
-}
-
-/*
- * add a call to a connection's call-by-ID tree
- */
-static void rxrpc_add_call_ID_to_conn(struct rxrpc_connection *conn,
-                                     struct rxrpc_call *call)
-{
-       struct rxrpc_call *xcall;
-       struct rb_node *parent, **p;
-       __be32 call_id;
-
-       write_lock_bh(&conn->lock);
-
-       call_id = call->call_id;
-       p = &conn->calls.rb_node;
-       parent = NULL;
-       while (*p) {
-               parent = *p;
-               xcall = rb_entry(parent, struct rxrpc_call, conn_node);
-
-               if (call_id < xcall->call_id)
-                       p = &(*p)->rb_left;
-               else if (call_id > xcall->call_id)
-                       p = &(*p)->rb_right;
-               else
-                       BUG();
-       }
-
-       rb_link_node(&call->conn_node, parent, p);
-       rb_insert_color(&call->conn_node, &conn->calls);
-
-       write_unlock_bh(&conn->lock);
-}
-
-/*
- * connect a call on an exclusive connection
- */
-static int rxrpc_connect_exclusive(struct rxrpc_sock *rx,
-                                  struct rxrpc_transport *trans,
-                                  u16 service_id,
-                                  struct rxrpc_call *call,
-                                  gfp_t gfp)
-{
-       struct rxrpc_connection *conn;
-       int chan, ret;
-
-       _enter("");
-
-       conn = rx->conn;
-       if (!conn) {
-               /* not yet present - create a candidate for a new connection
-                * and then redo the check */
-               conn = rxrpc_alloc_connection(gfp);
-               if (!conn) {
-                       _leave(" = -ENOMEM");
-                       return -ENOMEM;
-               }
-
-               conn->trans = trans;
-               conn->bundle = NULL;
-               conn->service_id = service_id;
-               conn->epoch = rxrpc_epoch;
-               conn->in_clientflag = 0;
-               conn->out_clientflag = RXRPC_CLIENT_INITIATED;
-               conn->cid = 0;
-               conn->state = RXRPC_CONN_CLIENT;
-               conn->avail_calls = RXRPC_MAXCALLS - 1;
-               conn->security_level = rx->min_sec_level;
-               conn->key = key_get(rx->key);
-
-               ret = rxrpc_init_client_conn_security(conn);
-               if (ret < 0) {
-                       key_put(conn->key);
-                       kfree(conn);
-                       _leave(" = %d [key]", ret);
-                       return ret;
-               }
-
-               write_lock_bh(&rxrpc_connection_lock);
-               list_add_tail(&conn->link, &rxrpc_connections);
-               write_unlock_bh(&rxrpc_connection_lock);
-
-               spin_lock(&trans->client_lock);
-               atomic_inc(&trans->usage);
-
-               _net("CONNECT EXCL new %d on TRANS %d",
-                    conn->debug_id, conn->trans->debug_id);
-
-               rxrpc_assign_connection_id(conn);
-               rx->conn = conn;
-       } else {
-               spin_lock(&trans->client_lock);
-       }
-
-       /* we've got a connection with a free channel and we can now attach the
-        * call to it
-        * - we're holding the transport's client lock
-        * - we're holding a reference on the connection
-        */
-       for (chan = 0; chan < RXRPC_MAXCALLS; chan++)
-               if (!conn->channels[chan])
-                       goto found_channel;
-       goto no_free_channels;
-
-found_channel:
-       atomic_inc(&conn->usage);
-       conn->channels[chan] = call;
-       call->conn = conn;
-       call->channel = chan;
-       call->cid = conn->cid | chan;
-       call->call_id = ++conn->call_counter;
-
-       _net("CONNECT client on conn %d chan %d as call %x",
-            conn->debug_id, chan, call->call_id);
-
-       spin_unlock(&trans->client_lock);
-
-       rxrpc_add_call_ID_to_conn(conn, call);
-       _leave(" = 0");
-       return 0;
-
-no_free_channels:
-       spin_unlock(&trans->client_lock);
-       _leave(" = -ENOSR");
-       return -ENOSR;
-}
-
-/*
- * find a connection for a call
- * - called in process context with IRQs enabled
- */
-int rxrpc_connect_call(struct rxrpc_sock *rx,
-                      struct rxrpc_transport *trans,
-                      struct rxrpc_conn_bundle *bundle,
-                      struct rxrpc_call *call,
-                      gfp_t gfp)
-{
-       struct rxrpc_connection *conn, *candidate;
-       int chan, ret;
-
-       DECLARE_WAITQUEUE(myself, current);
-
-       _enter("%p,%lx,", rx, call->user_call_ID);
-
-       if (test_bit(RXRPC_SOCK_EXCLUSIVE_CONN, &rx->flags))
-               return rxrpc_connect_exclusive(rx, trans, bundle->service_id,
-                                              call, gfp);
-
-       spin_lock(&trans->client_lock);
-       for (;;) {
-               /* see if the bundle has a call slot available */
-               if (!list_empty(&bundle->avail_conns)) {
-                       _debug("avail");
-                       conn = list_entry(bundle->avail_conns.next,
-                                         struct rxrpc_connection,
-                                         bundle_link);
-                       if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
-                               list_del_init(&conn->bundle_link);
-                               bundle->num_conns--;
-                               continue;
-                       }
-                       if (--conn->avail_calls == 0)
-                               list_move(&conn->bundle_link,
-                                         &bundle->busy_conns);
-                       ASSERTCMP(conn->avail_calls, <, RXRPC_MAXCALLS);
-                       ASSERT(conn->channels[0] == NULL ||
-                              conn->channels[1] == NULL ||
-                              conn->channels[2] == NULL ||
-                              conn->channels[3] == NULL);
-                       atomic_inc(&conn->usage);
-                       break;
-               }
-
-               if (!list_empty(&bundle->unused_conns)) {
-                       _debug("unused");
-                       conn = list_entry(bundle->unused_conns.next,
-                                         struct rxrpc_connection,
-                                         bundle_link);
-                       if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
-                               list_del_init(&conn->bundle_link);
-                               bundle->num_conns--;
-                               continue;
-                       }
-                       ASSERTCMP(conn->avail_calls, ==, RXRPC_MAXCALLS);
-                       conn->avail_calls = RXRPC_MAXCALLS - 1;
-                       ASSERT(conn->channels[0] == NULL &&
-                              conn->channels[1] == NULL &&
-                              conn->channels[2] == NULL &&
-                              conn->channels[3] == NULL);
-                       atomic_inc(&conn->usage);
-                       list_move(&conn->bundle_link, &bundle->avail_conns);
-                       break;
-               }
-
-               /* need to allocate a new connection */
-               _debug("get new conn [%d]", bundle->num_conns);
-
-               spin_unlock(&trans->client_lock);
-
-               if (signal_pending(current))
-                       goto interrupted;
-
-               if (bundle->num_conns >= 20) {
-                       _debug("too many conns");
-
-                       if (!gfpflags_allow_blocking(gfp)) {
-                               _leave(" = -EAGAIN");
-                               return -EAGAIN;
-                       }
-
-                       add_wait_queue(&bundle->chanwait, &myself);
-                       for (;;) {
-                               set_current_state(TASK_INTERRUPTIBLE);
-                               if (bundle->num_conns < 20 ||
-                                   !list_empty(&bundle->unused_conns) ||
-                                   !list_empty(&bundle->avail_conns))
-                                       break;
-                               if (signal_pending(current))
-                                       goto interrupted_dequeue;
-                               schedule();
-                       }
-                       remove_wait_queue(&bundle->chanwait, &myself);
-                       __set_current_state(TASK_RUNNING);
-                       spin_lock(&trans->client_lock);
-                       continue;
-               }
-
-               /* not yet present - create a candidate for a new connection and then
-                * redo the check */
-               candidate = rxrpc_alloc_connection(gfp);
-               if (!candidate) {
-                       _leave(" = -ENOMEM");
-                       return -ENOMEM;
-               }
-
-               candidate->trans = trans;
-               candidate->bundle = bundle;
-               candidate->service_id = bundle->service_id;
-               candidate->epoch = rxrpc_epoch;
-               candidate->in_clientflag = 0;
-               candidate->out_clientflag = RXRPC_CLIENT_INITIATED;
-               candidate->cid = 0;
-               candidate->state = RXRPC_CONN_CLIENT;
-               candidate->avail_calls = RXRPC_MAXCALLS;
-               candidate->security_level = rx->min_sec_level;
-               candidate->key = key_get(bundle->key);
-
-               ret = rxrpc_init_client_conn_security(candidate);
-               if (ret < 0) {
-                       key_put(candidate->key);
-                       kfree(candidate);
-                       _leave(" = %d [key]", ret);
-                       return ret;
-               }
-
-               write_lock_bh(&rxrpc_connection_lock);
-               list_add_tail(&candidate->link, &rxrpc_connections);
-               write_unlock_bh(&rxrpc_connection_lock);
-
-               spin_lock(&trans->client_lock);
-
-               list_add(&candidate->bundle_link, &bundle->unused_conns);
-               bundle->num_conns++;
-               atomic_inc(&bundle->usage);
-               atomic_inc(&trans->usage);
-
-               _net("CONNECT new %d on TRANS %d",
-                    candidate->debug_id, candidate->trans->debug_id);
-
-               rxrpc_assign_connection_id(candidate);
-               candidate->security->prime_packet_security(candidate);
-
-               /* leave the candidate lurking in zombie mode attached to the
-                * bundle until we're ready for it */
-               rxrpc_put_connection(candidate);
-               candidate = NULL;
-       }
-
-       /* we've got a connection with a free channel and we can now attach the
-        * call to it
-        * - we're holding the transport's client lock
-        * - we're holding a reference on the connection
-        * - we're holding a reference on the bundle
-        */
-       for (chan = 0; chan < RXRPC_MAXCALLS; chan++)
-               if (!conn->channels[chan])
-                       goto found_channel;
-       ASSERT(conn->channels[0] == NULL ||
-              conn->channels[1] == NULL ||
-              conn->channels[2] == NULL ||
-              conn->channels[3] == NULL);
-       BUG();
-
-found_channel:
-       conn->channels[chan] = call;
-       call->conn = conn;
-       call->channel = chan;
-       call->cid = conn->cid | chan;
-       call->call_id = ++conn->call_counter;
-
-       _net("CONNECT client on conn %d chan %d as call %x",
-            conn->debug_id, chan, call->call_id);
-
-       ASSERTCMP(conn->avail_calls, <, RXRPC_MAXCALLS);
-       spin_unlock(&trans->client_lock);
-
-       rxrpc_add_call_ID_to_conn(conn, call);
-
-       _leave(" = 0");
-       return 0;
-
-interrupted_dequeue:
-       remove_wait_queue(&bundle->chanwait, &myself);
-       __set_current_state(TASK_RUNNING);
-interrupted:
-       _leave(" = -ERESTARTSYS");
-       return -ERESTARTSYS;
-}
-
-/*
- * get a record of an incoming connection
- */
-struct rxrpc_connection *
-rxrpc_incoming_connection(struct rxrpc_transport *trans,
-                         struct rxrpc_host_header *hdr)
-{
-       struct rxrpc_connection *conn, *candidate = NULL;
-       struct rb_node *p, **pp;
-       const char *new = "old";
-       __be32 epoch;
-       u32 cid;
-
-       _enter("");
-
-       ASSERT(hdr->flags & RXRPC_CLIENT_INITIATED);
-
-       epoch = hdr->epoch;
-       cid = hdr->cid & RXRPC_CIDMASK;
-
-       /* search the connection list first */
-       read_lock_bh(&trans->conn_lock);
-
-       p = trans->server_conns.rb_node;
-       while (p) {
-               conn = rb_entry(p, struct rxrpc_connection, node);
-
-               _debug("maybe %x", conn->cid);
-
-               if (epoch < conn->epoch)
-                       p = p->rb_left;
-               else if (epoch > conn->epoch)
-                       p = p->rb_right;
-               else if (cid < conn->cid)
-                       p = p->rb_left;
-               else if (cid > conn->cid)
-                       p = p->rb_right;
-               else
-                       goto found_extant_connection;
-       }
-       read_unlock_bh(&trans->conn_lock);
-
-       /* not yet present - create a candidate for a new record and then
-        * redo the search */
-       candidate = rxrpc_alloc_connection(GFP_NOIO);
-       if (!candidate) {
-               _leave(" = -ENOMEM");
-               return ERR_PTR(-ENOMEM);
-       }
-
-       candidate->trans = trans;
-       candidate->epoch = hdr->epoch;
-       candidate->cid = hdr->cid & RXRPC_CIDMASK;
-       candidate->service_id = hdr->serviceId;
-       candidate->security_ix = hdr->securityIndex;
-       candidate->in_clientflag = RXRPC_CLIENT_INITIATED;
-       candidate->out_clientflag = 0;
-       candidate->state = RXRPC_CONN_SERVER;
-       if (candidate->service_id)
-               candidate->state = RXRPC_CONN_SERVER_UNSECURED;
-
-       write_lock_bh(&trans->conn_lock);
-
-       pp = &trans->server_conns.rb_node;
-       p = NULL;
-       while (*pp) {
-               p = *pp;
-               conn = rb_entry(p, struct rxrpc_connection, node);
-
-               if (epoch < conn->epoch)
-                       pp = &(*pp)->rb_left;
-               else if (epoch > conn->epoch)
-                       pp = &(*pp)->rb_right;
-               else if (cid < conn->cid)
-                       pp = &(*pp)->rb_left;
-               else if (cid > conn->cid)
-                       pp = &(*pp)->rb_right;
-               else
-                       goto found_extant_second;
-       }
-
-       /* we can now add the new candidate to the list */
-       conn = candidate;
-       candidate = NULL;
-       rb_link_node(&conn->node, p, pp);
-       rb_insert_color(&conn->node, &trans->server_conns);
-       atomic_inc(&conn->trans->usage);
-
-       write_unlock_bh(&trans->conn_lock);
-
-       write_lock_bh(&rxrpc_connection_lock);
-       list_add_tail(&conn->link, &rxrpc_connections);
-       write_unlock_bh(&rxrpc_connection_lock);
-
-       new = "new";
-
-success:
-       _net("CONNECTION %s %d {%x}", new, conn->debug_id, conn->cid);
-
-       _leave(" = %p {u=%d}", conn, atomic_read(&conn->usage));
-       return conn;
-
-       /* we found the connection in the list immediately */
-found_extant_connection:
-       if (hdr->securityIndex != conn->security_ix) {
-               read_unlock_bh(&trans->conn_lock);
-               goto security_mismatch;
-       }
-       atomic_inc(&conn->usage);
-       read_unlock_bh(&trans->conn_lock);
-       goto success;
-
-       /* we found the connection on the second time through the list */
-found_extant_second:
-       if (hdr->securityIndex != conn->security_ix) {
-               write_unlock_bh(&trans->conn_lock);
-               goto security_mismatch;
-       }
-       atomic_inc(&conn->usage);
-       write_unlock_bh(&trans->conn_lock);
-       kfree(candidate);
-       goto success;
-
-security_mismatch:
-       kfree(candidate);
-       _leave(" = -EKEYREJECTED");
-       return ERR_PTR(-EKEYREJECTED);
-}
-
-/*
- * find a connection based on transport and RxRPC connection ID for an incoming
- * packet
- */
-struct rxrpc_connection *rxrpc_find_connection(struct rxrpc_transport *trans,
-                                              struct rxrpc_host_header *hdr)
-{
-       struct rxrpc_connection *conn;
-       struct rb_node *p;
-       u32 epoch, cid;
-
-       _enter(",{%x,%x}", hdr->cid, hdr->flags);
-
-       read_lock_bh(&trans->conn_lock);
-
-       cid = hdr->cid & RXRPC_CIDMASK;
-       epoch = hdr->epoch;
-
-       if (hdr->flags & RXRPC_CLIENT_INITIATED)
-               p = trans->server_conns.rb_node;
-       else
-               p = trans->client_conns.rb_node;
-
-       while (p) {
-               conn = rb_entry(p, struct rxrpc_connection, node);
-
-               _debug("maybe %x", conn->cid);
-
-               if (epoch < conn->epoch)
-                       p = p->rb_left;
-               else if (epoch > conn->epoch)
-                       p = p->rb_right;
-               else if (cid < conn->cid)
-                       p = p->rb_left;
-               else if (cid > conn->cid)
-                       p = p->rb_right;
-               else
-                       goto found;
-       }
-
-       read_unlock_bh(&trans->conn_lock);
-       _leave(" = NULL");
-       return NULL;
-
-found:
-       atomic_inc(&conn->usage);
-       read_unlock_bh(&trans->conn_lock);
-       _leave(" = %p", conn);
-       return conn;
-}
-
-/*
- * release a virtual connection
- */
-void rxrpc_put_connection(struct rxrpc_connection *conn)
-{
-       _enter("%p{u=%d,d=%d}",
-              conn, atomic_read(&conn->usage), conn->debug_id);
-
-       ASSERTCMP(atomic_read(&conn->usage), >, 0);
-
-       conn->put_time = ktime_get_seconds();
-       if (atomic_dec_and_test(&conn->usage)) {
-               _debug("zombie");
-               rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0);
-       }
-
-       _leave("");
-}
-
-/*
- * destroy a virtual connection
- */
-static void rxrpc_destroy_connection(struct rxrpc_connection *conn)
-{
-       _enter("%p{%d}", conn, atomic_read(&conn->usage));
-
-       ASSERTCMP(atomic_read(&conn->usage), ==, 0);
-
-       _net("DESTROY CONN %d", conn->debug_id);
-
-       if (conn->bundle)
-               rxrpc_put_bundle(conn->trans, conn->bundle);
-
-       ASSERT(RB_EMPTY_ROOT(&conn->calls));
-       rxrpc_purge_queue(&conn->rx_queue);
-
-       conn->security->clear(conn);
-       key_put(conn->key);
-       key_put(conn->server_key);
-
-       rxrpc_put_transport(conn->trans);
-       kfree(conn);
-       _leave("");
-}
-
-/*
- * reap dead connections
- */
-static void rxrpc_connection_reaper(struct work_struct *work)
-{
-       struct rxrpc_connection *conn, *_p;
-       unsigned long now, earliest, reap_time;
-
-       LIST_HEAD(graveyard);
-
-       _enter("");
-
-       now = ktime_get_seconds();
-       earliest = ULONG_MAX;
-
-       write_lock_bh(&rxrpc_connection_lock);
-       list_for_each_entry_safe(conn, _p, &rxrpc_connections, link) {
-               _debug("reap CONN %d { u=%d,t=%ld }",
-                      conn->debug_id, atomic_read(&conn->usage),
-                      (long) now - (long) conn->put_time);
-
-               if (likely(atomic_read(&conn->usage) > 0))
-                       continue;
-
-               spin_lock(&conn->trans->client_lock);
-               write_lock(&conn->trans->conn_lock);
-               reap_time = conn->put_time + rxrpc_connection_expiry;
-
-               if (atomic_read(&conn->usage) > 0) {
-                       ;
-               } else if (reap_time <= now) {
-                       list_move_tail(&conn->link, &graveyard);
-                       if (conn->out_clientflag)
-                               rb_erase(&conn->node,
-                                        &conn->trans->client_conns);
-                       else
-                               rb_erase(&conn->node,
-                                        &conn->trans->server_conns);
-                       if (conn->bundle) {
-                               list_del_init(&conn->bundle_link);
-                               conn->bundle->num_conns--;
-                       }
-
-               } else if (reap_time < earliest) {
-                       earliest = reap_time;
-               }
-
-               write_unlock(&conn->trans->conn_lock);
-               spin_unlock(&conn->trans->client_lock);
-       }
-       write_unlock_bh(&rxrpc_connection_lock);
-
-       if (earliest != ULONG_MAX) {
-               _debug("reschedule reaper %ld", (long) earliest - now);
-               ASSERTCMP(earliest, >, now);
-               rxrpc_queue_delayed_work(&rxrpc_connection_reap,
-                                        (earliest - now) * HZ);
-       }
-
-       /* then destroy all those pulled out */
-       while (!list_empty(&graveyard)) {
-               conn = list_entry(graveyard.next, struct rxrpc_connection,
-                                 link);
-               list_del_init(&conn->link);
-
-               ASSERTCMP(atomic_read(&conn->usage), ==, 0);
-               rxrpc_destroy_connection(conn);
-       }
-
-       _leave("");
-}
-
-/*
- * preemptively destroy all the connection records rather than waiting for them
- * to time out
- */
-void __exit rxrpc_destroy_all_connections(void)
-{
-       _enter("");
-
-       rxrpc_connection_expiry = 0;
-       cancel_delayed_work(&rxrpc_connection_reap);
-       rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0);
-
-       _leave("");
-}
diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
deleted file mode 100644 (file)
index 8bdd692..0000000
+++ /dev/null
@@ -1,403 +0,0 @@
-/* connection-level event handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/errqueue.h>
-#include <linux/udp.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/icmp.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <net/ip.h>
-#include "ar-internal.h"
-
-/*
- * pass a connection-level abort onto all calls on that connection
- */
-static void rxrpc_abort_calls(struct rxrpc_connection *conn, int state,
-                             u32 abort_code)
-{
-       struct rxrpc_call *call;
-       struct rb_node *p;
-
-       _enter("{%d},%x", conn->debug_id, abort_code);
-
-       read_lock_bh(&conn->lock);
-
-       for (p = rb_first(&conn->calls); p; p = rb_next(p)) {
-               call = rb_entry(p, struct rxrpc_call, conn_node);
-               write_lock(&call->state_lock);
-               if (call->state <= RXRPC_CALL_COMPLETE) {
-                       call->state = state;
-                       if (state == RXRPC_CALL_LOCALLY_ABORTED) {
-                               call->local_abort = conn->local_abort;
-                               set_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
-                       } else {
-                               call->remote_abort = conn->remote_abort;
-                               set_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
-                       }
-                       rxrpc_queue_call(call);
-               }
-               write_unlock(&call->state_lock);
-       }
-
-       read_unlock_bh(&conn->lock);
-       _leave("");
-}
-
-/*
- * generate a connection-level abort
- */
-static int rxrpc_abort_connection(struct rxrpc_connection *conn,
-                                 u32 error, u32 abort_code)
-{
-       struct rxrpc_wire_header whdr;
-       struct msghdr msg;
-       struct kvec iov[2];
-       __be32 word;
-       size_t len;
-       u32 serial;
-       int ret;
-
-       _enter("%d,,%u,%u", conn->debug_id, error, abort_code);
-
-       /* generate a connection-level abort */
-       spin_lock_bh(&conn->state_lock);
-       if (conn->state < RXRPC_CONN_REMOTELY_ABORTED) {
-               conn->state = RXRPC_CONN_LOCALLY_ABORTED;
-               conn->error = error;
-               spin_unlock_bh(&conn->state_lock);
-       } else {
-               spin_unlock_bh(&conn->state_lock);
-               _leave(" = 0 [already dead]");
-               return 0;
-       }
-
-       rxrpc_abort_calls(conn, RXRPC_CALL_LOCALLY_ABORTED, abort_code);
-
-       msg.msg_name    = &conn->trans->peer->srx.transport;
-       msg.msg_namelen = conn->trans->peer->srx.transport_len;
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags   = 0;
-
-       whdr.epoch      = htonl(conn->epoch);
-       whdr.cid        = htonl(conn->cid);
-       whdr.callNumber = 0;
-       whdr.seq        = 0;
-       whdr.type       = RXRPC_PACKET_TYPE_ABORT;
-       whdr.flags      = conn->out_clientflag;
-       whdr.userStatus = 0;
-       whdr.securityIndex = conn->security_ix;
-       whdr._rsvd      = 0;
-       whdr.serviceId  = htons(conn->service_id);
-
-       word            = htonl(conn->local_abort);
-
-       iov[0].iov_base = &whdr;
-       iov[0].iov_len  = sizeof(whdr);
-       iov[1].iov_base = &word;
-       iov[1].iov_len  = sizeof(word);
-
-       len = iov[0].iov_len + iov[1].iov_len;
-
-       serial = atomic_inc_return(&conn->serial);
-       whdr.serial = htonl(serial);
-       _proto("Tx CONN ABORT %%%u { %d }", serial, conn->local_abort);
-
-       ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-       if (ret < 0) {
-               _debug("sendmsg failed: %d", ret);
-               return -EAGAIN;
-       }
-
-       _leave(" = 0");
-       return 0;
-}
-
-/*
- * mark a call as being on a now-secured channel
- * - must be called with softirqs disabled
- */
-static void rxrpc_call_is_secure(struct rxrpc_call *call)
-{
-       _enter("%p", call);
-       if (call) {
-               read_lock(&call->state_lock);
-               if (call->state < RXRPC_CALL_COMPLETE &&
-                   !test_and_set_bit(RXRPC_CALL_EV_SECURED, &call->events))
-                       rxrpc_queue_call(call);
-               read_unlock(&call->state_lock);
-       }
-}
-
-/*
- * connection-level Rx packet processor
- */
-static int rxrpc_process_event(struct rxrpc_connection *conn,
-                              struct sk_buff *skb,
-                              u32 *_abort_code)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       __be32 wtmp;
-       u32 abort_code;
-       int loop, ret;
-
-       if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
-               kleave(" = -ECONNABORTED [%u]", conn->state);
-               return -ECONNABORTED;
-       }
-
-       _enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, sp->hdr.serial);
-
-       switch (sp->hdr.type) {
-       case RXRPC_PACKET_TYPE_ABORT:
-               if (skb_copy_bits(skb, 0, &wtmp, sizeof(wtmp)) < 0)
-                       return -EPROTO;
-               abort_code = ntohl(wtmp);
-               _proto("Rx ABORT %%%u { ac=%d }", sp->hdr.serial, abort_code);
-
-               conn->state = RXRPC_CONN_REMOTELY_ABORTED;
-               rxrpc_abort_calls(conn, RXRPC_CALL_REMOTELY_ABORTED,
-                                 abort_code);
-               return -ECONNABORTED;
-
-       case RXRPC_PACKET_TYPE_CHALLENGE:
-               return conn->security->respond_to_challenge(conn, skb,
-                                                           _abort_code);
-
-       case RXRPC_PACKET_TYPE_RESPONSE:
-               ret = conn->security->verify_response(conn, skb, _abort_code);
-               if (ret < 0)
-                       return ret;
-
-               ret = conn->security->init_connection_security(conn);
-               if (ret < 0)
-                       return ret;
-
-               conn->security->prime_packet_security(conn);
-               read_lock_bh(&conn->lock);
-               spin_lock(&conn->state_lock);
-
-               if (conn->state == RXRPC_CONN_SERVER_CHALLENGING) {
-                       conn->state = RXRPC_CONN_SERVER;
-                       for (loop = 0; loop < RXRPC_MAXCALLS; loop++)
-                               rxrpc_call_is_secure(conn->channels[loop]);
-               }
-
-               spin_unlock(&conn->state_lock);
-               read_unlock_bh(&conn->lock);
-               return 0;
-
-       default:
-               _leave(" = -EPROTO [%u]", sp->hdr.type);
-               return -EPROTO;
-       }
-}
-
-/*
- * set up security and issue a challenge
- */
-static void rxrpc_secure_connection(struct rxrpc_connection *conn)
-{
-       u32 abort_code;
-       int ret;
-
-       _enter("{%d}", conn->debug_id);
-
-       ASSERT(conn->security_ix != 0);
-
-       if (!conn->key) {
-               _debug("set up security");
-               ret = rxrpc_init_server_conn_security(conn);
-               switch (ret) {
-               case 0:
-                       break;
-               case -ENOENT:
-                       abort_code = RX_CALL_DEAD;
-                       goto abort;
-               default:
-                       abort_code = RXKADNOAUTH;
-                       goto abort;
-               }
-       }
-
-       if (conn->security->issue_challenge(conn) < 0) {
-               abort_code = RX_CALL_DEAD;
-               ret = -ENOMEM;
-               goto abort;
-       }
-
-       _leave("");
-       return;
-
-abort:
-       _debug("abort %d, %d", ret, abort_code);
-       rxrpc_abort_connection(conn, -ret, abort_code);
-       _leave(" [aborted]");
-}
-
-/*
- * connection-level event processor
- */
-void rxrpc_process_connection(struct work_struct *work)
-{
-       struct rxrpc_connection *conn =
-               container_of(work, struct rxrpc_connection, processor);
-       struct sk_buff *skb;
-       u32 abort_code = RX_PROTOCOL_ERROR;
-       int ret;
-
-       _enter("{%d}", conn->debug_id);
-
-       atomic_inc(&conn->usage);
-
-       if (test_and_clear_bit(RXRPC_CONN_CHALLENGE, &conn->events)) {
-               rxrpc_secure_connection(conn);
-               rxrpc_put_connection(conn);
-       }
-
-       /* go through the conn-level event packets, releasing the ref on this
-        * connection that each one has when we've finished with it */
-       while ((skb = skb_dequeue(&conn->rx_queue))) {
-               ret = rxrpc_process_event(conn, skb, &abort_code);
-               switch (ret) {
-               case -EPROTO:
-               case -EKEYEXPIRED:
-               case -EKEYREJECTED:
-                       goto protocol_error;
-               case -EAGAIN:
-                       goto requeue_and_leave;
-               case -ECONNABORTED:
-               default:
-                       rxrpc_put_connection(conn);
-                       rxrpc_free_skb(skb);
-                       break;
-               }
-       }
-
-out:
-       rxrpc_put_connection(conn);
-       _leave("");
-       return;
-
-requeue_and_leave:
-       skb_queue_head(&conn->rx_queue, skb);
-       goto out;
-
-protocol_error:
-       if (rxrpc_abort_connection(conn, -ret, abort_code) < 0)
-               goto requeue_and_leave;
-       rxrpc_put_connection(conn);
-       rxrpc_free_skb(skb);
-       _leave(" [EPROTO]");
-       goto out;
-}
-
-/*
- * put a packet up for transport-level abort
- */
-void rxrpc_reject_packet(struct rxrpc_local *local, struct sk_buff *skb)
-{
-       CHECK_SLAB_OKAY(&local->usage);
-
-       if (!atomic_inc_not_zero(&local->usage)) {
-               printk("resurrected on reject\n");
-               BUG();
-       }
-
-       skb_queue_tail(&local->reject_queue, skb);
-       rxrpc_queue_work(&local->rejecter);
-}
-
-/*
- * reject packets through the local endpoint
- */
-void rxrpc_reject_packets(struct work_struct *work)
-{
-       union {
-               struct sockaddr sa;
-               struct sockaddr_in sin;
-       } sa;
-       struct rxrpc_skb_priv *sp;
-       struct rxrpc_wire_header whdr;
-       struct rxrpc_local *local;
-       struct sk_buff *skb;
-       struct msghdr msg;
-       struct kvec iov[2];
-       size_t size;
-       __be32 code;
-
-       local = container_of(work, struct rxrpc_local, rejecter);
-       rxrpc_get_local(local);
-
-       _enter("%d", local->debug_id);
-
-       iov[0].iov_base = &whdr;
-       iov[0].iov_len = sizeof(whdr);
-       iov[1].iov_base = &code;
-       iov[1].iov_len = sizeof(code);
-       size = sizeof(whdr) + sizeof(code);
-
-       msg.msg_name = &sa;
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags = 0;
-
-       memset(&sa, 0, sizeof(sa));
-       sa.sa.sa_family = local->srx.transport.family;
-       switch (sa.sa.sa_family) {
-       case AF_INET:
-               msg.msg_namelen = sizeof(sa.sin);
-               break;
-       default:
-               msg.msg_namelen = 0;
-               break;
-       }
-
-       memset(&whdr, 0, sizeof(whdr));
-       whdr.type = RXRPC_PACKET_TYPE_ABORT;
-
-       while ((skb = skb_dequeue(&local->reject_queue))) {
-               sp = rxrpc_skb(skb);
-               switch (sa.sa.sa_family) {
-               case AF_INET:
-                       sa.sin.sin_port = udp_hdr(skb)->source;
-                       sa.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
-                       code = htonl(skb->priority);
-
-                       whdr.epoch      = htonl(sp->hdr.epoch);
-                       whdr.cid        = htonl(sp->hdr.cid);
-                       whdr.callNumber = htonl(sp->hdr.callNumber);
-                       whdr.serviceId  = htons(sp->hdr.serviceId);
-                       whdr.flags      = sp->hdr.flags;
-                       whdr.flags      ^= RXRPC_CLIENT_INITIATED;
-                       whdr.flags      &= RXRPC_CLIENT_INITIATED;
-
-                       kernel_sendmsg(local->socket, &msg, iov, 2, size);
-                       break;
-
-               default:
-                       break;
-               }
-
-               rxrpc_free_skb(skb);
-               rxrpc_put_local(local);
-       }
-
-       rxrpc_put_local(local);
-       _leave("");
-}
diff --git a/net/rxrpc/ar-error.c b/net/rxrpc/ar-error.c
deleted file mode 100644 (file)
index 3e82d6f..0000000
+++ /dev/null
@@ -1,230 +0,0 @@
-/* Error message handling (ICMP)
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/errqueue.h>
-#include <linux/udp.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/icmp.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <net/ip.h>
-#include "ar-internal.h"
-
-/*
- * handle an error received on the local endpoint
- */
-void rxrpc_UDP_error_report(struct sock *sk)
-{
-       struct sock_exterr_skb *serr;
-       struct rxrpc_transport *trans;
-       struct rxrpc_local *local = sk->sk_user_data;
-       struct rxrpc_peer *peer;
-       struct sk_buff *skb;
-       __be32 addr;
-       __be16 port;
-
-       _enter("%p{%d}", sk, local->debug_id);
-
-       skb = sock_dequeue_err_skb(sk);
-       if (!skb) {
-               _leave("UDP socket errqueue empty");
-               return;
-       }
-       serr = SKB_EXT_ERR(skb);
-       if (!skb->len && serr->ee.ee_origin == SO_EE_ORIGIN_TIMESTAMPING) {
-               _leave("UDP empty message");
-               kfree_skb(skb);
-               return;
-       }
-
-       rxrpc_new_skb(skb);
-
-       addr = *(__be32 *)(skb_network_header(skb) + serr->addr_offset);
-       port = serr->port;
-
-       _net("Rx UDP Error from %pI4:%hu", &addr, ntohs(port));
-       _debug("Msg l:%d d:%d", skb->len, skb->data_len);
-
-       peer = rxrpc_find_peer(local, addr, port);
-       if (IS_ERR(peer)) {
-               rxrpc_free_skb(skb);
-               _leave(" [no peer]");
-               return;
-       }
-
-       trans = rxrpc_find_transport(local, peer);
-       if (!trans) {
-               rxrpc_put_peer(peer);
-               rxrpc_free_skb(skb);
-               _leave(" [no trans]");
-               return;
-       }
-
-       if (serr->ee.ee_origin == SO_EE_ORIGIN_ICMP &&
-           serr->ee.ee_type == ICMP_DEST_UNREACH &&
-           serr->ee.ee_code == ICMP_FRAG_NEEDED
-           ) {
-               u32 mtu = serr->ee.ee_info;
-
-               _net("Rx Received ICMP Fragmentation Needed (%d)", mtu);
-
-               /* wind down the local interface MTU */
-               if (mtu > 0 && peer->if_mtu == 65535 && mtu < peer->if_mtu) {
-                       peer->if_mtu = mtu;
-                       _net("I/F MTU %u", mtu);
-               }
-
-               if (mtu == 0) {
-                       /* they didn't give us a size, estimate one */
-                       mtu = peer->if_mtu;
-                       if (mtu > 1500) {
-                               mtu >>= 1;
-                               if (mtu < 1500)
-                                       mtu = 1500;
-                       } else {
-                               mtu -= 100;
-                               if (mtu < peer->hdrsize)
-                                       mtu = peer->hdrsize + 4;
-                       }
-               }
-
-               if (mtu < peer->mtu) {
-                       spin_lock_bh(&peer->lock);
-                       peer->mtu = mtu;
-                       peer->maxdata = peer->mtu - peer->hdrsize;
-                       spin_unlock_bh(&peer->lock);
-                       _net("Net MTU %u (maxdata %u)",
-                            peer->mtu, peer->maxdata);
-               }
-       }
-
-       rxrpc_put_peer(peer);
-
-       /* pass the transport ref to error_handler to release */
-       skb_queue_tail(&trans->error_queue, skb);
-       rxrpc_queue_work(&trans->error_handler);
-       _leave("");
-}
-
-/*
- * deal with UDP error messages
- */
-void rxrpc_UDP_error_handler(struct work_struct *work)
-{
-       struct sock_extended_err *ee;
-       struct sock_exterr_skb *serr;
-       struct rxrpc_transport *trans =
-               container_of(work, struct rxrpc_transport, error_handler);
-       struct sk_buff *skb;
-       int err;
-
-       _enter("");
-
-       skb = skb_dequeue(&trans->error_queue);
-       if (!skb)
-               return;
-
-       serr = SKB_EXT_ERR(skb);
-       ee = &serr->ee;
-
-       _net("Rx Error o=%d t=%d c=%d e=%d",
-            ee->ee_origin, ee->ee_type, ee->ee_code, ee->ee_errno);
-
-       err = ee->ee_errno;
-
-       switch (ee->ee_origin) {
-       case SO_EE_ORIGIN_ICMP:
-               switch (ee->ee_type) {
-               case ICMP_DEST_UNREACH:
-                       switch (ee->ee_code) {
-                       case ICMP_NET_UNREACH:
-                               _net("Rx Received ICMP Network Unreachable");
-                               break;
-                       case ICMP_HOST_UNREACH:
-                               _net("Rx Received ICMP Host Unreachable");
-                               break;
-                       case ICMP_PORT_UNREACH:
-                               _net("Rx Received ICMP Port Unreachable");
-                               break;
-                       case ICMP_NET_UNKNOWN:
-                               _net("Rx Received ICMP Unknown Network");
-                               break;
-                       case ICMP_HOST_UNKNOWN:
-                               _net("Rx Received ICMP Unknown Host");
-                               break;
-                       default:
-                               _net("Rx Received ICMP DestUnreach code=%u",
-                                    ee->ee_code);
-                               break;
-                       }
-                       break;
-
-               case ICMP_TIME_EXCEEDED:
-                       _net("Rx Received ICMP TTL Exceeded");
-                       break;
-
-               default:
-                       _proto("Rx Received ICMP error { type=%u code=%u }",
-                              ee->ee_type, ee->ee_code);
-                       break;
-               }
-               break;
-
-       case SO_EE_ORIGIN_LOCAL:
-               _proto("Rx Received local error { error=%d }",
-                      ee->ee_errno);
-               break;
-
-       case SO_EE_ORIGIN_NONE:
-       case SO_EE_ORIGIN_ICMP6:
-       default:
-               _proto("Rx Received error report { orig=%u }",
-                      ee->ee_origin);
-               break;
-       }
-
-       /* terminate all the affected calls if there's an unrecoverable
-        * error */
-       if (err) {
-               struct rxrpc_call *call, *_n;
-
-               _debug("ISSUE ERROR %d", err);
-
-               spin_lock_bh(&trans->peer->lock);
-               trans->peer->net_error = err;
-
-               list_for_each_entry_safe(call, _n, &trans->peer->error_targets,
-                                        error_link) {
-                       write_lock(&call->state_lock);
-                       if (call->state != RXRPC_CALL_COMPLETE &&
-                           call->state < RXRPC_CALL_NETWORK_ERROR) {
-                               call->state = RXRPC_CALL_NETWORK_ERROR;
-                               set_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events);
-                               rxrpc_queue_call(call);
-                       }
-                       write_unlock(&call->state_lock);
-                       list_del_init(&call->error_link);
-               }
-
-               spin_unlock_bh(&trans->peer->lock);
-       }
-
-       if (!skb_queue_empty(&trans->error_queue))
-               rxrpc_queue_work(&trans->error_handler);
-
-       rxrpc_free_skb(skb);
-       rxrpc_put_transport(trans);
-       _leave("");
-}
diff --git a/net/rxrpc/ar-input.c b/net/rxrpc/ar-input.c
deleted file mode 100644 (file)
index e0815a0..0000000
+++ /dev/null
@@ -1,800 +0,0 @@
-/* RxRPC packet reception
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/errqueue.h>
-#include <linux/udp.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/icmp.h>
-#include <linux/gfp.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <net/ip.h>
-#include <net/udp.h>
-#include <net/net_namespace.h>
-#include "ar-internal.h"
-
-/*
- * queue a packet for recvmsg to pass to userspace
- * - the caller must hold a lock on call->lock
- * - must not be called with interrupts disabled (sk_filter() disables BH's)
- * - eats the packet whether successful or not
- * - there must be just one reference to the packet, which the caller passes to
- *   this function
- */
-int rxrpc_queue_rcv_skb(struct rxrpc_call *call, struct sk_buff *skb,
-                       bool force, bool terminal)
-{
-       struct rxrpc_skb_priv *sp;
-       struct rxrpc_sock *rx = call->socket;
-       struct sock *sk;
-       int ret;
-
-       _enter(",,%d,%d", force, terminal);
-
-       ASSERT(!irqs_disabled());
-
-       sp = rxrpc_skb(skb);
-       ASSERTCMP(sp->call, ==, call);
-
-       /* if we've already posted the terminal message for a call, then we
-        * don't post any more */
-       if (test_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags)) {
-               _debug("already terminated");
-               ASSERTCMP(call->state, >=, RXRPC_CALL_COMPLETE);
-               skb->destructor = NULL;
-               sp->call = NULL;
-               rxrpc_put_call(call);
-               rxrpc_free_skb(skb);
-               return 0;
-       }
-
-       sk = &rx->sk;
-
-       if (!force) {
-               /* cast skb->rcvbuf to unsigned...  It's pointless, but
-                * reduces number of warnings when compiling with -W
-                * --ANK */
-//             ret = -ENOBUFS;
-//             if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
-//                 (unsigned int) sk->sk_rcvbuf)
-//                     goto out;
-
-               ret = sk_filter(sk, skb);
-               if (ret < 0)
-                       goto out;
-       }
-
-       spin_lock_bh(&sk->sk_receive_queue.lock);
-       if (!test_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags) &&
-           !test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-           call->socket->sk.sk_state != RXRPC_CLOSE) {
-               skb->destructor = rxrpc_packet_destructor;
-               skb->dev = NULL;
-               skb->sk = sk;
-               atomic_add(skb->truesize, &sk->sk_rmem_alloc);
-
-               if (terminal) {
-                       _debug("<<<< TERMINAL MESSAGE >>>>");
-                       set_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags);
-               }
-
-               /* allow interception by a kernel service */
-               if (rx->interceptor) {
-                       rx->interceptor(sk, call->user_call_ID, skb);
-                       spin_unlock_bh(&sk->sk_receive_queue.lock);
-               } else {
-                       _net("post skb %p", skb);
-                       __skb_queue_tail(&sk->sk_receive_queue, skb);
-                       spin_unlock_bh(&sk->sk_receive_queue.lock);
-
-                       if (!sock_flag(sk, SOCK_DEAD))
-                               sk->sk_data_ready(sk);
-               }
-               skb = NULL;
-       } else {
-               spin_unlock_bh(&sk->sk_receive_queue.lock);
-       }
-       ret = 0;
-
-out:
-       /* release the socket buffer */
-       if (skb) {
-               skb->destructor = NULL;
-               sp->call = NULL;
-               rxrpc_put_call(call);
-               rxrpc_free_skb(skb);
-       }
-
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * process a DATA packet, posting the packet to the appropriate queue
- * - eats the packet if successful
- */
-static int rxrpc_fast_process_data(struct rxrpc_call *call,
-                                  struct sk_buff *skb, u32 seq)
-{
-       struct rxrpc_skb_priv *sp;
-       bool terminal;
-       int ret, ackbit, ack;
-
-       _enter("{%u,%u},,{%u}", call->rx_data_post, call->rx_first_oos, seq);
-
-       sp = rxrpc_skb(skb);
-       ASSERTCMP(sp->call, ==, NULL);
-
-       spin_lock(&call->lock);
-
-       if (call->state > RXRPC_CALL_COMPLETE)
-               goto discard;
-
-       ASSERTCMP(call->rx_data_expect, >=, call->rx_data_post);
-       ASSERTCMP(call->rx_data_post, >=, call->rx_data_recv);
-       ASSERTCMP(call->rx_data_recv, >=, call->rx_data_eaten);
-
-       if (seq < call->rx_data_post) {
-               _debug("dup #%u [-%u]", seq, call->rx_data_post);
-               ack = RXRPC_ACK_DUPLICATE;
-               ret = -ENOBUFS;
-               goto discard_and_ack;
-       }
-
-       /* we may already have the packet in the out of sequence queue */
-       ackbit = seq - (call->rx_data_eaten + 1);
-       ASSERTCMP(ackbit, >=, 0);
-       if (__test_and_set_bit(ackbit, call->ackr_window)) {
-               _debug("dup oos #%u [%u,%u]",
-                      seq, call->rx_data_eaten, call->rx_data_post);
-               ack = RXRPC_ACK_DUPLICATE;
-               goto discard_and_ack;
-       }
-
-       if (seq >= call->ackr_win_top) {
-               _debug("exceed #%u [%u]", seq, call->ackr_win_top);
-               __clear_bit(ackbit, call->ackr_window);
-               ack = RXRPC_ACK_EXCEEDS_WINDOW;
-               goto discard_and_ack;
-       }
-
-       if (seq == call->rx_data_expect) {
-               clear_bit(RXRPC_CALL_EXPECT_OOS, &call->flags);
-               call->rx_data_expect++;
-       } else if (seq > call->rx_data_expect) {
-               _debug("oos #%u [%u]", seq, call->rx_data_expect);
-               call->rx_data_expect = seq + 1;
-               if (test_and_set_bit(RXRPC_CALL_EXPECT_OOS, &call->flags)) {
-                       ack = RXRPC_ACK_OUT_OF_SEQUENCE;
-                       goto enqueue_and_ack;
-               }
-               goto enqueue_packet;
-       }
-
-       if (seq != call->rx_data_post) {
-               _debug("ahead #%u [%u]", seq, call->rx_data_post);
-               goto enqueue_packet;
-       }
-
-       if (test_bit(RXRPC_CALL_RCVD_LAST, &call->flags))
-               goto protocol_error;
-
-       /* if the packet need security things doing to it, then it goes down
-        * the slow path */
-       if (call->conn->security_ix)
-               goto enqueue_packet;
-
-       sp->call = call;
-       rxrpc_get_call(call);
-       terminal = ((sp->hdr.flags & RXRPC_LAST_PACKET) &&
-                   !(sp->hdr.flags & RXRPC_CLIENT_INITIATED));
-       ret = rxrpc_queue_rcv_skb(call, skb, false, terminal);
-       if (ret < 0) {
-               if (ret == -ENOMEM || ret == -ENOBUFS) {
-                       __clear_bit(ackbit, call->ackr_window);
-                       ack = RXRPC_ACK_NOSPACE;
-                       goto discard_and_ack;
-               }
-               goto out;
-       }
-
-       skb = NULL;
-
-       _debug("post #%u", seq);
-       ASSERTCMP(call->rx_data_post, ==, seq);
-       call->rx_data_post++;
-
-       if (sp->hdr.flags & RXRPC_LAST_PACKET)
-               set_bit(RXRPC_CALL_RCVD_LAST, &call->flags);
-
-       /* if we've reached an out of sequence packet then we need to drain
-        * that queue into the socket Rx queue now */
-       if (call->rx_data_post == call->rx_first_oos) {
-               _debug("drain rx oos now");
-               read_lock(&call->state_lock);
-               if (call->state < RXRPC_CALL_COMPLETE &&
-                   !test_and_set_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events))
-                       rxrpc_queue_call(call);
-               read_unlock(&call->state_lock);
-       }
-
-       spin_unlock(&call->lock);
-       atomic_inc(&call->ackr_not_idle);
-       rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, sp->hdr.serial, false);
-       _leave(" = 0 [posted]");
-       return 0;
-
-protocol_error:
-       ret = -EBADMSG;
-out:
-       spin_unlock(&call->lock);
-       _leave(" = %d", ret);
-       return ret;
-
-discard_and_ack:
-       _debug("discard and ACK packet %p", skb);
-       __rxrpc_propose_ACK(call, ack, sp->hdr.serial, true);
-discard:
-       spin_unlock(&call->lock);
-       rxrpc_free_skb(skb);
-       _leave(" = 0 [discarded]");
-       return 0;
-
-enqueue_and_ack:
-       __rxrpc_propose_ACK(call, ack, sp->hdr.serial, true);
-enqueue_packet:
-       _net("defer skb %p", skb);
-       spin_unlock(&call->lock);
-       skb_queue_tail(&call->rx_queue, skb);
-       atomic_inc(&call->ackr_not_idle);
-       read_lock(&call->state_lock);
-       if (call->state < RXRPC_CALL_DEAD)
-               rxrpc_queue_call(call);
-       read_unlock(&call->state_lock);
-       _leave(" = 0 [queued]");
-       return 0;
-}
-
-/*
- * assume an implicit ACKALL of the transmission phase of a client socket upon
- * reception of the first reply packet
- */
-static void rxrpc_assume_implicit_ackall(struct rxrpc_call *call, u32 serial)
-{
-       write_lock_bh(&call->state_lock);
-
-       switch (call->state) {
-       case RXRPC_CALL_CLIENT_AWAIT_REPLY:
-               call->state = RXRPC_CALL_CLIENT_RECV_REPLY;
-               call->acks_latest = serial;
-
-               _debug("implicit ACKALL %%%u", call->acks_latest);
-               set_bit(RXRPC_CALL_EV_RCVD_ACKALL, &call->events);
-               write_unlock_bh(&call->state_lock);
-
-               if (try_to_del_timer_sync(&call->resend_timer) >= 0) {
-                       clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
-                       clear_bit(RXRPC_CALL_EV_RESEND, &call->events);
-                       clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-               }
-               break;
-
-       default:
-               write_unlock_bh(&call->state_lock);
-               break;
-       }
-}
-
-/*
- * post an incoming packet to the nominated call to deal with
- * - must get rid of the sk_buff, either by freeing it or by queuing it
- */
-void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       __be32 wtmp;
-       u32 hi_serial, abort_code;
-
-       _enter("%p,%p", call, skb);
-
-       ASSERT(!irqs_disabled());
-
-#if 0 // INJECT RX ERROR
-       if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
-               static int skip = 0;
-               if (++skip == 3) {
-                       printk("DROPPED 3RD PACKET!!!!!!!!!!!!!\n");
-                       skip = 0;
-                       goto free_packet;
-               }
-       }
-#endif
-
-       /* track the latest serial number on this connection for ACK packet
-        * information */
-       hi_serial = atomic_read(&call->conn->hi_serial);
-       while (sp->hdr.serial > hi_serial)
-               hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
-                                          sp->hdr.serial);
-
-       /* request ACK generation for any ACK or DATA packet that requests
-        * it */
-       if (sp->hdr.flags & RXRPC_REQUEST_ACK) {
-               _proto("ACK Requested on %%%u", sp->hdr.serial);
-               rxrpc_propose_ACK(call, RXRPC_ACK_REQUESTED, sp->hdr.serial, false);
-       }
-
-       switch (sp->hdr.type) {
-       case RXRPC_PACKET_TYPE_ABORT:
-               _debug("abort");
-
-               if (skb_copy_bits(skb, 0, &wtmp, sizeof(wtmp)) < 0)
-                       goto protocol_error;
-
-               abort_code = ntohl(wtmp);
-               _proto("Rx ABORT %%%u { %x }", sp->hdr.serial, abort_code);
-
-               write_lock_bh(&call->state_lock);
-               if (call->state < RXRPC_CALL_COMPLETE) {
-                       call->state = RXRPC_CALL_REMOTELY_ABORTED;
-                       call->remote_abort = abort_code;
-                       set_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
-                       rxrpc_queue_call(call);
-               }
-               goto free_packet_unlock;
-
-       case RXRPC_PACKET_TYPE_BUSY:
-               _proto("Rx BUSY %%%u", sp->hdr.serial);
-
-               if (call->conn->out_clientflag)
-                       goto protocol_error;
-
-               write_lock_bh(&call->state_lock);
-               switch (call->state) {
-               case RXRPC_CALL_CLIENT_SEND_REQUEST:
-                       call->state = RXRPC_CALL_SERVER_BUSY;
-                       set_bit(RXRPC_CALL_EV_RCVD_BUSY, &call->events);
-                       rxrpc_queue_call(call);
-               case RXRPC_CALL_SERVER_BUSY:
-                       goto free_packet_unlock;
-               default:
-                       goto protocol_error_locked;
-               }
-
-       default:
-               _proto("Rx %s %%%u", rxrpc_pkts[sp->hdr.type], sp->hdr.serial);
-               goto protocol_error;
-
-       case RXRPC_PACKET_TYPE_DATA:
-               _proto("Rx DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq);
-
-               if (sp->hdr.seq == 0)
-                       goto protocol_error;
-
-               call->ackr_prev_seq = sp->hdr.seq;
-
-               /* received data implicitly ACKs all of the request packets we
-                * sent when we're acting as a client */
-               if (call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY)
-                       rxrpc_assume_implicit_ackall(call, sp->hdr.serial);
-
-               switch (rxrpc_fast_process_data(call, skb, sp->hdr.seq)) {
-               case 0:
-                       skb = NULL;
-                       goto done;
-
-               default:
-                       BUG();
-
-                       /* data packet received beyond the last packet */
-               case -EBADMSG:
-                       goto protocol_error;
-               }
-
-       case RXRPC_PACKET_TYPE_ACKALL:
-       case RXRPC_PACKET_TYPE_ACK:
-               /* ACK processing is done in process context */
-               read_lock_bh(&call->state_lock);
-               if (call->state < RXRPC_CALL_DEAD) {
-                       skb_queue_tail(&call->rx_queue, skb);
-                       rxrpc_queue_call(call);
-                       skb = NULL;
-               }
-               read_unlock_bh(&call->state_lock);
-               goto free_packet;
-       }
-
-protocol_error:
-       _debug("protocol error");
-       write_lock_bh(&call->state_lock);
-protocol_error_locked:
-       if (call->state <= RXRPC_CALL_COMPLETE) {
-               call->state = RXRPC_CALL_LOCALLY_ABORTED;
-               call->local_abort = RX_PROTOCOL_ERROR;
-               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
-               rxrpc_queue_call(call);
-       }
-free_packet_unlock:
-       write_unlock_bh(&call->state_lock);
-free_packet:
-       rxrpc_free_skb(skb);
-done:
-       _leave("");
-}
-
-/*
- * split up a jumbo data packet
- */
-static void rxrpc_process_jumbo_packet(struct rxrpc_call *call,
-                                      struct sk_buff *jumbo)
-{
-       struct rxrpc_jumbo_header jhdr;
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *part;
-
-       _enter(",{%u,%u}", jumbo->data_len, jumbo->len);
-
-       sp = rxrpc_skb(jumbo);
-
-       do {
-               sp->hdr.flags &= ~RXRPC_JUMBO_PACKET;
-
-               /* make a clone to represent the first subpacket in what's left
-                * of the jumbo packet */
-               part = skb_clone(jumbo, GFP_ATOMIC);
-               if (!part) {
-                       /* simply ditch the tail in the event of ENOMEM */
-                       pskb_trim(jumbo, RXRPC_JUMBO_DATALEN);
-                       break;
-               }
-               rxrpc_new_skb(part);
-
-               pskb_trim(part, RXRPC_JUMBO_DATALEN);
-
-               if (!pskb_pull(jumbo, RXRPC_JUMBO_DATALEN))
-                       goto protocol_error;
-
-               if (skb_copy_bits(jumbo, 0, &jhdr, sizeof(jhdr)) < 0)
-                       goto protocol_error;
-               if (!pskb_pull(jumbo, sizeof(jhdr)))
-                       BUG();
-
-               sp->hdr.seq     += 1;
-               sp->hdr.serial  += 1;
-               sp->hdr.flags   = jhdr.flags;
-               sp->hdr._rsvd   = jhdr._rsvd;
-
-               _proto("Rx DATA Jumbo %%%u", sp->hdr.serial - 1);
-
-               rxrpc_fast_process_packet(call, part);
-               part = NULL;
-
-       } while (sp->hdr.flags & RXRPC_JUMBO_PACKET);
-
-       rxrpc_fast_process_packet(call, jumbo);
-       _leave("");
-       return;
-
-protocol_error:
-       _debug("protocol error");
-       rxrpc_free_skb(part);
-       rxrpc_free_skb(jumbo);
-       write_lock_bh(&call->state_lock);
-       if (call->state <= RXRPC_CALL_COMPLETE) {
-               call->state = RXRPC_CALL_LOCALLY_ABORTED;
-               call->local_abort = RX_PROTOCOL_ERROR;
-               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
-               rxrpc_queue_call(call);
-       }
-       write_unlock_bh(&call->state_lock);
-       _leave("");
-}
-
-/*
- * post an incoming packet to the appropriate call/socket to deal with
- * - must get rid of the sk_buff, either by freeing it or by queuing it
- */
-static void rxrpc_post_packet_to_call(struct rxrpc_call *call,
-                                     struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp;
-
-       _enter("%p,%p", call, skb);
-
-       sp = rxrpc_skb(skb);
-
-       _debug("extant call [%d]", call->state);
-
-       read_lock(&call->state_lock);
-       switch (call->state) {
-       case RXRPC_CALL_LOCALLY_ABORTED:
-               if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events)) {
-                       rxrpc_queue_call(call);
-                       goto free_unlock;
-               }
-       case RXRPC_CALL_REMOTELY_ABORTED:
-       case RXRPC_CALL_NETWORK_ERROR:
-       case RXRPC_CALL_DEAD:
-               goto dead_call;
-       case RXRPC_CALL_COMPLETE:
-       case RXRPC_CALL_CLIENT_FINAL_ACK:
-               /* complete server call */
-               if (call->conn->in_clientflag)
-                       goto dead_call;
-               /* resend last packet of a completed call */
-               _debug("final ack again");
-               rxrpc_get_call(call);
-               set_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events);
-               rxrpc_queue_call(call);
-               goto free_unlock;
-       default:
-               break;
-       }
-
-       read_unlock(&call->state_lock);
-       rxrpc_get_call(call);
-
-       if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
-           sp->hdr.flags & RXRPC_JUMBO_PACKET)
-               rxrpc_process_jumbo_packet(call, skb);
-       else
-               rxrpc_fast_process_packet(call, skb);
-
-       rxrpc_put_call(call);
-       goto done;
-
-dead_call:
-       if (sp->hdr.type != RXRPC_PACKET_TYPE_ABORT) {
-               skb->priority = RX_CALL_DEAD;
-               rxrpc_reject_packet(call->conn->trans->local, skb);
-               goto unlock;
-       }
-free_unlock:
-       rxrpc_free_skb(skb);
-unlock:
-       read_unlock(&call->state_lock);
-done:
-       _leave("");
-}
-
-/*
- * post connection-level events to the connection
- * - this includes challenges, responses and some aborts
- */
-static void rxrpc_post_packet_to_conn(struct rxrpc_connection *conn,
-                                     struct sk_buff *skb)
-{
-       _enter("%p,%p", conn, skb);
-
-       atomic_inc(&conn->usage);
-       skb_queue_tail(&conn->rx_queue, skb);
-       rxrpc_queue_conn(conn);
-}
-
-/*
- * post endpoint-level events to the local endpoint
- * - this includes debug and version messages
- */
-static void rxrpc_post_packet_to_local(struct rxrpc_local *local,
-                                      struct sk_buff *skb)
-{
-       _enter("%p,%p", local, skb);
-
-       atomic_inc(&local->usage);
-       skb_queue_tail(&local->event_queue, skb);
-       rxrpc_queue_work(&local->event_processor);
-}
-
-/*
- * Extract the wire header from a packet and translate the byte order.
- */
-static noinline
-int rxrpc_extract_header(struct rxrpc_skb_priv *sp, struct sk_buff *skb)
-{
-       struct rxrpc_wire_header whdr;
-
-       /* dig out the RxRPC connection details */
-       if (skb_copy_bits(skb, 0, &whdr, sizeof(whdr)) < 0)
-               return -EBADMSG;
-       if (!pskb_pull(skb, sizeof(whdr)))
-               BUG();
-
-       memset(sp, 0, sizeof(*sp));
-       sp->hdr.epoch           = ntohl(whdr.epoch);
-       sp->hdr.cid             = ntohl(whdr.cid);
-       sp->hdr.callNumber      = ntohl(whdr.callNumber);
-       sp->hdr.seq             = ntohl(whdr.seq);
-       sp->hdr.serial          = ntohl(whdr.serial);
-       sp->hdr.flags           = whdr.flags;
-       sp->hdr.type            = whdr.type;
-       sp->hdr.userStatus      = whdr.userStatus;
-       sp->hdr.securityIndex   = whdr.securityIndex;
-       sp->hdr._rsvd           = ntohs(whdr._rsvd);
-       sp->hdr.serviceId       = ntohs(whdr.serviceId);
-       return 0;
-}
-
-static struct rxrpc_connection *rxrpc_conn_from_local(struct rxrpc_local *local,
-                                              struct sk_buff *skb,
-                                              struct rxrpc_skb_priv *sp)
-{
-       struct rxrpc_peer *peer;
-       struct rxrpc_transport *trans;
-       struct rxrpc_connection *conn;
-
-       peer = rxrpc_find_peer(local, ip_hdr(skb)->saddr,
-                               udp_hdr(skb)->source);
-       if (IS_ERR(peer))
-               goto cant_find_conn;
-
-       trans = rxrpc_find_transport(local, peer);
-       rxrpc_put_peer(peer);
-       if (!trans)
-               goto cant_find_conn;
-
-       conn = rxrpc_find_connection(trans, &sp->hdr);
-       rxrpc_put_transport(trans);
-       if (!conn)
-               goto cant_find_conn;
-
-       return conn;
-cant_find_conn:
-       return NULL;
-}
-
-/*
- * handle data received on the local endpoint
- * - may be called in interrupt context
- */
-void rxrpc_data_ready(struct sock *sk)
-{
-       struct rxrpc_skb_priv *sp;
-       struct rxrpc_local *local;
-       struct sk_buff *skb;
-       int ret;
-
-       _enter("%p", sk);
-
-       ASSERT(!irqs_disabled());
-
-       read_lock_bh(&rxrpc_local_lock);
-       local = sk->sk_user_data;
-       if (local && atomic_read(&local->usage) > 0)
-               rxrpc_get_local(local);
-       else
-               local = NULL;
-       read_unlock_bh(&rxrpc_local_lock);
-       if (!local) {
-               _leave(" [local dead]");
-               return;
-       }
-
-       skb = skb_recv_datagram(sk, 0, 1, &ret);
-       if (!skb) {
-               rxrpc_put_local(local);
-               if (ret == -EAGAIN)
-                       return;
-               _debug("UDP socket error %d", ret);
-               return;
-       }
-
-       rxrpc_new_skb(skb);
-
-       _net("recv skb %p", skb);
-
-       /* we'll probably need to checksum it (didn't call sock_recvmsg) */
-       if (skb_checksum_complete(skb)) {
-               rxrpc_free_skb(skb);
-               rxrpc_put_local(local);
-               __UDP_INC_STATS(&init_net, UDP_MIB_INERRORS, 0);
-               _leave(" [CSUM failed]");
-               return;
-       }
-
-       __UDP_INC_STATS(&init_net, UDP_MIB_INDATAGRAMS, 0);
-
-       /* The socket buffer we have is owned by UDP, with UDP's data all over
-        * it, but we really want our own data there.
-        */
-       skb_orphan(skb);
-       sp = rxrpc_skb(skb);
-
-       _net("Rx UDP packet from %08x:%04hu",
-            ntohl(ip_hdr(skb)->saddr), ntohs(udp_hdr(skb)->source));
-
-       /* dig out the RxRPC connection details */
-       if (rxrpc_extract_header(sp, skb) < 0)
-               goto bad_message;
-
-       _net("Rx RxRPC %s ep=%x call=%x:%x",
-            sp->hdr.flags & RXRPC_CLIENT_INITIATED ? "ToServer" : "ToClient",
-            sp->hdr.epoch, sp->hdr.cid, sp->hdr.callNumber);
-
-       if (sp->hdr.type >= RXRPC_N_PACKET_TYPES ||
-           !((RXRPC_SUPPORTED_PACKET_TYPES >> sp->hdr.type) & 1)) {
-               _proto("Rx Bad Packet Type %u", sp->hdr.type);
-               goto bad_message;
-       }
-
-       if (sp->hdr.type == RXRPC_PACKET_TYPE_VERSION) {
-               rxrpc_post_packet_to_local(local, skb);
-               goto out;
-       }
-
-       if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
-           (sp->hdr.callNumber == 0 || sp->hdr.seq == 0))
-               goto bad_message;
-
-       if (sp->hdr.callNumber == 0) {
-               /* This is a connection-level packet. These should be
-                * fairly rare, so the extra overhead of looking them up the
-                * old-fashioned way doesn't really hurt */
-               struct rxrpc_connection *conn;
-
-               conn = rxrpc_conn_from_local(local, skb, sp);
-               if (!conn)
-                       goto cant_route_call;
-
-               _debug("CONN %p {%d}", conn, conn->debug_id);
-               rxrpc_post_packet_to_conn(conn, skb);
-               rxrpc_put_connection(conn);
-       } else {
-               struct rxrpc_call *call;
-
-               call = rxrpc_find_call_hash(&sp->hdr, local,
-                                           AF_INET, &ip_hdr(skb)->saddr);
-               if (call)
-                       rxrpc_post_packet_to_call(call, skb);
-               else
-                       goto cant_route_call;
-       }
-
-out:
-       rxrpc_put_local(local);
-       return;
-
-cant_route_call:
-       _debug("can't route call");
-       if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
-           sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
-               if (sp->hdr.seq == 1) {
-                       _debug("first packet");
-                       skb_queue_tail(&local->accept_queue, skb);
-                       rxrpc_queue_work(&local->acceptor);
-                       rxrpc_put_local(local);
-                       _leave(" [incoming]");
-                       return;
-               }
-               skb->priority = RX_INVALID_OPERATION;
-       } else {
-               skb->priority = RX_CALL_DEAD;
-       }
-
-       if (sp->hdr.type != RXRPC_PACKET_TYPE_ABORT) {
-               _debug("reject type %d",sp->hdr.type);
-               rxrpc_reject_packet(local, skb);
-       }
-       rxrpc_put_local(local);
-       _leave(" [no call]");
-       return;
-
-bad_message:
-       skb->priority = RX_PROTOCOL_ERROR;
-       rxrpc_reject_packet(local, skb);
-       rxrpc_put_local(local);
-       _leave(" [badmsg]");
-}
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c
deleted file mode 100644 (file)
index 4ad56fa..0000000
+++ /dev/null
@@ -1,1237 +0,0 @@
-/* RxRPC key management
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- *
- * RxRPC keys should have a description of describing their purpose:
- *     "afs@CAMBRIDGE.REDHAT.COM>
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <crypto/skcipher.h>
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/key-type.h>
-#include <linux/ctype.h>
-#include <linux/slab.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <keys/rxrpc-type.h>
-#include <keys/user-type.h>
-#include "ar-internal.h"
-
-static int rxrpc_vet_description_s(const char *);
-static int rxrpc_preparse(struct key_preparsed_payload *);
-static int rxrpc_preparse_s(struct key_preparsed_payload *);
-static void rxrpc_free_preparse(struct key_preparsed_payload *);
-static void rxrpc_free_preparse_s(struct key_preparsed_payload *);
-static void rxrpc_destroy(struct key *);
-static void rxrpc_destroy_s(struct key *);
-static void rxrpc_describe(const struct key *, struct seq_file *);
-static long rxrpc_read(const struct key *, char __user *, size_t);
-
-/*
- * rxrpc defined keys take an arbitrary string as the description and an
- * arbitrary blob of data as the payload
- */
-struct key_type key_type_rxrpc = {
-       .name           = "rxrpc",
-       .preparse       = rxrpc_preparse,
-       .free_preparse  = rxrpc_free_preparse,
-       .instantiate    = generic_key_instantiate,
-       .destroy        = rxrpc_destroy,
-       .describe       = rxrpc_describe,
-       .read           = rxrpc_read,
-};
-EXPORT_SYMBOL(key_type_rxrpc);
-
-/*
- * rxrpc server defined keys take "<serviceId>:<securityIndex>" as the
- * description and an 8-byte decryption key as the payload
- */
-struct key_type key_type_rxrpc_s = {
-       .name           = "rxrpc_s",
-       .vet_description = rxrpc_vet_description_s,
-       .preparse       = rxrpc_preparse_s,
-       .free_preparse  = rxrpc_free_preparse_s,
-       .instantiate    = generic_key_instantiate,
-       .destroy        = rxrpc_destroy_s,
-       .describe       = rxrpc_describe,
-};
-
-/*
- * Vet the description for an RxRPC server key
- */
-static int rxrpc_vet_description_s(const char *desc)
-{
-       unsigned long num;
-       char *p;
-
-       num = simple_strtoul(desc, &p, 10);
-       if (*p != ':' || num > 65535)
-               return -EINVAL;
-       num = simple_strtoul(p + 1, &p, 10);
-       if (*p || num < 1 || num > 255)
-               return -EINVAL;
-       return 0;
-}
-
-/*
- * parse an RxKAD type XDR format token
- * - the caller guarantees we have at least 4 words
- */
-static int rxrpc_preparse_xdr_rxkad(struct key_preparsed_payload *prep,
-                                   size_t datalen,
-                                   const __be32 *xdr, unsigned int toklen)
-{
-       struct rxrpc_key_token *token, **pptoken;
-       size_t plen;
-       u32 tktlen;
-
-       _enter(",{%x,%x,%x,%x},%u",
-              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), ntohl(xdr[3]),
-              toklen);
-
-       if (toklen <= 8 * 4)
-               return -EKEYREJECTED;
-       tktlen = ntohl(xdr[7]);
-       _debug("tktlen: %x", tktlen);
-       if (tktlen > AFSTOKEN_RK_TIX_MAX)
-               return -EKEYREJECTED;
-       if (toklen < 8 * 4 + tktlen)
-               return -EKEYREJECTED;
-
-       plen = sizeof(*token) + sizeof(*token->kad) + tktlen;
-       prep->quotalen = datalen + plen;
-
-       plen -= sizeof(*token);
-       token = kzalloc(sizeof(*token), GFP_KERNEL);
-       if (!token)
-               return -ENOMEM;
-
-       token->kad = kzalloc(plen, GFP_KERNEL);
-       if (!token->kad) {
-               kfree(token);
-               return -ENOMEM;
-       }
-
-       token->security_index   = RXRPC_SECURITY_RXKAD;
-       token->kad->ticket_len  = tktlen;
-       token->kad->vice_id     = ntohl(xdr[0]);
-       token->kad->kvno        = ntohl(xdr[1]);
-       token->kad->start       = ntohl(xdr[4]);
-       token->kad->expiry      = ntohl(xdr[5]);
-       token->kad->primary_flag = ntohl(xdr[6]);
-       memcpy(&token->kad->session_key, &xdr[2], 8);
-       memcpy(&token->kad->ticket, &xdr[8], tktlen);
-
-       _debug("SCIX: %u", token->security_index);
-       _debug("TLEN: %u", token->kad->ticket_len);
-       _debug("EXPY: %x", token->kad->expiry);
-       _debug("KVNO: %u", token->kad->kvno);
-       _debug("PRIM: %u", token->kad->primary_flag);
-       _debug("SKEY: %02x%02x%02x%02x%02x%02x%02x%02x",
-              token->kad->session_key[0], token->kad->session_key[1],
-              token->kad->session_key[2], token->kad->session_key[3],
-              token->kad->session_key[4], token->kad->session_key[5],
-              token->kad->session_key[6], token->kad->session_key[7]);
-       if (token->kad->ticket_len >= 8)
-               _debug("TCKT: %02x%02x%02x%02x%02x%02x%02x%02x",
-                      token->kad->ticket[0], token->kad->ticket[1],
-                      token->kad->ticket[2], token->kad->ticket[3],
-                      token->kad->ticket[4], token->kad->ticket[5],
-                      token->kad->ticket[6], token->kad->ticket[7]);
-
-       /* count the number of tokens attached */
-       prep->payload.data[1] = (void *)((unsigned long)prep->payload.data[1] + 1);
-
-       /* attach the data */
-       for (pptoken = (struct rxrpc_key_token **)&prep->payload.data[0];
-            *pptoken;
-            pptoken = &(*pptoken)->next)
-               continue;
-       *pptoken = token;
-       if (token->kad->expiry < prep->expiry)
-               prep->expiry = token->kad->expiry;
-
-       _leave(" = 0");
-       return 0;
-}
-
-static void rxrpc_free_krb5_principal(struct krb5_principal *princ)
-{
-       int loop;
-
-       if (princ->name_parts) {
-               for (loop = princ->n_name_parts - 1; loop >= 0; loop--)
-                       kfree(princ->name_parts[loop]);
-               kfree(princ->name_parts);
-       }
-       kfree(princ->realm);
-}
-
-static void rxrpc_free_krb5_tagged(struct krb5_tagged_data *td)
-{
-       kfree(td->data);
-}
-
-/*
- * free up an RxK5 token
- */
-static void rxrpc_rxk5_free(struct rxk5_key *rxk5)
-{
-       int loop;
-
-       rxrpc_free_krb5_principal(&rxk5->client);
-       rxrpc_free_krb5_principal(&rxk5->server);
-       rxrpc_free_krb5_tagged(&rxk5->session);
-
-       if (rxk5->addresses) {
-               for (loop = rxk5->n_addresses - 1; loop >= 0; loop--)
-                       rxrpc_free_krb5_tagged(&rxk5->addresses[loop]);
-               kfree(rxk5->addresses);
-       }
-       if (rxk5->authdata) {
-               for (loop = rxk5->n_authdata - 1; loop >= 0; loop--)
-                       rxrpc_free_krb5_tagged(&rxk5->authdata[loop]);
-               kfree(rxk5->authdata);
-       }
-
-       kfree(rxk5->ticket);
-       kfree(rxk5->ticket2);
-       kfree(rxk5);
-}
-
-/*
- * extract a krb5 principal
- */
-static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
-                                      const __be32 **_xdr,
-                                      unsigned int *_toklen)
-{
-       const __be32 *xdr = *_xdr;
-       unsigned int toklen = *_toklen, n_parts, loop, tmp;
-
-       /* there must be at least one name, and at least #names+1 length
-        * words */
-       if (toklen <= 12)
-               return -EINVAL;
-
-       _enter(",{%x,%x,%x},%u",
-              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), toklen);
-
-       n_parts = ntohl(*xdr++);
-       toklen -= 4;
-       if (n_parts <= 0 || n_parts > AFSTOKEN_K5_COMPONENTS_MAX)
-               return -EINVAL;
-       princ->n_name_parts = n_parts;
-
-       if (toklen <= (n_parts + 1) * 4)
-               return -EINVAL;
-
-       princ->name_parts = kcalloc(n_parts, sizeof(char *), GFP_KERNEL);
-       if (!princ->name_parts)
-               return -ENOMEM;
-
-       for (loop = 0; loop < n_parts; loop++) {
-               if (toklen < 4)
-                       return -EINVAL;
-               tmp = ntohl(*xdr++);
-               toklen -= 4;
-               if (tmp <= 0 || tmp > AFSTOKEN_STRING_MAX)
-                       return -EINVAL;
-               if (tmp > toklen)
-                       return -EINVAL;
-               princ->name_parts[loop] = kmalloc(tmp + 1, GFP_KERNEL);
-               if (!princ->name_parts[loop])
-                       return -ENOMEM;
-               memcpy(princ->name_parts[loop], xdr, tmp);
-               princ->name_parts[loop][tmp] = 0;
-               tmp = (tmp + 3) & ~3;
-               toklen -= tmp;
-               xdr += tmp >> 2;
-       }
-
-       if (toklen < 4)
-               return -EINVAL;
-       tmp = ntohl(*xdr++);
-       toklen -= 4;
-       if (tmp <= 0 || tmp > AFSTOKEN_K5_REALM_MAX)
-               return -EINVAL;
-       if (tmp > toklen)
-               return -EINVAL;
-       princ->realm = kmalloc(tmp + 1, GFP_KERNEL);
-       if (!princ->realm)
-               return -ENOMEM;
-       memcpy(princ->realm, xdr, tmp);
-       princ->realm[tmp] = 0;
-       tmp = (tmp + 3) & ~3;
-       toklen -= tmp;
-       xdr += tmp >> 2;
-
-       _debug("%s/...@%s", princ->name_parts[0], princ->realm);
-
-       *_xdr = xdr;
-       *_toklen = toklen;
-       _leave(" = 0 [toklen=%u]", toklen);
-       return 0;
-}
-
-/*
- * extract a piece of krb5 tagged data
- */
-static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td,
-                                        size_t max_data_size,
-                                        const __be32 **_xdr,
-                                        unsigned int *_toklen)
-{
-       const __be32 *xdr = *_xdr;
-       unsigned int toklen = *_toklen, len;
-
-       /* there must be at least one tag and one length word */
-       if (toklen <= 8)
-               return -EINVAL;
-
-       _enter(",%zu,{%x,%x},%u",
-              max_data_size, ntohl(xdr[0]), ntohl(xdr[1]), toklen);
-
-       td->tag = ntohl(*xdr++);
-       len = ntohl(*xdr++);
-       toklen -= 8;
-       if (len > max_data_size)
-               return -EINVAL;
-       td->data_len = len;
-
-       if (len > 0) {
-               td->data = kmemdup(xdr, len, GFP_KERNEL);
-               if (!td->data)
-                       return -ENOMEM;
-               len = (len + 3) & ~3;
-               toklen -= len;
-               xdr += len >> 2;
-       }
-
-       _debug("tag %x len %x", td->tag, td->data_len);
-
-       *_xdr = xdr;
-       *_toklen = toklen;
-       _leave(" = 0 [toklen=%u]", toklen);
-       return 0;
-}
-
-/*
- * extract an array of tagged data
- */
-static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
-                                         u8 *_n_elem,
-                                         u8 max_n_elem,
-                                         size_t max_elem_size,
-                                         const __be32 **_xdr,
-                                         unsigned int *_toklen)
-{
-       struct krb5_tagged_data *td;
-       const __be32 *xdr = *_xdr;
-       unsigned int toklen = *_toklen, n_elem, loop;
-       int ret;
-
-       /* there must be at least one count */
-       if (toklen < 4)
-               return -EINVAL;
-
-       _enter(",,%u,%zu,{%x},%u",
-              max_n_elem, max_elem_size, ntohl(xdr[0]), toklen);
-
-       n_elem = ntohl(*xdr++);
-       toklen -= 4;
-       if (n_elem > max_n_elem)
-               return -EINVAL;
-       *_n_elem = n_elem;
-       if (n_elem > 0) {
-               if (toklen <= (n_elem + 1) * 4)
-                       return -EINVAL;
-
-               _debug("n_elem %d", n_elem);
-
-               td = kcalloc(n_elem, sizeof(struct krb5_tagged_data),
-                            GFP_KERNEL);
-               if (!td)
-                       return -ENOMEM;
-               *_td = td;
-
-               for (loop = 0; loop < n_elem; loop++) {
-                       ret = rxrpc_krb5_decode_tagged_data(&td[loop],
-                                                           max_elem_size,
-                                                           &xdr, &toklen);
-                       if (ret < 0)
-                               return ret;
-               }
-       }
-
-       *_xdr = xdr;
-       *_toklen = toklen;
-       _leave(" = 0 [toklen=%u]", toklen);
-       return 0;
-}
-
-/*
- * extract a krb5 ticket
- */
-static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
-                                   const __be32 **_xdr, unsigned int *_toklen)
-{
-       const __be32 *xdr = *_xdr;
-       unsigned int toklen = *_toklen, len;
-
-       /* there must be at least one length word */
-       if (toklen <= 4)
-               return -EINVAL;
-
-       _enter(",{%x},%u", ntohl(xdr[0]), toklen);
-
-       len = ntohl(*xdr++);
-       toklen -= 4;
-       if (len > AFSTOKEN_K5_TIX_MAX)
-               return -EINVAL;
-       *_tktlen = len;
-
-       _debug("ticket len %u", len);
-
-       if (len > 0) {
-               *_ticket = kmemdup(xdr, len, GFP_KERNEL);
-               if (!*_ticket)
-                       return -ENOMEM;
-               len = (len + 3) & ~3;
-               toklen -= len;
-               xdr += len >> 2;
-       }
-
-       *_xdr = xdr;
-       *_toklen = toklen;
-       _leave(" = 0 [toklen=%u]", toklen);
-       return 0;
-}
-
-/*
- * parse an RxK5 type XDR format token
- * - the caller guarantees we have at least 4 words
- */
-static int rxrpc_preparse_xdr_rxk5(struct key_preparsed_payload *prep,
-                                  size_t datalen,
-                                  const __be32 *xdr, unsigned int toklen)
-{
-       struct rxrpc_key_token *token, **pptoken;
-       struct rxk5_key *rxk5;
-       const __be32 *end_xdr = xdr + (toklen >> 2);
-       int ret;
-
-       _enter(",{%x,%x,%x,%x},%u",
-              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), ntohl(xdr[3]),
-              toklen);
-
-       /* reserve some payload space for this subkey - the length of the token
-        * is a reasonable approximation */
-       prep->quotalen = datalen + toklen;
-
-       token = kzalloc(sizeof(*token), GFP_KERNEL);
-       if (!token)
-               return -ENOMEM;
-
-       rxk5 = kzalloc(sizeof(*rxk5), GFP_KERNEL);
-       if (!rxk5) {
-               kfree(token);
-               return -ENOMEM;
-       }
-
-       token->security_index = RXRPC_SECURITY_RXK5;
-       token->k5 = rxk5;
-
-       /* extract the principals */
-       ret = rxrpc_krb5_decode_principal(&rxk5->client, &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-       ret = rxrpc_krb5_decode_principal(&rxk5->server, &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-
-       /* extract the session key and the encoding type (the tag field ->
-        * ENCTYPE_xxx) */
-       ret = rxrpc_krb5_decode_tagged_data(&rxk5->session, AFSTOKEN_DATA_MAX,
-                                           &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-
-       if (toklen < 4 * 8 + 2 * 4)
-               goto inval;
-       rxk5->authtime  = be64_to_cpup((const __be64 *) xdr);
-       xdr += 2;
-       rxk5->starttime = be64_to_cpup((const __be64 *) xdr);
-       xdr += 2;
-       rxk5->endtime   = be64_to_cpup((const __be64 *) xdr);
-       xdr += 2;
-       rxk5->renew_till = be64_to_cpup((const __be64 *) xdr);
-       xdr += 2;
-       rxk5->is_skey = ntohl(*xdr++);
-       rxk5->flags = ntohl(*xdr++);
-       toklen -= 4 * 8 + 2 * 4;
-
-       _debug("times: a=%llx s=%llx e=%llx rt=%llx",
-              rxk5->authtime, rxk5->starttime, rxk5->endtime,
-              rxk5->renew_till);
-       _debug("is_skey=%x flags=%x", rxk5->is_skey, rxk5->flags);
-
-       /* extract the permitted client addresses */
-       ret = rxrpc_krb5_decode_tagged_array(&rxk5->addresses,
-                                            &rxk5->n_addresses,
-                                            AFSTOKEN_K5_ADDRESSES_MAX,
-                                            AFSTOKEN_DATA_MAX,
-                                            &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-
-       ASSERTCMP((end_xdr - xdr) << 2, ==, toklen);
-
-       /* extract the tickets */
-       ret = rxrpc_krb5_decode_ticket(&rxk5->ticket, &rxk5->ticket_len,
-                                      &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-       ret = rxrpc_krb5_decode_ticket(&rxk5->ticket2, &rxk5->ticket2_len,
-                                      &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-
-       ASSERTCMP((end_xdr - xdr) << 2, ==, toklen);
-
-       /* extract the typed auth data */
-       ret = rxrpc_krb5_decode_tagged_array(&rxk5->authdata,
-                                            &rxk5->n_authdata,
-                                            AFSTOKEN_K5_AUTHDATA_MAX,
-                                            AFSTOKEN_BDATALN_MAX,
-                                            &xdr, &toklen);
-       if (ret < 0)
-               goto error;
-
-       ASSERTCMP((end_xdr - xdr) << 2, ==, toklen);
-
-       if (toklen != 0)
-               goto inval;
-
-       /* attach the payload */
-       for (pptoken = (struct rxrpc_key_token **)&prep->payload.data[0];
-            *pptoken;
-            pptoken = &(*pptoken)->next)
-               continue;
-       *pptoken = token;
-       if (token->kad->expiry < prep->expiry)
-               prep->expiry = token->kad->expiry;
-
-       _leave(" = 0");
-       return 0;
-
-inval:
-       ret = -EINVAL;
-error:
-       rxrpc_rxk5_free(rxk5);
-       kfree(token);
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * attempt to parse the data as the XDR format
- * - the caller guarantees we have more than 7 words
- */
-static int rxrpc_preparse_xdr(struct key_preparsed_payload *prep)
-{
-       const __be32 *xdr = prep->data, *token;
-       const char *cp;
-       unsigned int len, tmp, loop, ntoken, toklen, sec_ix;
-       size_t datalen = prep->datalen;
-       int ret;
-
-       _enter(",{%x,%x,%x,%x},%zu",
-              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), ntohl(xdr[3]),
-              prep->datalen);
-
-       if (datalen > AFSTOKEN_LENGTH_MAX)
-               goto not_xdr;
-
-       /* XDR is an array of __be32's */
-       if (datalen & 3)
-               goto not_xdr;
-
-       /* the flags should be 0 (the setpag bit must be handled by
-        * userspace) */
-       if (ntohl(*xdr++) != 0)
-               goto not_xdr;
-       datalen -= 4;
-
-       /* check the cell name */
-       len = ntohl(*xdr++);
-       if (len < 1 || len > AFSTOKEN_CELL_MAX)
-               goto not_xdr;
-       datalen -= 4;
-       tmp = (len + 3) & ~3;
-       if (tmp > datalen)
-               goto not_xdr;
-
-       cp = (const char *) xdr;
-       for (loop = 0; loop < len; loop++)
-               if (!isprint(cp[loop]))
-                       goto not_xdr;
-       if (len < tmp)
-               for (; loop < tmp; loop++)
-                       if (cp[loop])
-                               goto not_xdr;
-       _debug("cellname: [%u/%u] '%*.*s'",
-              len, tmp, len, len, (const char *) xdr);
-       datalen -= tmp;
-       xdr += tmp >> 2;
-
-       /* get the token count */
-       if (datalen < 12)
-               goto not_xdr;
-       ntoken = ntohl(*xdr++);
-       datalen -= 4;
-       _debug("ntoken: %x", ntoken);
-       if (ntoken < 1 || ntoken > AFSTOKEN_MAX)
-               goto not_xdr;
-
-       /* check each token wrapper */
-       token = xdr;
-       loop = ntoken;
-       do {
-               if (datalen < 8)
-                       goto not_xdr;
-               toklen = ntohl(*xdr++);
-               sec_ix = ntohl(*xdr);
-               datalen -= 4;
-               _debug("token: [%x/%zx] %x", toklen, datalen, sec_ix);
-               if (toklen < 20 || toklen > datalen)
-                       goto not_xdr;
-               datalen -= (toklen + 3) & ~3;
-               xdr += (toklen + 3) >> 2;
-
-       } while (--loop > 0);
-
-       _debug("remainder: %zu", datalen);
-       if (datalen != 0)
-               goto not_xdr;
-
-       /* okay: we're going to assume it's valid XDR format
-        * - we ignore the cellname, relying on the key to be correctly named
-        */
-       do {
-               xdr = token;
-               toklen = ntohl(*xdr++);
-               token = xdr + ((toklen + 3) >> 2);
-               sec_ix = ntohl(*xdr++);
-               toklen -= 4;
-
-               _debug("TOKEN type=%u [%p-%p]", sec_ix, xdr, token);
-
-               switch (sec_ix) {
-               case RXRPC_SECURITY_RXKAD:
-                       ret = rxrpc_preparse_xdr_rxkad(prep, datalen, xdr, toklen);
-                       if (ret != 0)
-                               goto error;
-                       break;
-
-               case RXRPC_SECURITY_RXK5:
-                       ret = rxrpc_preparse_xdr_rxk5(prep, datalen, xdr, toklen);
-                       if (ret != 0)
-                               goto error;
-                       break;
-
-               default:
-                       ret = -EPROTONOSUPPORT;
-                       goto error;
-               }
-
-       } while (--ntoken > 0);
-
-       _leave(" = 0");
-       return 0;
-
-not_xdr:
-       _leave(" = -EPROTO");
-       return -EPROTO;
-error:
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * Preparse an rxrpc defined key.
- *
- * Data should be of the form:
- *     OFFSET  LEN     CONTENT
- *     0       4       key interface version number
- *     4       2       security index (type)
- *     6       2       ticket length
- *     8       4       key expiry time (time_t)
- *     12      4       kvno
- *     16      8       session key
- *     24      [len]   ticket
- *
- * if no data is provided, then a no-security key is made
- */
-static int rxrpc_preparse(struct key_preparsed_payload *prep)
-{
-       const struct rxrpc_key_data_v1 *v1;
-       struct rxrpc_key_token *token, **pp;
-       size_t plen;
-       u32 kver;
-       int ret;
-
-       _enter("%zu", prep->datalen);
-
-       /* handle a no-security key */
-       if (!prep->data && prep->datalen == 0)
-               return 0;
-
-       /* determine if the XDR payload format is being used */
-       if (prep->datalen > 7 * 4) {
-               ret = rxrpc_preparse_xdr(prep);
-               if (ret != -EPROTO)
-                       return ret;
-       }
-
-       /* get the key interface version number */
-       ret = -EINVAL;
-       if (prep->datalen <= 4 || !prep->data)
-               goto error;
-       memcpy(&kver, prep->data, sizeof(kver));
-       prep->data += sizeof(kver);
-       prep->datalen -= sizeof(kver);
-
-       _debug("KEY I/F VERSION: %u", kver);
-
-       ret = -EKEYREJECTED;
-       if (kver != 1)
-               goto error;
-
-       /* deal with a version 1 key */
-       ret = -EINVAL;
-       if (prep->datalen < sizeof(*v1))
-               goto error;
-
-       v1 = prep->data;
-       if (prep->datalen != sizeof(*v1) + v1->ticket_length)
-               goto error;
-
-       _debug("SCIX: %u", v1->security_index);
-       _debug("TLEN: %u", v1->ticket_length);
-       _debug("EXPY: %x", v1->expiry);
-       _debug("KVNO: %u", v1->kvno);
-       _debug("SKEY: %02x%02x%02x%02x%02x%02x%02x%02x",
-              v1->session_key[0], v1->session_key[1],
-              v1->session_key[2], v1->session_key[3],
-              v1->session_key[4], v1->session_key[5],
-              v1->session_key[6], v1->session_key[7]);
-       if (v1->ticket_length >= 8)
-               _debug("TCKT: %02x%02x%02x%02x%02x%02x%02x%02x",
-                      v1->ticket[0], v1->ticket[1],
-                      v1->ticket[2], v1->ticket[3],
-                      v1->ticket[4], v1->ticket[5],
-                      v1->ticket[6], v1->ticket[7]);
-
-       ret = -EPROTONOSUPPORT;
-       if (v1->security_index != RXRPC_SECURITY_RXKAD)
-               goto error;
-
-       plen = sizeof(*token->kad) + v1->ticket_length;
-       prep->quotalen = plen + sizeof(*token);
-
-       ret = -ENOMEM;
-       token = kzalloc(sizeof(*token), GFP_KERNEL);
-       if (!token)
-               goto error;
-       token->kad = kzalloc(plen, GFP_KERNEL);
-       if (!token->kad)
-               goto error_free;
-
-       token->security_index           = RXRPC_SECURITY_RXKAD;
-       token->kad->ticket_len          = v1->ticket_length;
-       token->kad->expiry              = v1->expiry;
-       token->kad->kvno                = v1->kvno;
-       memcpy(&token->kad->session_key, &v1->session_key, 8);
-       memcpy(&token->kad->ticket, v1->ticket, v1->ticket_length);
-
-       /* count the number of tokens attached */
-       prep->payload.data[1] = (void *)((unsigned long)prep->payload.data[1] + 1);
-
-       /* attach the data */
-       pp = (struct rxrpc_key_token **)&prep->payload.data[0];
-       while (*pp)
-               pp = &(*pp)->next;
-       *pp = token;
-       if (token->kad->expiry < prep->expiry)
-               prep->expiry = token->kad->expiry;
-       token = NULL;
-       ret = 0;
-
-error_free:
-       kfree(token);
-error:
-       return ret;
-}
-
-/*
- * Free token list.
- */
-static void rxrpc_free_token_list(struct rxrpc_key_token *token)
-{
-       struct rxrpc_key_token *next;
-
-       for (; token; token = next) {
-               next = token->next;
-               switch (token->security_index) {
-               case RXRPC_SECURITY_RXKAD:
-                       kfree(token->kad);
-                       break;
-               case RXRPC_SECURITY_RXK5:
-                       if (token->k5)
-                               rxrpc_rxk5_free(token->k5);
-                       break;
-               default:
-                       pr_err("Unknown token type %x on rxrpc key\n",
-                              token->security_index);
-                       BUG();
-               }
-
-               kfree(token);
-       }
-}
-
-/*
- * Clean up preparse data.
- */
-static void rxrpc_free_preparse(struct key_preparsed_payload *prep)
-{
-       rxrpc_free_token_list(prep->payload.data[0]);
-}
-
-/*
- * Preparse a server secret key.
- *
- * The data should be the 8-byte secret key.
- */
-static int rxrpc_preparse_s(struct key_preparsed_payload *prep)
-{
-       struct crypto_skcipher *ci;
-
-       _enter("%zu", prep->datalen);
-
-       if (prep->datalen != 8)
-               return -EINVAL;
-
-       memcpy(&prep->payload.data[2], prep->data, 8);
-
-       ci = crypto_alloc_skcipher("pcbc(des)", 0, CRYPTO_ALG_ASYNC);
-       if (IS_ERR(ci)) {
-               _leave(" = %ld", PTR_ERR(ci));
-               return PTR_ERR(ci);
-       }
-
-       if (crypto_skcipher_setkey(ci, prep->data, 8) < 0)
-               BUG();
-
-       prep->payload.data[0] = ci;
-       _leave(" = 0");
-       return 0;
-}
-
-/*
- * Clean up preparse data.
- */
-static void rxrpc_free_preparse_s(struct key_preparsed_payload *prep)
-{
-       if (prep->payload.data[0])
-               crypto_free_skcipher(prep->payload.data[0]);
-}
-
-/*
- * dispose of the data dangling from the corpse of a rxrpc key
- */
-static void rxrpc_destroy(struct key *key)
-{
-       rxrpc_free_token_list(key->payload.data[0]);
-}
-
-/*
- * dispose of the data dangling from the corpse of a rxrpc key
- */
-static void rxrpc_destroy_s(struct key *key)
-{
-       if (key->payload.data[0]) {
-               crypto_free_skcipher(key->payload.data[0]);
-               key->payload.data[0] = NULL;
-       }
-}
-
-/*
- * describe the rxrpc key
- */
-static void rxrpc_describe(const struct key *key, struct seq_file *m)
-{
-       seq_puts(m, key->description);
-}
-
-/*
- * grab the security key for a socket
- */
-int rxrpc_request_key(struct rxrpc_sock *rx, char __user *optval, int optlen)
-{
-       struct key *key;
-       char *description;
-
-       _enter("");
-
-       if (optlen <= 0 || optlen > PAGE_SIZE - 1)
-               return -EINVAL;
-
-       description = memdup_user_nul(optval, optlen);
-       if (IS_ERR(description))
-               return PTR_ERR(description);
-
-       key = request_key(&key_type_rxrpc, description, NULL);
-       if (IS_ERR(key)) {
-               kfree(description);
-               _leave(" = %ld", PTR_ERR(key));
-               return PTR_ERR(key);
-       }
-
-       rx->key = key;
-       kfree(description);
-       _leave(" = 0 [key %x]", key->serial);
-       return 0;
-}
-
-/*
- * grab the security keyring for a server socket
- */
-int rxrpc_server_keyring(struct rxrpc_sock *rx, char __user *optval,
-                        int optlen)
-{
-       struct key *key;
-       char *description;
-
-       _enter("");
-
-       if (optlen <= 0 || optlen > PAGE_SIZE - 1)
-               return -EINVAL;
-
-       description = memdup_user_nul(optval, optlen);
-       if (IS_ERR(description))
-               return PTR_ERR(description);
-
-       key = request_key(&key_type_keyring, description, NULL);
-       if (IS_ERR(key)) {
-               kfree(description);
-               _leave(" = %ld", PTR_ERR(key));
-               return PTR_ERR(key);
-       }
-
-       rx->securities = key;
-       kfree(description);
-       _leave(" = 0 [key %x]", key->serial);
-       return 0;
-}
-
-/*
- * generate a server data key
- */
-int rxrpc_get_server_data_key(struct rxrpc_connection *conn,
-                             const void *session_key,
-                             time_t expiry,
-                             u32 kvno)
-{
-       const struct cred *cred = current_cred();
-       struct key *key;
-       int ret;
-
-       struct {
-               u32 kver;
-               struct rxrpc_key_data_v1 v1;
-       } data;
-
-       _enter("");
-
-       key = key_alloc(&key_type_rxrpc, "x",
-                       GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred, 0,
-                       KEY_ALLOC_NOT_IN_QUOTA, NULL);
-       if (IS_ERR(key)) {
-               _leave(" = -ENOMEM [alloc %ld]", PTR_ERR(key));
-               return -ENOMEM;
-       }
-
-       _debug("key %d", key_serial(key));
-
-       data.kver = 1;
-       data.v1.security_index = RXRPC_SECURITY_RXKAD;
-       data.v1.ticket_length = 0;
-       data.v1.expiry = expiry;
-       data.v1.kvno = 0;
-
-       memcpy(&data.v1.session_key, session_key, sizeof(data.v1.session_key));
-
-       ret = key_instantiate_and_link(key, &data, sizeof(data), NULL, NULL);
-       if (ret < 0)
-               goto error;
-
-       conn->key = key;
-       _leave(" = 0 [%d]", key_serial(key));
-       return 0;
-
-error:
-       key_revoke(key);
-       key_put(key);
-       _leave(" = -ENOMEM [ins %d]", ret);
-       return -ENOMEM;
-}
-EXPORT_SYMBOL(rxrpc_get_server_data_key);
-
-/**
- * rxrpc_get_null_key - Generate a null RxRPC key
- * @keyname: The name to give the key.
- *
- * Generate a null RxRPC key that can be used to indicate anonymous security is
- * required for a particular domain.
- */
-struct key *rxrpc_get_null_key(const char *keyname)
-{
-       const struct cred *cred = current_cred();
-       struct key *key;
-       int ret;
-
-       key = key_alloc(&key_type_rxrpc, keyname,
-                       GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
-                       KEY_POS_SEARCH, KEY_ALLOC_NOT_IN_QUOTA, NULL);
-       if (IS_ERR(key))
-               return key;
-
-       ret = key_instantiate_and_link(key, NULL, 0, NULL, NULL);
-       if (ret < 0) {
-               key_revoke(key);
-               key_put(key);
-               return ERR_PTR(ret);
-       }
-
-       return key;
-}
-EXPORT_SYMBOL(rxrpc_get_null_key);
-
-/*
- * read the contents of an rxrpc key
- * - this returns the result in XDR form
- */
-static long rxrpc_read(const struct key *key,
-                      char __user *buffer, size_t buflen)
-{
-       const struct rxrpc_key_token *token;
-       const struct krb5_principal *princ;
-       size_t size;
-       __be32 __user *xdr, *oldxdr;
-       u32 cnlen, toksize, ntoks, tok, zero;
-       u16 toksizes[AFSTOKEN_MAX];
-       int loop;
-
-       _enter("");
-
-       /* we don't know what form we should return non-AFS keys in */
-       if (memcmp(key->description, "afs@", 4) != 0)
-               return -EOPNOTSUPP;
-       cnlen = strlen(key->description + 4);
-
-#define RND(X) (((X) + 3) & ~3)
-
-       /* AFS keys we return in XDR form, so we need to work out the size of
-        * the XDR */
-       size = 2 * 4;   /* flags, cellname len */
-       size += RND(cnlen);     /* cellname */
-       size += 1 * 4;  /* token count */
-
-       ntoks = 0;
-       for (token = key->payload.data[0]; token; token = token->next) {
-               toksize = 4;    /* sec index */
-
-               switch (token->security_index) {
-               case RXRPC_SECURITY_RXKAD:
-                       toksize += 8 * 4;       /* viceid, kvno, key*2, begin,
-                                                * end, primary, tktlen */
-                       toksize += RND(token->kad->ticket_len);
-                       break;
-
-               case RXRPC_SECURITY_RXK5:
-                       princ = &token->k5->client;
-                       toksize += 4 + princ->n_name_parts * 4;
-                       for (loop = 0; loop < princ->n_name_parts; loop++)
-                               toksize += RND(strlen(princ->name_parts[loop]));
-                       toksize += 4 + RND(strlen(princ->realm));
-
-                       princ = &token->k5->server;
-                       toksize += 4 + princ->n_name_parts * 4;
-                       for (loop = 0; loop < princ->n_name_parts; loop++)
-                               toksize += RND(strlen(princ->name_parts[loop]));
-                       toksize += 4 + RND(strlen(princ->realm));
-
-                       toksize += 8 + RND(token->k5->session.data_len);
-
-                       toksize += 4 * 8 + 2 * 4;
-
-                       toksize += 4 + token->k5->n_addresses * 8;
-                       for (loop = 0; loop < token->k5->n_addresses; loop++)
-                               toksize += RND(token->k5->addresses[loop].data_len);
-
-                       toksize += 4 + RND(token->k5->ticket_len);
-                       toksize += 4 + RND(token->k5->ticket2_len);
-
-                       toksize += 4 + token->k5->n_authdata * 8;
-                       for (loop = 0; loop < token->k5->n_authdata; loop++)
-                               toksize += RND(token->k5->authdata[loop].data_len);
-                       break;
-
-               default: /* we have a ticket we can't encode */
-                       BUG();
-                       continue;
-               }
-
-               _debug("token[%u]: toksize=%u", ntoks, toksize);
-               ASSERTCMP(toksize, <=, AFSTOKEN_LENGTH_MAX);
-
-               toksizes[ntoks++] = toksize;
-               size += toksize + 4; /* each token has a length word */
-       }
-
-#undef RND
-
-       if (!buffer || buflen < size)
-               return size;
-
-       xdr = (__be32 __user *) buffer;
-       zero = 0;
-#define ENCODE(x)                              \
-       do {                                    \
-               __be32 y = htonl(x);            \
-               if (put_user(y, xdr++) < 0)     \
-                       goto fault;             \
-       } while(0)
-#define ENCODE_DATA(l, s)                                              \
-       do {                                                            \
-               u32 _l = (l);                                           \
-               ENCODE(l);                                              \
-               if (copy_to_user(xdr, (s), _l) != 0)                    \
-                       goto fault;                                     \
-               if (_l & 3 &&                                           \
-                   copy_to_user((u8 __user *)xdr + _l, &zero, 4 - (_l & 3)) != 0) \
-                       goto fault;                                     \
-               xdr += (_l + 3) >> 2;                                   \
-       } while(0)
-#define ENCODE64(x)                                    \
-       do {                                            \
-               __be64 y = cpu_to_be64(x);              \
-               if (copy_to_user(xdr, &y, 8) != 0)      \
-                       goto fault;                     \
-               xdr += 8 >> 2;                          \
-       } while(0)
-#define ENCODE_STR(s)                          \
-       do {                                    \
-               const char *_s = (s);           \
-               ENCODE_DATA(strlen(_s), _s);    \
-       } while(0)
-
-       ENCODE(0);                                      /* flags */
-       ENCODE_DATA(cnlen, key->description + 4);       /* cellname */
-       ENCODE(ntoks);
-
-       tok = 0;
-       for (token = key->payload.data[0]; token; token = token->next) {
-               toksize = toksizes[tok++];
-               ENCODE(toksize);
-               oldxdr = xdr;
-               ENCODE(token->security_index);
-
-               switch (token->security_index) {
-               case RXRPC_SECURITY_RXKAD:
-                       ENCODE(token->kad->vice_id);
-                       ENCODE(token->kad->kvno);
-                       ENCODE_DATA(8, token->kad->session_key);
-                       ENCODE(token->kad->start);
-                       ENCODE(token->kad->expiry);
-                       ENCODE(token->kad->primary_flag);
-                       ENCODE_DATA(token->kad->ticket_len, token->kad->ticket);
-                       break;
-
-               case RXRPC_SECURITY_RXK5:
-                       princ = &token->k5->client;
-                       ENCODE(princ->n_name_parts);
-                       for (loop = 0; loop < princ->n_name_parts; loop++)
-                               ENCODE_STR(princ->name_parts[loop]);
-                       ENCODE_STR(princ->realm);
-
-                       princ = &token->k5->server;
-                       ENCODE(princ->n_name_parts);
-                       for (loop = 0; loop < princ->n_name_parts; loop++)
-                               ENCODE_STR(princ->name_parts[loop]);
-                       ENCODE_STR(princ->realm);
-
-                       ENCODE(token->k5->session.tag);
-                       ENCODE_DATA(token->k5->session.data_len,
-                                   token->k5->session.data);
-
-                       ENCODE64(token->k5->authtime);
-                       ENCODE64(token->k5->starttime);
-                       ENCODE64(token->k5->endtime);
-                       ENCODE64(token->k5->renew_till);
-                       ENCODE(token->k5->is_skey);
-                       ENCODE(token->k5->flags);
-
-                       ENCODE(token->k5->n_addresses);
-                       for (loop = 0; loop < token->k5->n_addresses; loop++) {
-                               ENCODE(token->k5->addresses[loop].tag);
-                               ENCODE_DATA(token->k5->addresses[loop].data_len,
-                                           token->k5->addresses[loop].data);
-                       }
-
-                       ENCODE_DATA(token->k5->ticket_len, token->k5->ticket);
-                       ENCODE_DATA(token->k5->ticket2_len, token->k5->ticket2);
-
-                       ENCODE(token->k5->n_authdata);
-                       for (loop = 0; loop < token->k5->n_authdata; loop++) {
-                               ENCODE(token->k5->authdata[loop].tag);
-                               ENCODE_DATA(token->k5->authdata[loop].data_len,
-                                           token->k5->authdata[loop].data);
-                       }
-                       break;
-
-               default:
-                       BUG();
-                       break;
-               }
-
-               ASSERTCMP((unsigned long)xdr - (unsigned long)oldxdr, ==,
-                         toksize);
-       }
-
-#undef ENCODE_STR
-#undef ENCODE_DATA
-#undef ENCODE64
-#undef ENCODE
-
-       ASSERTCMP(tok, ==, ntoks);
-       ASSERTCMP((char __user *) xdr - buffer, ==, size);
-       _leave(" = %zu", size);
-       return size;
-
-fault:
-       _leave(" = -EFAULT");
-       return -EFAULT;
-}
diff --git a/net/rxrpc/ar-local.c b/net/rxrpc/ar-local.c
deleted file mode 100644 (file)
index 111f250..0000000
+++ /dev/null
@@ -1,417 +0,0 @@
-/* AF_RXRPC local endpoint management
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <linux/udp.h>
-#include <linux/ip.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <generated/utsrelease.h>
-#include "ar-internal.h"
-
-static const char rxrpc_version_string[65] = "linux-" UTS_RELEASE " AF_RXRPC";
-
-static LIST_HEAD(rxrpc_locals);
-DEFINE_RWLOCK(rxrpc_local_lock);
-static DECLARE_RWSEM(rxrpc_local_sem);
-static DECLARE_WAIT_QUEUE_HEAD(rxrpc_local_wq);
-
-static void rxrpc_destroy_local(struct work_struct *work);
-static void rxrpc_process_local_events(struct work_struct *work);
-
-/*
- * allocate a new local
- */
-static
-struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
-{
-       struct rxrpc_local *local;
-
-       local = kzalloc(sizeof(struct rxrpc_local), GFP_KERNEL);
-       if (local) {
-               INIT_WORK(&local->destroyer, &rxrpc_destroy_local);
-               INIT_WORK(&local->acceptor, &rxrpc_accept_incoming_calls);
-               INIT_WORK(&local->rejecter, &rxrpc_reject_packets);
-               INIT_WORK(&local->event_processor, &rxrpc_process_local_events);
-               INIT_LIST_HEAD(&local->services);
-               INIT_LIST_HEAD(&local->link);
-               init_rwsem(&local->defrag_sem);
-               skb_queue_head_init(&local->accept_queue);
-               skb_queue_head_init(&local->reject_queue);
-               skb_queue_head_init(&local->event_queue);
-               spin_lock_init(&local->lock);
-               rwlock_init(&local->services_lock);
-               atomic_set(&local->usage, 1);
-               local->debug_id = atomic_inc_return(&rxrpc_debug_id);
-               memcpy(&local->srx, srx, sizeof(*srx));
-       }
-
-       _leave(" = %p", local);
-       return local;
-}
-
-/*
- * create the local socket
- * - must be called with rxrpc_local_sem writelocked
- */
-static int rxrpc_create_local(struct rxrpc_local *local)
-{
-       struct sock *sock;
-       int ret, opt;
-
-       _enter("%p{%d}", local, local->srx.transport_type);
-
-       /* create a socket to represent the local endpoint */
-       ret = sock_create_kern(&init_net, PF_INET, local->srx.transport_type,
-                              IPPROTO_UDP, &local->socket);
-       if (ret < 0) {
-               _leave(" = %d [socket]", ret);
-               return ret;
-       }
-
-       /* if a local address was supplied then bind it */
-       if (local->srx.transport_len > sizeof(sa_family_t)) {
-               _debug("bind");
-               ret = kernel_bind(local->socket,
-                                 (struct sockaddr *) &local->srx.transport,
-                                 local->srx.transport_len);
-               if (ret < 0) {
-                       _debug("bind failed");
-                       goto error;
-               }
-       }
-
-       /* we want to receive ICMP errors */
-       opt = 1;
-       ret = kernel_setsockopt(local->socket, SOL_IP, IP_RECVERR,
-                               (char *) &opt, sizeof(opt));
-       if (ret < 0) {
-               _debug("setsockopt failed");
-               goto error;
-       }
-
-       /* we want to set the don't fragment bit */
-       opt = IP_PMTUDISC_DO;
-       ret = kernel_setsockopt(local->socket, SOL_IP, IP_MTU_DISCOVER,
-                               (char *) &opt, sizeof(opt));
-       if (ret < 0) {
-               _debug("setsockopt failed");
-               goto error;
-       }
-
-       write_lock_bh(&rxrpc_local_lock);
-       list_add(&local->link, &rxrpc_locals);
-       write_unlock_bh(&rxrpc_local_lock);
-
-       /* set the socket up */
-       sock = local->socket->sk;
-       sock->sk_user_data      = local;
-       sock->sk_data_ready     = rxrpc_data_ready;
-       sock->sk_error_report   = rxrpc_UDP_error_report;
-       _leave(" = 0");
-       return 0;
-
-error:
-       kernel_sock_shutdown(local->socket, SHUT_RDWR);
-       local->socket->sk->sk_user_data = NULL;
-       sock_release(local->socket);
-       local->socket = NULL;
-
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * create a new local endpoint using the specified UDP address
- */
-struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx)
-{
-       struct rxrpc_local *local;
-       int ret;
-
-       _enter("{%d,%u,%pI4+%hu}",
-              srx->transport_type,
-              srx->transport.family,
-              &srx->transport.sin.sin_addr,
-              ntohs(srx->transport.sin.sin_port));
-
-       down_write(&rxrpc_local_sem);
-
-       /* see if we have a suitable local local endpoint already */
-       read_lock_bh(&rxrpc_local_lock);
-
-       list_for_each_entry(local, &rxrpc_locals, link) {
-               _debug("CMP {%d,%u,%pI4+%hu}",
-                      local->srx.transport_type,
-                      local->srx.transport.family,
-                      &local->srx.transport.sin.sin_addr,
-                      ntohs(local->srx.transport.sin.sin_port));
-
-               if (local->srx.transport_type != srx->transport_type ||
-                   local->srx.transport.family != srx->transport.family)
-                       continue;
-
-               switch (srx->transport.family) {
-               case AF_INET:
-                       if (local->srx.transport.sin.sin_port !=
-                           srx->transport.sin.sin_port)
-                               continue;
-                       if (memcmp(&local->srx.transport.sin.sin_addr,
-                                  &srx->transport.sin.sin_addr,
-                                  sizeof(struct in_addr)) != 0)
-                               continue;
-                       goto found_local;
-
-               default:
-                       BUG();
-               }
-       }
-
-       read_unlock_bh(&rxrpc_local_lock);
-
-       /* we didn't find one, so we need to create one */
-       local = rxrpc_alloc_local(srx);
-       if (!local) {
-               up_write(&rxrpc_local_sem);
-               return ERR_PTR(-ENOMEM);
-       }
-
-       ret = rxrpc_create_local(local);
-       if (ret < 0) {
-               up_write(&rxrpc_local_sem);
-               kfree(local);
-               _leave(" = %d", ret);
-               return ERR_PTR(ret);
-       }
-
-       up_write(&rxrpc_local_sem);
-
-       _net("LOCAL new %d {%d,%u,%pI4+%hu}",
-            local->debug_id,
-            local->srx.transport_type,
-            local->srx.transport.family,
-            &local->srx.transport.sin.sin_addr,
-            ntohs(local->srx.transport.sin.sin_port));
-
-       _leave(" = %p [new]", local);
-       return local;
-
-found_local:
-       rxrpc_get_local(local);
-       read_unlock_bh(&rxrpc_local_lock);
-       up_write(&rxrpc_local_sem);
-
-       _net("LOCAL old %d {%d,%u,%pI4+%hu}",
-            local->debug_id,
-            local->srx.transport_type,
-            local->srx.transport.family,
-            &local->srx.transport.sin.sin_addr,
-            ntohs(local->srx.transport.sin.sin_port));
-
-       _leave(" = %p [reuse]", local);
-       return local;
-}
-
-/*
- * release a local endpoint
- */
-void rxrpc_put_local(struct rxrpc_local *local)
-{
-       _enter("%p{u=%d}", local, atomic_read(&local->usage));
-
-       ASSERTCMP(atomic_read(&local->usage), >, 0);
-
-       /* to prevent a race, the decrement and the dequeue must be effectively
-        * atomic */
-       write_lock_bh(&rxrpc_local_lock);
-       if (unlikely(atomic_dec_and_test(&local->usage))) {
-               _debug("destroy local");
-               rxrpc_queue_work(&local->destroyer);
-       }
-       write_unlock_bh(&rxrpc_local_lock);
-       _leave("");
-}
-
-/*
- * destroy a local endpoint
- */
-static void rxrpc_destroy_local(struct work_struct *work)
-{
-       struct rxrpc_local *local =
-               container_of(work, struct rxrpc_local, destroyer);
-
-       _enter("%p{%d}", local, atomic_read(&local->usage));
-
-       down_write(&rxrpc_local_sem);
-
-       write_lock_bh(&rxrpc_local_lock);
-       if (atomic_read(&local->usage) > 0) {
-               write_unlock_bh(&rxrpc_local_lock);
-               up_read(&rxrpc_local_sem);
-               _leave(" [resurrected]");
-               return;
-       }
-
-       list_del(&local->link);
-       local->socket->sk->sk_user_data = NULL;
-       write_unlock_bh(&rxrpc_local_lock);
-
-       downgrade_write(&rxrpc_local_sem);
-
-       ASSERT(list_empty(&local->services));
-       ASSERT(!work_pending(&local->acceptor));
-       ASSERT(!work_pending(&local->rejecter));
-       ASSERT(!work_pending(&local->event_processor));
-
-       /* finish cleaning up the local descriptor */
-       rxrpc_purge_queue(&local->accept_queue);
-       rxrpc_purge_queue(&local->reject_queue);
-       rxrpc_purge_queue(&local->event_queue);
-       kernel_sock_shutdown(local->socket, SHUT_RDWR);
-       sock_release(local->socket);
-
-       up_read(&rxrpc_local_sem);
-
-       _net("DESTROY LOCAL %d", local->debug_id);
-       kfree(local);
-
-       if (list_empty(&rxrpc_locals))
-               wake_up_all(&rxrpc_local_wq);
-
-       _leave("");
-}
-
-/*
- * preemptively destroy all local local endpoint rather than waiting for
- * them to be destroyed
- */
-void __exit rxrpc_destroy_all_locals(void)
-{
-       DECLARE_WAITQUEUE(myself,current);
-
-       _enter("");
-
-       /* we simply have to wait for them to go away */
-       if (!list_empty(&rxrpc_locals)) {
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               add_wait_queue(&rxrpc_local_wq, &myself);
-
-               while (!list_empty(&rxrpc_locals)) {
-                       schedule();
-                       set_current_state(TASK_UNINTERRUPTIBLE);
-               }
-
-               remove_wait_queue(&rxrpc_local_wq, &myself);
-               set_current_state(TASK_RUNNING);
-       }
-
-       _leave("");
-}
-
-/*
- * Reply to a version request
- */
-static void rxrpc_send_version_request(struct rxrpc_local *local,
-                                      struct rxrpc_host_header *hdr,
-                                      struct sk_buff *skb)
-{
-       struct rxrpc_wire_header whdr;
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       struct sockaddr_in sin;
-       struct msghdr msg;
-       struct kvec iov[2];
-       size_t len;
-       int ret;
-
-       _enter("");
-
-       sin.sin_family = AF_INET;
-       sin.sin_port = udp_hdr(skb)->source;
-       sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
-
-       msg.msg_name    = &sin;
-       msg.msg_namelen = sizeof(sin);
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags   = 0;
-
-       whdr.epoch      = htonl(sp->hdr.epoch);
-       whdr.cid        = htonl(sp->hdr.cid);
-       whdr.callNumber = htonl(sp->hdr.callNumber);
-       whdr.seq        = 0;
-       whdr.serial     = 0;
-       whdr.type       = RXRPC_PACKET_TYPE_VERSION;
-       whdr.flags      = RXRPC_LAST_PACKET | (~hdr->flags & RXRPC_CLIENT_INITIATED);
-       whdr.userStatus = 0;
-       whdr.securityIndex = 0;
-       whdr._rsvd      = 0;
-       whdr.serviceId  = htons(sp->hdr.serviceId);
-
-       iov[0].iov_base = &whdr;
-       iov[0].iov_len  = sizeof(whdr);
-       iov[1].iov_base = (char *)rxrpc_version_string;
-       iov[1].iov_len  = sizeof(rxrpc_version_string);
-
-       len = iov[0].iov_len + iov[1].iov_len;
-
-       _proto("Tx VERSION (reply)");
-
-       ret = kernel_sendmsg(local->socket, &msg, iov, 2, len);
-       if (ret < 0)
-               _debug("sendmsg failed: %d", ret);
-
-       _leave("");
-}
-
-/*
- * Process event packets targetted at a local endpoint.
- */
-static void rxrpc_process_local_events(struct work_struct *work)
-{
-       struct rxrpc_local *local = container_of(work, struct rxrpc_local, event_processor);
-       struct sk_buff *skb;
-       char v;
-
-       _enter("");
-
-       atomic_inc(&local->usage);
-
-       while ((skb = skb_dequeue(&local->event_queue))) {
-               struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-
-               _debug("{%d},{%u}", local->debug_id, sp->hdr.type);
-
-               switch (sp->hdr.type) {
-               case RXRPC_PACKET_TYPE_VERSION:
-                       if (skb_copy_bits(skb, 0, &v, 1) < 0)
-                               return;
-                       _proto("Rx VERSION { %02x }", v);
-                       if (v == 0)
-                               rxrpc_send_version_request(local, &sp->hdr, skb);
-                       break;
-
-               default:
-                       /* Just ignore anything we don't understand */
-                       break;
-               }
-
-               rxrpc_put_local(local);
-               rxrpc_free_skb(skb);
-       }
-
-       rxrpc_put_local(local);
-       _leave("");
-}
diff --git a/net/rxrpc/ar-output.c b/net/rxrpc/ar-output.c
deleted file mode 100644 (file)
index 2e3c406..0000000
+++ /dev/null
@@ -1,724 +0,0 @@
-/* RxRPC packet transmission
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/net.h>
-#include <linux/gfp.h>
-#include <linux/skbuff.h>
-#include <linux/circ_buf.h>
-#include <linux/export.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * Time till packet resend (in jiffies).
- */
-unsigned int rxrpc_resend_timeout = 4 * HZ;
-
-static int rxrpc_send_data(struct rxrpc_sock *rx,
-                          struct rxrpc_call *call,
-                          struct msghdr *msg, size_t len);
-
-/*
- * extract control messages from the sendmsg() control buffer
- */
-static int rxrpc_sendmsg_cmsg(struct msghdr *msg,
-                             unsigned long *user_call_ID,
-                             enum rxrpc_command *command,
-                             u32 *abort_code)
-{
-       struct cmsghdr *cmsg;
-       bool got_user_ID = false;
-       int len;
-
-       *command = RXRPC_CMD_SEND_DATA;
-
-       if (msg->msg_controllen == 0)
-               return -EINVAL;
-
-       for_each_cmsghdr(cmsg, msg) {
-               if (!CMSG_OK(msg, cmsg))
-                       return -EINVAL;
-
-               len = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));
-               _debug("CMSG %d, %d, %d",
-                      cmsg->cmsg_level, cmsg->cmsg_type, len);
-
-               if (cmsg->cmsg_level != SOL_RXRPC)
-                       continue;
-
-               switch (cmsg->cmsg_type) {
-               case RXRPC_USER_CALL_ID:
-                       if (msg->msg_flags & MSG_CMSG_COMPAT) {
-                               if (len != sizeof(u32))
-                                       return -EINVAL;
-                               *user_call_ID = *(u32 *) CMSG_DATA(cmsg);
-                       } else {
-                               if (len != sizeof(unsigned long))
-                                       return -EINVAL;
-                               *user_call_ID = *(unsigned long *)
-                                       CMSG_DATA(cmsg);
-                       }
-                       _debug("User Call ID %lx", *user_call_ID);
-                       got_user_ID = true;
-                       break;
-
-               case RXRPC_ABORT:
-                       if (*command != RXRPC_CMD_SEND_DATA)
-                               return -EINVAL;
-                       *command = RXRPC_CMD_SEND_ABORT;
-                       if (len != sizeof(*abort_code))
-                               return -EINVAL;
-                       *abort_code = *(unsigned int *) CMSG_DATA(cmsg);
-                       _debug("Abort %x", *abort_code);
-                       if (*abort_code == 0)
-                               return -EINVAL;
-                       break;
-
-               case RXRPC_ACCEPT:
-                       if (*command != RXRPC_CMD_SEND_DATA)
-                               return -EINVAL;
-                       *command = RXRPC_CMD_ACCEPT;
-                       if (len != 0)
-                               return -EINVAL;
-                       break;
-
-               default:
-                       return -EINVAL;
-               }
-       }
-
-       if (!got_user_ID)
-               return -EINVAL;
-       _leave(" = 0");
-       return 0;
-}
-
-/*
- * abort a call, sending an ABORT packet to the peer
- */
-static void rxrpc_send_abort(struct rxrpc_call *call, u32 abort_code)
-{
-       write_lock_bh(&call->state_lock);
-
-       if (call->state <= RXRPC_CALL_COMPLETE) {
-               call->state = RXRPC_CALL_LOCALLY_ABORTED;
-               call->local_abort = abort_code;
-               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
-               del_timer_sync(&call->resend_timer);
-               del_timer_sync(&call->ack_timer);
-               clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
-               clear_bit(RXRPC_CALL_EV_ACK, &call->events);
-               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-               rxrpc_queue_call(call);
-       }
-
-       write_unlock_bh(&call->state_lock);
-}
-
-/*
- * Create a new client call for sendmsg().
- */
-static struct rxrpc_call *
-rxrpc_new_client_call_for_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg,
-                                 unsigned long user_call_ID)
-{
-       struct rxrpc_conn_bundle *bundle;
-       struct rxrpc_transport *trans;
-       struct rxrpc_call *call;
-       struct key *key;
-       long ret;
-
-       DECLARE_SOCKADDR(struct sockaddr_rxrpc *, srx, msg->msg_name);
-
-       _enter("");
-
-       if (!msg->msg_name)
-               return ERR_PTR(-EDESTADDRREQ);
-
-       trans = rxrpc_name_to_transport(rx, msg->msg_name, msg->msg_namelen, 0,
-                                       GFP_KERNEL);
-       if (IS_ERR(trans)) {
-               ret = PTR_ERR(trans);
-               goto out;
-       }
-
-       key = rx->key;
-       if (key && !rx->key->payload.data[0])
-               key = NULL;
-       bundle = rxrpc_get_bundle(rx, trans, key, srx->srx_service, GFP_KERNEL);
-       if (IS_ERR(bundle)) {
-               ret = PTR_ERR(bundle);
-               goto out_trans;
-       }
-
-       call = rxrpc_new_client_call(rx, trans, bundle, user_call_ID,
-                                    GFP_KERNEL);
-       rxrpc_put_bundle(trans, bundle);
-       rxrpc_put_transport(trans);
-       if (IS_ERR(call)) {
-               ret = PTR_ERR(call);
-               goto out_trans;
-       }
-
-       _leave(" = %p\n", call);
-       return call;
-
-out_trans:
-       rxrpc_put_transport(trans);
-out:
-       _leave(" = %ld", ret);
-       return ERR_PTR(ret);
-}
-
-/*
- * send a message forming part of a client call through an RxRPC socket
- * - caller holds the socket locked
- * - the socket may be either a client socket or a server socket
- */
-int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len)
-{
-       enum rxrpc_command cmd;
-       struct rxrpc_call *call;
-       unsigned long user_call_ID = 0;
-       u32 abort_code = 0;
-       int ret;
-
-       _enter("");
-
-       ret = rxrpc_sendmsg_cmsg(msg, &user_call_ID, &cmd, &abort_code);
-       if (ret < 0)
-               return ret;
-
-       if (cmd == RXRPC_CMD_ACCEPT) {
-               if (rx->sk.sk_state != RXRPC_SERVER_LISTENING)
-                       return -EINVAL;
-               call = rxrpc_accept_call(rx, user_call_ID);
-               if (IS_ERR(call))
-                       return PTR_ERR(call);
-               rxrpc_put_call(call);
-               return 0;
-       }
-
-       call = rxrpc_find_call_by_user_ID(rx, user_call_ID);
-       if (!call) {
-               if (cmd != RXRPC_CMD_SEND_DATA)
-                       return -EBADSLT;
-               call = rxrpc_new_client_call_for_sendmsg(rx, msg, user_call_ID);
-               if (IS_ERR(call))
-                       return PTR_ERR(call);
-       }
-
-       _debug("CALL %d USR %lx ST %d on CONN %p",
-              call->debug_id, call->user_call_ID, call->state, call->conn);
-
-       if (call->state >= RXRPC_CALL_COMPLETE) {
-               /* it's too late for this call */
-               ret = -ECONNRESET;
-       } else if (cmd == RXRPC_CMD_SEND_ABORT) {
-               rxrpc_send_abort(call, abort_code);
-               ret = 0;
-       } else if (cmd != RXRPC_CMD_SEND_DATA) {
-               ret = -EINVAL;
-       } else if (!call->in_clientflag &&
-                  call->state != RXRPC_CALL_CLIENT_SEND_REQUEST) {
-               /* request phase complete for this client call */
-               ret = -EPROTO;
-       } else if (call->in_clientflag &&
-                  call->state != RXRPC_CALL_SERVER_ACK_REQUEST &&
-                  call->state != RXRPC_CALL_SERVER_SEND_REPLY) {
-               /* Reply phase not begun or not complete for service call. */
-               ret = -EPROTO;
-       } else {
-               ret = rxrpc_send_data(rx, call, msg, len);
-       }
-
-       rxrpc_put_call(call);
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/**
- * rxrpc_kernel_send_data - Allow a kernel service to send data on a call
- * @call: The call to send data through
- * @msg: The data to send
- * @len: The amount of data to send
- *
- * Allow a kernel service to send data on a call.  The call must be in an state
- * appropriate to sending data.  No control data should be supplied in @msg,
- * nor should an address be supplied.  MSG_MORE should be flagged if there's
- * more data to come, otherwise this data will end the transmission phase.
- */
-int rxrpc_kernel_send_data(struct rxrpc_call *call, struct msghdr *msg,
-                          size_t len)
-{
-       int ret;
-
-       _enter("{%d,%s},", call->debug_id, rxrpc_call_states[call->state]);
-
-       ASSERTCMP(msg->msg_name, ==, NULL);
-       ASSERTCMP(msg->msg_control, ==, NULL);
-
-       lock_sock(&call->socket->sk);
-
-       _debug("CALL %d USR %lx ST %d on CONN %p",
-              call->debug_id, call->user_call_ID, call->state, call->conn);
-
-       if (call->state >= RXRPC_CALL_COMPLETE) {
-               ret = -ESHUTDOWN; /* it's too late for this call */
-       } else if (call->state != RXRPC_CALL_CLIENT_SEND_REQUEST &&
-                  call->state != RXRPC_CALL_SERVER_ACK_REQUEST &&
-                  call->state != RXRPC_CALL_SERVER_SEND_REPLY) {
-               ret = -EPROTO; /* request phase complete for this client call */
-       } else {
-               ret = rxrpc_send_data(call->socket, call, msg, len);
-       }
-
-       release_sock(&call->socket->sk);
-       _leave(" = %d", ret);
-       return ret;
-}
-
-EXPORT_SYMBOL(rxrpc_kernel_send_data);
-
-/**
- * rxrpc_kernel_abort_call - Allow a kernel service to abort a call
- * @call: The call to be aborted
- * @abort_code: The abort code to stick into the ABORT packet
- *
- * Allow a kernel service to abort a call, if it's still in an abortable state.
- */
-void rxrpc_kernel_abort_call(struct rxrpc_call *call, u32 abort_code)
-{
-       _enter("{%d},%d", call->debug_id, abort_code);
-
-       lock_sock(&call->socket->sk);
-
-       _debug("CALL %d USR %lx ST %d on CONN %p",
-              call->debug_id, call->user_call_ID, call->state, call->conn);
-
-       if (call->state < RXRPC_CALL_COMPLETE)
-               rxrpc_send_abort(call, abort_code);
-
-       release_sock(&call->socket->sk);
-       _leave("");
-}
-
-EXPORT_SYMBOL(rxrpc_kernel_abort_call);
-
-/*
- * send a packet through the transport endpoint
- */
-int rxrpc_send_packet(struct rxrpc_transport *trans, struct sk_buff *skb)
-{
-       struct kvec iov[1];
-       struct msghdr msg;
-       int ret, opt;
-
-       _enter(",{%d}", skb->len);
-
-       iov[0].iov_base = skb->head;
-       iov[0].iov_len = skb->len;
-
-       msg.msg_name = &trans->peer->srx.transport.sin;
-       msg.msg_namelen = sizeof(trans->peer->srx.transport.sin);
-       msg.msg_control = NULL;
-       msg.msg_controllen = 0;
-       msg.msg_flags = 0;
-
-       /* send the packet with the don't fragment bit set if we currently
-        * think it's small enough */
-       if (skb->len - sizeof(struct rxrpc_wire_header) < trans->peer->maxdata) {
-               down_read(&trans->local->defrag_sem);
-               /* send the packet by UDP
-                * - returns -EMSGSIZE if UDP would have to fragment the packet
-                *   to go out of the interface
-                *   - in which case, we'll have processed the ICMP error
-                *     message and update the peer record
-                */
-               ret = kernel_sendmsg(trans->local->socket, &msg, iov, 1,
-                                    iov[0].iov_len);
-
-               up_read(&trans->local->defrag_sem);
-               if (ret == -EMSGSIZE)
-                       goto send_fragmentable;
-
-               _leave(" = %d [%u]", ret, trans->peer->maxdata);
-               return ret;
-       }
-
-send_fragmentable:
-       /* attempt to send this message with fragmentation enabled */
-       _debug("send fragment");
-
-       down_write(&trans->local->defrag_sem);
-       opt = IP_PMTUDISC_DONT;
-       ret = kernel_setsockopt(trans->local->socket, SOL_IP, IP_MTU_DISCOVER,
-                               (char *) &opt, sizeof(opt));
-       if (ret == 0) {
-               ret = kernel_sendmsg(trans->local->socket, &msg, iov, 1,
-                                    iov[0].iov_len);
-
-               opt = IP_PMTUDISC_DO;
-               kernel_setsockopt(trans->local->socket, SOL_IP,
-                                 IP_MTU_DISCOVER, (char *) &opt, sizeof(opt));
-       }
-
-       up_write(&trans->local->defrag_sem);
-       _leave(" = %d [frag %u]", ret, trans->peer->maxdata);
-       return ret;
-}
-
-/*
- * wait for space to appear in the transmit/ACK window
- * - caller holds the socket locked
- */
-static int rxrpc_wait_for_tx_window(struct rxrpc_sock *rx,
-                                   struct rxrpc_call *call,
-                                   long *timeo)
-{
-       DECLARE_WAITQUEUE(myself, current);
-       int ret;
-
-       _enter(",{%d},%ld",
-              CIRC_SPACE(call->acks_head, ACCESS_ONCE(call->acks_tail),
-                         call->acks_winsz),
-              *timeo);
-
-       add_wait_queue(&call->tx_waitq, &myself);
-
-       for (;;) {
-               set_current_state(TASK_INTERRUPTIBLE);
-               ret = 0;
-               if (CIRC_SPACE(call->acks_head, ACCESS_ONCE(call->acks_tail),
-                              call->acks_winsz) > 0)
-                       break;
-               if (signal_pending(current)) {
-                       ret = sock_intr_errno(*timeo);
-                       break;
-               }
-
-               release_sock(&rx->sk);
-               *timeo = schedule_timeout(*timeo);
-               lock_sock(&rx->sk);
-       }
-
-       remove_wait_queue(&call->tx_waitq, &myself);
-       set_current_state(TASK_RUNNING);
-       _leave(" = %d", ret);
-       return ret;
-}
-
-/*
- * attempt to schedule an instant Tx resend
- */
-static inline void rxrpc_instant_resend(struct rxrpc_call *call)
-{
-       read_lock_bh(&call->state_lock);
-       if (try_to_del_timer_sync(&call->resend_timer) >= 0) {
-               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
-               if (call->state < RXRPC_CALL_COMPLETE &&
-                   !test_and_set_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events))
-                       rxrpc_queue_call(call);
-       }
-       read_unlock_bh(&call->state_lock);
-}
-
-/*
- * queue a packet for transmission, set the resend timer and attempt
- * to send the packet immediately
- */
-static void rxrpc_queue_packet(struct rxrpc_call *call, struct sk_buff *skb,
-                              bool last)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       int ret;
-
-       _net("queue skb %p [%d]", skb, call->acks_head);
-
-       ASSERT(call->acks_window != NULL);
-       call->acks_window[call->acks_head] = (unsigned long) skb;
-       smp_wmb();
-       call->acks_head = (call->acks_head + 1) & (call->acks_winsz - 1);
-
-       if (last || call->state == RXRPC_CALL_SERVER_ACK_REQUEST) {
-               _debug("________awaiting reply/ACK__________");
-               write_lock_bh(&call->state_lock);
-               switch (call->state) {
-               case RXRPC_CALL_CLIENT_SEND_REQUEST:
-                       call->state = RXRPC_CALL_CLIENT_AWAIT_REPLY;
-                       break;
-               case RXRPC_CALL_SERVER_ACK_REQUEST:
-                       call->state = RXRPC_CALL_SERVER_SEND_REPLY;
-                       if (!last)
-                               break;
-               case RXRPC_CALL_SERVER_SEND_REPLY:
-                       call->state = RXRPC_CALL_SERVER_AWAIT_ACK;
-                       break;
-               default:
-                       break;
-               }
-               write_unlock_bh(&call->state_lock);
-       }
-
-       _proto("Tx DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq);
-
-       sp->need_resend = false;
-       sp->resend_at = jiffies + rxrpc_resend_timeout;
-       if (!test_and_set_bit(RXRPC_CALL_RUN_RTIMER, &call->flags)) {
-               _debug("run timer");
-               call->resend_timer.expires = sp->resend_at;
-               add_timer(&call->resend_timer);
-       }
-
-       /* attempt to cancel the rx-ACK timer, deferring reply transmission if
-        * we're ACK'ing the request phase of an incoming call */
-       ret = -EAGAIN;
-       if (try_to_del_timer_sync(&call->ack_timer) >= 0) {
-               /* the packet may be freed by rxrpc_process_call() before this
-                * returns */
-               ret = rxrpc_send_packet(call->conn->trans, skb);
-               _net("sent skb %p", skb);
-       } else {
-               _debug("failed to delete ACK timer");
-       }
-
-       if (ret < 0) {
-               _debug("need instant resend %d", ret);
-               sp->need_resend = true;
-               rxrpc_instant_resend(call);
-       }
-
-       _leave("");
-}
-
-/*
- * Convert a host-endian header into a network-endian header.
- */
-static void rxrpc_insert_header(struct sk_buff *skb)
-{
-       struct rxrpc_wire_header whdr;
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-
-       whdr.epoch      = htonl(sp->hdr.epoch);
-       whdr.cid        = htonl(sp->hdr.cid);
-       whdr.callNumber = htonl(sp->hdr.callNumber);
-       whdr.seq        = htonl(sp->hdr.seq);
-       whdr.serial     = htonl(sp->hdr.serial);
-       whdr.type       = sp->hdr.type;
-       whdr.flags      = sp->hdr.flags;
-       whdr.userStatus = sp->hdr.userStatus;
-       whdr.securityIndex = sp->hdr.securityIndex;
-       whdr._rsvd      = htons(sp->hdr._rsvd);
-       whdr.serviceId  = htons(sp->hdr.serviceId);
-
-       memcpy(skb->head, &whdr, sizeof(whdr));
-}
-
-/*
- * send data through a socket
- * - must be called in process context
- * - caller holds the socket locked
- */
-static int rxrpc_send_data(struct rxrpc_sock *rx,
-                          struct rxrpc_call *call,
-                          struct msghdr *msg, size_t len)
-{
-       struct rxrpc_skb_priv *sp;
-       struct sk_buff *skb;
-       struct sock *sk = &rx->sk;
-       long timeo;
-       bool more;
-       int ret, copied;
-
-       timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
-
-       /* this should be in poll */
-       sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
-
-       if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
-               return -EPIPE;
-
-       more = msg->msg_flags & MSG_MORE;
-
-       skb = call->tx_pending;
-       call->tx_pending = NULL;
-
-       copied = 0;
-       do {
-               if (!skb) {
-                       size_t size, chunk, max, space;
-
-                       _debug("alloc");
-
-                       if (CIRC_SPACE(call->acks_head,
-                                      ACCESS_ONCE(call->acks_tail),
-                                      call->acks_winsz) <= 0) {
-                               ret = -EAGAIN;
-                               if (msg->msg_flags & MSG_DONTWAIT)
-                                       goto maybe_error;
-                               ret = rxrpc_wait_for_tx_window(rx, call,
-                                                              &timeo);
-                               if (ret < 0)
-                                       goto maybe_error;
-                       }
-
-                       max = call->conn->trans->peer->maxdata;
-                       max -= call->conn->security_size;
-                       max &= ~(call->conn->size_align - 1UL);
-
-                       chunk = max;
-                       if (chunk > msg_data_left(msg) && !more)
-                               chunk = msg_data_left(msg);
-
-                       space = chunk + call->conn->size_align;
-                       space &= ~(call->conn->size_align - 1UL);
-
-                       size = space + call->conn->header_size;
-
-                       _debug("SIZE: %zu/%zu/%zu", chunk, space, size);
-
-                       /* create a buffer that we can retain until it's ACK'd */
-                       skb = sock_alloc_send_skb(
-                               sk, size, msg->msg_flags & MSG_DONTWAIT, &ret);
-                       if (!skb)
-                               goto maybe_error;
-
-                       rxrpc_new_skb(skb);
-
-                       _debug("ALLOC SEND %p", skb);
-
-                       ASSERTCMP(skb->mark, ==, 0);
-
-                       _debug("HS: %u", call->conn->header_size);
-                       skb_reserve(skb, call->conn->header_size);
-                       skb->len += call->conn->header_size;
-
-                       sp = rxrpc_skb(skb);
-                       sp->remain = chunk;
-                       if (sp->remain > skb_tailroom(skb))
-                               sp->remain = skb_tailroom(skb);
-
-                       _net("skb: hr %d, tr %d, hl %d, rm %d",
-                              skb_headroom(skb),
-                              skb_tailroom(skb),
-                              skb_headlen(skb),
-                              sp->remain);
-
-                       skb->ip_summed = CHECKSUM_UNNECESSARY;
-               }
-
-               _debug("append");
-               sp = rxrpc_skb(skb);
-
-               /* append next segment of data to the current buffer */
-               if (msg_data_left(msg) > 0) {
-                       int copy = skb_tailroom(skb);
-                       ASSERTCMP(copy, >, 0);
-                       if (copy > msg_data_left(msg))
-                               copy = msg_data_left(msg);
-                       if (copy > sp->remain)
-                               copy = sp->remain;
-
-                       _debug("add");
-                       ret = skb_add_data(skb, &msg->msg_iter, copy);
-                       _debug("added");
-                       if (ret < 0)
-                               goto efault;
-                       sp->remain -= copy;
-                       skb->mark += copy;
-                       copied += copy;
-               }
-
-               /* check for the far side aborting the call or a network error
-                * occurring */
-               if (call->state > RXRPC_CALL_COMPLETE)
-                       goto call_aborted;
-
-               /* add the packet to the send queue if it's now full */
-               if (sp->remain <= 0 ||
-                   (msg_data_left(msg) == 0 && !more)) {
-                       struct rxrpc_connection *conn = call->conn;
-                       uint32_t seq;
-                       size_t pad;
-
-                       /* pad out if we're using security */
-                       if (conn->security_ix) {
-                               pad = conn->security_size + skb->mark;
-                               pad = conn->size_align - pad;
-                               pad &= conn->size_align - 1;
-                               _debug("pad %zu", pad);
-                               if (pad)
-                                       memset(skb_put(skb, pad), 0, pad);
-                       }
-
-                       seq = atomic_inc_return(&call->sequence);
-
-                       sp->hdr.epoch   = conn->epoch;
-                       sp->hdr.cid     = call->cid;
-                       sp->hdr.callNumber = call->call_id;
-                       sp->hdr.seq     = seq;
-                       sp->hdr.serial  = atomic_inc_return(&conn->serial);
-                       sp->hdr.type    = RXRPC_PACKET_TYPE_DATA;
-                       sp->hdr.userStatus = 0;
-                       sp->hdr.securityIndex = conn->security_ix;
-                       sp->hdr._rsvd   = 0;
-                       sp->hdr.serviceId = call->service_id;
-
-                       sp->hdr.flags = conn->out_clientflag;
-                       if (msg_data_left(msg) == 0 && !more)
-                               sp->hdr.flags |= RXRPC_LAST_PACKET;
-                       else if (CIRC_SPACE(call->acks_head,
-                                           ACCESS_ONCE(call->acks_tail),
-                                           call->acks_winsz) > 1)
-                               sp->hdr.flags |= RXRPC_MORE_PACKETS;
-                       if (more && seq & 1)
-                               sp->hdr.flags |= RXRPC_REQUEST_ACK;
-
-                       ret = conn->security->secure_packet(
-                               call, skb, skb->mark,
-                               skb->head + sizeof(struct rxrpc_wire_header));
-                       if (ret < 0)
-                               goto out;
-
-                       rxrpc_insert_header(skb);
-                       rxrpc_queue_packet(call, skb, !msg_data_left(msg) && !more);
-                       skb = NULL;
-               }
-       } while (msg_data_left(msg) > 0);
-
-success:
-       ret = copied;
-out:
-       call->tx_pending = skb;
-       _leave(" = %d", ret);
-       return ret;
-
-call_aborted:
-       rxrpc_free_skb(skb);
-       if (call->state == RXRPC_CALL_NETWORK_ERROR)
-               ret = call->conn->trans->peer->net_error;
-       else
-               ret = -ECONNABORTED;
-       _leave(" = %d", ret);
-       return ret;
-
-maybe_error:
-       if (copied)
-               goto success;
-       goto out;
-
-efault:
-       ret = -EFAULT;
-       goto out;
-}
diff --git a/net/rxrpc/ar-peer.c b/net/rxrpc/ar-peer.c
deleted file mode 100644 (file)
index 0b54cda..0000000
+++ /dev/null
@@ -1,305 +0,0 @@
-/* RxRPC remote transport endpoint management
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/udp.h>
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/icmp.h>
-#include <linux/slab.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <net/ip.h>
-#include <net/route.h>
-#include "ar-internal.h"
-
-static LIST_HEAD(rxrpc_peers);
-static DEFINE_RWLOCK(rxrpc_peer_lock);
-static DECLARE_WAIT_QUEUE_HEAD(rxrpc_peer_wq);
-
-static void rxrpc_destroy_peer(struct work_struct *work);
-
-/*
- * assess the MTU size for the network interface through which this peer is
- * reached
- */
-static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
-{
-       struct rtable *rt;
-       struct flowi4 fl4;
-
-       peer->if_mtu = 1500;
-
-       rt = ip_route_output_ports(&init_net, &fl4, NULL,
-                                  peer->srx.transport.sin.sin_addr.s_addr, 0,
-                                  htons(7000), htons(7001),
-                                  IPPROTO_UDP, 0, 0);
-       if (IS_ERR(rt)) {
-               _leave(" [route err %ld]", PTR_ERR(rt));
-               return;
-       }
-
-       peer->if_mtu = dst_mtu(&rt->dst);
-       dst_release(&rt->dst);
-
-       _leave(" [if_mtu %u]", peer->if_mtu);
-}
-
-/*
- * allocate a new peer
- */
-static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
-                                          gfp_t gfp)
-{
-       struct rxrpc_peer *peer;
-
-       _enter("");
-
-       peer = kzalloc(sizeof(struct rxrpc_peer), gfp);
-       if (peer) {
-               INIT_WORK(&peer->destroyer, &rxrpc_destroy_peer);
-               INIT_LIST_HEAD(&peer->link);
-               INIT_LIST_HEAD(&peer->error_targets);
-               spin_lock_init(&peer->lock);
-               atomic_set(&peer->usage, 1);
-               peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
-               memcpy(&peer->srx, srx, sizeof(*srx));
-
-               rxrpc_assess_MTU_size(peer);
-               peer->mtu = peer->if_mtu;
-
-               if (srx->transport.family == AF_INET) {
-                       peer->hdrsize = sizeof(struct iphdr);
-                       switch (srx->transport_type) {
-                       case SOCK_DGRAM:
-                               peer->hdrsize += sizeof(struct udphdr);
-                               break;
-                       default:
-                               BUG();
-                               break;
-                       }
-               } else {
-                       BUG();
-               }
-
-               peer->hdrsize += sizeof(struct rxrpc_wire_header);
-               peer->maxdata = peer->mtu - peer->hdrsize;
-       }
-
-       _leave(" = %p", peer);
-       return peer;
-}
-
-/*
- * obtain a remote transport endpoint for the specified address
- */
-struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
-{
-       struct rxrpc_peer *peer, *candidate;
-       const char *new = "old";
-       int usage;
-
-       _enter("{%d,%d,%pI4+%hu}",
-              srx->transport_type,
-              srx->transport_len,
-              &srx->transport.sin.sin_addr,
-              ntohs(srx->transport.sin.sin_port));
-
-       /* search the peer list first */
-       read_lock_bh(&rxrpc_peer_lock);
-       list_for_each_entry(peer, &rxrpc_peers, link) {
-               _debug("check PEER %d { u=%d t=%d l=%d }",
-                      peer->debug_id,
-                      atomic_read(&peer->usage),
-                      peer->srx.transport_type,
-                      peer->srx.transport_len);
-
-               if (atomic_read(&peer->usage) > 0 &&
-                   peer->srx.transport_type == srx->transport_type &&
-                   peer->srx.transport_len == srx->transport_len &&
-                   memcmp(&peer->srx.transport,
-                          &srx->transport,
-                          srx->transport_len) == 0)
-                       goto found_extant_peer;
-       }
-       read_unlock_bh(&rxrpc_peer_lock);
-
-       /* not yet present - create a candidate for a new record and then
-        * redo the search */
-       candidate = rxrpc_alloc_peer(srx, gfp);
-       if (!candidate) {
-               _leave(" = -ENOMEM");
-               return ERR_PTR(-ENOMEM);
-       }
-
-       write_lock_bh(&rxrpc_peer_lock);
-
-       list_for_each_entry(peer, &rxrpc_peers, link) {
-               if (atomic_read(&peer->usage) > 0 &&
-                   peer->srx.transport_type == srx->transport_type &&
-                   peer->srx.transport_len == srx->transport_len &&
-                   memcmp(&peer->srx.transport,
-                          &srx->transport,
-                          srx->transport_len) == 0)
-                       goto found_extant_second;
-       }
-
-       /* we can now add the new candidate to the list */
-       peer = candidate;
-       candidate = NULL;
-       usage = atomic_read(&peer->usage);
-
-       list_add_tail(&peer->link, &rxrpc_peers);
-       write_unlock_bh(&rxrpc_peer_lock);
-       new = "new";
-
-success:
-       _net("PEER %s %d {%d,%u,%pI4+%hu}",
-            new,
-            peer->debug_id,
-            peer->srx.transport_type,
-            peer->srx.transport.family,
-            &peer->srx.transport.sin.sin_addr,
-            ntohs(peer->srx.transport.sin.sin_port));
-
-       _leave(" = %p {u=%d}", peer, usage);
-       return peer;
-
-       /* we found the peer in the list immediately */
-found_extant_peer:
-       usage = atomic_inc_return(&peer->usage);
-       read_unlock_bh(&rxrpc_peer_lock);
-       goto success;
-
-       /* we found the peer on the second time through the list */
-found_extant_second:
-       usage = atomic_inc_return(&peer->usage);
-       write_unlock_bh(&rxrpc_peer_lock);
-       kfree(candidate);
-       goto success;
-}
-
-/*
- * find the peer associated with a packet
- */
-struct rxrpc_peer *rxrpc_find_peer(struct rxrpc_local *local,
-                                  __be32 addr, __be16 port)
-{
-       struct rxrpc_peer *peer;
-
-       _enter("");
-
-       /* search the peer list */
-       read_lock_bh(&rxrpc_peer_lock);
-
-       if (local->srx.transport.family == AF_INET &&
-           local->srx.transport_type == SOCK_DGRAM
-           ) {
-               list_for_each_entry(peer, &rxrpc_peers, link) {
-                       if (atomic_read(&peer->usage) > 0 &&
-                           peer->srx.transport_type == SOCK_DGRAM &&
-                           peer->srx.transport.family == AF_INET &&
-                           peer->srx.transport.sin.sin_port == port &&
-                           peer->srx.transport.sin.sin_addr.s_addr == addr)
-                               goto found_UDP_peer;
-               }
-
-               goto new_UDP_peer;
-       }
-
-       read_unlock_bh(&rxrpc_peer_lock);
-       _leave(" = -EAFNOSUPPORT");
-       return ERR_PTR(-EAFNOSUPPORT);
-
-found_UDP_peer:
-       _net("Rx UDP DGRAM from peer %d", peer->debug_id);
-       atomic_inc(&peer->usage);
-       read_unlock_bh(&rxrpc_peer_lock);
-       _leave(" = %p", peer);
-       return peer;
-
-new_UDP_peer:
-       _net("Rx UDP DGRAM from NEW peer");
-       read_unlock_bh(&rxrpc_peer_lock);
-       _leave(" = -EBUSY [new]");
-       return ERR_PTR(-EBUSY);
-}
-
-/*
- * release a remote transport endpoint
- */
-void rxrpc_put_peer(struct rxrpc_peer *peer)
-{
-       _enter("%p{u=%d}", peer, atomic_read(&peer->usage));
-
-       ASSERTCMP(atomic_read(&peer->usage), >, 0);
-
-       if (likely(!atomic_dec_and_test(&peer->usage))) {
-               _leave(" [in use]");
-               return;
-       }
-
-       rxrpc_queue_work(&peer->destroyer);
-       _leave("");
-}
-
-/*
- * destroy a remote transport endpoint
- */
-static void rxrpc_destroy_peer(struct work_struct *work)
-{
-       struct rxrpc_peer *peer =
-               container_of(work, struct rxrpc_peer, destroyer);
-
-       _enter("%p{%d}", peer, atomic_read(&peer->usage));
-
-       write_lock_bh(&rxrpc_peer_lock);
-       list_del(&peer->link);
-       write_unlock_bh(&rxrpc_peer_lock);
-
-       _net("DESTROY PEER %d", peer->debug_id);
-       kfree(peer);
-
-       if (list_empty(&rxrpc_peers))
-               wake_up_all(&rxrpc_peer_wq);
-       _leave("");
-}
-
-/*
- * preemptively destroy all the peer records from a transport endpoint rather
- * than waiting for them to time out
- */
-void __exit rxrpc_destroy_all_peers(void)
-{
-       DECLARE_WAITQUEUE(myself,current);
-
-       _enter("");
-
-       /* we simply have to wait for them to go away */
-       if (!list_empty(&rxrpc_peers)) {
-               set_current_state(TASK_UNINTERRUPTIBLE);
-               add_wait_queue(&rxrpc_peer_wq, &myself);
-
-               while (!list_empty(&rxrpc_peers)) {
-                       schedule();
-                       set_current_state(TASK_UNINTERRUPTIBLE);
-               }
-
-               remove_wait_queue(&rxrpc_peer_wq, &myself);
-               set_current_state(TASK_RUNNING);
-       }
-
-       _leave("");
-}
diff --git a/net/rxrpc/ar-proc.c b/net/rxrpc/ar-proc.c
deleted file mode 100644 (file)
index 225163b..0000000
+++ /dev/null
@@ -1,192 +0,0 @@
-/* /proc/net/ support for AF_RXRPC
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-static const char *const rxrpc_conn_states[] = {
-       [RXRPC_CONN_UNUSED]             = "Unused  ",
-       [RXRPC_CONN_CLIENT]             = "Client  ",
-       [RXRPC_CONN_SERVER_UNSECURED]   = "SvUnsec ",
-       [RXRPC_CONN_SERVER_CHALLENGING] = "SvChall ",
-       [RXRPC_CONN_SERVER]             = "SvSecure",
-       [RXRPC_CONN_REMOTELY_ABORTED]   = "RmtAbort",
-       [RXRPC_CONN_LOCALLY_ABORTED]    = "LocAbort",
-       [RXRPC_CONN_NETWORK_ERROR]      = "NetError",
-};
-
-/*
- * generate a list of extant and dead calls in /proc/net/rxrpc_calls
- */
-static void *rxrpc_call_seq_start(struct seq_file *seq, loff_t *_pos)
-{
-       read_lock(&rxrpc_call_lock);
-       return seq_list_start_head(&rxrpc_calls, *_pos);
-}
-
-static void *rxrpc_call_seq_next(struct seq_file *seq, void *v, loff_t *pos)
-{
-       return seq_list_next(v, &rxrpc_calls, pos);
-}
-
-static void rxrpc_call_seq_stop(struct seq_file *seq, void *v)
-{
-       read_unlock(&rxrpc_call_lock);
-}
-
-static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
-{
-       struct rxrpc_transport *trans;
-       struct rxrpc_call *call;
-       char lbuff[4 + 4 + 4 + 4 + 5 + 1], rbuff[4 + 4 + 4 + 4 + 5 + 1];
-
-       if (v == &rxrpc_calls) {
-               seq_puts(seq,
-                        "Proto Local                  Remote                "
-                        " SvID ConnID   CallID   End Use State    Abort   "
-                        " UserID\n");
-               return 0;
-       }
-
-       call = list_entry(v, struct rxrpc_call, link);
-       trans = call->conn->trans;
-
-       sprintf(lbuff, "%pI4:%u",
-               &trans->local->srx.transport.sin.sin_addr,
-               ntohs(trans->local->srx.transport.sin.sin_port));
-
-       sprintf(rbuff, "%pI4:%u",
-               &trans->peer->srx.transport.sin.sin_addr,
-               ntohs(trans->peer->srx.transport.sin.sin_port));
-
-       seq_printf(seq,
-                  "UDP   %-22.22s %-22.22s %4x %08x %08x %s %3u"
-                  " %-8.8s %08x %lx\n",
-                  lbuff,
-                  rbuff,
-                  call->conn->service_id,
-                  call->cid,
-                  call->call_id,
-                  call->conn->in_clientflag ? "Svc" : "Clt",
-                  atomic_read(&call->usage),
-                  rxrpc_call_states[call->state],
-                  call->remote_abort ?: call->local_abort,
-                  call->user_call_ID);
-
-       return 0;
-}
-
-static const struct seq_operations rxrpc_call_seq_ops = {
-       .start  = rxrpc_call_seq_start,
-       .next   = rxrpc_call_seq_next,
-       .stop   = rxrpc_call_seq_stop,
-       .show   = rxrpc_call_seq_show,
-};
-
-static int rxrpc_call_seq_open(struct inode *inode, struct file *file)
-{
-       return seq_open(file, &rxrpc_call_seq_ops);
-}
-
-const struct file_operations rxrpc_call_seq_fops = {
-       .owner          = THIS_MODULE,
-       .open           = rxrpc_call_seq_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
-};
-
-/*
- * generate a list of extant virtual connections in /proc/net/rxrpc_conns
- */
-static void *rxrpc_connection_seq_start(struct seq_file *seq, loff_t *_pos)
-{
-       read_lock(&rxrpc_connection_lock);
-       return seq_list_start_head(&rxrpc_connections, *_pos);
-}
-
-static void *rxrpc_connection_seq_next(struct seq_file *seq, void *v,
-                                      loff_t *pos)
-{
-       return seq_list_next(v, &rxrpc_connections, pos);
-}
-
-static void rxrpc_connection_seq_stop(struct seq_file *seq, void *v)
-{
-       read_unlock(&rxrpc_connection_lock);
-}
-
-static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
-{
-       struct rxrpc_connection *conn;
-       struct rxrpc_transport *trans;
-       char lbuff[4 + 4 + 4 + 4 + 5 + 1], rbuff[4 + 4 + 4 + 4 + 5 + 1];
-
-       if (v == &rxrpc_connections) {
-               seq_puts(seq,
-                        "Proto Local                  Remote                "
-                        " SvID ConnID   Calls    End Use State    Key     "
-                        " Serial   ISerial\n"
-                        );
-               return 0;
-       }
-
-       conn = list_entry(v, struct rxrpc_connection, link);
-       trans = conn->trans;
-
-       sprintf(lbuff, "%pI4:%u",
-               &trans->local->srx.transport.sin.sin_addr,
-               ntohs(trans->local->srx.transport.sin.sin_port));
-
-       sprintf(rbuff, "%pI4:%u",
-               &trans->peer->srx.transport.sin.sin_addr,
-               ntohs(trans->peer->srx.transport.sin.sin_port));
-
-       seq_printf(seq,
-                  "UDP   %-22.22s %-22.22s %4x %08x %08x %s %3u"
-                  " %s %08x %08x %08x\n",
-                  lbuff,
-                  rbuff,
-                  conn->service_id,
-                  conn->cid,
-                  conn->call_counter,
-                  conn->in_clientflag ? "Svc" : "Clt",
-                  atomic_read(&conn->usage),
-                  rxrpc_conn_states[conn->state],
-                  key_serial(conn->key),
-                  atomic_read(&conn->serial),
-                  atomic_read(&conn->hi_serial));
-
-       return 0;
-}
-
-static const struct seq_operations rxrpc_connection_seq_ops = {
-       .start  = rxrpc_connection_seq_start,
-       .next   = rxrpc_connection_seq_next,
-       .stop   = rxrpc_connection_seq_stop,
-       .show   = rxrpc_connection_seq_show,
-};
-
-
-static int rxrpc_connection_seq_open(struct inode *inode, struct file *file)
-{
-       return seq_open(file, &rxrpc_connection_seq_ops);
-}
-
-const struct file_operations rxrpc_connection_seq_fops = {
-       .owner          = THIS_MODULE,
-       .open           = rxrpc_connection_seq_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
-};
diff --git a/net/rxrpc/ar-recvmsg.c b/net/rxrpc/ar-recvmsg.c
deleted file mode 100644 (file)
index 59706b9..0000000
+++ /dev/null
@@ -1,436 +0,0 @@
-/* RxRPC recvmsg() implementation
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/export.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * removal a call's user ID from the socket tree to make the user ID available
- * again and so that it won't be seen again in association with that call
- */
-void rxrpc_remove_user_ID(struct rxrpc_sock *rx, struct rxrpc_call *call)
-{
-       _debug("RELEASE CALL %d", call->debug_id);
-
-       if (test_bit(RXRPC_CALL_HAS_USERID, &call->flags)) {
-               write_lock_bh(&rx->call_lock);
-               rb_erase(&call->sock_node, &call->socket->calls);
-               clear_bit(RXRPC_CALL_HAS_USERID, &call->flags);
-               write_unlock_bh(&rx->call_lock);
-       }
-
-       read_lock_bh(&call->state_lock);
-       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
-           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
-               rxrpc_queue_call(call);
-       read_unlock_bh(&call->state_lock);
-}
-
-/*
- * receive a message from an RxRPC socket
- * - we need to be careful about two or more threads calling recvmsg
- *   simultaneously
- */
-int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
-                 int flags)
-{
-       struct rxrpc_skb_priv *sp;
-       struct rxrpc_call *call = NULL, *continue_call = NULL;
-       struct rxrpc_sock *rx = rxrpc_sk(sock->sk);
-       struct sk_buff *skb;
-       long timeo;
-       int copy, ret, ullen, offset, copied = 0;
-       u32 abort_code;
-
-       DEFINE_WAIT(wait);
-
-       _enter(",,,%zu,%d", len, flags);
-
-       if (flags & (MSG_OOB | MSG_TRUNC))
-               return -EOPNOTSUPP;
-
-       ullen = msg->msg_flags & MSG_CMSG_COMPAT ? 4 : sizeof(unsigned long);
-
-       timeo = sock_rcvtimeo(&rx->sk, flags & MSG_DONTWAIT);
-       msg->msg_flags |= MSG_MORE;
-
-       lock_sock(&rx->sk);
-
-       for (;;) {
-               /* return immediately if a client socket has no outstanding
-                * calls */
-               if (RB_EMPTY_ROOT(&rx->calls)) {
-                       if (copied)
-                               goto out;
-                       if (rx->sk.sk_state != RXRPC_SERVER_LISTENING) {
-                               release_sock(&rx->sk);
-                               if (continue_call)
-                                       rxrpc_put_call(continue_call);
-                               return -ENODATA;
-                       }
-               }
-
-               /* get the next message on the Rx queue */
-               skb = skb_peek(&rx->sk.sk_receive_queue);
-               if (!skb) {
-                       /* nothing remains on the queue */
-                       if (copied &&
-                           (flags & MSG_PEEK || timeo == 0))
-                               goto out;
-
-                       /* wait for a message to turn up */
-                       release_sock(&rx->sk);
-                       prepare_to_wait_exclusive(sk_sleep(&rx->sk), &wait,
-                                                 TASK_INTERRUPTIBLE);
-                       ret = sock_error(&rx->sk);
-                       if (ret)
-                               goto wait_error;
-
-                       if (skb_queue_empty(&rx->sk.sk_receive_queue)) {
-                               if (signal_pending(current))
-                                       goto wait_interrupted;
-                               timeo = schedule_timeout(timeo);
-                       }
-                       finish_wait(sk_sleep(&rx->sk), &wait);
-                       lock_sock(&rx->sk);
-                       continue;
-               }
-
-       peek_next_packet:
-               sp = rxrpc_skb(skb);
-               call = sp->call;
-               ASSERT(call != NULL);
-
-               _debug("next pkt %s", rxrpc_pkts[sp->hdr.type]);
-
-               /* make sure we wait for the state to be updated in this call */
-               spin_lock_bh(&call->lock);
-               spin_unlock_bh(&call->lock);
-
-               if (test_bit(RXRPC_CALL_RELEASED, &call->flags)) {
-                       _debug("packet from released call");
-                       if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
-                               BUG();
-                       rxrpc_free_skb(skb);
-                       continue;
-               }
-
-               /* determine whether to continue last data receive */
-               if (continue_call) {
-                       _debug("maybe cont");
-                       if (call != continue_call ||
-                           skb->mark != RXRPC_SKB_MARK_DATA) {
-                               release_sock(&rx->sk);
-                               rxrpc_put_call(continue_call);
-                               _leave(" = %d [noncont]", copied);
-                               return copied;
-                       }
-               }
-
-               rxrpc_get_call(call);
-
-               /* copy the peer address and timestamp */
-               if (!continue_call) {
-                       if (msg->msg_name) {
-                               size_t len =
-                                       sizeof(call->conn->trans->peer->srx);
-                               memcpy(msg->msg_name,
-                                      &call->conn->trans->peer->srx, len);
-                               msg->msg_namelen = len;
-                       }
-                       sock_recv_timestamp(msg, &rx->sk, skb);
-               }
-
-               /* receive the message */
-               if (skb->mark != RXRPC_SKB_MARK_DATA)
-                       goto receive_non_data_message;
-
-               _debug("recvmsg DATA #%u { %d, %d }",
-                      sp->hdr.seq, skb->len, sp->offset);
-
-               if (!continue_call) {
-                       /* only set the control data once per recvmsg() */
-                       ret = put_cmsg(msg, SOL_RXRPC, RXRPC_USER_CALL_ID,
-                                      ullen, &call->user_call_ID);
-                       if (ret < 0)
-                               goto copy_error;
-                       ASSERT(test_bit(RXRPC_CALL_HAS_USERID, &call->flags));
-               }
-
-               ASSERTCMP(sp->hdr.seq, >=, call->rx_data_recv);
-               ASSERTCMP(sp->hdr.seq, <=, call->rx_data_recv + 1);
-               call->rx_data_recv = sp->hdr.seq;
-
-               ASSERTCMP(sp->hdr.seq, >, call->rx_data_eaten);
-
-               offset = sp->offset;
-               copy = skb->len - offset;
-               if (copy > len - copied)
-                       copy = len - copied;
-
-               ret = skb_copy_datagram_msg(skb, offset, msg, copy);
-
-               if (ret < 0)
-                       goto copy_error;
-
-               /* handle piecemeal consumption of data packets */
-               _debug("copied %d+%d", copy, copied);
-
-               offset += copy;
-               copied += copy;
-
-               if (!(flags & MSG_PEEK))
-                       sp->offset = offset;
-
-               if (sp->offset < skb->len) {
-                       _debug("buffer full");
-                       ASSERTCMP(copied, ==, len);
-                       break;
-               }
-
-               /* we transferred the whole data packet */
-               if (sp->hdr.flags & RXRPC_LAST_PACKET) {
-                       _debug("last");
-                       if (call->conn->out_clientflag) {
-                                /* last byte of reply received */
-                               ret = copied;
-                               goto terminal_message;
-                       }
-
-                       /* last bit of request received */
-                       if (!(flags & MSG_PEEK)) {
-                               _debug("eat packet");
-                               if (skb_dequeue(&rx->sk.sk_receive_queue) !=
-                                   skb)
-                                       BUG();
-                               rxrpc_free_skb(skb);
-                       }
-                       msg->msg_flags &= ~MSG_MORE;
-                       break;
-               }
-
-               /* move on to the next data message */
-               _debug("next");
-               if (!continue_call)
-                       continue_call = sp->call;
-               else
-                       rxrpc_put_call(call);
-               call = NULL;
-
-               if (flags & MSG_PEEK) {
-                       _debug("peek next");
-                       skb = skb->next;
-                       if (skb == (struct sk_buff *) &rx->sk.sk_receive_queue)
-                               break;
-                       goto peek_next_packet;
-               }
-
-               _debug("eat packet");
-               if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
-                       BUG();
-               rxrpc_free_skb(skb);
-       }
-
-       /* end of non-terminal data packet reception for the moment */
-       _debug("end rcv data");
-out:
-       release_sock(&rx->sk);
-       if (call)
-               rxrpc_put_call(call);
-       if (continue_call)
-               rxrpc_put_call(continue_call);
-       _leave(" = %d [data]", copied);
-       return copied;
-
-       /* handle non-DATA messages such as aborts, incoming connections and
-        * final ACKs */
-receive_non_data_message:
-       _debug("non-data");
-
-       if (skb->mark == RXRPC_SKB_MARK_NEW_CALL) {
-               _debug("RECV NEW CALL");
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_NEW_CALL, 0, &abort_code);
-               if (ret < 0)
-                       goto copy_error;
-               if (!(flags & MSG_PEEK)) {
-                       if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
-                               BUG();
-                       rxrpc_free_skb(skb);
-               }
-               goto out;
-       }
-
-       ret = put_cmsg(msg, SOL_RXRPC, RXRPC_USER_CALL_ID,
-                      ullen, &call->user_call_ID);
-       if (ret < 0)
-               goto copy_error;
-       ASSERT(test_bit(RXRPC_CALL_HAS_USERID, &call->flags));
-
-       switch (skb->mark) {
-       case RXRPC_SKB_MARK_DATA:
-               BUG();
-       case RXRPC_SKB_MARK_FINAL_ACK:
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ACK, 0, &abort_code);
-               break;
-       case RXRPC_SKB_MARK_BUSY:
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_BUSY, 0, &abort_code);
-               break;
-       case RXRPC_SKB_MARK_REMOTE_ABORT:
-               abort_code = call->remote_abort;
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ABORT, 4, &abort_code);
-               break;
-       case RXRPC_SKB_MARK_LOCAL_ABORT:
-               abort_code = call->local_abort;
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ABORT, 4, &abort_code);
-               break;
-       case RXRPC_SKB_MARK_NET_ERROR:
-               _debug("RECV NET ERROR %d", sp->error);
-               abort_code = sp->error;
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_NET_ERROR, 4, &abort_code);
-               break;
-       case RXRPC_SKB_MARK_LOCAL_ERROR:
-               _debug("RECV LOCAL ERROR %d", sp->error);
-               abort_code = sp->error;
-               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_LOCAL_ERROR, 4,
-                              &abort_code);
-               break;
-       default:
-               pr_err("Unknown packet mark %u\n", skb->mark);
-               BUG();
-               break;
-       }
-
-       if (ret < 0)
-               goto copy_error;
-
-terminal_message:
-       _debug("terminal");
-       msg->msg_flags &= ~MSG_MORE;
-       msg->msg_flags |= MSG_EOR;
-
-       if (!(flags & MSG_PEEK)) {
-               _net("free terminal skb %p", skb);
-               if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
-                       BUG();
-               rxrpc_free_skb(skb);
-               rxrpc_remove_user_ID(rx, call);
-       }
-
-       release_sock(&rx->sk);
-       rxrpc_put_call(call);
-       if (continue_call)
-               rxrpc_put_call(continue_call);
-       _leave(" = %d", ret);
-       return ret;
-
-copy_error:
-       _debug("copy error");
-       release_sock(&rx->sk);
-       rxrpc_put_call(call);
-       if (continue_call)
-               rxrpc_put_call(continue_call);
-       _leave(" = %d", ret);
-       return ret;
-
-wait_interrupted:
-       ret = sock_intr_errno(timeo);
-wait_error:
-       finish_wait(sk_sleep(&rx->sk), &wait);
-       if (continue_call)
-               rxrpc_put_call(continue_call);
-       if (copied)
-               copied = ret;
-       _leave(" = %d [waitfail %d]", copied, ret);
-       return copied;
-
-}
-
-/**
- * rxrpc_kernel_data_delivered - Record delivery of data message
- * @skb: Message holding data
- *
- * Record the delivery of a data message.  This permits RxRPC to keep its
- * tracking correct.  The socket buffer will be deleted.
- */
-void rxrpc_kernel_data_delivered(struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       struct rxrpc_call *call = sp->call;
-
-       ASSERTCMP(sp->hdr.seq, >=, call->rx_data_recv);
-       ASSERTCMP(sp->hdr.seq, <=, call->rx_data_recv + 1);
-       call->rx_data_recv = sp->hdr.seq;
-
-       ASSERTCMP(sp->hdr.seq, >, call->rx_data_eaten);
-       rxrpc_free_skb(skb);
-}
-
-EXPORT_SYMBOL(rxrpc_kernel_data_delivered);
-
-/**
- * rxrpc_kernel_is_data_last - Determine if data message is last one
- * @skb: Message holding data
- *
- * Determine if data message is last one for the parent call.
- */
-bool rxrpc_kernel_is_data_last(struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-
-       ASSERTCMP(skb->mark, ==, RXRPC_SKB_MARK_DATA);
-
-       return sp->hdr.flags & RXRPC_LAST_PACKET;
-}
-
-EXPORT_SYMBOL(rxrpc_kernel_is_data_last);
-
-/**
- * rxrpc_kernel_get_abort_code - Get the abort code from an RxRPC abort message
- * @skb: Message indicating an abort
- *
- * Get the abort code from an RxRPC abort message.
- */
-u32 rxrpc_kernel_get_abort_code(struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-
-       switch (skb->mark) {
-       case RXRPC_SKB_MARK_REMOTE_ABORT:
-               return sp->call->remote_abort;
-       case RXRPC_SKB_MARK_LOCAL_ABORT:
-               return sp->call->local_abort;
-       default:
-               BUG();
-       }
-}
-
-EXPORT_SYMBOL(rxrpc_kernel_get_abort_code);
-
-/**
- * rxrpc_kernel_get_error - Get the error number from an RxRPC error message
- * @skb: Message indicating an error
- *
- * Get the error number from an RxRPC error message.
- */
-int rxrpc_kernel_get_error_number(struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-
-       return sp->error;
-}
-
-EXPORT_SYMBOL(rxrpc_kernel_get_error_number);
diff --git a/net/rxrpc/ar-security.c b/net/rxrpc/ar-security.c
deleted file mode 100644 (file)
index d223253..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-/* RxRPC security handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/udp.h>
-#include <linux/crypto.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include <keys/rxrpc-type.h>
-#include "ar-internal.h"
-
-static LIST_HEAD(rxrpc_security_methods);
-static DECLARE_RWSEM(rxrpc_security_sem);
-
-static const struct rxrpc_security *rxrpc_security_types[] = {
-       [RXRPC_SECURITY_NONE]   = &rxrpc_no_security,
-#ifdef CONFIG_RXKAD
-       [RXRPC_SECURITY_RXKAD]  = &rxkad,
-#endif
-};
-
-int __init rxrpc_init_security(void)
-{
-       int i, ret;
-
-       for (i = 0; i < ARRAY_SIZE(rxrpc_security_types); i++) {
-               if (rxrpc_security_types[i]) {
-                       ret = rxrpc_security_types[i]->init();
-                       if (ret < 0)
-                               goto failed;
-               }
-       }
-
-       return 0;
-
-failed:
-       for (i--; i >= 0; i--)
-               if (rxrpc_security_types[i])
-                       rxrpc_security_types[i]->exit();
-       return ret;
-}
-
-void rxrpc_exit_security(void)
-{
-       int i;
-
-       for (i = 0; i < ARRAY_SIZE(rxrpc_security_types); i++)
-               if (rxrpc_security_types[i])
-                       rxrpc_security_types[i]->exit();
-}
-
-/*
- * look up an rxrpc security module
- */
-static const struct rxrpc_security *rxrpc_security_lookup(u8 security_index)
-{
-       if (security_index >= ARRAY_SIZE(rxrpc_security_types))
-               return NULL;
-       return rxrpc_security_types[security_index];
-}
-
-/*
- * initialise the security on a client connection
- */
-int rxrpc_init_client_conn_security(struct rxrpc_connection *conn)
-{
-       const struct rxrpc_security *sec;
-       struct rxrpc_key_token *token;
-       struct key *key = conn->key;
-       int ret;
-
-       _enter("{%d},{%x}", conn->debug_id, key_serial(key));
-
-       if (!key)
-               return 0;
-
-       ret = key_validate(key);
-       if (ret < 0)
-               return ret;
-
-       token = key->payload.data[0];
-       if (!token)
-               return -EKEYREJECTED;
-
-       sec = rxrpc_security_lookup(token->security_index);
-       if (!sec)
-               return -EKEYREJECTED;
-       conn->security = sec;
-
-       ret = conn->security->init_connection_security(conn);
-       if (ret < 0) {
-               conn->security = &rxrpc_no_security;
-               return ret;
-       }
-
-       _leave(" = 0");
-       return 0;
-}
-
-/*
- * initialise the security on a server connection
- */
-int rxrpc_init_server_conn_security(struct rxrpc_connection *conn)
-{
-       const struct rxrpc_security *sec;
-       struct rxrpc_local *local = conn->trans->local;
-       struct rxrpc_sock *rx;
-       struct key *key;
-       key_ref_t kref;
-       char kdesc[5 + 1 + 3 + 1];
-
-       _enter("");
-
-       sprintf(kdesc, "%u:%u", conn->service_id, conn->security_ix);
-
-       sec = rxrpc_security_lookup(conn->security_ix);
-       if (!sec) {
-               _leave(" = -ENOKEY [lookup]");
-               return -ENOKEY;
-       }
-
-       /* find the service */
-       read_lock_bh(&local->services_lock);
-       list_for_each_entry(rx, &local->services, listen_link) {
-               if (rx->srx.srx_service == conn->service_id)
-                       goto found_service;
-       }
-
-       /* the service appears to have died */
-       read_unlock_bh(&local->services_lock);
-       _leave(" = -ENOENT");
-       return -ENOENT;
-
-found_service:
-       if (!rx->securities) {
-               read_unlock_bh(&local->services_lock);
-               _leave(" = -ENOKEY");
-               return -ENOKEY;
-       }
-
-       /* look through the service's keyring */
-       kref = keyring_search(make_key_ref(rx->securities, 1UL),
-                             &key_type_rxrpc_s, kdesc);
-       if (IS_ERR(kref)) {
-               read_unlock_bh(&local->services_lock);
-               _leave(" = %ld [search]", PTR_ERR(kref));
-               return PTR_ERR(kref);
-       }
-
-       key = key_ref_to_ptr(kref);
-       read_unlock_bh(&local->services_lock);
-
-       conn->server_key = key;
-       conn->security = sec;
-
-       _leave(" = 0");
-       return 0;
-}
diff --git a/net/rxrpc/ar-skbuff.c b/net/rxrpc/ar-skbuff.c
deleted file mode 100644 (file)
index eee0cfd..0000000
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ar-skbuff.c: socket buffer destruction handling
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * set up for the ACK at the end of the receive phase when we discard the final
- * receive phase data packet
- * - called with softirqs disabled
- */
-static void rxrpc_request_final_ACK(struct rxrpc_call *call)
-{
-       /* the call may be aborted before we have a chance to ACK it */
-       write_lock(&call->state_lock);
-
-       switch (call->state) {
-       case RXRPC_CALL_CLIENT_RECV_REPLY:
-               call->state = RXRPC_CALL_CLIENT_FINAL_ACK;
-               _debug("request final ACK");
-
-               /* get an extra ref on the call for the final-ACK generator to
-                * release */
-               rxrpc_get_call(call);
-               set_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events);
-               if (try_to_del_timer_sync(&call->ack_timer) >= 0)
-                       rxrpc_queue_call(call);
-               break;
-
-       case RXRPC_CALL_SERVER_RECV_REQUEST:
-               call->state = RXRPC_CALL_SERVER_ACK_REQUEST;
-       default:
-               break;
-       }
-
-       write_unlock(&call->state_lock);
-}
-
-/*
- * drop the bottom ACK off of the call ACK window and advance the window
- */
-static void rxrpc_hard_ACK_data(struct rxrpc_call *call,
-                               struct rxrpc_skb_priv *sp)
-{
-       int loop;
-       u32 seq;
-
-       spin_lock_bh(&call->lock);
-
-       _debug("hard ACK #%u", sp->hdr.seq);
-
-       for (loop = 0; loop < RXRPC_ACKR_WINDOW_ASZ; loop++) {
-               call->ackr_window[loop] >>= 1;
-               call->ackr_window[loop] |=
-                       call->ackr_window[loop + 1] << (BITS_PER_LONG - 1);
-       }
-
-       seq = sp->hdr.seq;
-       ASSERTCMP(seq, ==, call->rx_data_eaten + 1);
-       call->rx_data_eaten = seq;
-
-       if (call->ackr_win_top < UINT_MAX)
-               call->ackr_win_top++;
-
-       ASSERTIFCMP(call->state <= RXRPC_CALL_COMPLETE,
-                   call->rx_data_post, >=, call->rx_data_recv);
-       ASSERTIFCMP(call->state <= RXRPC_CALL_COMPLETE,
-                   call->rx_data_recv, >=, call->rx_data_eaten);
-
-       if (sp->hdr.flags & RXRPC_LAST_PACKET) {
-               rxrpc_request_final_ACK(call);
-       } else if (atomic_dec_and_test(&call->ackr_not_idle) &&
-                  test_and_clear_bit(RXRPC_CALL_TX_SOFT_ACK, &call->flags)) {
-               /* We previously soft-ACK'd some received packets that have now
-                * been consumed, so send a hard-ACK if no more packets are
-                * immediately forthcoming to allow the transmitter to free up
-                * its Tx bufferage.
-                */
-               _debug("send Rx idle ACK");
-               __rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, sp->hdr.serial,
-                                   false);
-       }
-
-       spin_unlock_bh(&call->lock);
-}
-
-/*
- * destroy a packet that has an RxRPC control buffer
- * - advance the hard-ACK state of the parent call (done here in case something
- *   in the kernel bypasses recvmsg() and steals the packet directly off of the
- *   socket receive queue)
- */
-void rxrpc_packet_destructor(struct sk_buff *skb)
-{
-       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
-       struct rxrpc_call *call = sp->call;
-
-       _enter("%p{%p}", skb, call);
-
-       if (call) {
-               /* send the final ACK on a client call */
-               if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA)
-                       rxrpc_hard_ACK_data(call, sp);
-               rxrpc_put_call(call);
-               sp->call = NULL;
-       }
-
-       if (skb->sk)
-               sock_rfree(skb);
-       _leave("");
-}
-
-/**
- * rxrpc_kernel_free_skb - Free an RxRPC socket buffer
- * @skb: The socket buffer to be freed
- *
- * Let RxRPC free its own socket buffer, permitting it to maintain debug
- * accounting.
- */
-void rxrpc_kernel_free_skb(struct sk_buff *skb)
-{
-       rxrpc_free_skb(skb);
-}
-EXPORT_SYMBOL(rxrpc_kernel_free_skb);
diff --git a/net/rxrpc/ar-transport.c b/net/rxrpc/ar-transport.c
deleted file mode 100644 (file)
index a1b6518..0000000
+++ /dev/null
@@ -1,286 +0,0 @@
-/* RxRPC point-to-point transport session management
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
-#include <linux/module.h>
-#include <linux/net.h>
-#include <linux/skbuff.h>
-#include <linux/slab.h>
-#include <net/sock.h>
-#include <net/af_rxrpc.h>
-#include "ar-internal.h"
-
-/*
- * Time after last use at which transport record is cleaned up.
- */
-unsigned int rxrpc_transport_expiry = 3600 * 24;
-
-static void rxrpc_transport_reaper(struct work_struct *work);
-
-static LIST_HEAD(rxrpc_transports);
-static DEFINE_RWLOCK(rxrpc_transport_lock);
-static DECLARE_DELAYED_WORK(rxrpc_transport_reap, rxrpc_transport_reaper);
-
-/*
- * allocate a new transport session manager
- */
-static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
-                                                    struct rxrpc_peer *peer,
-                                                    gfp_t gfp)
-{
-       struct rxrpc_transport *trans;
-
-       _enter("");
-
-       trans = kzalloc(sizeof(struct rxrpc_transport), gfp);
-       if (trans) {
-               trans->local = local;
-               trans->peer = peer;
-               INIT_LIST_HEAD(&trans->link);
-               trans->bundles = RB_ROOT;
-               trans->client_conns = RB_ROOT;
-               trans->server_conns = RB_ROOT;
-               skb_queue_head_init(&trans->error_queue);
-               spin_lock_init(&trans->client_lock);
-               rwlock_init(&trans->conn_lock);
-               atomic_set(&trans->usage, 1);
-               trans->conn_idcounter = peer->srx.srx_service << 16;
-               trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
-
-               if (peer->srx.transport.family == AF_INET) {
-                       switch (peer->srx.transport_type) {
-                       case SOCK_DGRAM:
-                               INIT_WORK(&trans->error_handler,
-                                         rxrpc_UDP_error_handler);
-                               break;
-                       default:
-                               BUG();
-                               break;
-                       }
-               } else {
-                       BUG();
-               }
-       }
-
-       _leave(" = %p", trans);
-       return trans;
-}
-
-/*
- * obtain a transport session for the nominated endpoints
- */
-struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *local,
-                                           struct rxrpc_peer *peer,
-                                           gfp_t gfp)
-{
-       struct rxrpc_transport *trans, *candidate;
-       const char *new = "old";
-       int usage;
-
-       _enter("{%pI4+%hu},{%pI4+%hu},",
-              &local->srx.transport.sin.sin_addr,
-              ntohs(local->srx.transport.sin.sin_port),
-              &peer->srx.transport.sin.sin_addr,
-              ntohs(peer->srx.transport.sin.sin_port));
-
-       /* search the transport list first */
-       read_lock_bh(&rxrpc_transport_lock);
-       list_for_each_entry(trans, &rxrpc_transports, link) {
-               if (trans->local == local && trans->peer == peer)
-                       goto found_extant_transport;
-       }
-       read_unlock_bh(&rxrpc_transport_lock);
-
-       /* not yet present - create a candidate for a new record and then
-        * redo the search */
-       candidate = rxrpc_alloc_transport(local, peer, gfp);
-       if (!candidate) {
-               _leave(" = -ENOMEM");
-               return ERR_PTR(-ENOMEM);
-       }
-
-       write_lock_bh(&rxrpc_transport_lock);
-
-       list_for_each_entry(trans, &rxrpc_transports, link) {
-               if (trans->local == local && trans->peer == peer)
-                       goto found_extant_second;
-       }
-
-       /* we can now add the new candidate to the list */
-       trans = candidate;
-       candidate = NULL;
-       usage = atomic_read(&trans->usage);
-
-       rxrpc_get_local(trans->local);
-       atomic_inc(&trans->peer->usage);
-       list_add_tail(&trans->link, &rxrpc_transports);
-       write_unlock_bh(&rxrpc_transport_lock);
-       new = "new";
-
-success:
-       _net("TRANSPORT %s %d local %d -> peer %d",
-            new,
-            trans->debug_id,
-            trans->local->debug_id,
-            trans->peer->debug_id);
-
-       _leave(" = %p {u=%d}", trans, usage);
-       return trans;
-
-       /* we found the transport in the list immediately */
-found_extant_transport:
-       usage = atomic_inc_return(&trans->usage);
-       read_unlock_bh(&rxrpc_transport_lock);
-       goto success;
-
-       /* we found the transport on the second time through the list */
-found_extant_second:
-       usage = atomic_inc_return(&trans->usage);
-       write_unlock_bh(&rxrpc_transport_lock);
-       kfree(candidate);
-       goto success;
-}
-
-/*
- * find the transport connecting two endpoints
- */
-struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *local,
-                                            struct rxrpc_peer *peer)
-{
-       struct rxrpc_transport *trans;
-
-       _enter("{%pI4+%hu},{%pI4+%hu},",
-              &local->srx.transport.sin.sin_addr,
-              ntohs(local->srx.transport.sin.sin_port),
-              &peer->srx.transport.sin.sin_addr,
-              ntohs(peer->srx.transport.sin.sin_port));
-
-       /* search the transport list */
-       read_lock_bh(&rxrpc_transport_lock);
-
-       list_for_each_entry(trans, &rxrpc_transports, link) {
-               if (trans->local == local && trans->peer == peer)
-                       goto found_extant_transport;
-       }
-
-       read_unlock_bh(&rxrpc_transport_lock);
-       _leave(" = NULL");
-       return NULL;
-
-found_extant_transport:
-       atomic_inc(&trans->usage);
-       read_unlock_bh(&rxrpc_transport_lock);
-       _leave(" = %p", trans);
-       return trans;
-}
-
-/*
- * release a transport session
- */
-void rxrpc_put_transport(struct rxrpc_transport *trans)
-{
-       _enter("%p{u=%d}", trans, atomic_read(&trans->usage));
-
-       ASSERTCMP(atomic_read(&trans->usage), >, 0);
-
-       trans->put_time = ktime_get_seconds();
-       if (unlikely(atomic_dec_and_test(&trans->usage))) {
-               _debug("zombie");
-               /* let the reaper determine the timeout to avoid a race with
-                * overextending the timeout if the reaper is running at the
-                * same time */
-               rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
-       }
-       _leave("");
-}
-
-/*
- * clean up a transport session
- */
-static void rxrpc_cleanup_transport(struct rxrpc_transport *trans)
-{
-       _net("DESTROY TRANS %d", trans->debug_id);
-
-       rxrpc_purge_queue(&trans->error_queue);
-
-       rxrpc_put_local(trans->local);
-       rxrpc_put_peer(trans->peer);
-       kfree(trans);
-}
-
-/*
- * reap dead transports that have passed their expiry date
- */
-static void rxrpc_transport_reaper(struct work_struct *work)
-{
-       struct rxrpc_transport *trans, *_p;
-       unsigned long now, earliest, reap_time;
-
-       LIST_HEAD(graveyard);
-
-       _enter("");
-
-       now = ktime_get_seconds();
-       earliest = ULONG_MAX;
-
-       /* extract all the transports that have been dead too long */
-       write_lock_bh(&rxrpc_transport_lock);
-       list_for_each_entry_safe(trans, _p, &rxrpc_transports, link) {
-               _debug("reap TRANS %d { u=%d t=%ld }",
-                      trans->debug_id, atomic_read(&trans->usage),
-                      (long) now - (long) trans->put_time);
-
-               if (likely(atomic_read(&trans->usage) > 0))
-                       continue;
-
-               reap_time = trans->put_time + rxrpc_transport_expiry;
-               if (reap_time <= now)
-                       list_move_tail(&trans->link, &graveyard);
-               else if (reap_time < earliest)
-                       earliest = reap_time;
-       }
-       write_unlock_bh(&rxrpc_transport_lock);
-
-       if (earliest != ULONG_MAX) {
-               _debug("reschedule reaper %ld", (long) earliest - now);
-               ASSERTCMP(earliest, >, now);
-               rxrpc_queue_delayed_work(&rxrpc_transport_reap,
-                                        (earliest - now) * HZ);
-       }
-
-       /* then destroy all those pulled out */
-       while (!list_empty(&graveyard)) {
-               trans = list_entry(graveyard.next, struct rxrpc_transport,
-                                  link);
-               list_del_init(&trans->link);
-
-               ASSERTCMP(atomic_read(&trans->usage), ==, 0);
-               rxrpc_cleanup_transport(trans);
-       }
-
-       _leave("");
-}
-
-/*
- * preemptively destroy all the transport session records rather than waiting
- * for them to time out
- */
-void __exit rxrpc_destroy_all_transports(void)
-{
-       _enter("");
-
-       rxrpc_transport_expiry = 0;
-       cancel_delayed_work(&rxrpc_transport_reap);
-       rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
-
-       _leave("");
-}
diff --git a/net/rxrpc/call_accept.c b/net/rxrpc/call_accept.c
new file mode 100644 (file)
index 0000000..eea5f4a
--- /dev/null
@@ -0,0 +1,518 @@
+/* incoming call handling
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/errqueue.h>
+#include <linux/udp.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/icmp.h>
+#include <linux/gfp.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <net/ip.h>
+#include "ar-internal.h"
+
+/*
+ * generate a connection-level abort
+ */
+static int rxrpc_busy(struct rxrpc_local *local, struct sockaddr_rxrpc *srx,
+                     struct rxrpc_wire_header *whdr)
+{
+       struct msghdr msg;
+       struct kvec iov[1];
+       size_t len;
+       int ret;
+
+       _enter("%d,,", local->debug_id);
+
+       whdr->type      = RXRPC_PACKET_TYPE_BUSY;
+       whdr->serial    = htonl(1);
+
+       msg.msg_name    = &srx->transport.sin;
+       msg.msg_namelen = sizeof(srx->transport.sin);
+       msg.msg_control = NULL;
+       msg.msg_controllen = 0;
+       msg.msg_flags   = 0;
+
+       iov[0].iov_base = whdr;
+       iov[0].iov_len  = sizeof(*whdr);
+
+       len = iov[0].iov_len;
+
+       _proto("Tx BUSY %%1");
+
+       ret = kernel_sendmsg(local->socket, &msg, iov, 1, len);
+       if (ret < 0) {
+               _leave(" = -EAGAIN [sendmsg failed: %d]", ret);
+               return -EAGAIN;
+       }
+
+       _leave(" = 0");
+       return 0;
+}
+
+/*
+ * accept an incoming call that needs peer, transport and/or connection setting
+ * up
+ */
+static int rxrpc_accept_incoming_call(struct rxrpc_local *local,
+                                     struct rxrpc_sock *rx,
+                                     struct sk_buff *skb,
+                                     struct sockaddr_rxrpc *srx)
+{
+       struct rxrpc_connection *conn;
+       struct rxrpc_transport *trans;
+       struct rxrpc_skb_priv *sp, *nsp;
+       struct rxrpc_peer *peer;
+       struct rxrpc_call *call;
+       struct sk_buff *notification;
+       int ret;
+
+       _enter("");
+
+       sp = rxrpc_skb(skb);
+
+       /* get a notification message to send to the server app */
+       notification = alloc_skb(0, GFP_NOFS);
+       if (!notification) {
+               _debug("no memory");
+               ret = -ENOMEM;
+               goto error_nofree;
+       }
+       rxrpc_new_skb(notification);
+       notification->mark = RXRPC_SKB_MARK_NEW_CALL;
+
+       peer = rxrpc_get_peer(srx, GFP_NOIO);
+       if (IS_ERR(peer)) {
+               _debug("no peer");
+               ret = -EBUSY;
+               goto error;
+       }
+
+       trans = rxrpc_get_transport(local, peer, GFP_NOIO);
+       rxrpc_put_peer(peer);
+       if (IS_ERR(trans)) {
+               _debug("no trans");
+               ret = -EBUSY;
+               goto error;
+       }
+
+       conn = rxrpc_incoming_connection(trans, &sp->hdr);
+       rxrpc_put_transport(trans);
+       if (IS_ERR(conn)) {
+               _debug("no conn");
+               ret = PTR_ERR(conn);
+               goto error;
+       }
+
+       call = rxrpc_incoming_call(rx, conn, &sp->hdr);
+       rxrpc_put_connection(conn);
+       if (IS_ERR(call)) {
+               _debug("no call");
+               ret = PTR_ERR(call);
+               goto error;
+       }
+
+       /* attach the call to the socket */
+       read_lock_bh(&local->services_lock);
+       if (rx->sk.sk_state == RXRPC_CLOSE)
+               goto invalid_service;
+
+       write_lock(&rx->call_lock);
+       if (!test_and_set_bit(RXRPC_CALL_INIT_ACCEPT, &call->flags)) {
+               rxrpc_get_call(call);
+
+               spin_lock(&call->conn->state_lock);
+               if (sp->hdr.securityIndex > 0 &&
+                   call->conn->state == RXRPC_CONN_SERVER_UNSECURED) {
+                       _debug("await conn sec");
+                       list_add_tail(&call->accept_link, &rx->secureq);
+                       call->conn->state = RXRPC_CONN_SERVER_CHALLENGING;
+                       atomic_inc(&call->conn->usage);
+                       set_bit(RXRPC_CONN_CHALLENGE, &call->conn->events);
+                       rxrpc_queue_conn(call->conn);
+               } else {
+                       _debug("conn ready");
+                       call->state = RXRPC_CALL_SERVER_ACCEPTING;
+                       list_add_tail(&call->accept_link, &rx->acceptq);
+                       rxrpc_get_call(call);
+                       nsp = rxrpc_skb(notification);
+                       nsp->call = call;
+
+                       ASSERTCMP(atomic_read(&call->usage), >=, 3);
+
+                       _debug("notify");
+                       spin_lock(&call->lock);
+                       ret = rxrpc_queue_rcv_skb(call, notification, true,
+                                                 false);
+                       spin_unlock(&call->lock);
+                       notification = NULL;
+                       BUG_ON(ret < 0);
+               }
+               spin_unlock(&call->conn->state_lock);
+
+               _debug("queued");
+       }
+       write_unlock(&rx->call_lock);
+
+       _debug("process");
+       rxrpc_fast_process_packet(call, skb);
+
+       _debug("done");
+       read_unlock_bh(&local->services_lock);
+       rxrpc_free_skb(notification);
+       rxrpc_put_call(call);
+       _leave(" = 0");
+       return 0;
+
+invalid_service:
+       _debug("invalid");
+       read_unlock_bh(&local->services_lock);
+
+       read_lock_bh(&call->state_lock);
+       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
+               rxrpc_get_call(call);
+               rxrpc_queue_call(call);
+       }
+       read_unlock_bh(&call->state_lock);
+       rxrpc_put_call(call);
+       ret = -ECONNREFUSED;
+error:
+       rxrpc_free_skb(notification);
+error_nofree:
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * accept incoming calls that need peer, transport and/or connection setting up
+ * - the packets we get are all incoming client DATA packets that have seq == 1
+ */
+void rxrpc_accept_incoming_calls(struct work_struct *work)
+{
+       struct rxrpc_local *local =
+               container_of(work, struct rxrpc_local, acceptor);
+       struct rxrpc_skb_priv *sp;
+       struct sockaddr_rxrpc srx;
+       struct rxrpc_sock *rx;
+       struct rxrpc_wire_header whdr;
+       struct sk_buff *skb;
+       int ret;
+
+       _enter("%d", local->debug_id);
+
+       read_lock_bh(&rxrpc_local_lock);
+       if (atomic_read(&local->usage) > 0)
+               rxrpc_get_local(local);
+       else
+               local = NULL;
+       read_unlock_bh(&rxrpc_local_lock);
+       if (!local) {
+               _leave(" [local dead]");
+               return;
+       }
+
+process_next_packet:
+       skb = skb_dequeue(&local->accept_queue);
+       if (!skb) {
+               rxrpc_put_local(local);
+               _leave("\n");
+               return;
+       }
+
+       _net("incoming call skb %p", skb);
+
+       sp = rxrpc_skb(skb);
+
+       /* Set up a response packet header in case we need it */
+       whdr.epoch      = htonl(sp->hdr.epoch);
+       whdr.cid        = htonl(sp->hdr.cid);
+       whdr.callNumber = htonl(sp->hdr.callNumber);
+       whdr.seq        = htonl(sp->hdr.seq);
+       whdr.serial     = 0;
+       whdr.flags      = 0;
+       whdr.type       = 0;
+       whdr.userStatus = 0;
+       whdr.securityIndex = sp->hdr.securityIndex;
+       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;
+       }
+
+       /* get the socket providing the service */
+       read_lock_bh(&local->services_lock);
+       list_for_each_entry(rx, &local->services, listen_link) {
+               if (rx->srx.srx_service == sp->hdr.serviceId &&
+                   rx->sk.sk_state != RXRPC_CLOSE)
+                       goto found_service;
+       }
+       read_unlock_bh(&local->services_lock);
+       goto invalid_service;
+
+found_service:
+       _debug("found service %hd", rx->srx.srx_service);
+       if (sk_acceptq_is_full(&rx->sk))
+               goto backlog_full;
+       sk_acceptq_added(&rx->sk);
+       sock_hold(&rx->sk);
+       read_unlock_bh(&local->services_lock);
+
+       ret = rxrpc_accept_incoming_call(local, rx, skb, &srx);
+       if (ret < 0)
+               sk_acceptq_removed(&rx->sk);
+       sock_put(&rx->sk);
+       switch (ret) {
+       case -ECONNRESET: /* old calls are ignored */
+       case -ECONNABORTED: /* aborted calls are reaborted or ignored */
+       case 0:
+               goto process_next_packet;
+       case -ECONNREFUSED:
+               goto invalid_service;
+       case -EBUSY:
+               goto busy;
+       case -EKEYREJECTED:
+               goto security_mismatch;
+       default:
+               BUG();
+       }
+
+backlog_full:
+       read_unlock_bh(&local->services_lock);
+busy:
+       rxrpc_busy(local, &srx, &whdr);
+       rxrpc_free_skb(skb);
+       goto process_next_packet;
+
+invalid_service:
+       skb->priority = RX_INVALID_OPERATION;
+       rxrpc_reject_packet(local, skb);
+       goto process_next_packet;
+
+       /* can't change connection security type mid-flow */
+security_mismatch:
+       skb->priority = RX_PROTOCOL_ERROR;
+       rxrpc_reject_packet(local, skb);
+       goto process_next_packet;
+}
+
+/*
+ * handle acceptance of a call by userspace
+ * - assign the user call ID to the call at the front of the queue
+ */
+struct rxrpc_call *rxrpc_accept_call(struct rxrpc_sock *rx,
+                                    unsigned long user_call_ID)
+{
+       struct rxrpc_call *call;
+       struct rb_node *parent, **pp;
+       int ret;
+
+       _enter(",%lx", user_call_ID);
+
+       ASSERT(!irqs_disabled());
+
+       write_lock(&rx->call_lock);
+
+       ret = -ENODATA;
+       if (list_empty(&rx->acceptq))
+               goto out;
+
+       /* check the user ID isn't already in use */
+       ret = -EBADSLT;
+       pp = &rx->calls.rb_node;
+       parent = NULL;
+       while (*pp) {
+               parent = *pp;
+               call = rb_entry(parent, struct rxrpc_call, sock_node);
+
+               if (user_call_ID < call->user_call_ID)
+                       pp = &(*pp)->rb_left;
+               else if (user_call_ID > call->user_call_ID)
+                       pp = &(*pp)->rb_right;
+               else
+                       goto out;
+       }
+
+       /* dequeue the first call and check it's still valid */
+       call = list_entry(rx->acceptq.next, struct rxrpc_call, accept_link);
+       list_del_init(&call->accept_link);
+       sk_acceptq_removed(&rx->sk);
+
+       write_lock_bh(&call->state_lock);
+       switch (call->state) {
+       case RXRPC_CALL_SERVER_ACCEPTING:
+               call->state = RXRPC_CALL_SERVER_RECV_REQUEST;
+               break;
+       case RXRPC_CALL_REMOTELY_ABORTED:
+       case RXRPC_CALL_LOCALLY_ABORTED:
+               ret = -ECONNABORTED;
+               goto out_release;
+       case RXRPC_CALL_NETWORK_ERROR:
+               ret = call->conn->error;
+               goto out_release;
+       case RXRPC_CALL_DEAD:
+               ret = -ETIME;
+               goto out_discard;
+       default:
+               BUG();
+       }
+
+       /* formalise the acceptance */
+       call->user_call_ID = user_call_ID;
+       rb_link_node(&call->sock_node, parent, pp);
+       rb_insert_color(&call->sock_node, &rx->calls);
+       if (test_and_set_bit(RXRPC_CALL_HAS_USERID, &call->flags))
+               BUG();
+       if (test_and_set_bit(RXRPC_CALL_EV_ACCEPTED, &call->events))
+               BUG();
+       rxrpc_queue_call(call);
+
+       rxrpc_get_call(call);
+       write_unlock_bh(&call->state_lock);
+       write_unlock(&rx->call_lock);
+       _leave(" = %p{%d}", call, call->debug_id);
+       return call;
+
+       /* if the call is already dying or dead, then we leave the socket's ref
+        * on it to be released by rxrpc_dead_call_expired() as induced by
+        * rxrpc_release_call() */
+out_release:
+       _debug("release %p", call);
+       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
+               rxrpc_queue_call(call);
+out_discard:
+       write_unlock_bh(&call->state_lock);
+       _debug("discard %p", call);
+out:
+       write_unlock(&rx->call_lock);
+       _leave(" = %d", ret);
+       return ERR_PTR(ret);
+}
+
+/*
+ * Handle rejection of a call by userspace
+ * - reject the call at the front of the queue
+ */
+int rxrpc_reject_call(struct rxrpc_sock *rx)
+{
+       struct rxrpc_call *call;
+       int ret;
+
+       _enter("");
+
+       ASSERT(!irqs_disabled());
+
+       write_lock(&rx->call_lock);
+
+       ret = -ENODATA;
+       if (list_empty(&rx->acceptq))
+               goto out;
+
+       /* dequeue the first call and check it's still valid */
+       call = list_entry(rx->acceptq.next, struct rxrpc_call, accept_link);
+       list_del_init(&call->accept_link);
+       sk_acceptq_removed(&rx->sk);
+
+       write_lock_bh(&call->state_lock);
+       switch (call->state) {
+       case RXRPC_CALL_SERVER_ACCEPTING:
+               call->state = RXRPC_CALL_SERVER_BUSY;
+               if (test_and_set_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events))
+                       rxrpc_queue_call(call);
+               ret = 0;
+               goto out_release;
+       case RXRPC_CALL_REMOTELY_ABORTED:
+       case RXRPC_CALL_LOCALLY_ABORTED:
+               ret = -ECONNABORTED;
+               goto out_release;
+       case RXRPC_CALL_NETWORK_ERROR:
+               ret = call->conn->error;
+               goto out_release;
+       case RXRPC_CALL_DEAD:
+               ret = -ETIME;
+               goto out_discard;
+       default:
+               BUG();
+       }
+
+       /* if the call is already dying or dead, then we leave the socket's ref
+        * on it to be released by rxrpc_dead_call_expired() as induced by
+        * rxrpc_release_call() */
+out_release:
+       _debug("release %p", call);
+       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
+               rxrpc_queue_call(call);
+out_discard:
+       write_unlock_bh(&call->state_lock);
+       _debug("discard %p", call);
+out:
+       write_unlock(&rx->call_lock);
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/**
+ * rxrpc_kernel_accept_call - Allow a kernel service to accept an incoming call
+ * @sock: The socket on which the impending call is waiting
+ * @user_call_ID: The tag to attach to the call
+ *
+ * Allow a kernel service to accept an incoming call, assuming the incoming
+ * call is still valid.
+ */
+struct rxrpc_call *rxrpc_kernel_accept_call(struct socket *sock,
+                                           unsigned long user_call_ID)
+{
+       struct rxrpc_call *call;
+
+       _enter(",%lx", user_call_ID);
+       call = rxrpc_accept_call(rxrpc_sk(sock->sk), user_call_ID);
+       _leave(" = %p", call);
+       return call;
+}
+EXPORT_SYMBOL(rxrpc_kernel_accept_call);
+
+/**
+ * rxrpc_kernel_reject_call - Allow a kernel service to reject an incoming call
+ * @sock: The socket on which the impending call is waiting
+ *
+ * Allow a kernel service to reject an incoming call with a BUSY message,
+ * assuming the incoming call is still valid.
+ */
+int rxrpc_kernel_reject_call(struct socket *sock)
+{
+       int ret;
+
+       _enter("");
+       ret = rxrpc_reject_call(rxrpc_sk(sock->sk));
+       _leave(" = %d", ret);
+       return ret;
+}
+EXPORT_SYMBOL(rxrpc_kernel_reject_call);
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c
new file mode 100644 (file)
index 0000000..1838178
--- /dev/null
@@ -0,0 +1,1288 @@
+/* Management of Tx window, Tx resend, ACKs and out-of-sequence reception
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/circ_buf.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/udp.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * propose an ACK be sent
+ */
+void __rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
+                        u32 serial, bool immediate)
+{
+       unsigned long expiry;
+       s8 prior = rxrpc_ack_priority[ack_reason];
+
+       ASSERTCMP(prior, >, 0);
+
+       _enter("{%d},%s,%%%x,%u",
+              call->debug_id, rxrpc_acks(ack_reason), serial, immediate);
+
+       if (prior < rxrpc_ack_priority[call->ackr_reason]) {
+               if (immediate)
+                       goto cancel_timer;
+               return;
+       }
+
+       /* update DELAY, IDLE, REQUESTED and PING_RESPONSE ACK serial
+        * numbers */
+       if (prior == rxrpc_ack_priority[call->ackr_reason]) {
+               if (prior <= 4)
+                       call->ackr_serial = serial;
+               if (immediate)
+                       goto cancel_timer;
+               return;
+       }
+
+       call->ackr_reason = ack_reason;
+       call->ackr_serial = serial;
+
+       switch (ack_reason) {
+       case RXRPC_ACK_DELAY:
+               _debug("run delay timer");
+               expiry = rxrpc_soft_ack_delay;
+               goto run_timer;
+
+       case RXRPC_ACK_IDLE:
+               if (!immediate) {
+                       _debug("run defer timer");
+                       expiry = rxrpc_idle_ack_delay;
+                       goto run_timer;
+               }
+               goto cancel_timer;
+
+       case RXRPC_ACK_REQUESTED:
+               expiry = rxrpc_requested_ack_delay;
+               if (!expiry)
+                       goto cancel_timer;
+               if (!immediate || serial == 1) {
+                       _debug("run defer timer");
+                       goto run_timer;
+               }
+
+       default:
+               _debug("immediate ACK");
+               goto cancel_timer;
+       }
+
+run_timer:
+       expiry += jiffies;
+       if (!timer_pending(&call->ack_timer) ||
+           time_after(call->ack_timer.expires, expiry))
+               mod_timer(&call->ack_timer, expiry);
+       return;
+
+cancel_timer:
+       _debug("cancel timer %%%u", serial);
+       try_to_del_timer_sync(&call->ack_timer);
+       read_lock_bh(&call->state_lock);
+       if (call->state <= RXRPC_CALL_COMPLETE &&
+           !test_and_set_bit(RXRPC_CALL_EV_ACK, &call->events))
+               rxrpc_queue_call(call);
+       read_unlock_bh(&call->state_lock);
+}
+
+/*
+ * propose an ACK be sent, locking the call structure
+ */
+void rxrpc_propose_ACK(struct rxrpc_call *call, u8 ack_reason,
+                      u32 serial, bool immediate)
+{
+       s8 prior = rxrpc_ack_priority[ack_reason];
+
+       if (prior > rxrpc_ack_priority[call->ackr_reason]) {
+               spin_lock_bh(&call->lock);
+               __rxrpc_propose_ACK(call, ack_reason, serial, immediate);
+               spin_unlock_bh(&call->lock);
+       }
+}
+
+/*
+ * set the resend timer
+ */
+static void rxrpc_set_resend(struct rxrpc_call *call, u8 resend,
+                            unsigned long resend_at)
+{
+       read_lock_bh(&call->state_lock);
+       if (call->state >= RXRPC_CALL_COMPLETE)
+               resend = 0;
+
+       if (resend & 1) {
+               _debug("SET RESEND");
+               set_bit(RXRPC_CALL_EV_RESEND, &call->events);
+       }
+
+       if (resend & 2) {
+               _debug("MODIFY RESEND TIMER");
+               set_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+               mod_timer(&call->resend_timer, resend_at);
+       } else {
+               _debug("KILL RESEND TIMER");
+               del_timer_sync(&call->resend_timer);
+               clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
+               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+       }
+       read_unlock_bh(&call->state_lock);
+}
+
+/*
+ * resend packets
+ */
+static void rxrpc_resend(struct rxrpc_call *call)
+{
+       struct rxrpc_wire_header *whdr;
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *txb;
+       unsigned long *p_txb, resend_at;
+       bool stop;
+       int loop;
+       u8 resend;
+
+       _enter("{%d,%d,%d,%d},",
+              call->acks_hard, call->acks_unacked,
+              atomic_read(&call->sequence),
+              CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
+
+       stop = false;
+       resend = 0;
+       resend_at = 0;
+
+       for (loop = call->acks_tail;
+            loop != call->acks_head || stop;
+            loop = (loop + 1) &  (call->acks_winsz - 1)
+            ) {
+               p_txb = call->acks_window + loop;
+               smp_read_barrier_depends();
+               if (*p_txb & 1)
+                       continue;
+
+               txb = (struct sk_buff *) *p_txb;
+               sp = rxrpc_skb(txb);
+
+               if (sp->need_resend) {
+                       sp->need_resend = false;
+
+                       /* each Tx packet has a new serial number */
+                       sp->hdr.serial = atomic_inc_return(&call->conn->serial);
+
+                       whdr = (struct rxrpc_wire_header *)txb->head;
+                       whdr->serial = htonl(sp->hdr.serial);
+
+                       _proto("Tx DATA %%%u { #%d }",
+                              sp->hdr.serial, sp->hdr.seq);
+                       if (rxrpc_send_packet(call->conn->trans, txb) < 0) {
+                               stop = true;
+                               sp->resend_at = jiffies + 3;
+                       } else {
+                               sp->resend_at =
+                                       jiffies + rxrpc_resend_timeout;
+                       }
+               }
+
+               if (time_after_eq(jiffies + 1, sp->resend_at)) {
+                       sp->need_resend = true;
+                       resend |= 1;
+               } else if (resend & 2) {
+                       if (time_before(sp->resend_at, resend_at))
+                               resend_at = sp->resend_at;
+               } else {
+                       resend_at = sp->resend_at;
+                       resend |= 2;
+               }
+       }
+
+       rxrpc_set_resend(call, resend, resend_at);
+       _leave("");
+}
+
+/*
+ * handle resend timer expiry
+ */
+static void rxrpc_resend_timer(struct rxrpc_call *call)
+{
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *txb;
+       unsigned long *p_txb, resend_at;
+       int loop;
+       u8 resend;
+
+       _enter("%d,%d,%d",
+              call->acks_tail, call->acks_unacked, call->acks_head);
+
+       if (call->state >= RXRPC_CALL_COMPLETE)
+               return;
+
+       resend = 0;
+       resend_at = 0;
+
+       for (loop = call->acks_unacked;
+            loop != call->acks_head;
+            loop = (loop + 1) &  (call->acks_winsz - 1)
+            ) {
+               p_txb = call->acks_window + loop;
+               smp_read_barrier_depends();
+               txb = (struct sk_buff *) (*p_txb & ~1);
+               sp = rxrpc_skb(txb);
+
+               ASSERT(!(*p_txb & 1));
+
+               if (sp->need_resend) {
+                       ;
+               } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
+                       sp->need_resend = true;
+                       resend |= 1;
+               } else if (resend & 2) {
+                       if (time_before(sp->resend_at, resend_at))
+                               resend_at = sp->resend_at;
+               } else {
+                       resend_at = sp->resend_at;
+                       resend |= 2;
+               }
+       }
+
+       rxrpc_set_resend(call, resend, resend_at);
+       _leave("");
+}
+
+/*
+ * process soft ACKs of our transmitted packets
+ * - these indicate packets the peer has or has not received, but hasn't yet
+ *   given to the consumer, and so can still be discarded and re-requested
+ */
+static int rxrpc_process_soft_ACKs(struct rxrpc_call *call,
+                                  struct rxrpc_ackpacket *ack,
+                                  struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *txb;
+       unsigned long *p_txb, resend_at;
+       int loop;
+       u8 sacks[RXRPC_MAXACKS], resend;
+
+       _enter("{%d,%d},{%d},",
+              call->acks_hard,
+              CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz),
+              ack->nAcks);
+
+       if (skb_copy_bits(skb, 0, sacks, ack->nAcks) < 0)
+               goto protocol_error;
+
+       resend = 0;
+       resend_at = 0;
+       for (loop = 0; loop < ack->nAcks; loop++) {
+               p_txb = call->acks_window;
+               p_txb += (call->acks_tail + loop) & (call->acks_winsz - 1);
+               smp_read_barrier_depends();
+               txb = (struct sk_buff *) (*p_txb & ~1);
+               sp = rxrpc_skb(txb);
+
+               switch (sacks[loop]) {
+               case RXRPC_ACK_TYPE_ACK:
+                       sp->need_resend = false;
+                       *p_txb |= 1;
+                       break;
+               case RXRPC_ACK_TYPE_NACK:
+                       sp->need_resend = true;
+                       *p_txb &= ~1;
+                       resend = 1;
+                       break;
+               default:
+                       _debug("Unsupported ACK type %d", sacks[loop]);
+                       goto protocol_error;
+               }
+       }
+
+       smp_mb();
+       call->acks_unacked = (call->acks_tail + loop) & (call->acks_winsz - 1);
+
+       /* anything not explicitly ACK'd is implicitly NACK'd, but may just not
+        * have been received or processed yet by the far end */
+       for (loop = call->acks_unacked;
+            loop != call->acks_head;
+            loop = (loop + 1) &  (call->acks_winsz - 1)
+            ) {
+               p_txb = call->acks_window + loop;
+               smp_read_barrier_depends();
+               txb = (struct sk_buff *) (*p_txb & ~1);
+               sp = rxrpc_skb(txb);
+
+               if (*p_txb & 1) {
+                       /* packet must have been discarded */
+                       sp->need_resend = true;
+                       *p_txb &= ~1;
+                       resend |= 1;
+               } else if (sp->need_resend) {
+                       ;
+               } else if (time_after_eq(jiffies + 1, sp->resend_at)) {
+                       sp->need_resend = true;
+                       resend |= 1;
+               } else if (resend & 2) {
+                       if (time_before(sp->resend_at, resend_at))
+                               resend_at = sp->resend_at;
+               } else {
+                       resend_at = sp->resend_at;
+                       resend |= 2;
+               }
+       }
+
+       rxrpc_set_resend(call, resend, resend_at);
+       _leave(" = 0");
+       return 0;
+
+protocol_error:
+       _leave(" = -EPROTO");
+       return -EPROTO;
+}
+
+/*
+ * discard hard-ACK'd packets from the Tx window
+ */
+static void rxrpc_rotate_tx_window(struct rxrpc_call *call, u32 hard)
+{
+       unsigned long _skb;
+       int tail = call->acks_tail, old_tail;
+       int win = CIRC_CNT(call->acks_head, tail, call->acks_winsz);
+
+       _enter("{%u,%u},%u", call->acks_hard, win, hard);
+
+       ASSERTCMP(hard - call->acks_hard, <=, win);
+
+       while (call->acks_hard < hard) {
+               smp_read_barrier_depends();
+               _skb = call->acks_window[tail] & ~1;
+               rxrpc_free_skb((struct sk_buff *) _skb);
+               old_tail = tail;
+               tail = (tail + 1) & (call->acks_winsz - 1);
+               call->acks_tail = tail;
+               if (call->acks_unacked == old_tail)
+                       call->acks_unacked = tail;
+               call->acks_hard++;
+       }
+
+       wake_up(&call->tx_waitq);
+}
+
+/*
+ * clear the Tx window in the event of a failure
+ */
+static void rxrpc_clear_tx_window(struct rxrpc_call *call)
+{
+       rxrpc_rotate_tx_window(call, atomic_read(&call->sequence));
+}
+
+/*
+ * drain the out of sequence received packet queue into the packet Rx queue
+ */
+static int rxrpc_drain_rx_oos_queue(struct rxrpc_call *call)
+{
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *skb;
+       bool terminal;
+       int ret;
+
+       _enter("{%d,%d}", call->rx_data_post, call->rx_first_oos);
+
+       spin_lock_bh(&call->lock);
+
+       ret = -ECONNRESET;
+       if (test_bit(RXRPC_CALL_RELEASED, &call->flags))
+               goto socket_unavailable;
+
+       skb = skb_dequeue(&call->rx_oos_queue);
+       if (skb) {
+               sp = rxrpc_skb(skb);
+
+               _debug("drain OOS packet %d [%d]",
+                      sp->hdr.seq, call->rx_first_oos);
+
+               if (sp->hdr.seq != call->rx_first_oos) {
+                       skb_queue_head(&call->rx_oos_queue, skb);
+                       call->rx_first_oos = rxrpc_skb(skb)->hdr.seq;
+                       _debug("requeue %p {%u}", skb, call->rx_first_oos);
+               } else {
+                       skb->mark = RXRPC_SKB_MARK_DATA;
+                       terminal = ((sp->hdr.flags & RXRPC_LAST_PACKET) &&
+                               !(sp->hdr.flags & RXRPC_CLIENT_INITIATED));
+                       ret = rxrpc_queue_rcv_skb(call, skb, true, terminal);
+                       BUG_ON(ret < 0);
+                       _debug("drain #%u", call->rx_data_post);
+                       call->rx_data_post++;
+
+                       /* find out what the next packet is */
+                       skb = skb_peek(&call->rx_oos_queue);
+                       if (skb)
+                               call->rx_first_oos = rxrpc_skb(skb)->hdr.seq;
+                       else
+                               call->rx_first_oos = 0;
+                       _debug("peek %p {%u}", skb, call->rx_first_oos);
+               }
+       }
+
+       ret = 0;
+socket_unavailable:
+       spin_unlock_bh(&call->lock);
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * insert an out of sequence packet into the buffer
+ */
+static void rxrpc_insert_oos_packet(struct rxrpc_call *call,
+                                   struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp, *psp;
+       struct sk_buff *p;
+       u32 seq;
+
+       sp = rxrpc_skb(skb);
+       seq = sp->hdr.seq;
+       _enter(",,{%u}", seq);
+
+       skb->destructor = rxrpc_packet_destructor;
+       ASSERTCMP(sp->call, ==, NULL);
+       sp->call = call;
+       rxrpc_get_call(call);
+
+       /* insert into the buffer in sequence order */
+       spin_lock_bh(&call->lock);
+
+       skb_queue_walk(&call->rx_oos_queue, p) {
+               psp = rxrpc_skb(p);
+               if (psp->hdr.seq > seq) {
+                       _debug("insert oos #%u before #%u", seq, psp->hdr.seq);
+                       skb_insert(p, skb, &call->rx_oos_queue);
+                       goto inserted;
+               }
+       }
+
+       _debug("append oos #%u", seq);
+       skb_queue_tail(&call->rx_oos_queue, skb);
+inserted:
+
+       /* we might now have a new front to the queue */
+       if (call->rx_first_oos == 0 || seq < call->rx_first_oos)
+               call->rx_first_oos = seq;
+
+       read_lock(&call->state_lock);
+       if (call->state < RXRPC_CALL_COMPLETE &&
+           call->rx_data_post == call->rx_first_oos) {
+               _debug("drain rx oos now");
+               set_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events);
+       }
+       read_unlock(&call->state_lock);
+
+       spin_unlock_bh(&call->lock);
+       _leave(" [stored #%u]", call->rx_first_oos);
+}
+
+/*
+ * clear the Tx window on final ACK reception
+ */
+static void rxrpc_zap_tx_window(struct rxrpc_call *call)
+{
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *skb;
+       unsigned long _skb, *acks_window;
+       u8 winsz = call->acks_winsz;
+       int tail;
+
+       acks_window = call->acks_window;
+       call->acks_window = NULL;
+
+       while (CIRC_CNT(call->acks_head, call->acks_tail, winsz) > 0) {
+               tail = call->acks_tail;
+               smp_read_barrier_depends();
+               _skb = acks_window[tail] & ~1;
+               smp_mb();
+               call->acks_tail = (call->acks_tail + 1) & (winsz - 1);
+
+               skb = (struct sk_buff *) _skb;
+               sp = rxrpc_skb(skb);
+               _debug("+++ clear Tx %u", sp->hdr.seq);
+               rxrpc_free_skb(skb);
+       }
+
+       kfree(acks_window);
+}
+
+/*
+ * process the extra information that may be appended to an ACK packet
+ */
+static void rxrpc_extract_ackinfo(struct rxrpc_call *call, struct sk_buff *skb,
+                                 unsigned int latest, int nAcks)
+{
+       struct rxrpc_ackinfo ackinfo;
+       struct rxrpc_peer *peer;
+       unsigned int mtu;
+
+       if (skb_copy_bits(skb, nAcks + 3, &ackinfo, sizeof(ackinfo)) < 0) {
+               _leave(" [no ackinfo]");
+               return;
+       }
+
+       _proto("Rx ACK %%%u Info { rx=%u max=%u rwin=%u jm=%u }",
+              latest,
+              ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU),
+              ntohl(ackinfo.rwind), ntohl(ackinfo.jumbo_max));
+
+       mtu = min(ntohl(ackinfo.rxMTU), ntohl(ackinfo.maxMTU));
+
+       peer = call->conn->trans->peer;
+       if (mtu < peer->maxdata) {
+               spin_lock_bh(&peer->lock);
+               peer->maxdata = mtu;
+               peer->mtu = mtu + peer->hdrsize;
+               spin_unlock_bh(&peer->lock);
+               _net("Net MTU %u (maxdata %u)", peer->mtu, peer->maxdata);
+       }
+}
+
+/*
+ * process packets in the reception queue
+ */
+static int rxrpc_process_rx_queue(struct rxrpc_call *call,
+                                 u32 *_abort_code)
+{
+       struct rxrpc_ackpacket ack;
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *skb;
+       bool post_ACK;
+       int latest;
+       u32 hard, tx;
+
+       _enter("");
+
+process_further:
+       skb = skb_dequeue(&call->rx_queue);
+       if (!skb)
+               return -EAGAIN;
+
+       _net("deferred skb %p", skb);
+
+       sp = rxrpc_skb(skb);
+
+       _debug("process %s [st %d]", rxrpc_pkts[sp->hdr.type], call->state);
+
+       post_ACK = false;
+
+       switch (sp->hdr.type) {
+               /* data packets that wind up here have been received out of
+                * order, need security processing or are jumbo packets */
+       case RXRPC_PACKET_TYPE_DATA:
+               _proto("OOSQ DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq);
+
+               /* secured packets must be verified and possibly decrypted */
+               if (call->conn->security->verify_packet(call, skb,
+                                                       _abort_code) < 0)
+                       goto protocol_error;
+
+               rxrpc_insert_oos_packet(call, skb);
+               goto process_further;
+
+               /* partial ACK to process */
+       case RXRPC_PACKET_TYPE_ACK:
+               if (skb_copy_bits(skb, 0, &ack, sizeof(ack)) < 0) {
+                       _debug("extraction failure");
+                       goto protocol_error;
+               }
+               if (!skb_pull(skb, sizeof(ack)))
+                       BUG();
+
+               latest = sp->hdr.serial;
+               hard = ntohl(ack.firstPacket);
+               tx = atomic_read(&call->sequence);
+
+               _proto("Rx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
+                      latest,
+                      ntohs(ack.maxSkew),
+                      hard,
+                      ntohl(ack.previousPacket),
+                      ntohl(ack.serial),
+                      rxrpc_acks(ack.reason),
+                      ack.nAcks);
+
+               rxrpc_extract_ackinfo(call, skb, latest, ack.nAcks);
+
+               if (ack.reason == RXRPC_ACK_PING) {
+                       _proto("Rx ACK %%%u PING Request", latest);
+                       rxrpc_propose_ACK(call, RXRPC_ACK_PING_RESPONSE,
+                                         sp->hdr.serial, true);
+               }
+
+               /* discard any out-of-order or duplicate ACKs */
+               if (latest - call->acks_latest <= 0) {
+                       _debug("discard ACK %d <= %d",
+                              latest, call->acks_latest);
+                       goto discard;
+               }
+               call->acks_latest = latest;
+
+               if (call->state != RXRPC_CALL_CLIENT_SEND_REQUEST &&
+                   call->state != RXRPC_CALL_CLIENT_AWAIT_REPLY &&
+                   call->state != RXRPC_CALL_SERVER_SEND_REPLY &&
+                   call->state != RXRPC_CALL_SERVER_AWAIT_ACK)
+                       goto discard;
+
+               _debug("Tx=%d H=%u S=%d", tx, call->acks_hard, call->state);
+
+               if (hard > 0) {
+                       if (hard - 1 > tx) {
+                               _debug("hard-ACK'd packet %d not transmitted"
+                                      " (%d top)",
+                                      hard - 1, tx);
+                               goto protocol_error;
+                       }
+
+                       if ((call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY ||
+                            call->state == RXRPC_CALL_SERVER_AWAIT_ACK) &&
+                           hard > tx) {
+                               call->acks_hard = tx;
+                               goto all_acked;
+                       }
+
+                       smp_rmb();
+                       rxrpc_rotate_tx_window(call, hard - 1);
+               }
+
+               if (ack.nAcks > 0) {
+                       if (hard - 1 + ack.nAcks > tx) {
+                               _debug("soft-ACK'd packet %d+%d not"
+                                      " transmitted (%d top)",
+                                      hard - 1, ack.nAcks, tx);
+                               goto protocol_error;
+                       }
+
+                       if (rxrpc_process_soft_ACKs(call, &ack, skb) < 0)
+                               goto protocol_error;
+               }
+               goto discard;
+
+               /* complete ACK to process */
+       case RXRPC_PACKET_TYPE_ACKALL:
+               goto all_acked;
+
+               /* abort and busy are handled elsewhere */
+       case RXRPC_PACKET_TYPE_BUSY:
+       case RXRPC_PACKET_TYPE_ABORT:
+               BUG();
+
+               /* connection level events - also handled elsewhere */
+       case RXRPC_PACKET_TYPE_CHALLENGE:
+       case RXRPC_PACKET_TYPE_RESPONSE:
+       case RXRPC_PACKET_TYPE_DEBUG:
+               BUG();
+       }
+
+       /* if we've had a hard ACK that covers all the packets we've sent, then
+        * that ends that phase of the operation */
+all_acked:
+       write_lock_bh(&call->state_lock);
+       _debug("ack all %d", call->state);
+
+       switch (call->state) {
+       case RXRPC_CALL_CLIENT_AWAIT_REPLY:
+               call->state = RXRPC_CALL_CLIENT_RECV_REPLY;
+               break;
+       case RXRPC_CALL_SERVER_AWAIT_ACK:
+               _debug("srv complete");
+               call->state = RXRPC_CALL_COMPLETE;
+               post_ACK = true;
+               break;
+       case RXRPC_CALL_CLIENT_SEND_REQUEST:
+       case RXRPC_CALL_SERVER_RECV_REQUEST:
+               goto protocol_error_unlock; /* can't occur yet */
+       default:
+               write_unlock_bh(&call->state_lock);
+               goto discard; /* assume packet left over from earlier phase */
+       }
+
+       write_unlock_bh(&call->state_lock);
+
+       /* if all the packets we sent are hard-ACK'd, then we can discard
+        * whatever we've got left */
+       _debug("clear Tx %d",
+              CIRC_CNT(call->acks_head, call->acks_tail, call->acks_winsz));
+
+       del_timer_sync(&call->resend_timer);
+       clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+       clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
+
+       if (call->acks_window)
+               rxrpc_zap_tx_window(call);
+
+       if (post_ACK) {
+               /* post the final ACK message for userspace to pick up */
+               _debug("post ACK");
+               skb->mark = RXRPC_SKB_MARK_FINAL_ACK;
+               sp->call = call;
+               rxrpc_get_call(call);
+               spin_lock_bh(&call->lock);
+               if (rxrpc_queue_rcv_skb(call, skb, true, true) < 0)
+                       BUG();
+               spin_unlock_bh(&call->lock);
+               goto process_further;
+       }
+
+discard:
+       rxrpc_free_skb(skb);
+       goto process_further;
+
+protocol_error_unlock:
+       write_unlock_bh(&call->state_lock);
+protocol_error:
+       rxrpc_free_skb(skb);
+       _leave(" = -EPROTO");
+       return -EPROTO;
+}
+
+/*
+ * post a message to the socket Rx queue for recvmsg() to pick up
+ */
+static int rxrpc_post_message(struct rxrpc_call *call, u32 mark, u32 error,
+                             bool fatal)
+{
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *skb;
+       int ret;
+
+       _enter("{%d,%lx},%u,%u,%d",
+              call->debug_id, call->flags, mark, error, fatal);
+
+       /* remove timers and things for fatal messages */
+       if (fatal) {
+               del_timer_sync(&call->resend_timer);
+               del_timer_sync(&call->ack_timer);
+               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+       }
+
+       if (mark != RXRPC_SKB_MARK_NEW_CALL &&
+           !test_bit(RXRPC_CALL_HAS_USERID, &call->flags)) {
+               _leave("[no userid]");
+               return 0;
+       }
+
+       if (!test_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags)) {
+               skb = alloc_skb(0, GFP_NOFS);
+               if (!skb)
+                       return -ENOMEM;
+
+               rxrpc_new_skb(skb);
+
+               skb->mark = mark;
+
+               sp = rxrpc_skb(skb);
+               memset(sp, 0, sizeof(*sp));
+               sp->error = error;
+               sp->call = call;
+               rxrpc_get_call(call);
+
+               spin_lock_bh(&call->lock);
+               ret = rxrpc_queue_rcv_skb(call, skb, true, fatal);
+               spin_unlock_bh(&call->lock);
+               BUG_ON(ret < 0);
+       }
+
+       return 0;
+}
+
+/*
+ * handle background processing of incoming call packets and ACK / abort
+ * generation
+ */
+void rxrpc_process_call(struct work_struct *work)
+{
+       struct rxrpc_call *call =
+               container_of(work, struct rxrpc_call, processor);
+       struct rxrpc_wire_header whdr;
+       struct rxrpc_ackpacket ack;
+       struct rxrpc_ackinfo ackinfo;
+       struct msghdr msg;
+       struct kvec iov[5];
+       enum rxrpc_call_event genbit;
+       unsigned long bits;
+       __be32 data, pad;
+       size_t len;
+       int loop, nbit, ioc, ret, mtu;
+       u32 serial, abort_code = RX_PROTOCOL_ERROR;
+       u8 *acks = NULL;
+
+       //printk("\n--------------------\n");
+       _enter("{%d,%s,%lx} [%lu]",
+              call->debug_id, rxrpc_call_states[call->state], call->events,
+              (jiffies - call->creation_jif) / (HZ / 10));
+
+       if (test_and_set_bit(RXRPC_CALL_PROC_BUSY, &call->flags)) {
+               _debug("XXXXXXXXXXXXX RUNNING ON MULTIPLE CPUS XXXXXXXXXXXXX");
+               return;
+       }
+
+       /* there's a good chance we're going to have to send a message, so set
+        * one up in advance */
+       msg.msg_name    = &call->conn->trans->peer->srx.transport;
+       msg.msg_namelen = call->conn->trans->peer->srx.transport_len;
+       msg.msg_control = NULL;
+       msg.msg_controllen = 0;
+       msg.msg_flags   = 0;
+
+       whdr.epoch      = htonl(call->conn->epoch);
+       whdr.cid        = htonl(call->cid);
+       whdr.callNumber = htonl(call->call_id);
+       whdr.seq        = 0;
+       whdr.type       = RXRPC_PACKET_TYPE_ACK;
+       whdr.flags      = call->conn->out_clientflag;
+       whdr.userStatus = 0;
+       whdr.securityIndex = call->conn->security_ix;
+       whdr._rsvd      = 0;
+       whdr.serviceId  = htons(call->service_id);
+
+       memset(iov, 0, sizeof(iov));
+       iov[0].iov_base = &whdr;
+       iov[0].iov_len  = sizeof(whdr);
+
+       /* deal with events of a final nature */
+       if (test_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
+               rxrpc_release_call(call);
+               clear_bit(RXRPC_CALL_EV_RELEASE, &call->events);
+       }
+
+       if (test_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events)) {
+               int error;
+
+               clear_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
+               clear_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events);
+               clear_bit(RXRPC_CALL_EV_ABORT, &call->events);
+
+               error = call->conn->trans->peer->net_error;
+               _debug("post net error %d", error);
+
+               if (rxrpc_post_message(call, RXRPC_SKB_MARK_NET_ERROR,
+                                      error, true) < 0)
+                       goto no_mem;
+               clear_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events);
+               goto kill_ACKs;
+       }
+
+       if (test_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events)) {
+               ASSERTCMP(call->state, >, RXRPC_CALL_COMPLETE);
+
+               clear_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events);
+               clear_bit(RXRPC_CALL_EV_ABORT, &call->events);
+
+               _debug("post conn abort");
+
+               if (rxrpc_post_message(call, RXRPC_SKB_MARK_LOCAL_ERROR,
+                                      call->conn->error, true) < 0)
+                       goto no_mem;
+               clear_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
+               goto kill_ACKs;
+       }
+
+       if (test_bit(RXRPC_CALL_EV_REJECT_BUSY, &call->events)) {
+               whdr.type = RXRPC_PACKET_TYPE_BUSY;
+               genbit = RXRPC_CALL_EV_REJECT_BUSY;
+               goto send_message;
+       }
+
+       if (test_bit(RXRPC_CALL_EV_ABORT, &call->events)) {
+               ASSERTCMP(call->state, >, RXRPC_CALL_COMPLETE);
+
+               if (rxrpc_post_message(call, RXRPC_SKB_MARK_LOCAL_ERROR,
+                                      ECONNABORTED, true) < 0)
+                       goto no_mem;
+               whdr.type = RXRPC_PACKET_TYPE_ABORT;
+               data = htonl(call->local_abort);
+               iov[1].iov_base = &data;
+               iov[1].iov_len = sizeof(data);
+               genbit = RXRPC_CALL_EV_ABORT;
+               goto send_message;
+       }
+
+       if (test_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events)) {
+               genbit = RXRPC_CALL_EV_ACK_FINAL;
+
+               ack.bufferSpace = htons(8);
+               ack.maxSkew     = 0;
+               ack.serial      = 0;
+               ack.reason      = RXRPC_ACK_IDLE;
+               ack.nAcks       = 0;
+               call->ackr_reason = 0;
+
+               spin_lock_bh(&call->lock);
+               ack.serial      = htonl(call->ackr_serial);
+               ack.previousPacket = htonl(call->ackr_prev_seq);
+               ack.firstPacket = htonl(call->rx_data_eaten + 1);
+               spin_unlock_bh(&call->lock);
+
+               pad = 0;
+
+               iov[1].iov_base = &ack;
+               iov[1].iov_len  = sizeof(ack);
+               iov[2].iov_base = &pad;
+               iov[2].iov_len  = 3;
+               iov[3].iov_base = &ackinfo;
+               iov[3].iov_len  = sizeof(ackinfo);
+               goto send_ACK;
+       }
+
+       if (call->events & ((1 << RXRPC_CALL_EV_RCVD_BUSY) |
+                           (1 << RXRPC_CALL_EV_RCVD_ABORT))
+           ) {
+               u32 mark;
+
+               if (test_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events))
+                       mark = RXRPC_SKB_MARK_REMOTE_ABORT;
+               else
+                       mark = RXRPC_SKB_MARK_BUSY;
+
+               _debug("post abort/busy");
+               rxrpc_clear_tx_window(call);
+               if (rxrpc_post_message(call, mark, ECONNABORTED, true) < 0)
+                       goto no_mem;
+
+               clear_bit(RXRPC_CALL_EV_RCVD_BUSY, &call->events);
+               clear_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
+               goto kill_ACKs;
+       }
+
+       if (test_and_clear_bit(RXRPC_CALL_EV_RCVD_ACKALL, &call->events)) {
+               _debug("do implicit ackall");
+               rxrpc_clear_tx_window(call);
+       }
+
+       if (test_bit(RXRPC_CALL_EV_LIFE_TIMER, &call->events)) {
+               write_lock_bh(&call->state_lock);
+               if (call->state <= RXRPC_CALL_COMPLETE) {
+                       call->state = RXRPC_CALL_LOCALLY_ABORTED;
+                       call->local_abort = RX_CALL_TIMEOUT;
+                       set_bit(RXRPC_CALL_EV_ABORT, &call->events);
+               }
+               write_unlock_bh(&call->state_lock);
+
+               _debug("post timeout");
+               if (rxrpc_post_message(call, RXRPC_SKB_MARK_LOCAL_ERROR,
+                                      ETIME, true) < 0)
+                       goto no_mem;
+
+               clear_bit(RXRPC_CALL_EV_LIFE_TIMER, &call->events);
+               goto kill_ACKs;
+       }
+
+       /* deal with assorted inbound messages */
+       if (!skb_queue_empty(&call->rx_queue)) {
+               switch (rxrpc_process_rx_queue(call, &abort_code)) {
+               case 0:
+               case -EAGAIN:
+                       break;
+               case -ENOMEM:
+                       goto no_mem;
+               case -EKEYEXPIRED:
+               case -EKEYREJECTED:
+               case -EPROTO:
+                       rxrpc_abort_call(call, abort_code);
+                       goto kill_ACKs;
+               }
+       }
+
+       /* handle resending */
+       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events))
+               rxrpc_resend_timer(call);
+       if (test_and_clear_bit(RXRPC_CALL_EV_RESEND, &call->events))
+               rxrpc_resend(call);
+
+       /* consider sending an ordinary ACK */
+       if (test_bit(RXRPC_CALL_EV_ACK, &call->events)) {
+               _debug("send ACK: window: %d - %d { %lx }",
+                      call->rx_data_eaten, call->ackr_win_top,
+                      call->ackr_window[0]);
+
+               if (call->state > RXRPC_CALL_SERVER_ACK_REQUEST &&
+                   call->ackr_reason != RXRPC_ACK_PING_RESPONSE) {
+                       /* ACK by sending reply DATA packet in this state */
+                       clear_bit(RXRPC_CALL_EV_ACK, &call->events);
+                       goto maybe_reschedule;
+               }
+
+               genbit = RXRPC_CALL_EV_ACK;
+
+               acks = kzalloc(call->ackr_win_top - call->rx_data_eaten,
+                              GFP_NOFS);
+               if (!acks)
+                       goto no_mem;
+
+               //hdr.flags     = RXRPC_SLOW_START_OK;
+               ack.bufferSpace = htons(8);
+               ack.maxSkew     = 0;
+
+               spin_lock_bh(&call->lock);
+               ack.reason      = call->ackr_reason;
+               ack.serial      = htonl(call->ackr_serial);
+               ack.previousPacket = htonl(call->ackr_prev_seq);
+               ack.firstPacket = htonl(call->rx_data_eaten + 1);
+
+               ack.nAcks = 0;
+               for (loop = 0; loop < RXRPC_ACKR_WINDOW_ASZ; loop++) {
+                       nbit = loop * BITS_PER_LONG;
+                       for (bits = call->ackr_window[loop]; bits; bits >>= 1
+                            ) {
+                               _debug("- l=%d n=%d b=%lx", loop, nbit, bits);
+                               if (bits & 1) {
+                                       acks[nbit] = RXRPC_ACK_TYPE_ACK;
+                                       ack.nAcks = nbit + 1;
+                               }
+                               nbit++;
+                       }
+               }
+               call->ackr_reason = 0;
+               spin_unlock_bh(&call->lock);
+
+               pad = 0;
+
+               iov[1].iov_base = &ack;
+               iov[1].iov_len  = sizeof(ack);
+               iov[2].iov_base = acks;
+               iov[2].iov_len  = ack.nAcks;
+               iov[3].iov_base = &pad;
+               iov[3].iov_len  = 3;
+               iov[4].iov_base = &ackinfo;
+               iov[4].iov_len  = sizeof(ackinfo);
+
+               switch (ack.reason) {
+               case RXRPC_ACK_REQUESTED:
+               case RXRPC_ACK_DUPLICATE:
+               case RXRPC_ACK_OUT_OF_SEQUENCE:
+               case RXRPC_ACK_EXCEEDS_WINDOW:
+               case RXRPC_ACK_NOSPACE:
+               case RXRPC_ACK_PING:
+               case RXRPC_ACK_PING_RESPONSE:
+                       goto send_ACK_with_skew;
+               case RXRPC_ACK_DELAY:
+               case RXRPC_ACK_IDLE:
+                       goto send_ACK;
+               }
+       }
+
+       /* handle completion of security negotiations on an incoming
+        * connection */
+       if (test_and_clear_bit(RXRPC_CALL_EV_SECURED, &call->events)) {
+               _debug("secured");
+               spin_lock_bh(&call->lock);
+
+               if (call->state == RXRPC_CALL_SERVER_SECURING) {
+                       _debug("securing");
+                       write_lock(&call->conn->lock);
+                       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+                           !test_bit(RXRPC_CALL_EV_RELEASE, &call->events)) {
+                               _debug("not released");
+                               call->state = RXRPC_CALL_SERVER_ACCEPTING;
+                               list_move_tail(&call->accept_link,
+                                              &call->socket->acceptq);
+                       }
+                       write_unlock(&call->conn->lock);
+                       read_lock(&call->state_lock);
+                       if (call->state < RXRPC_CALL_COMPLETE)
+                               set_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events);
+                       read_unlock(&call->state_lock);
+               }
+
+               spin_unlock_bh(&call->lock);
+               if (!test_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events))
+                       goto maybe_reschedule;
+       }
+
+       /* post a notification of an acceptable connection to the app */
+       if (test_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events)) {
+               _debug("post accept");
+               if (rxrpc_post_message(call, RXRPC_SKB_MARK_NEW_CALL,
+                                      0, false) < 0)
+                       goto no_mem;
+               clear_bit(RXRPC_CALL_EV_POST_ACCEPT, &call->events);
+               goto maybe_reschedule;
+       }
+
+       /* handle incoming call acceptance */
+       if (test_and_clear_bit(RXRPC_CALL_EV_ACCEPTED, &call->events)) {
+               _debug("accepted");
+               ASSERTCMP(call->rx_data_post, ==, 0);
+               call->rx_data_post = 1;
+               read_lock_bh(&call->state_lock);
+               if (call->state < RXRPC_CALL_COMPLETE)
+                       set_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events);
+               read_unlock_bh(&call->state_lock);
+       }
+
+       /* drain the out of sequence received packet queue into the packet Rx
+        * queue */
+       if (test_and_clear_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events)) {
+               while (call->rx_data_post == call->rx_first_oos)
+                       if (rxrpc_drain_rx_oos_queue(call) < 0)
+                               break;
+               goto maybe_reschedule;
+       }
+
+       /* other events may have been raised since we started checking */
+       goto maybe_reschedule;
+
+send_ACK_with_skew:
+       ack.maxSkew = htons(atomic_read(&call->conn->hi_serial) -
+                           ntohl(ack.serial));
+send_ACK:
+       mtu = call->conn->trans->peer->if_mtu;
+       mtu -= call->conn->trans->peer->hdrsize;
+       ackinfo.maxMTU  = htonl(mtu);
+       ackinfo.rwind   = htonl(rxrpc_rx_window_size);
+
+       /* permit the peer to send us jumbo packets if it wants to */
+       ackinfo.rxMTU   = htonl(rxrpc_rx_mtu);
+       ackinfo.jumbo_max = htonl(rxrpc_rx_jumbo_max);
+
+       serial = atomic_inc_return(&call->conn->serial);
+       whdr.serial = htonl(serial);
+       _proto("Tx ACK %%%u { m=%hu f=#%u p=#%u s=%%%u r=%s n=%u }",
+              serial,
+              ntohs(ack.maxSkew),
+              ntohl(ack.firstPacket),
+              ntohl(ack.previousPacket),
+              ntohl(ack.serial),
+              rxrpc_acks(ack.reason),
+              ack.nAcks);
+
+       del_timer_sync(&call->ack_timer);
+       if (ack.nAcks > 0)
+               set_bit(RXRPC_CALL_TX_SOFT_ACK, &call->flags);
+       goto send_message_2;
+
+send_message:
+       _debug("send message");
+
+       serial = atomic_inc_return(&call->conn->serial);
+       whdr.serial = htonl(serial);
+       _proto("Tx %s %%%u", rxrpc_pkts[whdr.type], serial);
+send_message_2:
+
+       len = iov[0].iov_len;
+       ioc = 1;
+       if (iov[4].iov_len) {
+               ioc = 5;
+               len += iov[4].iov_len;
+               len += iov[3].iov_len;
+               len += iov[2].iov_len;
+               len += iov[1].iov_len;
+       } else if (iov[3].iov_len) {
+               ioc = 4;
+               len += iov[3].iov_len;
+               len += iov[2].iov_len;
+               len += iov[1].iov_len;
+       } else if (iov[2].iov_len) {
+               ioc = 3;
+               len += iov[2].iov_len;
+               len += iov[1].iov_len;
+       } else if (iov[1].iov_len) {
+               ioc = 2;
+               len += iov[1].iov_len;
+       }
+
+       ret = kernel_sendmsg(call->conn->trans->local->socket,
+                            &msg, iov, ioc, len);
+       if (ret < 0) {
+               _debug("sendmsg failed: %d", ret);
+               read_lock_bh(&call->state_lock);
+               if (call->state < RXRPC_CALL_DEAD)
+                       rxrpc_queue_call(call);
+               read_unlock_bh(&call->state_lock);
+               goto error;
+       }
+
+       switch (genbit) {
+       case RXRPC_CALL_EV_ABORT:
+               clear_bit(genbit, &call->events);
+               clear_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
+               goto kill_ACKs;
+
+       case RXRPC_CALL_EV_ACK_FINAL:
+               write_lock_bh(&call->state_lock);
+               if (call->state == RXRPC_CALL_CLIENT_FINAL_ACK)
+                       call->state = RXRPC_CALL_COMPLETE;
+               write_unlock_bh(&call->state_lock);
+               goto kill_ACKs;
+
+       default:
+               clear_bit(genbit, &call->events);
+               switch (call->state) {
+               case RXRPC_CALL_CLIENT_AWAIT_REPLY:
+               case RXRPC_CALL_CLIENT_RECV_REPLY:
+               case RXRPC_CALL_SERVER_RECV_REQUEST:
+               case RXRPC_CALL_SERVER_ACK_REQUEST:
+                       _debug("start ACK timer");
+                       rxrpc_propose_ACK(call, RXRPC_ACK_DELAY,
+                                         call->ackr_serial, false);
+               default:
+                       break;
+               }
+               goto maybe_reschedule;
+       }
+
+kill_ACKs:
+       del_timer_sync(&call->ack_timer);
+       if (test_and_clear_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events))
+               rxrpc_put_call(call);
+       clear_bit(RXRPC_CALL_EV_ACK, &call->events);
+
+maybe_reschedule:
+       if (call->events || !skb_queue_empty(&call->rx_queue)) {
+               read_lock_bh(&call->state_lock);
+               if (call->state < RXRPC_CALL_DEAD)
+                       rxrpc_queue_call(call);
+               read_unlock_bh(&call->state_lock);
+       }
+
+       /* don't leave aborted connections on the accept queue */
+       if (call->state >= RXRPC_CALL_COMPLETE &&
+           !list_empty(&call->accept_link)) {
+               _debug("X unlinking once-pending call %p { e=%lx f=%lx c=%x }",
+                      call, call->events, call->flags, call->conn->cid);
+
+               read_lock_bh(&call->state_lock);
+               if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+                   !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
+                       rxrpc_queue_call(call);
+               read_unlock_bh(&call->state_lock);
+       }
+
+error:
+       clear_bit(RXRPC_CALL_PROC_BUSY, &call->flags);
+       kfree(acks);
+
+       /* because we don't want two CPUs both processing the work item for one
+        * call at the same time, we use a flag to note when it's busy; however
+        * this means there's a race between clearing the flag and setting the
+        * work pending bit and the work item being processed again */
+       if (call->events && !work_pending(&call->processor)) {
+               _debug("jumpstart %x", call->conn->cid);
+               rxrpc_queue_call(call);
+       }
+
+       _leave("");
+       return;
+
+no_mem:
+       _debug("out of memory");
+       goto maybe_reschedule;
+}
diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c
new file mode 100644 (file)
index 0000000..68125dc
--- /dev/null
@@ -0,0 +1,980 @@
+/* RxRPC individual remote procedure call handling
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/circ_buf.h>
+#include <linux/hashtable.h>
+#include <linux/spinlock_types.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * Maximum lifetime of a call (in jiffies).
+ */
+unsigned int rxrpc_max_call_lifetime = 60 * HZ;
+
+/*
+ * Time till dead call expires after last use (in jiffies).
+ */
+unsigned int rxrpc_dead_call_expiry = 2 * HZ;
+
+const char *const rxrpc_call_states[NR__RXRPC_CALL_STATES] = {
+       [RXRPC_CALL_CLIENT_SEND_REQUEST]        = "ClSndReq",
+       [RXRPC_CALL_CLIENT_AWAIT_REPLY]         = "ClAwtRpl",
+       [RXRPC_CALL_CLIENT_RECV_REPLY]          = "ClRcvRpl",
+       [RXRPC_CALL_CLIENT_FINAL_ACK]           = "ClFnlACK",
+       [RXRPC_CALL_SERVER_SECURING]            = "SvSecure",
+       [RXRPC_CALL_SERVER_ACCEPTING]           = "SvAccept",
+       [RXRPC_CALL_SERVER_RECV_REQUEST]        = "SvRcvReq",
+       [RXRPC_CALL_SERVER_ACK_REQUEST]         = "SvAckReq",
+       [RXRPC_CALL_SERVER_SEND_REPLY]          = "SvSndRpl",
+       [RXRPC_CALL_SERVER_AWAIT_ACK]           = "SvAwtACK",
+       [RXRPC_CALL_COMPLETE]                   = "Complete",
+       [RXRPC_CALL_SERVER_BUSY]                = "SvBusy  ",
+       [RXRPC_CALL_REMOTELY_ABORTED]           = "RmtAbort",
+       [RXRPC_CALL_LOCALLY_ABORTED]            = "LocAbort",
+       [RXRPC_CALL_NETWORK_ERROR]              = "NetError",
+       [RXRPC_CALL_DEAD]                       = "Dead    ",
+};
+
+struct kmem_cache *rxrpc_call_jar;
+LIST_HEAD(rxrpc_calls);
+DEFINE_RWLOCK(rxrpc_call_lock);
+
+static void rxrpc_destroy_call(struct work_struct *work);
+static void rxrpc_call_life_expired(unsigned long _call);
+static void rxrpc_dead_call_expired(unsigned long _call);
+static void rxrpc_ack_time_expired(unsigned long _call);
+static void rxrpc_resend_time_expired(unsigned long _call);
+
+static DEFINE_SPINLOCK(rxrpc_call_hash_lock);
+static DEFINE_HASHTABLE(rxrpc_call_hash, 10);
+
+/*
+ * Hash function for rxrpc_call_hash
+ */
+static unsigned long rxrpc_call_hashfunc(
+       u8              in_clientflag,
+       u32             cid,
+       u32             call_id,
+       u32             epoch,
+       u16             service_id,
+       sa_family_t     proto,
+       void            *localptr,
+       unsigned int    addr_size,
+       const u8        *peer_addr)
+{
+       const u16 *p;
+       unsigned int i;
+       unsigned long key;
+
+       _enter("");
+
+       key = (unsigned long)localptr;
+       /* We just want to add up the __be32 values, so forcing the
+        * cast should be okay.
+        */
+       key += epoch;
+       key += service_id;
+       key += call_id;
+       key += (cid & RXRPC_CIDMASK) >> RXRPC_CIDSHIFT;
+       key += cid & RXRPC_CHANNELMASK;
+       key += in_clientflag;
+       key += proto;
+       /* Step through the peer address in 16-bit portions for speed */
+       for (i = 0, p = (const u16 *)peer_addr; i < addr_size >> 1; i++, p++)
+               key += *p;
+       _leave(" key = 0x%lx", key);
+       return key;
+}
+
+/*
+ * Add a call to the hashtable
+ */
+static void rxrpc_call_hash_add(struct rxrpc_call *call)
+{
+       unsigned long key;
+       unsigned int addr_size = 0;
+
+       _enter("");
+       switch (call->proto) {
+       case AF_INET:
+               addr_size = sizeof(call->peer_ip.ipv4_addr);
+               break;
+       case AF_INET6:
+               addr_size = sizeof(call->peer_ip.ipv6_addr);
+               break;
+       default:
+               break;
+       }
+       key = rxrpc_call_hashfunc(call->in_clientflag, call->cid,
+                                 call->call_id, call->epoch,
+                                 call->service_id, call->proto,
+                                 call->conn->trans->local, addr_size,
+                                 call->peer_ip.ipv6_addr);
+       /* Store the full key in the call */
+       call->hash_key = key;
+       spin_lock(&rxrpc_call_hash_lock);
+       hash_add_rcu(rxrpc_call_hash, &call->hash_node, key);
+       spin_unlock(&rxrpc_call_hash_lock);
+       _leave("");
+}
+
+/*
+ * Remove a call from the hashtable
+ */
+static void rxrpc_call_hash_del(struct rxrpc_call *call)
+{
+       _enter("");
+       spin_lock(&rxrpc_call_hash_lock);
+       hash_del_rcu(&call->hash_node);
+       spin_unlock(&rxrpc_call_hash_lock);
+       _leave("");
+}
+
+/*
+ * Find a call in the hashtable and return it, or NULL if it
+ * isn't there.
+ */
+struct rxrpc_call *rxrpc_find_call_hash(
+       struct rxrpc_host_header *hdr,
+       void            *localptr,
+       sa_family_t     proto,
+       const void      *peer_addr)
+{
+       unsigned long key;
+       unsigned int addr_size = 0;
+       struct rxrpc_call *call = NULL;
+       struct rxrpc_call *ret = NULL;
+       u8 in_clientflag = hdr->flags & RXRPC_CLIENT_INITIATED;
+
+       _enter("");
+       switch (proto) {
+       case AF_INET:
+               addr_size = sizeof(call->peer_ip.ipv4_addr);
+               break;
+       case AF_INET6:
+               addr_size = sizeof(call->peer_ip.ipv6_addr);
+               break;
+       default:
+               break;
+       }
+
+       key = rxrpc_call_hashfunc(in_clientflag, hdr->cid, hdr->callNumber,
+                                 hdr->epoch, hdr->serviceId,
+                                 proto, localptr, addr_size,
+                                 peer_addr);
+       hash_for_each_possible_rcu(rxrpc_call_hash, call, hash_node, key) {
+               if (call->hash_key == key &&
+                   call->call_id == hdr->callNumber &&
+                   call->cid == hdr->cid &&
+                   call->in_clientflag == in_clientflag &&
+                   call->service_id == hdr->serviceId &&
+                   call->proto == proto &&
+                   call->local == localptr &&
+                   memcmp(call->peer_ip.ipv6_addr, peer_addr,
+                          addr_size) == 0 &&
+                   call->epoch == hdr->epoch) {
+                       ret = call;
+                       break;
+               }
+       }
+       _leave(" = %p", ret);
+       return ret;
+}
+
+/*
+ * find an extant server call
+ * - called in process context with IRQs enabled
+ */
+struct rxrpc_call *rxrpc_find_call_by_user_ID(struct rxrpc_sock *rx,
+                                             unsigned long user_call_ID)
+{
+       struct rxrpc_call *call;
+       struct rb_node *p;
+
+       _enter("%p,%lx", rx, user_call_ID);
+
+       read_lock(&rx->call_lock);
+
+       p = rx->calls.rb_node;
+       while (p) {
+               call = rb_entry(p, struct rxrpc_call, sock_node);
+
+               if (user_call_ID < call->user_call_ID)
+                       p = p->rb_left;
+               else if (user_call_ID > call->user_call_ID)
+                       p = p->rb_right;
+               else
+                       goto found_extant_call;
+       }
+
+       read_unlock(&rx->call_lock);
+       _leave(" = NULL");
+       return NULL;
+
+found_extant_call:
+       rxrpc_get_call(call);
+       read_unlock(&rx->call_lock);
+       _leave(" = %p [%d]", call, atomic_read(&call->usage));
+       return call;
+}
+
+/*
+ * allocate a new call
+ */
+static struct rxrpc_call *rxrpc_alloc_call(gfp_t gfp)
+{
+       struct rxrpc_call *call;
+
+       call = kmem_cache_zalloc(rxrpc_call_jar, gfp);
+       if (!call)
+               return NULL;
+
+       call->acks_winsz = 16;
+       call->acks_window = kmalloc(call->acks_winsz * sizeof(unsigned long),
+                                   gfp);
+       if (!call->acks_window) {
+               kmem_cache_free(rxrpc_call_jar, call);
+               return NULL;
+       }
+
+       setup_timer(&call->lifetimer, &rxrpc_call_life_expired,
+                   (unsigned long) call);
+       setup_timer(&call->deadspan, &rxrpc_dead_call_expired,
+                   (unsigned long) call);
+       setup_timer(&call->ack_timer, &rxrpc_ack_time_expired,
+                   (unsigned long) call);
+       setup_timer(&call->resend_timer, &rxrpc_resend_time_expired,
+                   (unsigned long) call);
+       INIT_WORK(&call->destroyer, &rxrpc_destroy_call);
+       INIT_WORK(&call->processor, &rxrpc_process_call);
+       INIT_LIST_HEAD(&call->accept_link);
+       skb_queue_head_init(&call->rx_queue);
+       skb_queue_head_init(&call->rx_oos_queue);
+       init_waitqueue_head(&call->tx_waitq);
+       spin_lock_init(&call->lock);
+       rwlock_init(&call->state_lock);
+       atomic_set(&call->usage, 1);
+       call->debug_id = atomic_inc_return(&rxrpc_debug_id);
+       call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
+
+       memset(&call->sock_node, 0xed, sizeof(call->sock_node));
+
+       call->rx_data_expect = 1;
+       call->rx_data_eaten = 0;
+       call->rx_first_oos = 0;
+       call->ackr_win_top = call->rx_data_eaten + 1 + rxrpc_rx_window_size;
+       call->creation_jif = jiffies;
+       return call;
+}
+
+/*
+ * allocate a new client call and attempt to get a connection slot for it
+ */
+static struct rxrpc_call *rxrpc_alloc_client_call(
+       struct rxrpc_sock *rx,
+       struct rxrpc_transport *trans,
+       struct rxrpc_conn_bundle *bundle,
+       gfp_t gfp)
+{
+       struct rxrpc_call *call;
+       int ret;
+
+       _enter("");
+
+       ASSERT(rx != NULL);
+       ASSERT(trans != NULL);
+       ASSERT(bundle != NULL);
+
+       call = rxrpc_alloc_call(gfp);
+       if (!call)
+               return ERR_PTR(-ENOMEM);
+
+       sock_hold(&rx->sk);
+       call->socket = rx;
+       call->rx_data_post = 1;
+
+       ret = rxrpc_connect_call(rx, trans, bundle, call, gfp);
+       if (ret < 0) {
+               kmem_cache_free(rxrpc_call_jar, call);
+               return ERR_PTR(ret);
+       }
+
+       /* Record copies of information for hashtable lookup */
+       call->proto = rx->proto;
+       call->local = trans->local;
+       switch (call->proto) {
+       case AF_INET:
+               call->peer_ip.ipv4_addr =
+                       trans->peer->srx.transport.sin.sin_addr.s_addr;
+               break;
+       case AF_INET6:
+               memcpy(call->peer_ip.ipv6_addr,
+                      trans->peer->srx.transport.sin6.sin6_addr.in6_u.u6_addr8,
+                      sizeof(call->peer_ip.ipv6_addr));
+               break;
+       }
+       call->epoch = call->conn->epoch;
+       call->service_id = call->conn->service_id;
+       call->in_clientflag = call->conn->in_clientflag;
+       /* Add the new call to the hashtable */
+       rxrpc_call_hash_add(call);
+
+       spin_lock(&call->conn->trans->peer->lock);
+       list_add(&call->error_link, &call->conn->trans->peer->error_targets);
+       spin_unlock(&call->conn->trans->peer->lock);
+
+       call->lifetimer.expires = jiffies + rxrpc_max_call_lifetime;
+       add_timer(&call->lifetimer);
+
+       _leave(" = %p", call);
+       return call;
+}
+
+/*
+ * set up a call for the given data
+ * - called in process context with IRQs enabled
+ */
+struct rxrpc_call *rxrpc_new_client_call(struct rxrpc_sock *rx,
+                                        struct rxrpc_transport *trans,
+                                        struct rxrpc_conn_bundle *bundle,
+                                        unsigned long user_call_ID,
+                                        gfp_t gfp)
+{
+       struct rxrpc_call *call, *xcall;
+       struct rb_node *parent, **pp;
+
+       _enter("%p,%d,%d,%lx",
+              rx, trans->debug_id, bundle ? bundle->debug_id : -1,
+              user_call_ID);
+
+       call = rxrpc_alloc_client_call(rx, trans, bundle, gfp);
+       if (IS_ERR(call)) {
+               _leave(" = %ld", PTR_ERR(call));
+               return call;
+       }
+
+       call->user_call_ID = user_call_ID;
+       __set_bit(RXRPC_CALL_HAS_USERID, &call->flags);
+
+       write_lock(&rx->call_lock);
+
+       pp = &rx->calls.rb_node;
+       parent = NULL;
+       while (*pp) {
+               parent = *pp;
+               xcall = rb_entry(parent, struct rxrpc_call, sock_node);
+
+               if (user_call_ID < xcall->user_call_ID)
+                       pp = &(*pp)->rb_left;
+               else if (user_call_ID > xcall->user_call_ID)
+                       pp = &(*pp)->rb_right;
+               else
+                       goto found_user_ID_now_present;
+       }
+
+       rxrpc_get_call(call);
+
+       rb_link_node(&call->sock_node, parent, pp);
+       rb_insert_color(&call->sock_node, &rx->calls);
+       write_unlock(&rx->call_lock);
+
+       write_lock_bh(&rxrpc_call_lock);
+       list_add_tail(&call->link, &rxrpc_calls);
+       write_unlock_bh(&rxrpc_call_lock);
+
+       _net("CALL new %d on CONN %d", call->debug_id, call->conn->debug_id);
+
+       _leave(" = %p [new]", call);
+       return call;
+
+       /* We unexpectedly found the user ID in the list after taking
+        * the call_lock.  This shouldn't happen unless the user races
+        * with itself and tries to add the same user ID twice at the
+        * same time in different threads.
+        */
+found_user_ID_now_present:
+       write_unlock(&rx->call_lock);
+       rxrpc_put_call(call);
+       _leave(" = -EEXIST [%p]", call);
+       return ERR_PTR(-EEXIST);
+}
+
+/*
+ * set up an incoming call
+ * - called in process context with IRQs enabled
+ */
+struct rxrpc_call *rxrpc_incoming_call(struct rxrpc_sock *rx,
+                                      struct rxrpc_connection *conn,
+                                      struct rxrpc_host_header *hdr)
+{
+       struct rxrpc_call *call, *candidate;
+       struct rb_node **p, *parent;
+       u32 call_id;
+
+       _enter(",%d", conn->debug_id);
+
+       ASSERT(rx != NULL);
+
+       candidate = rxrpc_alloc_call(GFP_NOIO);
+       if (!candidate)
+               return ERR_PTR(-EBUSY);
+
+       candidate->socket = rx;
+       candidate->conn = conn;
+       candidate->cid = hdr->cid;
+       candidate->call_id = hdr->callNumber;
+       candidate->channel = hdr->cid & RXRPC_CHANNELMASK;
+       candidate->rx_data_post = 0;
+       candidate->state = RXRPC_CALL_SERVER_ACCEPTING;
+       if (conn->security_ix > 0)
+               candidate->state = RXRPC_CALL_SERVER_SECURING;
+
+       write_lock_bh(&conn->lock);
+
+       /* set the channel for this call */
+       call = conn->channels[candidate->channel];
+       _debug("channel[%u] is %p", candidate->channel, call);
+       if (call && call->call_id == hdr->callNumber) {
+               /* already set; must've been a duplicate packet */
+               _debug("extant call [%d]", call->state);
+               ASSERTCMP(call->conn, ==, conn);
+
+               read_lock(&call->state_lock);
+               switch (call->state) {
+               case RXRPC_CALL_LOCALLY_ABORTED:
+                       if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events))
+                               rxrpc_queue_call(call);
+               case RXRPC_CALL_REMOTELY_ABORTED:
+                       read_unlock(&call->state_lock);
+                       goto aborted_call;
+               default:
+                       rxrpc_get_call(call);
+                       read_unlock(&call->state_lock);
+                       goto extant_call;
+               }
+       }
+
+       if (call) {
+               /* it seems the channel is still in use from the previous call
+                * - ditch the old binding if its call is now complete */
+               _debug("CALL: %u { %s }",
+                      call->debug_id, rxrpc_call_states[call->state]);
+
+               if (call->state >= RXRPC_CALL_COMPLETE) {
+                       conn->channels[call->channel] = NULL;
+               } else {
+                       write_unlock_bh(&conn->lock);
+                       kmem_cache_free(rxrpc_call_jar, candidate);
+                       _leave(" = -EBUSY");
+                       return ERR_PTR(-EBUSY);
+               }
+       }
+
+       /* check the call number isn't duplicate */
+       _debug("check dup");
+       call_id = hdr->callNumber;
+       p = &conn->calls.rb_node;
+       parent = NULL;
+       while (*p) {
+               parent = *p;
+               call = rb_entry(parent, struct rxrpc_call, conn_node);
+
+               /* The tree is sorted in order of the __be32 value without
+                * turning it into host order.
+                */
+               if (call_id < call->call_id)
+                       p = &(*p)->rb_left;
+               else if (call_id > call->call_id)
+                       p = &(*p)->rb_right;
+               else
+                       goto old_call;
+       }
+
+       /* make the call available */
+       _debug("new call");
+       call = candidate;
+       candidate = NULL;
+       rb_link_node(&call->conn_node, parent, p);
+       rb_insert_color(&call->conn_node, &conn->calls);
+       conn->channels[call->channel] = call;
+       sock_hold(&rx->sk);
+       atomic_inc(&conn->usage);
+       write_unlock_bh(&conn->lock);
+
+       spin_lock(&conn->trans->peer->lock);
+       list_add(&call->error_link, &conn->trans->peer->error_targets);
+       spin_unlock(&conn->trans->peer->lock);
+
+       write_lock_bh(&rxrpc_call_lock);
+       list_add_tail(&call->link, &rxrpc_calls);
+       write_unlock_bh(&rxrpc_call_lock);
+
+       /* Record copies of information for hashtable lookup */
+       call->proto = rx->proto;
+       call->local = conn->trans->local;
+       switch (call->proto) {
+       case AF_INET:
+               call->peer_ip.ipv4_addr =
+                       conn->trans->peer->srx.transport.sin.sin_addr.s_addr;
+               break;
+       case AF_INET6:
+               memcpy(call->peer_ip.ipv6_addr,
+                      conn->trans->peer->srx.transport.sin6.sin6_addr.in6_u.u6_addr8,
+                      sizeof(call->peer_ip.ipv6_addr));
+               break;
+       default:
+               break;
+       }
+       call->epoch = conn->epoch;
+       call->service_id = conn->service_id;
+       call->in_clientflag = conn->in_clientflag;
+       /* Add the new call to the hashtable */
+       rxrpc_call_hash_add(call);
+
+       _net("CALL incoming %d on CONN %d", call->debug_id, call->conn->debug_id);
+
+       call->lifetimer.expires = jiffies + rxrpc_max_call_lifetime;
+       add_timer(&call->lifetimer);
+       _leave(" = %p {%d} [new]", call, call->debug_id);
+       return call;
+
+extant_call:
+       write_unlock_bh(&conn->lock);
+       kmem_cache_free(rxrpc_call_jar, candidate);
+       _leave(" = %p {%d} [extant]", call, call ? call->debug_id : -1);
+       return call;
+
+aborted_call:
+       write_unlock_bh(&conn->lock);
+       kmem_cache_free(rxrpc_call_jar, candidate);
+       _leave(" = -ECONNABORTED");
+       return ERR_PTR(-ECONNABORTED);
+
+old_call:
+       write_unlock_bh(&conn->lock);
+       kmem_cache_free(rxrpc_call_jar, candidate);
+       _leave(" = -ECONNRESET [old]");
+       return ERR_PTR(-ECONNRESET);
+}
+
+/*
+ * detach a call from a socket and set up for release
+ */
+void rxrpc_release_call(struct rxrpc_call *call)
+{
+       struct rxrpc_connection *conn = call->conn;
+       struct rxrpc_sock *rx = call->socket;
+
+       _enter("{%d,%d,%d,%d}",
+              call->debug_id, atomic_read(&call->usage),
+              atomic_read(&call->ackr_not_idle),
+              call->rx_first_oos);
+
+       spin_lock_bh(&call->lock);
+       if (test_and_set_bit(RXRPC_CALL_RELEASED, &call->flags))
+               BUG();
+       spin_unlock_bh(&call->lock);
+
+       /* dissociate from the socket
+        * - the socket's ref on the call is passed to the death timer
+        */
+       _debug("RELEASE CALL %p (%d CONN %p)", call, call->debug_id, conn);
+
+       write_lock_bh(&rx->call_lock);
+       if (!list_empty(&call->accept_link)) {
+               _debug("unlinking once-pending call %p { e=%lx f=%lx }",
+                      call, call->events, call->flags);
+               ASSERT(!test_bit(RXRPC_CALL_HAS_USERID, &call->flags));
+               list_del_init(&call->accept_link);
+               sk_acceptq_removed(&rx->sk);
+       } else if (test_bit(RXRPC_CALL_HAS_USERID, &call->flags)) {
+               rb_erase(&call->sock_node, &rx->calls);
+               memset(&call->sock_node, 0xdd, sizeof(call->sock_node));
+               clear_bit(RXRPC_CALL_HAS_USERID, &call->flags);
+       }
+       write_unlock_bh(&rx->call_lock);
+
+       /* free up the channel for reuse */
+       spin_lock(&conn->trans->client_lock);
+       write_lock_bh(&conn->lock);
+       write_lock(&call->state_lock);
+
+       if (conn->channels[call->channel] == call)
+               conn->channels[call->channel] = NULL;
+
+       if (conn->out_clientflag && conn->bundle) {
+               conn->avail_calls++;
+               switch (conn->avail_calls) {
+               case 1:
+                       list_move_tail(&conn->bundle_link,
+                                      &conn->bundle->avail_conns);
+               case 2 ... RXRPC_MAXCALLS - 1:
+                       ASSERT(conn->channels[0] == NULL ||
+                              conn->channels[1] == NULL ||
+                              conn->channels[2] == NULL ||
+                              conn->channels[3] == NULL);
+                       break;
+               case RXRPC_MAXCALLS:
+                       list_move_tail(&conn->bundle_link,
+                                      &conn->bundle->unused_conns);
+                       ASSERT(conn->channels[0] == NULL &&
+                              conn->channels[1] == NULL &&
+                              conn->channels[2] == NULL &&
+                              conn->channels[3] == NULL);
+                       break;
+               default:
+                       pr_err("conn->avail_calls=%d\n", conn->avail_calls);
+                       BUG();
+               }
+       }
+
+       spin_unlock(&conn->trans->client_lock);
+
+       if (call->state < RXRPC_CALL_COMPLETE &&
+           call->state != RXRPC_CALL_CLIENT_FINAL_ACK) {
+               _debug("+++ ABORTING STATE %d +++\n", call->state);
+               call->state = RXRPC_CALL_LOCALLY_ABORTED;
+               call->local_abort = RX_CALL_DEAD;
+               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
+               rxrpc_queue_call(call);
+       }
+       write_unlock(&call->state_lock);
+       write_unlock_bh(&conn->lock);
+
+       /* clean up the Rx queue */
+       if (!skb_queue_empty(&call->rx_queue) ||
+           !skb_queue_empty(&call->rx_oos_queue)) {
+               struct rxrpc_skb_priv *sp;
+               struct sk_buff *skb;
+
+               _debug("purge Rx queues");
+
+               spin_lock_bh(&call->lock);
+               while ((skb = skb_dequeue(&call->rx_queue)) ||
+                      (skb = skb_dequeue(&call->rx_oos_queue))) {
+                       sp = rxrpc_skb(skb);
+                       if (sp->call) {
+                               ASSERTCMP(sp->call, ==, call);
+                               rxrpc_put_call(call);
+                               sp->call = NULL;
+                       }
+                       skb->destructor = NULL;
+                       spin_unlock_bh(&call->lock);
+
+                       _debug("- zap %s %%%u #%u",
+                              rxrpc_pkts[sp->hdr.type],
+                              sp->hdr.serial, sp->hdr.seq);
+                       rxrpc_free_skb(skb);
+                       spin_lock_bh(&call->lock);
+               }
+               spin_unlock_bh(&call->lock);
+
+               ASSERTCMP(call->state, !=, RXRPC_CALL_COMPLETE);
+       }
+
+       del_timer_sync(&call->resend_timer);
+       del_timer_sync(&call->ack_timer);
+       del_timer_sync(&call->lifetimer);
+       call->deadspan.expires = jiffies + rxrpc_dead_call_expiry;
+       add_timer(&call->deadspan);
+
+       _leave("");
+}
+
+/*
+ * handle a dead call being ready for reaping
+ */
+static void rxrpc_dead_call_expired(unsigned long _call)
+{
+       struct rxrpc_call *call = (struct rxrpc_call *) _call;
+
+       _enter("{%d}", call->debug_id);
+
+       write_lock_bh(&call->state_lock);
+       call->state = RXRPC_CALL_DEAD;
+       write_unlock_bh(&call->state_lock);
+       rxrpc_put_call(call);
+}
+
+/*
+ * mark a call as to be released, aborting it if it's still in progress
+ * - called with softirqs disabled
+ */
+static void rxrpc_mark_call_released(struct rxrpc_call *call)
+{
+       bool sched;
+
+       write_lock(&call->state_lock);
+       if (call->state < RXRPC_CALL_DEAD) {
+               sched = false;
+               if (call->state < RXRPC_CALL_COMPLETE) {
+                       _debug("abort call %p", call);
+                       call->state = RXRPC_CALL_LOCALLY_ABORTED;
+                       call->local_abort = RX_CALL_DEAD;
+                       if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events))
+                               sched = true;
+               }
+               if (!test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
+                       sched = true;
+               if (sched)
+                       rxrpc_queue_call(call);
+       }
+       write_unlock(&call->state_lock);
+}
+
+/*
+ * release all the calls associated with a socket
+ */
+void rxrpc_release_calls_on_socket(struct rxrpc_sock *rx)
+{
+       struct rxrpc_call *call;
+       struct rb_node *p;
+
+       _enter("%p", rx);
+
+       read_lock_bh(&rx->call_lock);
+
+       /* mark all the calls as no longer wanting incoming packets */
+       for (p = rb_first(&rx->calls); p; p = rb_next(p)) {
+               call = rb_entry(p, struct rxrpc_call, sock_node);
+               rxrpc_mark_call_released(call);
+       }
+
+       /* kill the not-yet-accepted incoming calls */
+       list_for_each_entry(call, &rx->secureq, accept_link) {
+               rxrpc_mark_call_released(call);
+       }
+
+       list_for_each_entry(call, &rx->acceptq, accept_link) {
+               rxrpc_mark_call_released(call);
+       }
+
+       read_unlock_bh(&rx->call_lock);
+       _leave("");
+}
+
+/*
+ * release a call
+ */
+void __rxrpc_put_call(struct rxrpc_call *call)
+{
+       ASSERT(call != NULL);
+
+       _enter("%p{u=%d}", call, atomic_read(&call->usage));
+
+       ASSERTCMP(atomic_read(&call->usage), >, 0);
+
+       if (atomic_dec_and_test(&call->usage)) {
+               _debug("call %d dead", call->debug_id);
+               ASSERTCMP(call->state, ==, RXRPC_CALL_DEAD);
+               rxrpc_queue_work(&call->destroyer);
+       }
+       _leave("");
+}
+
+/*
+ * clean up a call
+ */
+static void rxrpc_cleanup_call(struct rxrpc_call *call)
+{
+       _net("DESTROY CALL %d", call->debug_id);
+
+       ASSERT(call->socket);
+
+       memset(&call->sock_node, 0xcd, sizeof(call->sock_node));
+
+       del_timer_sync(&call->lifetimer);
+       del_timer_sync(&call->deadspan);
+       del_timer_sync(&call->ack_timer);
+       del_timer_sync(&call->resend_timer);
+
+       ASSERT(test_bit(RXRPC_CALL_RELEASED, &call->flags));
+       ASSERTCMP(call->events, ==, 0);
+       if (work_pending(&call->processor)) {
+               _debug("defer destroy");
+               rxrpc_queue_work(&call->destroyer);
+               return;
+       }
+
+       if (call->conn) {
+               spin_lock(&call->conn->trans->peer->lock);
+               list_del(&call->error_link);
+               spin_unlock(&call->conn->trans->peer->lock);
+
+               write_lock_bh(&call->conn->lock);
+               rb_erase(&call->conn_node, &call->conn->calls);
+               write_unlock_bh(&call->conn->lock);
+               rxrpc_put_connection(call->conn);
+       }
+
+       /* Remove the call from the hash */
+       rxrpc_call_hash_del(call);
+
+       if (call->acks_window) {
+               _debug("kill Tx window %d",
+                      CIRC_CNT(call->acks_head, call->acks_tail,
+                               call->acks_winsz));
+               smp_mb();
+               while (CIRC_CNT(call->acks_head, call->acks_tail,
+                               call->acks_winsz) > 0) {
+                       struct rxrpc_skb_priv *sp;
+                       unsigned long _skb;
+
+                       _skb = call->acks_window[call->acks_tail] & ~1;
+                       sp = rxrpc_skb((struct sk_buff *)_skb);
+                       _debug("+++ clear Tx %u", sp->hdr.seq);
+                       rxrpc_free_skb((struct sk_buff *)_skb);
+                       call->acks_tail =
+                               (call->acks_tail + 1) & (call->acks_winsz - 1);
+               }
+
+               kfree(call->acks_window);
+       }
+
+       rxrpc_free_skb(call->tx_pending);
+
+       rxrpc_purge_queue(&call->rx_queue);
+       ASSERT(skb_queue_empty(&call->rx_oos_queue));
+       sock_put(&call->socket->sk);
+       kmem_cache_free(rxrpc_call_jar, call);
+}
+
+/*
+ * destroy a call
+ */
+static void rxrpc_destroy_call(struct work_struct *work)
+{
+       struct rxrpc_call *call =
+               container_of(work, struct rxrpc_call, destroyer);
+
+       _enter("%p{%d,%d,%p}",
+              call, atomic_read(&call->usage), call->channel, call->conn);
+
+       ASSERTCMP(call->state, ==, RXRPC_CALL_DEAD);
+
+       write_lock_bh(&rxrpc_call_lock);
+       list_del_init(&call->link);
+       write_unlock_bh(&rxrpc_call_lock);
+
+       rxrpc_cleanup_call(call);
+       _leave("");
+}
+
+/*
+ * preemptively destroy all the call records from a transport endpoint rather
+ * than waiting for them to time out
+ */
+void __exit rxrpc_destroy_all_calls(void)
+{
+       struct rxrpc_call *call;
+
+       _enter("");
+       write_lock_bh(&rxrpc_call_lock);
+
+       while (!list_empty(&rxrpc_calls)) {
+               call = list_entry(rxrpc_calls.next, struct rxrpc_call, link);
+               _debug("Zapping call %p", call);
+
+               list_del_init(&call->link);
+
+               switch (atomic_read(&call->usage)) {
+               case 0:
+                       ASSERTCMP(call->state, ==, RXRPC_CALL_DEAD);
+                       break;
+               case 1:
+                       if (del_timer_sync(&call->deadspan) != 0 &&
+                           call->state != RXRPC_CALL_DEAD)
+                               rxrpc_dead_call_expired((unsigned long) call);
+                       if (call->state != RXRPC_CALL_DEAD)
+                               break;
+               default:
+                       pr_err("Call %p still in use (%d,%d,%s,%lx,%lx)!\n",
+                              call, atomic_read(&call->usage),
+                              atomic_read(&call->ackr_not_idle),
+                              rxrpc_call_states[call->state],
+                              call->flags, call->events);
+                       if (!skb_queue_empty(&call->rx_queue))
+                               pr_err("Rx queue occupied\n");
+                       if (!skb_queue_empty(&call->rx_oos_queue))
+                               pr_err("OOS queue occupied\n");
+                       break;
+               }
+
+               write_unlock_bh(&rxrpc_call_lock);
+               cond_resched();
+               write_lock_bh(&rxrpc_call_lock);
+       }
+
+       write_unlock_bh(&rxrpc_call_lock);
+       _leave("");
+}
+
+/*
+ * handle call lifetime being exceeded
+ */
+static void rxrpc_call_life_expired(unsigned long _call)
+{
+       struct rxrpc_call *call = (struct rxrpc_call *) _call;
+
+       if (call->state >= RXRPC_CALL_COMPLETE)
+               return;
+
+       _enter("{%d}", call->debug_id);
+       read_lock_bh(&call->state_lock);
+       if (call->state < RXRPC_CALL_COMPLETE) {
+               set_bit(RXRPC_CALL_EV_LIFE_TIMER, &call->events);
+               rxrpc_queue_call(call);
+       }
+       read_unlock_bh(&call->state_lock);
+}
+
+/*
+ * handle resend timer expiry
+ * - may not take call->state_lock as this can deadlock against del_timer_sync()
+ */
+static void rxrpc_resend_time_expired(unsigned long _call)
+{
+       struct rxrpc_call *call = (struct rxrpc_call *) _call;
+
+       _enter("{%d}", call->debug_id);
+
+       if (call->state >= RXRPC_CALL_COMPLETE)
+               return;
+
+       clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+       if (!test_and_set_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events))
+               rxrpc_queue_call(call);
+}
+
+/*
+ * handle ACK timer expiry
+ */
+static void rxrpc_ack_time_expired(unsigned long _call)
+{
+       struct rxrpc_call *call = (struct rxrpc_call *) _call;
+
+       _enter("{%d}", call->debug_id);
+
+       if (call->state >= RXRPC_CALL_COMPLETE)
+               return;
+
+       read_lock_bh(&call->state_lock);
+       if (call->state < RXRPC_CALL_COMPLETE &&
+           !test_and_set_bit(RXRPC_CALL_EV_ACK, &call->events))
+               rxrpc_queue_call(call);
+       read_unlock_bh(&call->state_lock);
+}
diff --git a/net/rxrpc/conn_event.c b/net/rxrpc/conn_event.c
new file mode 100644 (file)
index 0000000..8bdd692
--- /dev/null
@@ -0,0 +1,403 @@
+/* connection-level event handling
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/errqueue.h>
+#include <linux/udp.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/icmp.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <net/ip.h>
+#include "ar-internal.h"
+
+/*
+ * pass a connection-level abort onto all calls on that connection
+ */
+static void rxrpc_abort_calls(struct rxrpc_connection *conn, int state,
+                             u32 abort_code)
+{
+       struct rxrpc_call *call;
+       struct rb_node *p;
+
+       _enter("{%d},%x", conn->debug_id, abort_code);
+
+       read_lock_bh(&conn->lock);
+
+       for (p = rb_first(&conn->calls); p; p = rb_next(p)) {
+               call = rb_entry(p, struct rxrpc_call, conn_node);
+               write_lock(&call->state_lock);
+               if (call->state <= RXRPC_CALL_COMPLETE) {
+                       call->state = state;
+                       if (state == RXRPC_CALL_LOCALLY_ABORTED) {
+                               call->local_abort = conn->local_abort;
+                               set_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
+                       } else {
+                               call->remote_abort = conn->remote_abort;
+                               set_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
+                       }
+                       rxrpc_queue_call(call);
+               }
+               write_unlock(&call->state_lock);
+       }
+
+       read_unlock_bh(&conn->lock);
+       _leave("");
+}
+
+/*
+ * generate a connection-level abort
+ */
+static int rxrpc_abort_connection(struct rxrpc_connection *conn,
+                                 u32 error, u32 abort_code)
+{
+       struct rxrpc_wire_header whdr;
+       struct msghdr msg;
+       struct kvec iov[2];
+       __be32 word;
+       size_t len;
+       u32 serial;
+       int ret;
+
+       _enter("%d,,%u,%u", conn->debug_id, error, abort_code);
+
+       /* generate a connection-level abort */
+       spin_lock_bh(&conn->state_lock);
+       if (conn->state < RXRPC_CONN_REMOTELY_ABORTED) {
+               conn->state = RXRPC_CONN_LOCALLY_ABORTED;
+               conn->error = error;
+               spin_unlock_bh(&conn->state_lock);
+       } else {
+               spin_unlock_bh(&conn->state_lock);
+               _leave(" = 0 [already dead]");
+               return 0;
+       }
+
+       rxrpc_abort_calls(conn, RXRPC_CALL_LOCALLY_ABORTED, abort_code);
+
+       msg.msg_name    = &conn->trans->peer->srx.transport;
+       msg.msg_namelen = conn->trans->peer->srx.transport_len;
+       msg.msg_control = NULL;
+       msg.msg_controllen = 0;
+       msg.msg_flags   = 0;
+
+       whdr.epoch      = htonl(conn->epoch);
+       whdr.cid        = htonl(conn->cid);
+       whdr.callNumber = 0;
+       whdr.seq        = 0;
+       whdr.type       = RXRPC_PACKET_TYPE_ABORT;
+       whdr.flags      = conn->out_clientflag;
+       whdr.userStatus = 0;
+       whdr.securityIndex = conn->security_ix;
+       whdr._rsvd      = 0;
+       whdr.serviceId  = htons(conn->service_id);
+
+       word            = htonl(conn->local_abort);
+
+       iov[0].iov_base = &whdr;
+       iov[0].iov_len  = sizeof(whdr);
+       iov[1].iov_base = &word;
+       iov[1].iov_len  = sizeof(word);
+
+       len = iov[0].iov_len + iov[1].iov_len;
+
+       serial = atomic_inc_return(&conn->serial);
+       whdr.serial = htonl(serial);
+       _proto("Tx CONN ABORT %%%u { %d }", serial, conn->local_abort);
+
+       ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
+       if (ret < 0) {
+               _debug("sendmsg failed: %d", ret);
+               return -EAGAIN;
+       }
+
+       _leave(" = 0");
+       return 0;
+}
+
+/*
+ * mark a call as being on a now-secured channel
+ * - must be called with softirqs disabled
+ */
+static void rxrpc_call_is_secure(struct rxrpc_call *call)
+{
+       _enter("%p", call);
+       if (call) {
+               read_lock(&call->state_lock);
+               if (call->state < RXRPC_CALL_COMPLETE &&
+                   !test_and_set_bit(RXRPC_CALL_EV_SECURED, &call->events))
+                       rxrpc_queue_call(call);
+               read_unlock(&call->state_lock);
+       }
+}
+
+/*
+ * connection-level Rx packet processor
+ */
+static int rxrpc_process_event(struct rxrpc_connection *conn,
+                              struct sk_buff *skb,
+                              u32 *_abort_code)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       __be32 wtmp;
+       u32 abort_code;
+       int loop, ret;
+
+       if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
+               kleave(" = -ECONNABORTED [%u]", conn->state);
+               return -ECONNABORTED;
+       }
+
+       _enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, sp->hdr.serial);
+
+       switch (sp->hdr.type) {
+       case RXRPC_PACKET_TYPE_ABORT:
+               if (skb_copy_bits(skb, 0, &wtmp, sizeof(wtmp)) < 0)
+                       return -EPROTO;
+               abort_code = ntohl(wtmp);
+               _proto("Rx ABORT %%%u { ac=%d }", sp->hdr.serial, abort_code);
+
+               conn->state = RXRPC_CONN_REMOTELY_ABORTED;
+               rxrpc_abort_calls(conn, RXRPC_CALL_REMOTELY_ABORTED,
+                                 abort_code);
+               return -ECONNABORTED;
+
+       case RXRPC_PACKET_TYPE_CHALLENGE:
+               return conn->security->respond_to_challenge(conn, skb,
+                                                           _abort_code);
+
+       case RXRPC_PACKET_TYPE_RESPONSE:
+               ret = conn->security->verify_response(conn, skb, _abort_code);
+               if (ret < 0)
+                       return ret;
+
+               ret = conn->security->init_connection_security(conn);
+               if (ret < 0)
+                       return ret;
+
+               conn->security->prime_packet_security(conn);
+               read_lock_bh(&conn->lock);
+               spin_lock(&conn->state_lock);
+
+               if (conn->state == RXRPC_CONN_SERVER_CHALLENGING) {
+                       conn->state = RXRPC_CONN_SERVER;
+                       for (loop = 0; loop < RXRPC_MAXCALLS; loop++)
+                               rxrpc_call_is_secure(conn->channels[loop]);
+               }
+
+               spin_unlock(&conn->state_lock);
+               read_unlock_bh(&conn->lock);
+               return 0;
+
+       default:
+               _leave(" = -EPROTO [%u]", sp->hdr.type);
+               return -EPROTO;
+       }
+}
+
+/*
+ * set up security and issue a challenge
+ */
+static void rxrpc_secure_connection(struct rxrpc_connection *conn)
+{
+       u32 abort_code;
+       int ret;
+
+       _enter("{%d}", conn->debug_id);
+
+       ASSERT(conn->security_ix != 0);
+
+       if (!conn->key) {
+               _debug("set up security");
+               ret = rxrpc_init_server_conn_security(conn);
+               switch (ret) {
+               case 0:
+                       break;
+               case -ENOENT:
+                       abort_code = RX_CALL_DEAD;
+                       goto abort;
+               default:
+                       abort_code = RXKADNOAUTH;
+                       goto abort;
+               }
+       }
+
+       if (conn->security->issue_challenge(conn) < 0) {
+               abort_code = RX_CALL_DEAD;
+               ret = -ENOMEM;
+               goto abort;
+       }
+
+       _leave("");
+       return;
+
+abort:
+       _debug("abort %d, %d", ret, abort_code);
+       rxrpc_abort_connection(conn, -ret, abort_code);
+       _leave(" [aborted]");
+}
+
+/*
+ * connection-level event processor
+ */
+void rxrpc_process_connection(struct work_struct *work)
+{
+       struct rxrpc_connection *conn =
+               container_of(work, struct rxrpc_connection, processor);
+       struct sk_buff *skb;
+       u32 abort_code = RX_PROTOCOL_ERROR;
+       int ret;
+
+       _enter("{%d}", conn->debug_id);
+
+       atomic_inc(&conn->usage);
+
+       if (test_and_clear_bit(RXRPC_CONN_CHALLENGE, &conn->events)) {
+               rxrpc_secure_connection(conn);
+               rxrpc_put_connection(conn);
+       }
+
+       /* go through the conn-level event packets, releasing the ref on this
+        * connection that each one has when we've finished with it */
+       while ((skb = skb_dequeue(&conn->rx_queue))) {
+               ret = rxrpc_process_event(conn, skb, &abort_code);
+               switch (ret) {
+               case -EPROTO:
+               case -EKEYEXPIRED:
+               case -EKEYREJECTED:
+                       goto protocol_error;
+               case -EAGAIN:
+                       goto requeue_and_leave;
+               case -ECONNABORTED:
+               default:
+                       rxrpc_put_connection(conn);
+                       rxrpc_free_skb(skb);
+                       break;
+               }
+       }
+
+out:
+       rxrpc_put_connection(conn);
+       _leave("");
+       return;
+
+requeue_and_leave:
+       skb_queue_head(&conn->rx_queue, skb);
+       goto out;
+
+protocol_error:
+       if (rxrpc_abort_connection(conn, -ret, abort_code) < 0)
+               goto requeue_and_leave;
+       rxrpc_put_connection(conn);
+       rxrpc_free_skb(skb);
+       _leave(" [EPROTO]");
+       goto out;
+}
+
+/*
+ * put a packet up for transport-level abort
+ */
+void rxrpc_reject_packet(struct rxrpc_local *local, struct sk_buff *skb)
+{
+       CHECK_SLAB_OKAY(&local->usage);
+
+       if (!atomic_inc_not_zero(&local->usage)) {
+               printk("resurrected on reject\n");
+               BUG();
+       }
+
+       skb_queue_tail(&local->reject_queue, skb);
+       rxrpc_queue_work(&local->rejecter);
+}
+
+/*
+ * reject packets through the local endpoint
+ */
+void rxrpc_reject_packets(struct work_struct *work)
+{
+       union {
+               struct sockaddr sa;
+               struct sockaddr_in sin;
+       } sa;
+       struct rxrpc_skb_priv *sp;
+       struct rxrpc_wire_header whdr;
+       struct rxrpc_local *local;
+       struct sk_buff *skb;
+       struct msghdr msg;
+       struct kvec iov[2];
+       size_t size;
+       __be32 code;
+
+       local = container_of(work, struct rxrpc_local, rejecter);
+       rxrpc_get_local(local);
+
+       _enter("%d", local->debug_id);
+
+       iov[0].iov_base = &whdr;
+       iov[0].iov_len = sizeof(whdr);
+       iov[1].iov_base = &code;
+       iov[1].iov_len = sizeof(code);
+       size = sizeof(whdr) + sizeof(code);
+
+       msg.msg_name = &sa;
+       msg.msg_control = NULL;
+       msg.msg_controllen = 0;
+       msg.msg_flags = 0;
+
+       memset(&sa, 0, sizeof(sa));
+       sa.sa.sa_family = local->srx.transport.family;
+       switch (sa.sa.sa_family) {
+       case AF_INET:
+               msg.msg_namelen = sizeof(sa.sin);
+               break;
+       default:
+               msg.msg_namelen = 0;
+               break;
+       }
+
+       memset(&whdr, 0, sizeof(whdr));
+       whdr.type = RXRPC_PACKET_TYPE_ABORT;
+
+       while ((skb = skb_dequeue(&local->reject_queue))) {
+               sp = rxrpc_skb(skb);
+               switch (sa.sa.sa_family) {
+               case AF_INET:
+                       sa.sin.sin_port = udp_hdr(skb)->source;
+                       sa.sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
+                       code = htonl(skb->priority);
+
+                       whdr.epoch      = htonl(sp->hdr.epoch);
+                       whdr.cid        = htonl(sp->hdr.cid);
+                       whdr.callNumber = htonl(sp->hdr.callNumber);
+                       whdr.serviceId  = htons(sp->hdr.serviceId);
+                       whdr.flags      = sp->hdr.flags;
+                       whdr.flags      ^= RXRPC_CLIENT_INITIATED;
+                       whdr.flags      &= RXRPC_CLIENT_INITIATED;
+
+                       kernel_sendmsg(local->socket, &msg, iov, 2, size);
+                       break;
+
+               default:
+                       break;
+               }
+
+               rxrpc_free_skb(skb);
+               rxrpc_put_local(local);
+       }
+
+       rxrpc_put_local(local);
+       _leave("");
+}
diff --git a/net/rxrpc/conn_object.c b/net/rxrpc/conn_object.c
new file mode 100644 (file)
index 0000000..8ecde4b
--- /dev/null
@@ -0,0 +1,912 @@
+/* RxRPC virtual connection handler
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/crypto.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * Time till a connection expires after last use (in seconds).
+ */
+unsigned int rxrpc_connection_expiry = 10 * 60;
+
+static void rxrpc_connection_reaper(struct work_struct *work);
+
+LIST_HEAD(rxrpc_connections);
+DEFINE_RWLOCK(rxrpc_connection_lock);
+static DECLARE_DELAYED_WORK(rxrpc_connection_reap, rxrpc_connection_reaper);
+
+/*
+ * allocate a new client connection bundle
+ */
+static struct rxrpc_conn_bundle *rxrpc_alloc_bundle(gfp_t gfp)
+{
+       struct rxrpc_conn_bundle *bundle;
+
+       _enter("");
+
+       bundle = kzalloc(sizeof(struct rxrpc_conn_bundle), gfp);
+       if (bundle) {
+               INIT_LIST_HEAD(&bundle->unused_conns);
+               INIT_LIST_HEAD(&bundle->avail_conns);
+               INIT_LIST_HEAD(&bundle->busy_conns);
+               init_waitqueue_head(&bundle->chanwait);
+               atomic_set(&bundle->usage, 1);
+       }
+
+       _leave(" = %p", bundle);
+       return bundle;
+}
+
+/*
+ * compare bundle parameters with what we're looking for
+ * - return -ve, 0 or +ve
+ */
+static inline
+int rxrpc_cmp_bundle(const struct rxrpc_conn_bundle *bundle,
+                    struct key *key, u16 service_id)
+{
+       return (bundle->service_id - service_id) ?:
+               ((unsigned long)bundle->key - (unsigned long)key);
+}
+
+/*
+ * get bundle of client connections that a client socket can make use of
+ */
+struct rxrpc_conn_bundle *rxrpc_get_bundle(struct rxrpc_sock *rx,
+                                          struct rxrpc_transport *trans,
+                                          struct key *key,
+                                          u16 service_id,
+                                          gfp_t gfp)
+{
+       struct rxrpc_conn_bundle *bundle, *candidate;
+       struct rb_node *p, *parent, **pp;
+
+       _enter("%p{%x},%x,%hx,",
+              rx, key_serial(key), trans->debug_id, service_id);
+
+       /* search the extant bundles first for one that matches the specified
+        * user ID */
+       spin_lock(&trans->client_lock);
+
+       p = trans->bundles.rb_node;
+       while (p) {
+               bundle = rb_entry(p, struct rxrpc_conn_bundle, node);
+
+               if (rxrpc_cmp_bundle(bundle, key, service_id) < 0)
+                       p = p->rb_left;
+               else if (rxrpc_cmp_bundle(bundle, key, service_id) > 0)
+                       p = p->rb_right;
+               else
+                       goto found_extant_bundle;
+       }
+
+       spin_unlock(&trans->client_lock);
+
+       /* not yet present - create a candidate for a new record and then
+        * redo the search */
+       candidate = rxrpc_alloc_bundle(gfp);
+       if (!candidate) {
+               _leave(" = -ENOMEM");
+               return ERR_PTR(-ENOMEM);
+       }
+
+       candidate->key = key_get(key);
+       candidate->service_id = service_id;
+
+       spin_lock(&trans->client_lock);
+
+       pp = &trans->bundles.rb_node;
+       parent = NULL;
+       while (*pp) {
+               parent = *pp;
+               bundle = rb_entry(parent, struct rxrpc_conn_bundle, node);
+
+               if (rxrpc_cmp_bundle(bundle, key, service_id) < 0)
+                       pp = &(*pp)->rb_left;
+               else if (rxrpc_cmp_bundle(bundle, key, service_id) > 0)
+                       pp = &(*pp)->rb_right;
+               else
+                       goto found_extant_second;
+       }
+
+       /* second search also failed; add the new bundle */
+       bundle = candidate;
+       candidate = NULL;
+
+       rb_link_node(&bundle->node, parent, pp);
+       rb_insert_color(&bundle->node, &trans->bundles);
+       spin_unlock(&trans->client_lock);
+       _net("BUNDLE new on trans %d", trans->debug_id);
+       _leave(" = %p [new]", bundle);
+       return bundle;
+
+       /* we found the bundle in the list immediately */
+found_extant_bundle:
+       atomic_inc(&bundle->usage);
+       spin_unlock(&trans->client_lock);
+       _net("BUNDLE old on trans %d", trans->debug_id);
+       _leave(" = %p [extant %d]", bundle, atomic_read(&bundle->usage));
+       return bundle;
+
+       /* we found the bundle on the second time through the list */
+found_extant_second:
+       atomic_inc(&bundle->usage);
+       spin_unlock(&trans->client_lock);
+       kfree(candidate);
+       _net("BUNDLE old2 on trans %d", trans->debug_id);
+       _leave(" = %p [second %d]", bundle, atomic_read(&bundle->usage));
+       return bundle;
+}
+
+/*
+ * release a bundle
+ */
+void rxrpc_put_bundle(struct rxrpc_transport *trans,
+                     struct rxrpc_conn_bundle *bundle)
+{
+       _enter("%p,%p{%d}",trans, bundle, atomic_read(&bundle->usage));
+
+       if (atomic_dec_and_lock(&bundle->usage, &trans->client_lock)) {
+               _debug("Destroy bundle");
+               rb_erase(&bundle->node, &trans->bundles);
+               spin_unlock(&trans->client_lock);
+               ASSERT(list_empty(&bundle->unused_conns));
+               ASSERT(list_empty(&bundle->avail_conns));
+               ASSERT(list_empty(&bundle->busy_conns));
+               ASSERTCMP(bundle->num_conns, ==, 0);
+               key_put(bundle->key);
+               kfree(bundle);
+       }
+
+       _leave("");
+}
+
+/*
+ * allocate a new connection
+ */
+static struct rxrpc_connection *rxrpc_alloc_connection(gfp_t gfp)
+{
+       struct rxrpc_connection *conn;
+
+       _enter("");
+
+       conn = kzalloc(sizeof(struct rxrpc_connection), gfp);
+       if (conn) {
+               INIT_WORK(&conn->processor, &rxrpc_process_connection);
+               INIT_LIST_HEAD(&conn->bundle_link);
+               conn->calls = RB_ROOT;
+               skb_queue_head_init(&conn->rx_queue);
+               conn->security = &rxrpc_no_security;
+               rwlock_init(&conn->lock);
+               spin_lock_init(&conn->state_lock);
+               atomic_set(&conn->usage, 1);
+               conn->debug_id = atomic_inc_return(&rxrpc_debug_id);
+               conn->avail_calls = RXRPC_MAXCALLS;
+               conn->size_align = 4;
+               conn->header_size = sizeof(struct rxrpc_wire_header);
+       }
+
+       _leave(" = %p{%d}", conn, conn ? conn->debug_id : 0);
+       return conn;
+}
+
+/*
+ * assign a connection ID to a connection and add it to the transport's
+ * connection lookup tree
+ * - called with transport client lock held
+ */
+static void rxrpc_assign_connection_id(struct rxrpc_connection *conn)
+{
+       struct rxrpc_connection *xconn;
+       struct rb_node *parent, **p;
+       __be32 epoch;
+       u32 cid;
+
+       _enter("");
+
+       epoch = conn->epoch;
+
+       write_lock_bh(&conn->trans->conn_lock);
+
+       conn->trans->conn_idcounter += RXRPC_CID_INC;
+       if (conn->trans->conn_idcounter < RXRPC_CID_INC)
+               conn->trans->conn_idcounter = RXRPC_CID_INC;
+       cid = conn->trans->conn_idcounter;
+
+attempt_insertion:
+       parent = NULL;
+       p = &conn->trans->client_conns.rb_node;
+
+       while (*p) {
+               parent = *p;
+               xconn = rb_entry(parent, struct rxrpc_connection, node);
+
+               if (epoch < xconn->epoch)
+                       p = &(*p)->rb_left;
+               else if (epoch > xconn->epoch)
+                       p = &(*p)->rb_right;
+               else if (cid < xconn->cid)
+                       p = &(*p)->rb_left;
+               else if (cid > xconn->cid)
+                       p = &(*p)->rb_right;
+               else
+                       goto id_exists;
+       }
+
+       /* we've found a suitable hole - arrange for this connection to occupy
+        * it */
+       rb_link_node(&conn->node, parent, p);
+       rb_insert_color(&conn->node, &conn->trans->client_conns);
+
+       conn->cid = cid;
+       write_unlock_bh(&conn->trans->conn_lock);
+       _leave(" [CID %x]", cid);
+       return;
+
+       /* we found a connection with the proposed ID - walk the tree from that
+        * point looking for the next unused ID */
+id_exists:
+       for (;;) {
+               cid += RXRPC_CID_INC;
+               if (cid < RXRPC_CID_INC) {
+                       cid = RXRPC_CID_INC;
+                       conn->trans->conn_idcounter = cid;
+                       goto attempt_insertion;
+               }
+
+               parent = rb_next(parent);
+               if (!parent)
+                       goto attempt_insertion;
+
+               xconn = rb_entry(parent, struct rxrpc_connection, node);
+               if (epoch < xconn->epoch ||
+                   cid < xconn->cid)
+                       goto attempt_insertion;
+       }
+}
+
+/*
+ * add a call to a connection's call-by-ID tree
+ */
+static void rxrpc_add_call_ID_to_conn(struct rxrpc_connection *conn,
+                                     struct rxrpc_call *call)
+{
+       struct rxrpc_call *xcall;
+       struct rb_node *parent, **p;
+       __be32 call_id;
+
+       write_lock_bh(&conn->lock);
+
+       call_id = call->call_id;
+       p = &conn->calls.rb_node;
+       parent = NULL;
+       while (*p) {
+               parent = *p;
+               xcall = rb_entry(parent, struct rxrpc_call, conn_node);
+
+               if (call_id < xcall->call_id)
+                       p = &(*p)->rb_left;
+               else if (call_id > xcall->call_id)
+                       p = &(*p)->rb_right;
+               else
+                       BUG();
+       }
+
+       rb_link_node(&call->conn_node, parent, p);
+       rb_insert_color(&call->conn_node, &conn->calls);
+
+       write_unlock_bh(&conn->lock);
+}
+
+/*
+ * connect a call on an exclusive connection
+ */
+static int rxrpc_connect_exclusive(struct rxrpc_sock *rx,
+                                  struct rxrpc_transport *trans,
+                                  u16 service_id,
+                                  struct rxrpc_call *call,
+                                  gfp_t gfp)
+{
+       struct rxrpc_connection *conn;
+       int chan, ret;
+
+       _enter("");
+
+       conn = rx->conn;
+       if (!conn) {
+               /* not yet present - create a candidate for a new connection
+                * and then redo the check */
+               conn = rxrpc_alloc_connection(gfp);
+               if (!conn) {
+                       _leave(" = -ENOMEM");
+                       return -ENOMEM;
+               }
+
+               conn->trans = trans;
+               conn->bundle = NULL;
+               conn->service_id = service_id;
+               conn->epoch = rxrpc_epoch;
+               conn->in_clientflag = 0;
+               conn->out_clientflag = RXRPC_CLIENT_INITIATED;
+               conn->cid = 0;
+               conn->state = RXRPC_CONN_CLIENT;
+               conn->avail_calls = RXRPC_MAXCALLS - 1;
+               conn->security_level = rx->min_sec_level;
+               conn->key = key_get(rx->key);
+
+               ret = rxrpc_init_client_conn_security(conn);
+               if (ret < 0) {
+                       key_put(conn->key);
+                       kfree(conn);
+                       _leave(" = %d [key]", ret);
+                       return ret;
+               }
+
+               write_lock_bh(&rxrpc_connection_lock);
+               list_add_tail(&conn->link, &rxrpc_connections);
+               write_unlock_bh(&rxrpc_connection_lock);
+
+               spin_lock(&trans->client_lock);
+               atomic_inc(&trans->usage);
+
+               _net("CONNECT EXCL new %d on TRANS %d",
+                    conn->debug_id, conn->trans->debug_id);
+
+               rxrpc_assign_connection_id(conn);
+               rx->conn = conn;
+       } else {
+               spin_lock(&trans->client_lock);
+       }
+
+       /* we've got a connection with a free channel and we can now attach the
+        * call to it
+        * - we're holding the transport's client lock
+        * - we're holding a reference on the connection
+        */
+       for (chan = 0; chan < RXRPC_MAXCALLS; chan++)
+               if (!conn->channels[chan])
+                       goto found_channel;
+       goto no_free_channels;
+
+found_channel:
+       atomic_inc(&conn->usage);
+       conn->channels[chan] = call;
+       call->conn = conn;
+       call->channel = chan;
+       call->cid = conn->cid | chan;
+       call->call_id = ++conn->call_counter;
+
+       _net("CONNECT client on conn %d chan %d as call %x",
+            conn->debug_id, chan, call->call_id);
+
+       spin_unlock(&trans->client_lock);
+
+       rxrpc_add_call_ID_to_conn(conn, call);
+       _leave(" = 0");
+       return 0;
+
+no_free_channels:
+       spin_unlock(&trans->client_lock);
+       _leave(" = -ENOSR");
+       return -ENOSR;
+}
+
+/*
+ * find a connection for a call
+ * - called in process context with IRQs enabled
+ */
+int rxrpc_connect_call(struct rxrpc_sock *rx,
+                      struct rxrpc_transport *trans,
+                      struct rxrpc_conn_bundle *bundle,
+                      struct rxrpc_call *call,
+                      gfp_t gfp)
+{
+       struct rxrpc_connection *conn, *candidate;
+       int chan, ret;
+
+       DECLARE_WAITQUEUE(myself, current);
+
+       _enter("%p,%lx,", rx, call->user_call_ID);
+
+       if (test_bit(RXRPC_SOCK_EXCLUSIVE_CONN, &rx->flags))
+               return rxrpc_connect_exclusive(rx, trans, bundle->service_id,
+                                              call, gfp);
+
+       spin_lock(&trans->client_lock);
+       for (;;) {
+               /* see if the bundle has a call slot available */
+               if (!list_empty(&bundle->avail_conns)) {
+                       _debug("avail");
+                       conn = list_entry(bundle->avail_conns.next,
+                                         struct rxrpc_connection,
+                                         bundle_link);
+                       if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
+                               list_del_init(&conn->bundle_link);
+                               bundle->num_conns--;
+                               continue;
+                       }
+                       if (--conn->avail_calls == 0)
+                               list_move(&conn->bundle_link,
+                                         &bundle->busy_conns);
+                       ASSERTCMP(conn->avail_calls, <, RXRPC_MAXCALLS);
+                       ASSERT(conn->channels[0] == NULL ||
+                              conn->channels[1] == NULL ||
+                              conn->channels[2] == NULL ||
+                              conn->channels[3] == NULL);
+                       atomic_inc(&conn->usage);
+                       break;
+               }
+
+               if (!list_empty(&bundle->unused_conns)) {
+                       _debug("unused");
+                       conn = list_entry(bundle->unused_conns.next,
+                                         struct rxrpc_connection,
+                                         bundle_link);
+                       if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {
+                               list_del_init(&conn->bundle_link);
+                               bundle->num_conns--;
+                               continue;
+                       }
+                       ASSERTCMP(conn->avail_calls, ==, RXRPC_MAXCALLS);
+                       conn->avail_calls = RXRPC_MAXCALLS - 1;
+                       ASSERT(conn->channels[0] == NULL &&
+                              conn->channels[1] == NULL &&
+                              conn->channels[2] == NULL &&
+                              conn->channels[3] == NULL);
+                       atomic_inc(&conn->usage);
+                       list_move(&conn->bundle_link, &bundle->avail_conns);
+                       break;
+               }
+
+               /* need to allocate a new connection */
+               _debug("get new conn [%d]", bundle->num_conns);
+
+               spin_unlock(&trans->client_lock);
+
+               if (signal_pending(current))
+                       goto interrupted;
+
+               if (bundle->num_conns >= 20) {
+                       _debug("too many conns");
+
+                       if (!gfpflags_allow_blocking(gfp)) {
+                               _leave(" = -EAGAIN");
+                               return -EAGAIN;
+                       }
+
+                       add_wait_queue(&bundle->chanwait, &myself);
+                       for (;;) {
+                               set_current_state(TASK_INTERRUPTIBLE);
+                               if (bundle->num_conns < 20 ||
+                                   !list_empty(&bundle->unused_conns) ||
+                                   !list_empty(&bundle->avail_conns))
+                                       break;
+                               if (signal_pending(current))
+                                       goto interrupted_dequeue;
+                               schedule();
+                       }
+                       remove_wait_queue(&bundle->chanwait, &myself);
+                       __set_current_state(TASK_RUNNING);
+                       spin_lock(&trans->client_lock);
+                       continue;
+               }
+
+               /* not yet present - create a candidate for a new connection and then
+                * redo the check */
+               candidate = rxrpc_alloc_connection(gfp);
+               if (!candidate) {
+                       _leave(" = -ENOMEM");
+                       return -ENOMEM;
+               }
+
+               candidate->trans = trans;
+               candidate->bundle = bundle;
+               candidate->service_id = bundle->service_id;
+               candidate->epoch = rxrpc_epoch;
+               candidate->in_clientflag = 0;
+               candidate->out_clientflag = RXRPC_CLIENT_INITIATED;
+               candidate->cid = 0;
+               candidate->state = RXRPC_CONN_CLIENT;
+               candidate->avail_calls = RXRPC_MAXCALLS;
+               candidate->security_level = rx->min_sec_level;
+               candidate->key = key_get(bundle->key);
+
+               ret = rxrpc_init_client_conn_security(candidate);
+               if (ret < 0) {
+                       key_put(candidate->key);
+                       kfree(candidate);
+                       _leave(" = %d [key]", ret);
+                       return ret;
+               }
+
+               write_lock_bh(&rxrpc_connection_lock);
+               list_add_tail(&candidate->link, &rxrpc_connections);
+               write_unlock_bh(&rxrpc_connection_lock);
+
+               spin_lock(&trans->client_lock);
+
+               list_add(&candidate->bundle_link, &bundle->unused_conns);
+               bundle->num_conns++;
+               atomic_inc(&bundle->usage);
+               atomic_inc(&trans->usage);
+
+               _net("CONNECT new %d on TRANS %d",
+                    candidate->debug_id, candidate->trans->debug_id);
+
+               rxrpc_assign_connection_id(candidate);
+               candidate->security->prime_packet_security(candidate);
+
+               /* leave the candidate lurking in zombie mode attached to the
+                * bundle until we're ready for it */
+               rxrpc_put_connection(candidate);
+               candidate = NULL;
+       }
+
+       /* we've got a connection with a free channel and we can now attach the
+        * call to it
+        * - we're holding the transport's client lock
+        * - we're holding a reference on the connection
+        * - we're holding a reference on the bundle
+        */
+       for (chan = 0; chan < RXRPC_MAXCALLS; chan++)
+               if (!conn->channels[chan])
+                       goto found_channel;
+       ASSERT(conn->channels[0] == NULL ||
+              conn->channels[1] == NULL ||
+              conn->channels[2] == NULL ||
+              conn->channels[3] == NULL);
+       BUG();
+
+found_channel:
+       conn->channels[chan] = call;
+       call->conn = conn;
+       call->channel = chan;
+       call->cid = conn->cid | chan;
+       call->call_id = ++conn->call_counter;
+
+       _net("CONNECT client on conn %d chan %d as call %x",
+            conn->debug_id, chan, call->call_id);
+
+       ASSERTCMP(conn->avail_calls, <, RXRPC_MAXCALLS);
+       spin_unlock(&trans->client_lock);
+
+       rxrpc_add_call_ID_to_conn(conn, call);
+
+       _leave(" = 0");
+       return 0;
+
+interrupted_dequeue:
+       remove_wait_queue(&bundle->chanwait, &myself);
+       __set_current_state(TASK_RUNNING);
+interrupted:
+       _leave(" = -ERESTARTSYS");
+       return -ERESTARTSYS;
+}
+
+/*
+ * get a record of an incoming connection
+ */
+struct rxrpc_connection *
+rxrpc_incoming_connection(struct rxrpc_transport *trans,
+                         struct rxrpc_host_header *hdr)
+{
+       struct rxrpc_connection *conn, *candidate = NULL;
+       struct rb_node *p, **pp;
+       const char *new = "old";
+       __be32 epoch;
+       u32 cid;
+
+       _enter("");
+
+       ASSERT(hdr->flags & RXRPC_CLIENT_INITIATED);
+
+       epoch = hdr->epoch;
+       cid = hdr->cid & RXRPC_CIDMASK;
+
+       /* search the connection list first */
+       read_lock_bh(&trans->conn_lock);
+
+       p = trans->server_conns.rb_node;
+       while (p) {
+               conn = rb_entry(p, struct rxrpc_connection, node);
+
+               _debug("maybe %x", conn->cid);
+
+               if (epoch < conn->epoch)
+                       p = p->rb_left;
+               else if (epoch > conn->epoch)
+                       p = p->rb_right;
+               else if (cid < conn->cid)
+                       p = p->rb_left;
+               else if (cid > conn->cid)
+                       p = p->rb_right;
+               else
+                       goto found_extant_connection;
+       }
+       read_unlock_bh(&trans->conn_lock);
+
+       /* not yet present - create a candidate for a new record and then
+        * redo the search */
+       candidate = rxrpc_alloc_connection(GFP_NOIO);
+       if (!candidate) {
+               _leave(" = -ENOMEM");
+               return ERR_PTR(-ENOMEM);
+       }
+
+       candidate->trans = trans;
+       candidate->epoch = hdr->epoch;
+       candidate->cid = hdr->cid & RXRPC_CIDMASK;
+       candidate->service_id = hdr->serviceId;
+       candidate->security_ix = hdr->securityIndex;
+       candidate->in_clientflag = RXRPC_CLIENT_INITIATED;
+       candidate->out_clientflag = 0;
+       candidate->state = RXRPC_CONN_SERVER;
+       if (candidate->service_id)
+               candidate->state = RXRPC_CONN_SERVER_UNSECURED;
+
+       write_lock_bh(&trans->conn_lock);
+
+       pp = &trans->server_conns.rb_node;
+       p = NULL;
+       while (*pp) {
+               p = *pp;
+               conn = rb_entry(p, struct rxrpc_connection, node);
+
+               if (epoch < conn->epoch)
+                       pp = &(*pp)->rb_left;
+               else if (epoch > conn->epoch)
+                       pp = &(*pp)->rb_right;
+               else if (cid < conn->cid)
+                       pp = &(*pp)->rb_left;
+               else if (cid > conn->cid)
+                       pp = &(*pp)->rb_right;
+               else
+                       goto found_extant_second;
+       }
+
+       /* we can now add the new candidate to the list */
+       conn = candidate;
+       candidate = NULL;
+       rb_link_node(&conn->node, p, pp);
+       rb_insert_color(&conn->node, &trans->server_conns);
+       atomic_inc(&conn->trans->usage);
+
+       write_unlock_bh(&trans->conn_lock);
+
+       write_lock_bh(&rxrpc_connection_lock);
+       list_add_tail(&conn->link, &rxrpc_connections);
+       write_unlock_bh(&rxrpc_connection_lock);
+
+       new = "new";
+
+success:
+       _net("CONNECTION %s %d {%x}", new, conn->debug_id, conn->cid);
+
+       _leave(" = %p {u=%d}", conn, atomic_read(&conn->usage));
+       return conn;
+
+       /* we found the connection in the list immediately */
+found_extant_connection:
+       if (hdr->securityIndex != conn->security_ix) {
+               read_unlock_bh(&trans->conn_lock);
+               goto security_mismatch;
+       }
+       atomic_inc(&conn->usage);
+       read_unlock_bh(&trans->conn_lock);
+       goto success;
+
+       /* we found the connection on the second time through the list */
+found_extant_second:
+       if (hdr->securityIndex != conn->security_ix) {
+               write_unlock_bh(&trans->conn_lock);
+               goto security_mismatch;
+       }
+       atomic_inc(&conn->usage);
+       write_unlock_bh(&trans->conn_lock);
+       kfree(candidate);
+       goto success;
+
+security_mismatch:
+       kfree(candidate);
+       _leave(" = -EKEYREJECTED");
+       return ERR_PTR(-EKEYREJECTED);
+}
+
+/*
+ * find a connection based on transport and RxRPC connection ID for an incoming
+ * packet
+ */
+struct rxrpc_connection *rxrpc_find_connection(struct rxrpc_transport *trans,
+                                              struct rxrpc_host_header *hdr)
+{
+       struct rxrpc_connection *conn;
+       struct rb_node *p;
+       u32 epoch, cid;
+
+       _enter(",{%x,%x}", hdr->cid, hdr->flags);
+
+       read_lock_bh(&trans->conn_lock);
+
+       cid = hdr->cid & RXRPC_CIDMASK;
+       epoch = hdr->epoch;
+
+       if (hdr->flags & RXRPC_CLIENT_INITIATED)
+               p = trans->server_conns.rb_node;
+       else
+               p = trans->client_conns.rb_node;
+
+       while (p) {
+               conn = rb_entry(p, struct rxrpc_connection, node);
+
+               _debug("maybe %x", conn->cid);
+
+               if (epoch < conn->epoch)
+                       p = p->rb_left;
+               else if (epoch > conn->epoch)
+                       p = p->rb_right;
+               else if (cid < conn->cid)
+                       p = p->rb_left;
+               else if (cid > conn->cid)
+                       p = p->rb_right;
+               else
+                       goto found;
+       }
+
+       read_unlock_bh(&trans->conn_lock);
+       _leave(" = NULL");
+       return NULL;
+
+found:
+       atomic_inc(&conn->usage);
+       read_unlock_bh(&trans->conn_lock);
+       _leave(" = %p", conn);
+       return conn;
+}
+
+/*
+ * release a virtual connection
+ */
+void rxrpc_put_connection(struct rxrpc_connection *conn)
+{
+       _enter("%p{u=%d,d=%d}",
+              conn, atomic_read(&conn->usage), conn->debug_id);
+
+       ASSERTCMP(atomic_read(&conn->usage), >, 0);
+
+       conn->put_time = ktime_get_seconds();
+       if (atomic_dec_and_test(&conn->usage)) {
+               _debug("zombie");
+               rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0);
+       }
+
+       _leave("");
+}
+
+/*
+ * destroy a virtual connection
+ */
+static void rxrpc_destroy_connection(struct rxrpc_connection *conn)
+{
+       _enter("%p{%d}", conn, atomic_read(&conn->usage));
+
+       ASSERTCMP(atomic_read(&conn->usage), ==, 0);
+
+       _net("DESTROY CONN %d", conn->debug_id);
+
+       if (conn->bundle)
+               rxrpc_put_bundle(conn->trans, conn->bundle);
+
+       ASSERT(RB_EMPTY_ROOT(&conn->calls));
+       rxrpc_purge_queue(&conn->rx_queue);
+
+       conn->security->clear(conn);
+       key_put(conn->key);
+       key_put(conn->server_key);
+
+       rxrpc_put_transport(conn->trans);
+       kfree(conn);
+       _leave("");
+}
+
+/*
+ * reap dead connections
+ */
+static void rxrpc_connection_reaper(struct work_struct *work)
+{
+       struct rxrpc_connection *conn, *_p;
+       unsigned long now, earliest, reap_time;
+
+       LIST_HEAD(graveyard);
+
+       _enter("");
+
+       now = ktime_get_seconds();
+       earliest = ULONG_MAX;
+
+       write_lock_bh(&rxrpc_connection_lock);
+       list_for_each_entry_safe(conn, _p, &rxrpc_connections, link) {
+               _debug("reap CONN %d { u=%d,t=%ld }",
+                      conn->debug_id, atomic_read(&conn->usage),
+                      (long) now - (long) conn->put_time);
+
+               if (likely(atomic_read(&conn->usage) > 0))
+                       continue;
+
+               spin_lock(&conn->trans->client_lock);
+               write_lock(&conn->trans->conn_lock);
+               reap_time = conn->put_time + rxrpc_connection_expiry;
+
+               if (atomic_read(&conn->usage) > 0) {
+                       ;
+               } else if (reap_time <= now) {
+                       list_move_tail(&conn->link, &graveyard);
+                       if (conn->out_clientflag)
+                               rb_erase(&conn->node,
+                                        &conn->trans->client_conns);
+                       else
+                               rb_erase(&conn->node,
+                                        &conn->trans->server_conns);
+                       if (conn->bundle) {
+                               list_del_init(&conn->bundle_link);
+                               conn->bundle->num_conns--;
+                       }
+
+               } else if (reap_time < earliest) {
+                       earliest = reap_time;
+               }
+
+               write_unlock(&conn->trans->conn_lock);
+               spin_unlock(&conn->trans->client_lock);
+       }
+       write_unlock_bh(&rxrpc_connection_lock);
+
+       if (earliest != ULONG_MAX) {
+               _debug("reschedule reaper %ld", (long) earliest - now);
+               ASSERTCMP(earliest, >, now);
+               rxrpc_queue_delayed_work(&rxrpc_connection_reap,
+                                        (earliest - now) * HZ);
+       }
+
+       /* then destroy all those pulled out */
+       while (!list_empty(&graveyard)) {
+               conn = list_entry(graveyard.next, struct rxrpc_connection,
+                                 link);
+               list_del_init(&conn->link);
+
+               ASSERTCMP(atomic_read(&conn->usage), ==, 0);
+               rxrpc_destroy_connection(conn);
+       }
+
+       _leave("");
+}
+
+/*
+ * preemptively destroy all the connection records rather than waiting for them
+ * to time out
+ */
+void __exit rxrpc_destroy_all_connections(void)
+{
+       _enter("");
+
+       rxrpc_connection_expiry = 0;
+       cancel_delayed_work(&rxrpc_connection_reap);
+       rxrpc_queue_delayed_work(&rxrpc_connection_reap, 0);
+
+       _leave("");
+}
diff --git a/net/rxrpc/input.c b/net/rxrpc/input.c
new file mode 100644 (file)
index 0000000..e0815a0
--- /dev/null
@@ -0,0 +1,800 @@
+/* RxRPC packet reception
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/errqueue.h>
+#include <linux/udp.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/icmp.h>
+#include <linux/gfp.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <net/ip.h>
+#include <net/udp.h>
+#include <net/net_namespace.h>
+#include "ar-internal.h"
+
+/*
+ * queue a packet for recvmsg to pass to userspace
+ * - the caller must hold a lock on call->lock
+ * - must not be called with interrupts disabled (sk_filter() disables BH's)
+ * - eats the packet whether successful or not
+ * - there must be just one reference to the packet, which the caller passes to
+ *   this function
+ */
+int rxrpc_queue_rcv_skb(struct rxrpc_call *call, struct sk_buff *skb,
+                       bool force, bool terminal)
+{
+       struct rxrpc_skb_priv *sp;
+       struct rxrpc_sock *rx = call->socket;
+       struct sock *sk;
+       int ret;
+
+       _enter(",,%d,%d", force, terminal);
+
+       ASSERT(!irqs_disabled());
+
+       sp = rxrpc_skb(skb);
+       ASSERTCMP(sp->call, ==, call);
+
+       /* if we've already posted the terminal message for a call, then we
+        * don't post any more */
+       if (test_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags)) {
+               _debug("already terminated");
+               ASSERTCMP(call->state, >=, RXRPC_CALL_COMPLETE);
+               skb->destructor = NULL;
+               sp->call = NULL;
+               rxrpc_put_call(call);
+               rxrpc_free_skb(skb);
+               return 0;
+       }
+
+       sk = &rx->sk;
+
+       if (!force) {
+               /* cast skb->rcvbuf to unsigned...  It's pointless, but
+                * reduces number of warnings when compiling with -W
+                * --ANK */
+//             ret = -ENOBUFS;
+//             if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
+//                 (unsigned int) sk->sk_rcvbuf)
+//                     goto out;
+
+               ret = sk_filter(sk, skb);
+               if (ret < 0)
+                       goto out;
+       }
+
+       spin_lock_bh(&sk->sk_receive_queue.lock);
+       if (!test_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags) &&
+           !test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+           call->socket->sk.sk_state != RXRPC_CLOSE) {
+               skb->destructor = rxrpc_packet_destructor;
+               skb->dev = NULL;
+               skb->sk = sk;
+               atomic_add(skb->truesize, &sk->sk_rmem_alloc);
+
+               if (terminal) {
+                       _debug("<<<< TERMINAL MESSAGE >>>>");
+                       set_bit(RXRPC_CALL_TERMINAL_MSG, &call->flags);
+               }
+
+               /* allow interception by a kernel service */
+               if (rx->interceptor) {
+                       rx->interceptor(sk, call->user_call_ID, skb);
+                       spin_unlock_bh(&sk->sk_receive_queue.lock);
+               } else {
+                       _net("post skb %p", skb);
+                       __skb_queue_tail(&sk->sk_receive_queue, skb);
+                       spin_unlock_bh(&sk->sk_receive_queue.lock);
+
+                       if (!sock_flag(sk, SOCK_DEAD))
+                               sk->sk_data_ready(sk);
+               }
+               skb = NULL;
+       } else {
+               spin_unlock_bh(&sk->sk_receive_queue.lock);
+       }
+       ret = 0;
+
+out:
+       /* release the socket buffer */
+       if (skb) {
+               skb->destructor = NULL;
+               sp->call = NULL;
+               rxrpc_put_call(call);
+               rxrpc_free_skb(skb);
+       }
+
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * process a DATA packet, posting the packet to the appropriate queue
+ * - eats the packet if successful
+ */
+static int rxrpc_fast_process_data(struct rxrpc_call *call,
+                                  struct sk_buff *skb, u32 seq)
+{
+       struct rxrpc_skb_priv *sp;
+       bool terminal;
+       int ret, ackbit, ack;
+
+       _enter("{%u,%u},,{%u}", call->rx_data_post, call->rx_first_oos, seq);
+
+       sp = rxrpc_skb(skb);
+       ASSERTCMP(sp->call, ==, NULL);
+
+       spin_lock(&call->lock);
+
+       if (call->state > RXRPC_CALL_COMPLETE)
+               goto discard;
+
+       ASSERTCMP(call->rx_data_expect, >=, call->rx_data_post);
+       ASSERTCMP(call->rx_data_post, >=, call->rx_data_recv);
+       ASSERTCMP(call->rx_data_recv, >=, call->rx_data_eaten);
+
+       if (seq < call->rx_data_post) {
+               _debug("dup #%u [-%u]", seq, call->rx_data_post);
+               ack = RXRPC_ACK_DUPLICATE;
+               ret = -ENOBUFS;
+               goto discard_and_ack;
+       }
+
+       /* we may already have the packet in the out of sequence queue */
+       ackbit = seq - (call->rx_data_eaten + 1);
+       ASSERTCMP(ackbit, >=, 0);
+       if (__test_and_set_bit(ackbit, call->ackr_window)) {
+               _debug("dup oos #%u [%u,%u]",
+                      seq, call->rx_data_eaten, call->rx_data_post);
+               ack = RXRPC_ACK_DUPLICATE;
+               goto discard_and_ack;
+       }
+
+       if (seq >= call->ackr_win_top) {
+               _debug("exceed #%u [%u]", seq, call->ackr_win_top);
+               __clear_bit(ackbit, call->ackr_window);
+               ack = RXRPC_ACK_EXCEEDS_WINDOW;
+               goto discard_and_ack;
+       }
+
+       if (seq == call->rx_data_expect) {
+               clear_bit(RXRPC_CALL_EXPECT_OOS, &call->flags);
+               call->rx_data_expect++;
+       } else if (seq > call->rx_data_expect) {
+               _debug("oos #%u [%u]", seq, call->rx_data_expect);
+               call->rx_data_expect = seq + 1;
+               if (test_and_set_bit(RXRPC_CALL_EXPECT_OOS, &call->flags)) {
+                       ack = RXRPC_ACK_OUT_OF_SEQUENCE;
+                       goto enqueue_and_ack;
+               }
+               goto enqueue_packet;
+       }
+
+       if (seq != call->rx_data_post) {
+               _debug("ahead #%u [%u]", seq, call->rx_data_post);
+               goto enqueue_packet;
+       }
+
+       if (test_bit(RXRPC_CALL_RCVD_LAST, &call->flags))
+               goto protocol_error;
+
+       /* if the packet need security things doing to it, then it goes down
+        * the slow path */
+       if (call->conn->security_ix)
+               goto enqueue_packet;
+
+       sp->call = call;
+       rxrpc_get_call(call);
+       terminal = ((sp->hdr.flags & RXRPC_LAST_PACKET) &&
+                   !(sp->hdr.flags & RXRPC_CLIENT_INITIATED));
+       ret = rxrpc_queue_rcv_skb(call, skb, false, terminal);
+       if (ret < 0) {
+               if (ret == -ENOMEM || ret == -ENOBUFS) {
+                       __clear_bit(ackbit, call->ackr_window);
+                       ack = RXRPC_ACK_NOSPACE;
+                       goto discard_and_ack;
+               }
+               goto out;
+       }
+
+       skb = NULL;
+
+       _debug("post #%u", seq);
+       ASSERTCMP(call->rx_data_post, ==, seq);
+       call->rx_data_post++;
+
+       if (sp->hdr.flags & RXRPC_LAST_PACKET)
+               set_bit(RXRPC_CALL_RCVD_LAST, &call->flags);
+
+       /* if we've reached an out of sequence packet then we need to drain
+        * that queue into the socket Rx queue now */
+       if (call->rx_data_post == call->rx_first_oos) {
+               _debug("drain rx oos now");
+               read_lock(&call->state_lock);
+               if (call->state < RXRPC_CALL_COMPLETE &&
+                   !test_and_set_bit(RXRPC_CALL_EV_DRAIN_RX_OOS, &call->events))
+                       rxrpc_queue_call(call);
+               read_unlock(&call->state_lock);
+       }
+
+       spin_unlock(&call->lock);
+       atomic_inc(&call->ackr_not_idle);
+       rxrpc_propose_ACK(call, RXRPC_ACK_DELAY, sp->hdr.serial, false);
+       _leave(" = 0 [posted]");
+       return 0;
+
+protocol_error:
+       ret = -EBADMSG;
+out:
+       spin_unlock(&call->lock);
+       _leave(" = %d", ret);
+       return ret;
+
+discard_and_ack:
+       _debug("discard and ACK packet %p", skb);
+       __rxrpc_propose_ACK(call, ack, sp->hdr.serial, true);
+discard:
+       spin_unlock(&call->lock);
+       rxrpc_free_skb(skb);
+       _leave(" = 0 [discarded]");
+       return 0;
+
+enqueue_and_ack:
+       __rxrpc_propose_ACK(call, ack, sp->hdr.serial, true);
+enqueue_packet:
+       _net("defer skb %p", skb);
+       spin_unlock(&call->lock);
+       skb_queue_tail(&call->rx_queue, skb);
+       atomic_inc(&call->ackr_not_idle);
+       read_lock(&call->state_lock);
+       if (call->state < RXRPC_CALL_DEAD)
+               rxrpc_queue_call(call);
+       read_unlock(&call->state_lock);
+       _leave(" = 0 [queued]");
+       return 0;
+}
+
+/*
+ * assume an implicit ACKALL of the transmission phase of a client socket upon
+ * reception of the first reply packet
+ */
+static void rxrpc_assume_implicit_ackall(struct rxrpc_call *call, u32 serial)
+{
+       write_lock_bh(&call->state_lock);
+
+       switch (call->state) {
+       case RXRPC_CALL_CLIENT_AWAIT_REPLY:
+               call->state = RXRPC_CALL_CLIENT_RECV_REPLY;
+               call->acks_latest = serial;
+
+               _debug("implicit ACKALL %%%u", call->acks_latest);
+               set_bit(RXRPC_CALL_EV_RCVD_ACKALL, &call->events);
+               write_unlock_bh(&call->state_lock);
+
+               if (try_to_del_timer_sync(&call->resend_timer) >= 0) {
+                       clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
+                       clear_bit(RXRPC_CALL_EV_RESEND, &call->events);
+                       clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+               }
+               break;
+
+       default:
+               write_unlock_bh(&call->state_lock);
+               break;
+       }
+}
+
+/*
+ * post an incoming packet to the nominated call to deal with
+ * - must get rid of the sk_buff, either by freeing it or by queuing it
+ */
+void rxrpc_fast_process_packet(struct rxrpc_call *call, struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       __be32 wtmp;
+       u32 hi_serial, abort_code;
+
+       _enter("%p,%p", call, skb);
+
+       ASSERT(!irqs_disabled());
+
+#if 0 // INJECT RX ERROR
+       if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
+               static int skip = 0;
+               if (++skip == 3) {
+                       printk("DROPPED 3RD PACKET!!!!!!!!!!!!!\n");
+                       skip = 0;
+                       goto free_packet;
+               }
+       }
+#endif
+
+       /* track the latest serial number on this connection for ACK packet
+        * information */
+       hi_serial = atomic_read(&call->conn->hi_serial);
+       while (sp->hdr.serial > hi_serial)
+               hi_serial = atomic_cmpxchg(&call->conn->hi_serial, hi_serial,
+                                          sp->hdr.serial);
+
+       /* request ACK generation for any ACK or DATA packet that requests
+        * it */
+       if (sp->hdr.flags & RXRPC_REQUEST_ACK) {
+               _proto("ACK Requested on %%%u", sp->hdr.serial);
+               rxrpc_propose_ACK(call, RXRPC_ACK_REQUESTED, sp->hdr.serial, false);
+       }
+
+       switch (sp->hdr.type) {
+       case RXRPC_PACKET_TYPE_ABORT:
+               _debug("abort");
+
+               if (skb_copy_bits(skb, 0, &wtmp, sizeof(wtmp)) < 0)
+                       goto protocol_error;
+
+               abort_code = ntohl(wtmp);
+               _proto("Rx ABORT %%%u { %x }", sp->hdr.serial, abort_code);
+
+               write_lock_bh(&call->state_lock);
+               if (call->state < RXRPC_CALL_COMPLETE) {
+                       call->state = RXRPC_CALL_REMOTELY_ABORTED;
+                       call->remote_abort = abort_code;
+                       set_bit(RXRPC_CALL_EV_RCVD_ABORT, &call->events);
+                       rxrpc_queue_call(call);
+               }
+               goto free_packet_unlock;
+
+       case RXRPC_PACKET_TYPE_BUSY:
+               _proto("Rx BUSY %%%u", sp->hdr.serial);
+
+               if (call->conn->out_clientflag)
+                       goto protocol_error;
+
+               write_lock_bh(&call->state_lock);
+               switch (call->state) {
+               case RXRPC_CALL_CLIENT_SEND_REQUEST:
+                       call->state = RXRPC_CALL_SERVER_BUSY;
+                       set_bit(RXRPC_CALL_EV_RCVD_BUSY, &call->events);
+                       rxrpc_queue_call(call);
+               case RXRPC_CALL_SERVER_BUSY:
+                       goto free_packet_unlock;
+               default:
+                       goto protocol_error_locked;
+               }
+
+       default:
+               _proto("Rx %s %%%u", rxrpc_pkts[sp->hdr.type], sp->hdr.serial);
+               goto protocol_error;
+
+       case RXRPC_PACKET_TYPE_DATA:
+               _proto("Rx DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq);
+
+               if (sp->hdr.seq == 0)
+                       goto protocol_error;
+
+               call->ackr_prev_seq = sp->hdr.seq;
+
+               /* received data implicitly ACKs all of the request packets we
+                * sent when we're acting as a client */
+               if (call->state == RXRPC_CALL_CLIENT_AWAIT_REPLY)
+                       rxrpc_assume_implicit_ackall(call, sp->hdr.serial);
+
+               switch (rxrpc_fast_process_data(call, skb, sp->hdr.seq)) {
+               case 0:
+                       skb = NULL;
+                       goto done;
+
+               default:
+                       BUG();
+
+                       /* data packet received beyond the last packet */
+               case -EBADMSG:
+                       goto protocol_error;
+               }
+
+       case RXRPC_PACKET_TYPE_ACKALL:
+       case RXRPC_PACKET_TYPE_ACK:
+               /* ACK processing is done in process context */
+               read_lock_bh(&call->state_lock);
+               if (call->state < RXRPC_CALL_DEAD) {
+                       skb_queue_tail(&call->rx_queue, skb);
+                       rxrpc_queue_call(call);
+                       skb = NULL;
+               }
+               read_unlock_bh(&call->state_lock);
+               goto free_packet;
+       }
+
+protocol_error:
+       _debug("protocol error");
+       write_lock_bh(&call->state_lock);
+protocol_error_locked:
+       if (call->state <= RXRPC_CALL_COMPLETE) {
+               call->state = RXRPC_CALL_LOCALLY_ABORTED;
+               call->local_abort = RX_PROTOCOL_ERROR;
+               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
+               rxrpc_queue_call(call);
+       }
+free_packet_unlock:
+       write_unlock_bh(&call->state_lock);
+free_packet:
+       rxrpc_free_skb(skb);
+done:
+       _leave("");
+}
+
+/*
+ * split up a jumbo data packet
+ */
+static void rxrpc_process_jumbo_packet(struct rxrpc_call *call,
+                                      struct sk_buff *jumbo)
+{
+       struct rxrpc_jumbo_header jhdr;
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *part;
+
+       _enter(",{%u,%u}", jumbo->data_len, jumbo->len);
+
+       sp = rxrpc_skb(jumbo);
+
+       do {
+               sp->hdr.flags &= ~RXRPC_JUMBO_PACKET;
+
+               /* make a clone to represent the first subpacket in what's left
+                * of the jumbo packet */
+               part = skb_clone(jumbo, GFP_ATOMIC);
+               if (!part) {
+                       /* simply ditch the tail in the event of ENOMEM */
+                       pskb_trim(jumbo, RXRPC_JUMBO_DATALEN);
+                       break;
+               }
+               rxrpc_new_skb(part);
+
+               pskb_trim(part, RXRPC_JUMBO_DATALEN);
+
+               if (!pskb_pull(jumbo, RXRPC_JUMBO_DATALEN))
+                       goto protocol_error;
+
+               if (skb_copy_bits(jumbo, 0, &jhdr, sizeof(jhdr)) < 0)
+                       goto protocol_error;
+               if (!pskb_pull(jumbo, sizeof(jhdr)))
+                       BUG();
+
+               sp->hdr.seq     += 1;
+               sp->hdr.serial  += 1;
+               sp->hdr.flags   = jhdr.flags;
+               sp->hdr._rsvd   = jhdr._rsvd;
+
+               _proto("Rx DATA Jumbo %%%u", sp->hdr.serial - 1);
+
+               rxrpc_fast_process_packet(call, part);
+               part = NULL;
+
+       } while (sp->hdr.flags & RXRPC_JUMBO_PACKET);
+
+       rxrpc_fast_process_packet(call, jumbo);
+       _leave("");
+       return;
+
+protocol_error:
+       _debug("protocol error");
+       rxrpc_free_skb(part);
+       rxrpc_free_skb(jumbo);
+       write_lock_bh(&call->state_lock);
+       if (call->state <= RXRPC_CALL_COMPLETE) {
+               call->state = RXRPC_CALL_LOCALLY_ABORTED;
+               call->local_abort = RX_PROTOCOL_ERROR;
+               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
+               rxrpc_queue_call(call);
+       }
+       write_unlock_bh(&call->state_lock);
+       _leave("");
+}
+
+/*
+ * post an incoming packet to the appropriate call/socket to deal with
+ * - must get rid of the sk_buff, either by freeing it or by queuing it
+ */
+static void rxrpc_post_packet_to_call(struct rxrpc_call *call,
+                                     struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp;
+
+       _enter("%p,%p", call, skb);
+
+       sp = rxrpc_skb(skb);
+
+       _debug("extant call [%d]", call->state);
+
+       read_lock(&call->state_lock);
+       switch (call->state) {
+       case RXRPC_CALL_LOCALLY_ABORTED:
+               if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events)) {
+                       rxrpc_queue_call(call);
+                       goto free_unlock;
+               }
+       case RXRPC_CALL_REMOTELY_ABORTED:
+       case RXRPC_CALL_NETWORK_ERROR:
+       case RXRPC_CALL_DEAD:
+               goto dead_call;
+       case RXRPC_CALL_COMPLETE:
+       case RXRPC_CALL_CLIENT_FINAL_ACK:
+               /* complete server call */
+               if (call->conn->in_clientflag)
+                       goto dead_call;
+               /* resend last packet of a completed call */
+               _debug("final ack again");
+               rxrpc_get_call(call);
+               set_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events);
+               rxrpc_queue_call(call);
+               goto free_unlock;
+       default:
+               break;
+       }
+
+       read_unlock(&call->state_lock);
+       rxrpc_get_call(call);
+
+       if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
+           sp->hdr.flags & RXRPC_JUMBO_PACKET)
+               rxrpc_process_jumbo_packet(call, skb);
+       else
+               rxrpc_fast_process_packet(call, skb);
+
+       rxrpc_put_call(call);
+       goto done;
+
+dead_call:
+       if (sp->hdr.type != RXRPC_PACKET_TYPE_ABORT) {
+               skb->priority = RX_CALL_DEAD;
+               rxrpc_reject_packet(call->conn->trans->local, skb);
+               goto unlock;
+       }
+free_unlock:
+       rxrpc_free_skb(skb);
+unlock:
+       read_unlock(&call->state_lock);
+done:
+       _leave("");
+}
+
+/*
+ * post connection-level events to the connection
+ * - this includes challenges, responses and some aborts
+ */
+static void rxrpc_post_packet_to_conn(struct rxrpc_connection *conn,
+                                     struct sk_buff *skb)
+{
+       _enter("%p,%p", conn, skb);
+
+       atomic_inc(&conn->usage);
+       skb_queue_tail(&conn->rx_queue, skb);
+       rxrpc_queue_conn(conn);
+}
+
+/*
+ * post endpoint-level events to the local endpoint
+ * - this includes debug and version messages
+ */
+static void rxrpc_post_packet_to_local(struct rxrpc_local *local,
+                                      struct sk_buff *skb)
+{
+       _enter("%p,%p", local, skb);
+
+       atomic_inc(&local->usage);
+       skb_queue_tail(&local->event_queue, skb);
+       rxrpc_queue_work(&local->event_processor);
+}
+
+/*
+ * Extract the wire header from a packet and translate the byte order.
+ */
+static noinline
+int rxrpc_extract_header(struct rxrpc_skb_priv *sp, struct sk_buff *skb)
+{
+       struct rxrpc_wire_header whdr;
+
+       /* dig out the RxRPC connection details */
+       if (skb_copy_bits(skb, 0, &whdr, sizeof(whdr)) < 0)
+               return -EBADMSG;
+       if (!pskb_pull(skb, sizeof(whdr)))
+               BUG();
+
+       memset(sp, 0, sizeof(*sp));
+       sp->hdr.epoch           = ntohl(whdr.epoch);
+       sp->hdr.cid             = ntohl(whdr.cid);
+       sp->hdr.callNumber      = ntohl(whdr.callNumber);
+       sp->hdr.seq             = ntohl(whdr.seq);
+       sp->hdr.serial          = ntohl(whdr.serial);
+       sp->hdr.flags           = whdr.flags;
+       sp->hdr.type            = whdr.type;
+       sp->hdr.userStatus      = whdr.userStatus;
+       sp->hdr.securityIndex   = whdr.securityIndex;
+       sp->hdr._rsvd           = ntohs(whdr._rsvd);
+       sp->hdr.serviceId       = ntohs(whdr.serviceId);
+       return 0;
+}
+
+static struct rxrpc_connection *rxrpc_conn_from_local(struct rxrpc_local *local,
+                                              struct sk_buff *skb,
+                                              struct rxrpc_skb_priv *sp)
+{
+       struct rxrpc_peer *peer;
+       struct rxrpc_transport *trans;
+       struct rxrpc_connection *conn;
+
+       peer = rxrpc_find_peer(local, ip_hdr(skb)->saddr,
+                               udp_hdr(skb)->source);
+       if (IS_ERR(peer))
+               goto cant_find_conn;
+
+       trans = rxrpc_find_transport(local, peer);
+       rxrpc_put_peer(peer);
+       if (!trans)
+               goto cant_find_conn;
+
+       conn = rxrpc_find_connection(trans, &sp->hdr);
+       rxrpc_put_transport(trans);
+       if (!conn)
+               goto cant_find_conn;
+
+       return conn;
+cant_find_conn:
+       return NULL;
+}
+
+/*
+ * handle data received on the local endpoint
+ * - may be called in interrupt context
+ */
+void rxrpc_data_ready(struct sock *sk)
+{
+       struct rxrpc_skb_priv *sp;
+       struct rxrpc_local *local;
+       struct sk_buff *skb;
+       int ret;
+
+       _enter("%p", sk);
+
+       ASSERT(!irqs_disabled());
+
+       read_lock_bh(&rxrpc_local_lock);
+       local = sk->sk_user_data;
+       if (local && atomic_read(&local->usage) > 0)
+               rxrpc_get_local(local);
+       else
+               local = NULL;
+       read_unlock_bh(&rxrpc_local_lock);
+       if (!local) {
+               _leave(" [local dead]");
+               return;
+       }
+
+       skb = skb_recv_datagram(sk, 0, 1, &ret);
+       if (!skb) {
+               rxrpc_put_local(local);
+               if (ret == -EAGAIN)
+                       return;
+               _debug("UDP socket error %d", ret);
+               return;
+       }
+
+       rxrpc_new_skb(skb);
+
+       _net("recv skb %p", skb);
+
+       /* we'll probably need to checksum it (didn't call sock_recvmsg) */
+       if (skb_checksum_complete(skb)) {
+               rxrpc_free_skb(skb);
+               rxrpc_put_local(local);
+               __UDP_INC_STATS(&init_net, UDP_MIB_INERRORS, 0);
+               _leave(" [CSUM failed]");
+               return;
+       }
+
+       __UDP_INC_STATS(&init_net, UDP_MIB_INDATAGRAMS, 0);
+
+       /* The socket buffer we have is owned by UDP, with UDP's data all over
+        * it, but we really want our own data there.
+        */
+       skb_orphan(skb);
+       sp = rxrpc_skb(skb);
+
+       _net("Rx UDP packet from %08x:%04hu",
+            ntohl(ip_hdr(skb)->saddr), ntohs(udp_hdr(skb)->source));
+
+       /* dig out the RxRPC connection details */
+       if (rxrpc_extract_header(sp, skb) < 0)
+               goto bad_message;
+
+       _net("Rx RxRPC %s ep=%x call=%x:%x",
+            sp->hdr.flags & RXRPC_CLIENT_INITIATED ? "ToServer" : "ToClient",
+            sp->hdr.epoch, sp->hdr.cid, sp->hdr.callNumber);
+
+       if (sp->hdr.type >= RXRPC_N_PACKET_TYPES ||
+           !((RXRPC_SUPPORTED_PACKET_TYPES >> sp->hdr.type) & 1)) {
+               _proto("Rx Bad Packet Type %u", sp->hdr.type);
+               goto bad_message;
+       }
+
+       if (sp->hdr.type == RXRPC_PACKET_TYPE_VERSION) {
+               rxrpc_post_packet_to_local(local, skb);
+               goto out;
+       }
+
+       if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA &&
+           (sp->hdr.callNumber == 0 || sp->hdr.seq == 0))
+               goto bad_message;
+
+       if (sp->hdr.callNumber == 0) {
+               /* This is a connection-level packet. These should be
+                * fairly rare, so the extra overhead of looking them up the
+                * old-fashioned way doesn't really hurt */
+               struct rxrpc_connection *conn;
+
+               conn = rxrpc_conn_from_local(local, skb, sp);
+               if (!conn)
+                       goto cant_route_call;
+
+               _debug("CONN %p {%d}", conn, conn->debug_id);
+               rxrpc_post_packet_to_conn(conn, skb);
+               rxrpc_put_connection(conn);
+       } else {
+               struct rxrpc_call *call;
+
+               call = rxrpc_find_call_hash(&sp->hdr, local,
+                                           AF_INET, &ip_hdr(skb)->saddr);
+               if (call)
+                       rxrpc_post_packet_to_call(call, skb);
+               else
+                       goto cant_route_call;
+       }
+
+out:
+       rxrpc_put_local(local);
+       return;
+
+cant_route_call:
+       _debug("can't route call");
+       if (sp->hdr.flags & RXRPC_CLIENT_INITIATED &&
+           sp->hdr.type == RXRPC_PACKET_TYPE_DATA) {
+               if (sp->hdr.seq == 1) {
+                       _debug("first packet");
+                       skb_queue_tail(&local->accept_queue, skb);
+                       rxrpc_queue_work(&local->acceptor);
+                       rxrpc_put_local(local);
+                       _leave(" [incoming]");
+                       return;
+               }
+               skb->priority = RX_INVALID_OPERATION;
+       } else {
+               skb->priority = RX_CALL_DEAD;
+       }
+
+       if (sp->hdr.type != RXRPC_PACKET_TYPE_ABORT) {
+               _debug("reject type %d",sp->hdr.type);
+               rxrpc_reject_packet(local, skb);
+       }
+       rxrpc_put_local(local);
+       _leave(" [no call]");
+       return;
+
+bad_message:
+       skb->priority = RX_PROTOCOL_ERROR;
+       rxrpc_reject_packet(local, skb);
+       rxrpc_put_local(local);
+       _leave(" [badmsg]");
+}
diff --git a/net/rxrpc/key.c b/net/rxrpc/key.c
new file mode 100644 (file)
index 0000000..4ad56fa
--- /dev/null
@@ -0,0 +1,1237 @@
+/* RxRPC key management
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ *
+ * RxRPC keys should have a description of describing their purpose:
+ *     "afs@CAMBRIDGE.REDHAT.COM>
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <crypto/skcipher.h>
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/key-type.h>
+#include <linux/ctype.h>
+#include <linux/slab.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <keys/rxrpc-type.h>
+#include <keys/user-type.h>
+#include "ar-internal.h"
+
+static int rxrpc_vet_description_s(const char *);
+static int rxrpc_preparse(struct key_preparsed_payload *);
+static int rxrpc_preparse_s(struct key_preparsed_payload *);
+static void rxrpc_free_preparse(struct key_preparsed_payload *);
+static void rxrpc_free_preparse_s(struct key_preparsed_payload *);
+static void rxrpc_destroy(struct key *);
+static void rxrpc_destroy_s(struct key *);
+static void rxrpc_describe(const struct key *, struct seq_file *);
+static long rxrpc_read(const struct key *, char __user *, size_t);
+
+/*
+ * rxrpc defined keys take an arbitrary string as the description and an
+ * arbitrary blob of data as the payload
+ */
+struct key_type key_type_rxrpc = {
+       .name           = "rxrpc",
+       .preparse       = rxrpc_preparse,
+       .free_preparse  = rxrpc_free_preparse,
+       .instantiate    = generic_key_instantiate,
+       .destroy        = rxrpc_destroy,
+       .describe       = rxrpc_describe,
+       .read           = rxrpc_read,
+};
+EXPORT_SYMBOL(key_type_rxrpc);
+
+/*
+ * rxrpc server defined keys take "<serviceId>:<securityIndex>" as the
+ * description and an 8-byte decryption key as the payload
+ */
+struct key_type key_type_rxrpc_s = {
+       .name           = "rxrpc_s",
+       .vet_description = rxrpc_vet_description_s,
+       .preparse       = rxrpc_preparse_s,
+       .free_preparse  = rxrpc_free_preparse_s,
+       .instantiate    = generic_key_instantiate,
+       .destroy        = rxrpc_destroy_s,
+       .describe       = rxrpc_describe,
+};
+
+/*
+ * Vet the description for an RxRPC server key
+ */
+static int rxrpc_vet_description_s(const char *desc)
+{
+       unsigned long num;
+       char *p;
+
+       num = simple_strtoul(desc, &p, 10);
+       if (*p != ':' || num > 65535)
+               return -EINVAL;
+       num = simple_strtoul(p + 1, &p, 10);
+       if (*p || num < 1 || num > 255)
+               return -EINVAL;
+       return 0;
+}
+
+/*
+ * parse an RxKAD type XDR format token
+ * - the caller guarantees we have at least 4 words
+ */
+static int rxrpc_preparse_xdr_rxkad(struct key_preparsed_payload *prep,
+                                   size_t datalen,
+                                   const __be32 *xdr, unsigned int toklen)
+{
+       struct rxrpc_key_token *token, **pptoken;
+       size_t plen;
+       u32 tktlen;
+
+       _enter(",{%x,%x,%x,%x},%u",
+              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), ntohl(xdr[3]),
+              toklen);
+
+       if (toklen <= 8 * 4)
+               return -EKEYREJECTED;
+       tktlen = ntohl(xdr[7]);
+       _debug("tktlen: %x", tktlen);
+       if (tktlen > AFSTOKEN_RK_TIX_MAX)
+               return -EKEYREJECTED;
+       if (toklen < 8 * 4 + tktlen)
+               return -EKEYREJECTED;
+
+       plen = sizeof(*token) + sizeof(*token->kad) + tktlen;
+       prep->quotalen = datalen + plen;
+
+       plen -= sizeof(*token);
+       token = kzalloc(sizeof(*token), GFP_KERNEL);
+       if (!token)
+               return -ENOMEM;
+
+       token->kad = kzalloc(plen, GFP_KERNEL);
+       if (!token->kad) {
+               kfree(token);
+               return -ENOMEM;
+       }
+
+       token->security_index   = RXRPC_SECURITY_RXKAD;
+       token->kad->ticket_len  = tktlen;
+       token->kad->vice_id     = ntohl(xdr[0]);
+       token->kad->kvno        = ntohl(xdr[1]);
+       token->kad->start       = ntohl(xdr[4]);
+       token->kad->expiry      = ntohl(xdr[5]);
+       token->kad->primary_flag = ntohl(xdr[6]);
+       memcpy(&token->kad->session_key, &xdr[2], 8);
+       memcpy(&token->kad->ticket, &xdr[8], tktlen);
+
+       _debug("SCIX: %u", token->security_index);
+       _debug("TLEN: %u", token->kad->ticket_len);
+       _debug("EXPY: %x", token->kad->expiry);
+       _debug("KVNO: %u", token->kad->kvno);
+       _debug("PRIM: %u", token->kad->primary_flag);
+       _debug("SKEY: %02x%02x%02x%02x%02x%02x%02x%02x",
+              token->kad->session_key[0], token->kad->session_key[1],
+              token->kad->session_key[2], token->kad->session_key[3],
+              token->kad->session_key[4], token->kad->session_key[5],
+              token->kad->session_key[6], token->kad->session_key[7]);
+       if (token->kad->ticket_len >= 8)
+               _debug("TCKT: %02x%02x%02x%02x%02x%02x%02x%02x",
+                      token->kad->ticket[0], token->kad->ticket[1],
+                      token->kad->ticket[2], token->kad->ticket[3],
+                      token->kad->ticket[4], token->kad->ticket[5],
+                      token->kad->ticket[6], token->kad->ticket[7]);
+
+       /* count the number of tokens attached */
+       prep->payload.data[1] = (void *)((unsigned long)prep->payload.data[1] + 1);
+
+       /* attach the data */
+       for (pptoken = (struct rxrpc_key_token **)&prep->payload.data[0];
+            *pptoken;
+            pptoken = &(*pptoken)->next)
+               continue;
+       *pptoken = token;
+       if (token->kad->expiry < prep->expiry)
+               prep->expiry = token->kad->expiry;
+
+       _leave(" = 0");
+       return 0;
+}
+
+static void rxrpc_free_krb5_principal(struct krb5_principal *princ)
+{
+       int loop;
+
+       if (princ->name_parts) {
+               for (loop = princ->n_name_parts - 1; loop >= 0; loop--)
+                       kfree(princ->name_parts[loop]);
+               kfree(princ->name_parts);
+       }
+       kfree(princ->realm);
+}
+
+static void rxrpc_free_krb5_tagged(struct krb5_tagged_data *td)
+{
+       kfree(td->data);
+}
+
+/*
+ * free up an RxK5 token
+ */
+static void rxrpc_rxk5_free(struct rxk5_key *rxk5)
+{
+       int loop;
+
+       rxrpc_free_krb5_principal(&rxk5->client);
+       rxrpc_free_krb5_principal(&rxk5->server);
+       rxrpc_free_krb5_tagged(&rxk5->session);
+
+       if (rxk5->addresses) {
+               for (loop = rxk5->n_addresses - 1; loop >= 0; loop--)
+                       rxrpc_free_krb5_tagged(&rxk5->addresses[loop]);
+               kfree(rxk5->addresses);
+       }
+       if (rxk5->authdata) {
+               for (loop = rxk5->n_authdata - 1; loop >= 0; loop--)
+                       rxrpc_free_krb5_tagged(&rxk5->authdata[loop]);
+               kfree(rxk5->authdata);
+       }
+
+       kfree(rxk5->ticket);
+       kfree(rxk5->ticket2);
+       kfree(rxk5);
+}
+
+/*
+ * extract a krb5 principal
+ */
+static int rxrpc_krb5_decode_principal(struct krb5_principal *princ,
+                                      const __be32 **_xdr,
+                                      unsigned int *_toklen)
+{
+       const __be32 *xdr = *_xdr;
+       unsigned int toklen = *_toklen, n_parts, loop, tmp;
+
+       /* there must be at least one name, and at least #names+1 length
+        * words */
+       if (toklen <= 12)
+               return -EINVAL;
+
+       _enter(",{%x,%x,%x},%u",
+              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), toklen);
+
+       n_parts = ntohl(*xdr++);
+       toklen -= 4;
+       if (n_parts <= 0 || n_parts > AFSTOKEN_K5_COMPONENTS_MAX)
+               return -EINVAL;
+       princ->n_name_parts = n_parts;
+
+       if (toklen <= (n_parts + 1) * 4)
+               return -EINVAL;
+
+       princ->name_parts = kcalloc(n_parts, sizeof(char *), GFP_KERNEL);
+       if (!princ->name_parts)
+               return -ENOMEM;
+
+       for (loop = 0; loop < n_parts; loop++) {
+               if (toklen < 4)
+                       return -EINVAL;
+               tmp = ntohl(*xdr++);
+               toklen -= 4;
+               if (tmp <= 0 || tmp > AFSTOKEN_STRING_MAX)
+                       return -EINVAL;
+               if (tmp > toklen)
+                       return -EINVAL;
+               princ->name_parts[loop] = kmalloc(tmp + 1, GFP_KERNEL);
+               if (!princ->name_parts[loop])
+                       return -ENOMEM;
+               memcpy(princ->name_parts[loop], xdr, tmp);
+               princ->name_parts[loop][tmp] = 0;
+               tmp = (tmp + 3) & ~3;
+               toklen -= tmp;
+               xdr += tmp >> 2;
+       }
+
+       if (toklen < 4)
+               return -EINVAL;
+       tmp = ntohl(*xdr++);
+       toklen -= 4;
+       if (tmp <= 0 || tmp > AFSTOKEN_K5_REALM_MAX)
+               return -EINVAL;
+       if (tmp > toklen)
+               return -EINVAL;
+       princ->realm = kmalloc(tmp + 1, GFP_KERNEL);
+       if (!princ->realm)
+               return -ENOMEM;
+       memcpy(princ->realm, xdr, tmp);
+       princ->realm[tmp] = 0;
+       tmp = (tmp + 3) & ~3;
+       toklen -= tmp;
+       xdr += tmp >> 2;
+
+       _debug("%s/...@%s", princ->name_parts[0], princ->realm);
+
+       *_xdr = xdr;
+       *_toklen = toklen;
+       _leave(" = 0 [toklen=%u]", toklen);
+       return 0;
+}
+
+/*
+ * extract a piece of krb5 tagged data
+ */
+static int rxrpc_krb5_decode_tagged_data(struct krb5_tagged_data *td,
+                                        size_t max_data_size,
+                                        const __be32 **_xdr,
+                                        unsigned int *_toklen)
+{
+       const __be32 *xdr = *_xdr;
+       unsigned int toklen = *_toklen, len;
+
+       /* there must be at least one tag and one length word */
+       if (toklen <= 8)
+               return -EINVAL;
+
+       _enter(",%zu,{%x,%x},%u",
+              max_data_size, ntohl(xdr[0]), ntohl(xdr[1]), toklen);
+
+       td->tag = ntohl(*xdr++);
+       len = ntohl(*xdr++);
+       toklen -= 8;
+       if (len > max_data_size)
+               return -EINVAL;
+       td->data_len = len;
+
+       if (len > 0) {
+               td->data = kmemdup(xdr, len, GFP_KERNEL);
+               if (!td->data)
+                       return -ENOMEM;
+               len = (len + 3) & ~3;
+               toklen -= len;
+               xdr += len >> 2;
+       }
+
+       _debug("tag %x len %x", td->tag, td->data_len);
+
+       *_xdr = xdr;
+       *_toklen = toklen;
+       _leave(" = 0 [toklen=%u]", toklen);
+       return 0;
+}
+
+/*
+ * extract an array of tagged data
+ */
+static int rxrpc_krb5_decode_tagged_array(struct krb5_tagged_data **_td,
+                                         u8 *_n_elem,
+                                         u8 max_n_elem,
+                                         size_t max_elem_size,
+                                         const __be32 **_xdr,
+                                         unsigned int *_toklen)
+{
+       struct krb5_tagged_data *td;
+       const __be32 *xdr = *_xdr;
+       unsigned int toklen = *_toklen, n_elem, loop;
+       int ret;
+
+       /* there must be at least one count */
+       if (toklen < 4)
+               return -EINVAL;
+
+       _enter(",,%u,%zu,{%x},%u",
+              max_n_elem, max_elem_size, ntohl(xdr[0]), toklen);
+
+       n_elem = ntohl(*xdr++);
+       toklen -= 4;
+       if (n_elem > max_n_elem)
+               return -EINVAL;
+       *_n_elem = n_elem;
+       if (n_elem > 0) {
+               if (toklen <= (n_elem + 1) * 4)
+                       return -EINVAL;
+
+               _debug("n_elem %d", n_elem);
+
+               td = kcalloc(n_elem, sizeof(struct krb5_tagged_data),
+                            GFP_KERNEL);
+               if (!td)
+                       return -ENOMEM;
+               *_td = td;
+
+               for (loop = 0; loop < n_elem; loop++) {
+                       ret = rxrpc_krb5_decode_tagged_data(&td[loop],
+                                                           max_elem_size,
+                                                           &xdr, &toklen);
+                       if (ret < 0)
+                               return ret;
+               }
+       }
+
+       *_xdr = xdr;
+       *_toklen = toklen;
+       _leave(" = 0 [toklen=%u]", toklen);
+       return 0;
+}
+
+/*
+ * extract a krb5 ticket
+ */
+static int rxrpc_krb5_decode_ticket(u8 **_ticket, u16 *_tktlen,
+                                   const __be32 **_xdr, unsigned int *_toklen)
+{
+       const __be32 *xdr = *_xdr;
+       unsigned int toklen = *_toklen, len;
+
+       /* there must be at least one length word */
+       if (toklen <= 4)
+               return -EINVAL;
+
+       _enter(",{%x},%u", ntohl(xdr[0]), toklen);
+
+       len = ntohl(*xdr++);
+       toklen -= 4;
+       if (len > AFSTOKEN_K5_TIX_MAX)
+               return -EINVAL;
+       *_tktlen = len;
+
+       _debug("ticket len %u", len);
+
+       if (len > 0) {
+               *_ticket = kmemdup(xdr, len, GFP_KERNEL);
+               if (!*_ticket)
+                       return -ENOMEM;
+               len = (len + 3) & ~3;
+               toklen -= len;
+               xdr += len >> 2;
+       }
+
+       *_xdr = xdr;
+       *_toklen = toklen;
+       _leave(" = 0 [toklen=%u]", toklen);
+       return 0;
+}
+
+/*
+ * parse an RxK5 type XDR format token
+ * - the caller guarantees we have at least 4 words
+ */
+static int rxrpc_preparse_xdr_rxk5(struct key_preparsed_payload *prep,
+                                  size_t datalen,
+                                  const __be32 *xdr, unsigned int toklen)
+{
+       struct rxrpc_key_token *token, **pptoken;
+       struct rxk5_key *rxk5;
+       const __be32 *end_xdr = xdr + (toklen >> 2);
+       int ret;
+
+       _enter(",{%x,%x,%x,%x},%u",
+              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), ntohl(xdr[3]),
+              toklen);
+
+       /* reserve some payload space for this subkey - the length of the token
+        * is a reasonable approximation */
+       prep->quotalen = datalen + toklen;
+
+       token = kzalloc(sizeof(*token), GFP_KERNEL);
+       if (!token)
+               return -ENOMEM;
+
+       rxk5 = kzalloc(sizeof(*rxk5), GFP_KERNEL);
+       if (!rxk5) {
+               kfree(token);
+               return -ENOMEM;
+       }
+
+       token->security_index = RXRPC_SECURITY_RXK5;
+       token->k5 = rxk5;
+
+       /* extract the principals */
+       ret = rxrpc_krb5_decode_principal(&rxk5->client, &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+       ret = rxrpc_krb5_decode_principal(&rxk5->server, &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+
+       /* extract the session key and the encoding type (the tag field ->
+        * ENCTYPE_xxx) */
+       ret = rxrpc_krb5_decode_tagged_data(&rxk5->session, AFSTOKEN_DATA_MAX,
+                                           &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+
+       if (toklen < 4 * 8 + 2 * 4)
+               goto inval;
+       rxk5->authtime  = be64_to_cpup((const __be64 *) xdr);
+       xdr += 2;
+       rxk5->starttime = be64_to_cpup((const __be64 *) xdr);
+       xdr += 2;
+       rxk5->endtime   = be64_to_cpup((const __be64 *) xdr);
+       xdr += 2;
+       rxk5->renew_till = be64_to_cpup((const __be64 *) xdr);
+       xdr += 2;
+       rxk5->is_skey = ntohl(*xdr++);
+       rxk5->flags = ntohl(*xdr++);
+       toklen -= 4 * 8 + 2 * 4;
+
+       _debug("times: a=%llx s=%llx e=%llx rt=%llx",
+              rxk5->authtime, rxk5->starttime, rxk5->endtime,
+              rxk5->renew_till);
+       _debug("is_skey=%x flags=%x", rxk5->is_skey, rxk5->flags);
+
+       /* extract the permitted client addresses */
+       ret = rxrpc_krb5_decode_tagged_array(&rxk5->addresses,
+                                            &rxk5->n_addresses,
+                                            AFSTOKEN_K5_ADDRESSES_MAX,
+                                            AFSTOKEN_DATA_MAX,
+                                            &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+
+       ASSERTCMP((end_xdr - xdr) << 2, ==, toklen);
+
+       /* extract the tickets */
+       ret = rxrpc_krb5_decode_ticket(&rxk5->ticket, &rxk5->ticket_len,
+                                      &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+       ret = rxrpc_krb5_decode_ticket(&rxk5->ticket2, &rxk5->ticket2_len,
+                                      &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+
+       ASSERTCMP((end_xdr - xdr) << 2, ==, toklen);
+
+       /* extract the typed auth data */
+       ret = rxrpc_krb5_decode_tagged_array(&rxk5->authdata,
+                                            &rxk5->n_authdata,
+                                            AFSTOKEN_K5_AUTHDATA_MAX,
+                                            AFSTOKEN_BDATALN_MAX,
+                                            &xdr, &toklen);
+       if (ret < 0)
+               goto error;
+
+       ASSERTCMP((end_xdr - xdr) << 2, ==, toklen);
+
+       if (toklen != 0)
+               goto inval;
+
+       /* attach the payload */
+       for (pptoken = (struct rxrpc_key_token **)&prep->payload.data[0];
+            *pptoken;
+            pptoken = &(*pptoken)->next)
+               continue;
+       *pptoken = token;
+       if (token->kad->expiry < prep->expiry)
+               prep->expiry = token->kad->expiry;
+
+       _leave(" = 0");
+       return 0;
+
+inval:
+       ret = -EINVAL;
+error:
+       rxrpc_rxk5_free(rxk5);
+       kfree(token);
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * attempt to parse the data as the XDR format
+ * - the caller guarantees we have more than 7 words
+ */
+static int rxrpc_preparse_xdr(struct key_preparsed_payload *prep)
+{
+       const __be32 *xdr = prep->data, *token;
+       const char *cp;
+       unsigned int len, tmp, loop, ntoken, toklen, sec_ix;
+       size_t datalen = prep->datalen;
+       int ret;
+
+       _enter(",{%x,%x,%x,%x},%zu",
+              ntohl(xdr[0]), ntohl(xdr[1]), ntohl(xdr[2]), ntohl(xdr[3]),
+              prep->datalen);
+
+       if (datalen > AFSTOKEN_LENGTH_MAX)
+               goto not_xdr;
+
+       /* XDR is an array of __be32's */
+       if (datalen & 3)
+               goto not_xdr;
+
+       /* the flags should be 0 (the setpag bit must be handled by
+        * userspace) */
+       if (ntohl(*xdr++) != 0)
+               goto not_xdr;
+       datalen -= 4;
+
+       /* check the cell name */
+       len = ntohl(*xdr++);
+       if (len < 1 || len > AFSTOKEN_CELL_MAX)
+               goto not_xdr;
+       datalen -= 4;
+       tmp = (len + 3) & ~3;
+       if (tmp > datalen)
+               goto not_xdr;
+
+       cp = (const char *) xdr;
+       for (loop = 0; loop < len; loop++)
+               if (!isprint(cp[loop]))
+                       goto not_xdr;
+       if (len < tmp)
+               for (; loop < tmp; loop++)
+                       if (cp[loop])
+                               goto not_xdr;
+       _debug("cellname: [%u/%u] '%*.*s'",
+              len, tmp, len, len, (const char *) xdr);
+       datalen -= tmp;
+       xdr += tmp >> 2;
+
+       /* get the token count */
+       if (datalen < 12)
+               goto not_xdr;
+       ntoken = ntohl(*xdr++);
+       datalen -= 4;
+       _debug("ntoken: %x", ntoken);
+       if (ntoken < 1 || ntoken > AFSTOKEN_MAX)
+               goto not_xdr;
+
+       /* check each token wrapper */
+       token = xdr;
+       loop = ntoken;
+       do {
+               if (datalen < 8)
+                       goto not_xdr;
+               toklen = ntohl(*xdr++);
+               sec_ix = ntohl(*xdr);
+               datalen -= 4;
+               _debug("token: [%x/%zx] %x", toklen, datalen, sec_ix);
+               if (toklen < 20 || toklen > datalen)
+                       goto not_xdr;
+               datalen -= (toklen + 3) & ~3;
+               xdr += (toklen + 3) >> 2;
+
+       } while (--loop > 0);
+
+       _debug("remainder: %zu", datalen);
+       if (datalen != 0)
+               goto not_xdr;
+
+       /* okay: we're going to assume it's valid XDR format
+        * - we ignore the cellname, relying on the key to be correctly named
+        */
+       do {
+               xdr = token;
+               toklen = ntohl(*xdr++);
+               token = xdr + ((toklen + 3) >> 2);
+               sec_ix = ntohl(*xdr++);
+               toklen -= 4;
+
+               _debug("TOKEN type=%u [%p-%p]", sec_ix, xdr, token);
+
+               switch (sec_ix) {
+               case RXRPC_SECURITY_RXKAD:
+                       ret = rxrpc_preparse_xdr_rxkad(prep, datalen, xdr, toklen);
+                       if (ret != 0)
+                               goto error;
+                       break;
+
+               case RXRPC_SECURITY_RXK5:
+                       ret = rxrpc_preparse_xdr_rxk5(prep, datalen, xdr, toklen);
+                       if (ret != 0)
+                               goto error;
+                       break;
+
+               default:
+                       ret = -EPROTONOSUPPORT;
+                       goto error;
+               }
+
+       } while (--ntoken > 0);
+
+       _leave(" = 0");
+       return 0;
+
+not_xdr:
+       _leave(" = -EPROTO");
+       return -EPROTO;
+error:
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * Preparse an rxrpc defined key.
+ *
+ * Data should be of the form:
+ *     OFFSET  LEN     CONTENT
+ *     0       4       key interface version number
+ *     4       2       security index (type)
+ *     6       2       ticket length
+ *     8       4       key expiry time (time_t)
+ *     12      4       kvno
+ *     16      8       session key
+ *     24      [len]   ticket
+ *
+ * if no data is provided, then a no-security key is made
+ */
+static int rxrpc_preparse(struct key_preparsed_payload *prep)
+{
+       const struct rxrpc_key_data_v1 *v1;
+       struct rxrpc_key_token *token, **pp;
+       size_t plen;
+       u32 kver;
+       int ret;
+
+       _enter("%zu", prep->datalen);
+
+       /* handle a no-security key */
+       if (!prep->data && prep->datalen == 0)
+               return 0;
+
+       /* determine if the XDR payload format is being used */
+       if (prep->datalen > 7 * 4) {
+               ret = rxrpc_preparse_xdr(prep);
+               if (ret != -EPROTO)
+                       return ret;
+       }
+
+       /* get the key interface version number */
+       ret = -EINVAL;
+       if (prep->datalen <= 4 || !prep->data)
+               goto error;
+       memcpy(&kver, prep->data, sizeof(kver));
+       prep->data += sizeof(kver);
+       prep->datalen -= sizeof(kver);
+
+       _debug("KEY I/F VERSION: %u", kver);
+
+       ret = -EKEYREJECTED;
+       if (kver != 1)
+               goto error;
+
+       /* deal with a version 1 key */
+       ret = -EINVAL;
+       if (prep->datalen < sizeof(*v1))
+               goto error;
+
+       v1 = prep->data;
+       if (prep->datalen != sizeof(*v1) + v1->ticket_length)
+               goto error;
+
+       _debug("SCIX: %u", v1->security_index);
+       _debug("TLEN: %u", v1->ticket_length);
+       _debug("EXPY: %x", v1->expiry);
+       _debug("KVNO: %u", v1->kvno);
+       _debug("SKEY: %02x%02x%02x%02x%02x%02x%02x%02x",
+              v1->session_key[0], v1->session_key[1],
+              v1->session_key[2], v1->session_key[3],
+              v1->session_key[4], v1->session_key[5],
+              v1->session_key[6], v1->session_key[7]);
+       if (v1->ticket_length >= 8)
+               _debug("TCKT: %02x%02x%02x%02x%02x%02x%02x%02x",
+                      v1->ticket[0], v1->ticket[1],
+                      v1->ticket[2], v1->ticket[3],
+                      v1->ticket[4], v1->ticket[5],
+                      v1->ticket[6], v1->ticket[7]);
+
+       ret = -EPROTONOSUPPORT;
+       if (v1->security_index != RXRPC_SECURITY_RXKAD)
+               goto error;
+
+       plen = sizeof(*token->kad) + v1->ticket_length;
+       prep->quotalen = plen + sizeof(*token);
+
+       ret = -ENOMEM;
+       token = kzalloc(sizeof(*token), GFP_KERNEL);
+       if (!token)
+               goto error;
+       token->kad = kzalloc(plen, GFP_KERNEL);
+       if (!token->kad)
+               goto error_free;
+
+       token->security_index           = RXRPC_SECURITY_RXKAD;
+       token->kad->ticket_len          = v1->ticket_length;
+       token->kad->expiry              = v1->expiry;
+       token->kad->kvno                = v1->kvno;
+       memcpy(&token->kad->session_key, &v1->session_key, 8);
+       memcpy(&token->kad->ticket, v1->ticket, v1->ticket_length);
+
+       /* count the number of tokens attached */
+       prep->payload.data[1] = (void *)((unsigned long)prep->payload.data[1] + 1);
+
+       /* attach the data */
+       pp = (struct rxrpc_key_token **)&prep->payload.data[0];
+       while (*pp)
+               pp = &(*pp)->next;
+       *pp = token;
+       if (token->kad->expiry < prep->expiry)
+               prep->expiry = token->kad->expiry;
+       token = NULL;
+       ret = 0;
+
+error_free:
+       kfree(token);
+error:
+       return ret;
+}
+
+/*
+ * Free token list.
+ */
+static void rxrpc_free_token_list(struct rxrpc_key_token *token)
+{
+       struct rxrpc_key_token *next;
+
+       for (; token; token = next) {
+               next = token->next;
+               switch (token->security_index) {
+               case RXRPC_SECURITY_RXKAD:
+                       kfree(token->kad);
+                       break;
+               case RXRPC_SECURITY_RXK5:
+                       if (token->k5)
+                               rxrpc_rxk5_free(token->k5);
+                       break;
+               default:
+                       pr_err("Unknown token type %x on rxrpc key\n",
+                              token->security_index);
+                       BUG();
+               }
+
+               kfree(token);
+       }
+}
+
+/*
+ * Clean up preparse data.
+ */
+static void rxrpc_free_preparse(struct key_preparsed_payload *prep)
+{
+       rxrpc_free_token_list(prep->payload.data[0]);
+}
+
+/*
+ * Preparse a server secret key.
+ *
+ * The data should be the 8-byte secret key.
+ */
+static int rxrpc_preparse_s(struct key_preparsed_payload *prep)
+{
+       struct crypto_skcipher *ci;
+
+       _enter("%zu", prep->datalen);
+
+       if (prep->datalen != 8)
+               return -EINVAL;
+
+       memcpy(&prep->payload.data[2], prep->data, 8);
+
+       ci = crypto_alloc_skcipher("pcbc(des)", 0, CRYPTO_ALG_ASYNC);
+       if (IS_ERR(ci)) {
+               _leave(" = %ld", PTR_ERR(ci));
+               return PTR_ERR(ci);
+       }
+
+       if (crypto_skcipher_setkey(ci, prep->data, 8) < 0)
+               BUG();
+
+       prep->payload.data[0] = ci;
+       _leave(" = 0");
+       return 0;
+}
+
+/*
+ * Clean up preparse data.
+ */
+static void rxrpc_free_preparse_s(struct key_preparsed_payload *prep)
+{
+       if (prep->payload.data[0])
+               crypto_free_skcipher(prep->payload.data[0]);
+}
+
+/*
+ * dispose of the data dangling from the corpse of a rxrpc key
+ */
+static void rxrpc_destroy(struct key *key)
+{
+       rxrpc_free_token_list(key->payload.data[0]);
+}
+
+/*
+ * dispose of the data dangling from the corpse of a rxrpc key
+ */
+static void rxrpc_destroy_s(struct key *key)
+{
+       if (key->payload.data[0]) {
+               crypto_free_skcipher(key->payload.data[0]);
+               key->payload.data[0] = NULL;
+       }
+}
+
+/*
+ * describe the rxrpc key
+ */
+static void rxrpc_describe(const struct key *key, struct seq_file *m)
+{
+       seq_puts(m, key->description);
+}
+
+/*
+ * grab the security key for a socket
+ */
+int rxrpc_request_key(struct rxrpc_sock *rx, char __user *optval, int optlen)
+{
+       struct key *key;
+       char *description;
+
+       _enter("");
+
+       if (optlen <= 0 || optlen > PAGE_SIZE - 1)
+               return -EINVAL;
+
+       description = memdup_user_nul(optval, optlen);
+       if (IS_ERR(description))
+               return PTR_ERR(description);
+
+       key = request_key(&key_type_rxrpc, description, NULL);
+       if (IS_ERR(key)) {
+               kfree(description);
+               _leave(" = %ld", PTR_ERR(key));
+               return PTR_ERR(key);
+       }
+
+       rx->key = key;
+       kfree(description);
+       _leave(" = 0 [key %x]", key->serial);
+       return 0;
+}
+
+/*
+ * grab the security keyring for a server socket
+ */
+int rxrpc_server_keyring(struct rxrpc_sock *rx, char __user *optval,
+                        int optlen)
+{
+       struct key *key;
+       char *description;
+
+       _enter("");
+
+       if (optlen <= 0 || optlen > PAGE_SIZE - 1)
+               return -EINVAL;
+
+       description = memdup_user_nul(optval, optlen);
+       if (IS_ERR(description))
+               return PTR_ERR(description);
+
+       key = request_key(&key_type_keyring, description, NULL);
+       if (IS_ERR(key)) {
+               kfree(description);
+               _leave(" = %ld", PTR_ERR(key));
+               return PTR_ERR(key);
+       }
+
+       rx->securities = key;
+       kfree(description);
+       _leave(" = 0 [key %x]", key->serial);
+       return 0;
+}
+
+/*
+ * generate a server data key
+ */
+int rxrpc_get_server_data_key(struct rxrpc_connection *conn,
+                             const void *session_key,
+                             time_t expiry,
+                             u32 kvno)
+{
+       const struct cred *cred = current_cred();
+       struct key *key;
+       int ret;
+
+       struct {
+               u32 kver;
+               struct rxrpc_key_data_v1 v1;
+       } data;
+
+       _enter("");
+
+       key = key_alloc(&key_type_rxrpc, "x",
+                       GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred, 0,
+                       KEY_ALLOC_NOT_IN_QUOTA, NULL);
+       if (IS_ERR(key)) {
+               _leave(" = -ENOMEM [alloc %ld]", PTR_ERR(key));
+               return -ENOMEM;
+       }
+
+       _debug("key %d", key_serial(key));
+
+       data.kver = 1;
+       data.v1.security_index = RXRPC_SECURITY_RXKAD;
+       data.v1.ticket_length = 0;
+       data.v1.expiry = expiry;
+       data.v1.kvno = 0;
+
+       memcpy(&data.v1.session_key, session_key, sizeof(data.v1.session_key));
+
+       ret = key_instantiate_and_link(key, &data, sizeof(data), NULL, NULL);
+       if (ret < 0)
+               goto error;
+
+       conn->key = key;
+       _leave(" = 0 [%d]", key_serial(key));
+       return 0;
+
+error:
+       key_revoke(key);
+       key_put(key);
+       _leave(" = -ENOMEM [ins %d]", ret);
+       return -ENOMEM;
+}
+EXPORT_SYMBOL(rxrpc_get_server_data_key);
+
+/**
+ * rxrpc_get_null_key - Generate a null RxRPC key
+ * @keyname: The name to give the key.
+ *
+ * Generate a null RxRPC key that can be used to indicate anonymous security is
+ * required for a particular domain.
+ */
+struct key *rxrpc_get_null_key(const char *keyname)
+{
+       const struct cred *cred = current_cred();
+       struct key *key;
+       int ret;
+
+       key = key_alloc(&key_type_rxrpc, keyname,
+                       GLOBAL_ROOT_UID, GLOBAL_ROOT_GID, cred,
+                       KEY_POS_SEARCH, KEY_ALLOC_NOT_IN_QUOTA, NULL);
+       if (IS_ERR(key))
+               return key;
+
+       ret = key_instantiate_and_link(key, NULL, 0, NULL, NULL);
+       if (ret < 0) {
+               key_revoke(key);
+               key_put(key);
+               return ERR_PTR(ret);
+       }
+
+       return key;
+}
+EXPORT_SYMBOL(rxrpc_get_null_key);
+
+/*
+ * read the contents of an rxrpc key
+ * - this returns the result in XDR form
+ */
+static long rxrpc_read(const struct key *key,
+                      char __user *buffer, size_t buflen)
+{
+       const struct rxrpc_key_token *token;
+       const struct krb5_principal *princ;
+       size_t size;
+       __be32 __user *xdr, *oldxdr;
+       u32 cnlen, toksize, ntoks, tok, zero;
+       u16 toksizes[AFSTOKEN_MAX];
+       int loop;
+
+       _enter("");
+
+       /* we don't know what form we should return non-AFS keys in */
+       if (memcmp(key->description, "afs@", 4) != 0)
+               return -EOPNOTSUPP;
+       cnlen = strlen(key->description + 4);
+
+#define RND(X) (((X) + 3) & ~3)
+
+       /* AFS keys we return in XDR form, so we need to work out the size of
+        * the XDR */
+       size = 2 * 4;   /* flags, cellname len */
+       size += RND(cnlen);     /* cellname */
+       size += 1 * 4;  /* token count */
+
+       ntoks = 0;
+       for (token = key->payload.data[0]; token; token = token->next) {
+               toksize = 4;    /* sec index */
+
+               switch (token->security_index) {
+               case RXRPC_SECURITY_RXKAD:
+                       toksize += 8 * 4;       /* viceid, kvno, key*2, begin,
+                                                * end, primary, tktlen */
+                       toksize += RND(token->kad->ticket_len);
+                       break;
+
+               case RXRPC_SECURITY_RXK5:
+                       princ = &token->k5->client;
+                       toksize += 4 + princ->n_name_parts * 4;
+                       for (loop = 0; loop < princ->n_name_parts; loop++)
+                               toksize += RND(strlen(princ->name_parts[loop]));
+                       toksize += 4 + RND(strlen(princ->realm));
+
+                       princ = &token->k5->server;
+                       toksize += 4 + princ->n_name_parts * 4;
+                       for (loop = 0; loop < princ->n_name_parts; loop++)
+                               toksize += RND(strlen(princ->name_parts[loop]));
+                       toksize += 4 + RND(strlen(princ->realm));
+
+                       toksize += 8 + RND(token->k5->session.data_len);
+
+                       toksize += 4 * 8 + 2 * 4;
+
+                       toksize += 4 + token->k5->n_addresses * 8;
+                       for (loop = 0; loop < token->k5->n_addresses; loop++)
+                               toksize += RND(token->k5->addresses[loop].data_len);
+
+                       toksize += 4 + RND(token->k5->ticket_len);
+                       toksize += 4 + RND(token->k5->ticket2_len);
+
+                       toksize += 4 + token->k5->n_authdata * 8;
+                       for (loop = 0; loop < token->k5->n_authdata; loop++)
+                               toksize += RND(token->k5->authdata[loop].data_len);
+                       break;
+
+               default: /* we have a ticket we can't encode */
+                       BUG();
+                       continue;
+               }
+
+               _debug("token[%u]: toksize=%u", ntoks, toksize);
+               ASSERTCMP(toksize, <=, AFSTOKEN_LENGTH_MAX);
+
+               toksizes[ntoks++] = toksize;
+               size += toksize + 4; /* each token has a length word */
+       }
+
+#undef RND
+
+       if (!buffer || buflen < size)
+               return size;
+
+       xdr = (__be32 __user *) buffer;
+       zero = 0;
+#define ENCODE(x)                              \
+       do {                                    \
+               __be32 y = htonl(x);            \
+               if (put_user(y, xdr++) < 0)     \
+                       goto fault;             \
+       } while(0)
+#define ENCODE_DATA(l, s)                                              \
+       do {                                                            \
+               u32 _l = (l);                                           \
+               ENCODE(l);                                              \
+               if (copy_to_user(xdr, (s), _l) != 0)                    \
+                       goto fault;                                     \
+               if (_l & 3 &&                                           \
+                   copy_to_user((u8 __user *)xdr + _l, &zero, 4 - (_l & 3)) != 0) \
+                       goto fault;                                     \
+               xdr += (_l + 3) >> 2;                                   \
+       } while(0)
+#define ENCODE64(x)                                    \
+       do {                                            \
+               __be64 y = cpu_to_be64(x);              \
+               if (copy_to_user(xdr, &y, 8) != 0)      \
+                       goto fault;                     \
+               xdr += 8 >> 2;                          \
+       } while(0)
+#define ENCODE_STR(s)                          \
+       do {                                    \
+               const char *_s = (s);           \
+               ENCODE_DATA(strlen(_s), _s);    \
+       } while(0)
+
+       ENCODE(0);                                      /* flags */
+       ENCODE_DATA(cnlen, key->description + 4);       /* cellname */
+       ENCODE(ntoks);
+
+       tok = 0;
+       for (token = key->payload.data[0]; token; token = token->next) {
+               toksize = toksizes[tok++];
+               ENCODE(toksize);
+               oldxdr = xdr;
+               ENCODE(token->security_index);
+
+               switch (token->security_index) {
+               case RXRPC_SECURITY_RXKAD:
+                       ENCODE(token->kad->vice_id);
+                       ENCODE(token->kad->kvno);
+                       ENCODE_DATA(8, token->kad->session_key);
+                       ENCODE(token->kad->start);
+                       ENCODE(token->kad->expiry);
+                       ENCODE(token->kad->primary_flag);
+                       ENCODE_DATA(token->kad->ticket_len, token->kad->ticket);
+                       break;
+
+               case RXRPC_SECURITY_RXK5:
+                       princ = &token->k5->client;
+                       ENCODE(princ->n_name_parts);
+                       for (loop = 0; loop < princ->n_name_parts; loop++)
+                               ENCODE_STR(princ->name_parts[loop]);
+                       ENCODE_STR(princ->realm);
+
+                       princ = &token->k5->server;
+                       ENCODE(princ->n_name_parts);
+                       for (loop = 0; loop < princ->n_name_parts; loop++)
+                               ENCODE_STR(princ->name_parts[loop]);
+                       ENCODE_STR(princ->realm);
+
+                       ENCODE(token->k5->session.tag);
+                       ENCODE_DATA(token->k5->session.data_len,
+                                   token->k5->session.data);
+
+                       ENCODE64(token->k5->authtime);
+                       ENCODE64(token->k5->starttime);
+                       ENCODE64(token->k5->endtime);
+                       ENCODE64(token->k5->renew_till);
+                       ENCODE(token->k5->is_skey);
+                       ENCODE(token->k5->flags);
+
+                       ENCODE(token->k5->n_addresses);
+                       for (loop = 0; loop < token->k5->n_addresses; loop++) {
+                               ENCODE(token->k5->addresses[loop].tag);
+                               ENCODE_DATA(token->k5->addresses[loop].data_len,
+                                           token->k5->addresses[loop].data);
+                       }
+
+                       ENCODE_DATA(token->k5->ticket_len, token->k5->ticket);
+                       ENCODE_DATA(token->k5->ticket2_len, token->k5->ticket2);
+
+                       ENCODE(token->k5->n_authdata);
+                       for (loop = 0; loop < token->k5->n_authdata; loop++) {
+                               ENCODE(token->k5->authdata[loop].tag);
+                               ENCODE_DATA(token->k5->authdata[loop].data_len,
+                                           token->k5->authdata[loop].data);
+                       }
+                       break;
+
+               default:
+                       BUG();
+                       break;
+               }
+
+               ASSERTCMP((unsigned long)xdr - (unsigned long)oldxdr, ==,
+                         toksize);
+       }
+
+#undef ENCODE_STR
+#undef ENCODE_DATA
+#undef ENCODE64
+#undef ENCODE
+
+       ASSERTCMP(tok, ==, ntoks);
+       ASSERTCMP((char __user *) xdr - buffer, ==, size);
+       _leave(" = %zu", size);
+       return size;
+
+fault:
+       _leave(" = -EFAULT");
+       return -EFAULT;
+}
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c
new file mode 100644 (file)
index 0000000..111f250
--- /dev/null
@@ -0,0 +1,417 @@
+/* AF_RXRPC local endpoint management
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <linux/udp.h>
+#include <linux/ip.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <generated/utsrelease.h>
+#include "ar-internal.h"
+
+static const char rxrpc_version_string[65] = "linux-" UTS_RELEASE " AF_RXRPC";
+
+static LIST_HEAD(rxrpc_locals);
+DEFINE_RWLOCK(rxrpc_local_lock);
+static DECLARE_RWSEM(rxrpc_local_sem);
+static DECLARE_WAIT_QUEUE_HEAD(rxrpc_local_wq);
+
+static void rxrpc_destroy_local(struct work_struct *work);
+static void rxrpc_process_local_events(struct work_struct *work);
+
+/*
+ * allocate a new local
+ */
+static
+struct rxrpc_local *rxrpc_alloc_local(struct sockaddr_rxrpc *srx)
+{
+       struct rxrpc_local *local;
+
+       local = kzalloc(sizeof(struct rxrpc_local), GFP_KERNEL);
+       if (local) {
+               INIT_WORK(&local->destroyer, &rxrpc_destroy_local);
+               INIT_WORK(&local->acceptor, &rxrpc_accept_incoming_calls);
+               INIT_WORK(&local->rejecter, &rxrpc_reject_packets);
+               INIT_WORK(&local->event_processor, &rxrpc_process_local_events);
+               INIT_LIST_HEAD(&local->services);
+               INIT_LIST_HEAD(&local->link);
+               init_rwsem(&local->defrag_sem);
+               skb_queue_head_init(&local->accept_queue);
+               skb_queue_head_init(&local->reject_queue);
+               skb_queue_head_init(&local->event_queue);
+               spin_lock_init(&local->lock);
+               rwlock_init(&local->services_lock);
+               atomic_set(&local->usage, 1);
+               local->debug_id = atomic_inc_return(&rxrpc_debug_id);
+               memcpy(&local->srx, srx, sizeof(*srx));
+       }
+
+       _leave(" = %p", local);
+       return local;
+}
+
+/*
+ * create the local socket
+ * - must be called with rxrpc_local_sem writelocked
+ */
+static int rxrpc_create_local(struct rxrpc_local *local)
+{
+       struct sock *sock;
+       int ret, opt;
+
+       _enter("%p{%d}", local, local->srx.transport_type);
+
+       /* create a socket to represent the local endpoint */
+       ret = sock_create_kern(&init_net, PF_INET, local->srx.transport_type,
+                              IPPROTO_UDP, &local->socket);
+       if (ret < 0) {
+               _leave(" = %d [socket]", ret);
+               return ret;
+       }
+
+       /* if a local address was supplied then bind it */
+       if (local->srx.transport_len > sizeof(sa_family_t)) {
+               _debug("bind");
+               ret = kernel_bind(local->socket,
+                                 (struct sockaddr *) &local->srx.transport,
+                                 local->srx.transport_len);
+               if (ret < 0) {
+                       _debug("bind failed");
+                       goto error;
+               }
+       }
+
+       /* we want to receive ICMP errors */
+       opt = 1;
+       ret = kernel_setsockopt(local->socket, SOL_IP, IP_RECVERR,
+                               (char *) &opt, sizeof(opt));
+       if (ret < 0) {
+               _debug("setsockopt failed");
+               goto error;
+       }
+
+       /* we want to set the don't fragment bit */
+       opt = IP_PMTUDISC_DO;
+       ret = kernel_setsockopt(local->socket, SOL_IP, IP_MTU_DISCOVER,
+                               (char *) &opt, sizeof(opt));
+       if (ret < 0) {
+               _debug("setsockopt failed");
+               goto error;
+       }
+
+       write_lock_bh(&rxrpc_local_lock);
+       list_add(&local->link, &rxrpc_locals);
+       write_unlock_bh(&rxrpc_local_lock);
+
+       /* set the socket up */
+       sock = local->socket->sk;
+       sock->sk_user_data      = local;
+       sock->sk_data_ready     = rxrpc_data_ready;
+       sock->sk_error_report   = rxrpc_UDP_error_report;
+       _leave(" = 0");
+       return 0;
+
+error:
+       kernel_sock_shutdown(local->socket, SHUT_RDWR);
+       local->socket->sk->sk_user_data = NULL;
+       sock_release(local->socket);
+       local->socket = NULL;
+
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * create a new local endpoint using the specified UDP address
+ */
+struct rxrpc_local *rxrpc_lookup_local(struct sockaddr_rxrpc *srx)
+{
+       struct rxrpc_local *local;
+       int ret;
+
+       _enter("{%d,%u,%pI4+%hu}",
+              srx->transport_type,
+              srx->transport.family,
+              &srx->transport.sin.sin_addr,
+              ntohs(srx->transport.sin.sin_port));
+
+       down_write(&rxrpc_local_sem);
+
+       /* see if we have a suitable local local endpoint already */
+       read_lock_bh(&rxrpc_local_lock);
+
+       list_for_each_entry(local, &rxrpc_locals, link) {
+               _debug("CMP {%d,%u,%pI4+%hu}",
+                      local->srx.transport_type,
+                      local->srx.transport.family,
+                      &local->srx.transport.sin.sin_addr,
+                      ntohs(local->srx.transport.sin.sin_port));
+
+               if (local->srx.transport_type != srx->transport_type ||
+                   local->srx.transport.family != srx->transport.family)
+                       continue;
+
+               switch (srx->transport.family) {
+               case AF_INET:
+                       if (local->srx.transport.sin.sin_port !=
+                           srx->transport.sin.sin_port)
+                               continue;
+                       if (memcmp(&local->srx.transport.sin.sin_addr,
+                                  &srx->transport.sin.sin_addr,
+                                  sizeof(struct in_addr)) != 0)
+                               continue;
+                       goto found_local;
+
+               default:
+                       BUG();
+               }
+       }
+
+       read_unlock_bh(&rxrpc_local_lock);
+
+       /* we didn't find one, so we need to create one */
+       local = rxrpc_alloc_local(srx);
+       if (!local) {
+               up_write(&rxrpc_local_sem);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       ret = rxrpc_create_local(local);
+       if (ret < 0) {
+               up_write(&rxrpc_local_sem);
+               kfree(local);
+               _leave(" = %d", ret);
+               return ERR_PTR(ret);
+       }
+
+       up_write(&rxrpc_local_sem);
+
+       _net("LOCAL new %d {%d,%u,%pI4+%hu}",
+            local->debug_id,
+            local->srx.transport_type,
+            local->srx.transport.family,
+            &local->srx.transport.sin.sin_addr,
+            ntohs(local->srx.transport.sin.sin_port));
+
+       _leave(" = %p [new]", local);
+       return local;
+
+found_local:
+       rxrpc_get_local(local);
+       read_unlock_bh(&rxrpc_local_lock);
+       up_write(&rxrpc_local_sem);
+
+       _net("LOCAL old %d {%d,%u,%pI4+%hu}",
+            local->debug_id,
+            local->srx.transport_type,
+            local->srx.transport.family,
+            &local->srx.transport.sin.sin_addr,
+            ntohs(local->srx.transport.sin.sin_port));
+
+       _leave(" = %p [reuse]", local);
+       return local;
+}
+
+/*
+ * release a local endpoint
+ */
+void rxrpc_put_local(struct rxrpc_local *local)
+{
+       _enter("%p{u=%d}", local, atomic_read(&local->usage));
+
+       ASSERTCMP(atomic_read(&local->usage), >, 0);
+
+       /* to prevent a race, the decrement and the dequeue must be effectively
+        * atomic */
+       write_lock_bh(&rxrpc_local_lock);
+       if (unlikely(atomic_dec_and_test(&local->usage))) {
+               _debug("destroy local");
+               rxrpc_queue_work(&local->destroyer);
+       }
+       write_unlock_bh(&rxrpc_local_lock);
+       _leave("");
+}
+
+/*
+ * destroy a local endpoint
+ */
+static void rxrpc_destroy_local(struct work_struct *work)
+{
+       struct rxrpc_local *local =
+               container_of(work, struct rxrpc_local, destroyer);
+
+       _enter("%p{%d}", local, atomic_read(&local->usage));
+
+       down_write(&rxrpc_local_sem);
+
+       write_lock_bh(&rxrpc_local_lock);
+       if (atomic_read(&local->usage) > 0) {
+               write_unlock_bh(&rxrpc_local_lock);
+               up_read(&rxrpc_local_sem);
+               _leave(" [resurrected]");
+               return;
+       }
+
+       list_del(&local->link);
+       local->socket->sk->sk_user_data = NULL;
+       write_unlock_bh(&rxrpc_local_lock);
+
+       downgrade_write(&rxrpc_local_sem);
+
+       ASSERT(list_empty(&local->services));
+       ASSERT(!work_pending(&local->acceptor));
+       ASSERT(!work_pending(&local->rejecter));
+       ASSERT(!work_pending(&local->event_processor));
+
+       /* finish cleaning up the local descriptor */
+       rxrpc_purge_queue(&local->accept_queue);
+       rxrpc_purge_queue(&local->reject_queue);
+       rxrpc_purge_queue(&local->event_queue);
+       kernel_sock_shutdown(local->socket, SHUT_RDWR);
+       sock_release(local->socket);
+
+       up_read(&rxrpc_local_sem);
+
+       _net("DESTROY LOCAL %d", local->debug_id);
+       kfree(local);
+
+       if (list_empty(&rxrpc_locals))
+               wake_up_all(&rxrpc_local_wq);
+
+       _leave("");
+}
+
+/*
+ * preemptively destroy all local local endpoint rather than waiting for
+ * them to be destroyed
+ */
+void __exit rxrpc_destroy_all_locals(void)
+{
+       DECLARE_WAITQUEUE(myself,current);
+
+       _enter("");
+
+       /* we simply have to wait for them to go away */
+       if (!list_empty(&rxrpc_locals)) {
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               add_wait_queue(&rxrpc_local_wq, &myself);
+
+               while (!list_empty(&rxrpc_locals)) {
+                       schedule();
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+               }
+
+               remove_wait_queue(&rxrpc_local_wq, &myself);
+               set_current_state(TASK_RUNNING);
+       }
+
+       _leave("");
+}
+
+/*
+ * Reply to a version request
+ */
+static void rxrpc_send_version_request(struct rxrpc_local *local,
+                                      struct rxrpc_host_header *hdr,
+                                      struct sk_buff *skb)
+{
+       struct rxrpc_wire_header whdr;
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       struct sockaddr_in sin;
+       struct msghdr msg;
+       struct kvec iov[2];
+       size_t len;
+       int ret;
+
+       _enter("");
+
+       sin.sin_family = AF_INET;
+       sin.sin_port = udp_hdr(skb)->source;
+       sin.sin_addr.s_addr = ip_hdr(skb)->saddr;
+
+       msg.msg_name    = &sin;
+       msg.msg_namelen = sizeof(sin);
+       msg.msg_control = NULL;
+       msg.msg_controllen = 0;
+       msg.msg_flags   = 0;
+
+       whdr.epoch      = htonl(sp->hdr.epoch);
+       whdr.cid        = htonl(sp->hdr.cid);
+       whdr.callNumber = htonl(sp->hdr.callNumber);
+       whdr.seq        = 0;
+       whdr.serial     = 0;
+       whdr.type       = RXRPC_PACKET_TYPE_VERSION;
+       whdr.flags      = RXRPC_LAST_PACKET | (~hdr->flags & RXRPC_CLIENT_INITIATED);
+       whdr.userStatus = 0;
+       whdr.securityIndex = 0;
+       whdr._rsvd      = 0;
+       whdr.serviceId  = htons(sp->hdr.serviceId);
+
+       iov[0].iov_base = &whdr;
+       iov[0].iov_len  = sizeof(whdr);
+       iov[1].iov_base = (char *)rxrpc_version_string;
+       iov[1].iov_len  = sizeof(rxrpc_version_string);
+
+       len = iov[0].iov_len + iov[1].iov_len;
+
+       _proto("Tx VERSION (reply)");
+
+       ret = kernel_sendmsg(local->socket, &msg, iov, 2, len);
+       if (ret < 0)
+               _debug("sendmsg failed: %d", ret);
+
+       _leave("");
+}
+
+/*
+ * Process event packets targetted at a local endpoint.
+ */
+static void rxrpc_process_local_events(struct work_struct *work)
+{
+       struct rxrpc_local *local = container_of(work, struct rxrpc_local, event_processor);
+       struct sk_buff *skb;
+       char v;
+
+       _enter("");
+
+       atomic_inc(&local->usage);
+
+       while ((skb = skb_dequeue(&local->event_queue))) {
+               struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+
+               _debug("{%d},{%u}", local->debug_id, sp->hdr.type);
+
+               switch (sp->hdr.type) {
+               case RXRPC_PACKET_TYPE_VERSION:
+                       if (skb_copy_bits(skb, 0, &v, 1) < 0)
+                               return;
+                       _proto("Rx VERSION { %02x }", v);
+                       if (v == 0)
+                               rxrpc_send_version_request(local, &sp->hdr, skb);
+                       break;
+
+               default:
+                       /* Just ignore anything we don't understand */
+                       break;
+               }
+
+               rxrpc_put_local(local);
+               rxrpc_free_skb(skb);
+       }
+
+       rxrpc_put_local(local);
+       _leave("");
+}
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c
new file mode 100644 (file)
index 0000000..2e3c406
--- /dev/null
@@ -0,0 +1,724 @@
+/* RxRPC packet transmission
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/net.h>
+#include <linux/gfp.h>
+#include <linux/skbuff.h>
+#include <linux/circ_buf.h>
+#include <linux/export.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * Time till packet resend (in jiffies).
+ */
+unsigned int rxrpc_resend_timeout = 4 * HZ;
+
+static int rxrpc_send_data(struct rxrpc_sock *rx,
+                          struct rxrpc_call *call,
+                          struct msghdr *msg, size_t len);
+
+/*
+ * extract control messages from the sendmsg() control buffer
+ */
+static int rxrpc_sendmsg_cmsg(struct msghdr *msg,
+                             unsigned long *user_call_ID,
+                             enum rxrpc_command *command,
+                             u32 *abort_code)
+{
+       struct cmsghdr *cmsg;
+       bool got_user_ID = false;
+       int len;
+
+       *command = RXRPC_CMD_SEND_DATA;
+
+       if (msg->msg_controllen == 0)
+               return -EINVAL;
+
+       for_each_cmsghdr(cmsg, msg) {
+               if (!CMSG_OK(msg, cmsg))
+                       return -EINVAL;
+
+               len = cmsg->cmsg_len - CMSG_ALIGN(sizeof(struct cmsghdr));
+               _debug("CMSG %d, %d, %d",
+                      cmsg->cmsg_level, cmsg->cmsg_type, len);
+
+               if (cmsg->cmsg_level != SOL_RXRPC)
+                       continue;
+
+               switch (cmsg->cmsg_type) {
+               case RXRPC_USER_CALL_ID:
+                       if (msg->msg_flags & MSG_CMSG_COMPAT) {
+                               if (len != sizeof(u32))
+                                       return -EINVAL;
+                               *user_call_ID = *(u32 *) CMSG_DATA(cmsg);
+                       } else {
+                               if (len != sizeof(unsigned long))
+                                       return -EINVAL;
+                               *user_call_ID = *(unsigned long *)
+                                       CMSG_DATA(cmsg);
+                       }
+                       _debug("User Call ID %lx", *user_call_ID);
+                       got_user_ID = true;
+                       break;
+
+               case RXRPC_ABORT:
+                       if (*command != RXRPC_CMD_SEND_DATA)
+                               return -EINVAL;
+                       *command = RXRPC_CMD_SEND_ABORT;
+                       if (len != sizeof(*abort_code))
+                               return -EINVAL;
+                       *abort_code = *(unsigned int *) CMSG_DATA(cmsg);
+                       _debug("Abort %x", *abort_code);
+                       if (*abort_code == 0)
+                               return -EINVAL;
+                       break;
+
+               case RXRPC_ACCEPT:
+                       if (*command != RXRPC_CMD_SEND_DATA)
+                               return -EINVAL;
+                       *command = RXRPC_CMD_ACCEPT;
+                       if (len != 0)
+                               return -EINVAL;
+                       break;
+
+               default:
+                       return -EINVAL;
+               }
+       }
+
+       if (!got_user_ID)
+               return -EINVAL;
+       _leave(" = 0");
+       return 0;
+}
+
+/*
+ * abort a call, sending an ABORT packet to the peer
+ */
+static void rxrpc_send_abort(struct rxrpc_call *call, u32 abort_code)
+{
+       write_lock_bh(&call->state_lock);
+
+       if (call->state <= RXRPC_CALL_COMPLETE) {
+               call->state = RXRPC_CALL_LOCALLY_ABORTED;
+               call->local_abort = abort_code;
+               set_bit(RXRPC_CALL_EV_ABORT, &call->events);
+               del_timer_sync(&call->resend_timer);
+               del_timer_sync(&call->ack_timer);
+               clear_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events);
+               clear_bit(RXRPC_CALL_EV_ACK, &call->events);
+               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+               rxrpc_queue_call(call);
+       }
+
+       write_unlock_bh(&call->state_lock);
+}
+
+/*
+ * Create a new client call for sendmsg().
+ */
+static struct rxrpc_call *
+rxrpc_new_client_call_for_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg,
+                                 unsigned long user_call_ID)
+{
+       struct rxrpc_conn_bundle *bundle;
+       struct rxrpc_transport *trans;
+       struct rxrpc_call *call;
+       struct key *key;
+       long ret;
+
+       DECLARE_SOCKADDR(struct sockaddr_rxrpc *, srx, msg->msg_name);
+
+       _enter("");
+
+       if (!msg->msg_name)
+               return ERR_PTR(-EDESTADDRREQ);
+
+       trans = rxrpc_name_to_transport(rx, msg->msg_name, msg->msg_namelen, 0,
+                                       GFP_KERNEL);
+       if (IS_ERR(trans)) {
+               ret = PTR_ERR(trans);
+               goto out;
+       }
+
+       key = rx->key;
+       if (key && !rx->key->payload.data[0])
+               key = NULL;
+       bundle = rxrpc_get_bundle(rx, trans, key, srx->srx_service, GFP_KERNEL);
+       if (IS_ERR(bundle)) {
+               ret = PTR_ERR(bundle);
+               goto out_trans;
+       }
+
+       call = rxrpc_new_client_call(rx, trans, bundle, user_call_ID,
+                                    GFP_KERNEL);
+       rxrpc_put_bundle(trans, bundle);
+       rxrpc_put_transport(trans);
+       if (IS_ERR(call)) {
+               ret = PTR_ERR(call);
+               goto out_trans;
+       }
+
+       _leave(" = %p\n", call);
+       return call;
+
+out_trans:
+       rxrpc_put_transport(trans);
+out:
+       _leave(" = %ld", ret);
+       return ERR_PTR(ret);
+}
+
+/*
+ * send a message forming part of a client call through an RxRPC socket
+ * - caller holds the socket locked
+ * - the socket may be either a client socket or a server socket
+ */
+int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len)
+{
+       enum rxrpc_command cmd;
+       struct rxrpc_call *call;
+       unsigned long user_call_ID = 0;
+       u32 abort_code = 0;
+       int ret;
+
+       _enter("");
+
+       ret = rxrpc_sendmsg_cmsg(msg, &user_call_ID, &cmd, &abort_code);
+       if (ret < 0)
+               return ret;
+
+       if (cmd == RXRPC_CMD_ACCEPT) {
+               if (rx->sk.sk_state != RXRPC_SERVER_LISTENING)
+                       return -EINVAL;
+               call = rxrpc_accept_call(rx, user_call_ID);
+               if (IS_ERR(call))
+                       return PTR_ERR(call);
+               rxrpc_put_call(call);
+               return 0;
+       }
+
+       call = rxrpc_find_call_by_user_ID(rx, user_call_ID);
+       if (!call) {
+               if (cmd != RXRPC_CMD_SEND_DATA)
+                       return -EBADSLT;
+               call = rxrpc_new_client_call_for_sendmsg(rx, msg, user_call_ID);
+               if (IS_ERR(call))
+                       return PTR_ERR(call);
+       }
+
+       _debug("CALL %d USR %lx ST %d on CONN %p",
+              call->debug_id, call->user_call_ID, call->state, call->conn);
+
+       if (call->state >= RXRPC_CALL_COMPLETE) {
+               /* it's too late for this call */
+               ret = -ECONNRESET;
+       } else if (cmd == RXRPC_CMD_SEND_ABORT) {
+               rxrpc_send_abort(call, abort_code);
+               ret = 0;
+       } else if (cmd != RXRPC_CMD_SEND_DATA) {
+               ret = -EINVAL;
+       } else if (!call->in_clientflag &&
+                  call->state != RXRPC_CALL_CLIENT_SEND_REQUEST) {
+               /* request phase complete for this client call */
+               ret = -EPROTO;
+       } else if (call->in_clientflag &&
+                  call->state != RXRPC_CALL_SERVER_ACK_REQUEST &&
+                  call->state != RXRPC_CALL_SERVER_SEND_REPLY) {
+               /* Reply phase not begun or not complete for service call. */
+               ret = -EPROTO;
+       } else {
+               ret = rxrpc_send_data(rx, call, msg, len);
+       }
+
+       rxrpc_put_call(call);
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/**
+ * rxrpc_kernel_send_data - Allow a kernel service to send data on a call
+ * @call: The call to send data through
+ * @msg: The data to send
+ * @len: The amount of data to send
+ *
+ * Allow a kernel service to send data on a call.  The call must be in an state
+ * appropriate to sending data.  No control data should be supplied in @msg,
+ * nor should an address be supplied.  MSG_MORE should be flagged if there's
+ * more data to come, otherwise this data will end the transmission phase.
+ */
+int rxrpc_kernel_send_data(struct rxrpc_call *call, struct msghdr *msg,
+                          size_t len)
+{
+       int ret;
+
+       _enter("{%d,%s},", call->debug_id, rxrpc_call_states[call->state]);
+
+       ASSERTCMP(msg->msg_name, ==, NULL);
+       ASSERTCMP(msg->msg_control, ==, NULL);
+
+       lock_sock(&call->socket->sk);
+
+       _debug("CALL %d USR %lx ST %d on CONN %p",
+              call->debug_id, call->user_call_ID, call->state, call->conn);
+
+       if (call->state >= RXRPC_CALL_COMPLETE) {
+               ret = -ESHUTDOWN; /* it's too late for this call */
+       } else if (call->state != RXRPC_CALL_CLIENT_SEND_REQUEST &&
+                  call->state != RXRPC_CALL_SERVER_ACK_REQUEST &&
+                  call->state != RXRPC_CALL_SERVER_SEND_REPLY) {
+               ret = -EPROTO; /* request phase complete for this client call */
+       } else {
+               ret = rxrpc_send_data(call->socket, call, msg, len);
+       }
+
+       release_sock(&call->socket->sk);
+       _leave(" = %d", ret);
+       return ret;
+}
+
+EXPORT_SYMBOL(rxrpc_kernel_send_data);
+
+/**
+ * rxrpc_kernel_abort_call - Allow a kernel service to abort a call
+ * @call: The call to be aborted
+ * @abort_code: The abort code to stick into the ABORT packet
+ *
+ * Allow a kernel service to abort a call, if it's still in an abortable state.
+ */
+void rxrpc_kernel_abort_call(struct rxrpc_call *call, u32 abort_code)
+{
+       _enter("{%d},%d", call->debug_id, abort_code);
+
+       lock_sock(&call->socket->sk);
+
+       _debug("CALL %d USR %lx ST %d on CONN %p",
+              call->debug_id, call->user_call_ID, call->state, call->conn);
+
+       if (call->state < RXRPC_CALL_COMPLETE)
+               rxrpc_send_abort(call, abort_code);
+
+       release_sock(&call->socket->sk);
+       _leave("");
+}
+
+EXPORT_SYMBOL(rxrpc_kernel_abort_call);
+
+/*
+ * send a packet through the transport endpoint
+ */
+int rxrpc_send_packet(struct rxrpc_transport *trans, struct sk_buff *skb)
+{
+       struct kvec iov[1];
+       struct msghdr msg;
+       int ret, opt;
+
+       _enter(",{%d}", skb->len);
+
+       iov[0].iov_base = skb->head;
+       iov[0].iov_len = skb->len;
+
+       msg.msg_name = &trans->peer->srx.transport.sin;
+       msg.msg_namelen = sizeof(trans->peer->srx.transport.sin);
+       msg.msg_control = NULL;
+       msg.msg_controllen = 0;
+       msg.msg_flags = 0;
+
+       /* send the packet with the don't fragment bit set if we currently
+        * think it's small enough */
+       if (skb->len - sizeof(struct rxrpc_wire_header) < trans->peer->maxdata) {
+               down_read(&trans->local->defrag_sem);
+               /* send the packet by UDP
+                * - returns -EMSGSIZE if UDP would have to fragment the packet
+                *   to go out of the interface
+                *   - in which case, we'll have processed the ICMP error
+                *     message and update the peer record
+                */
+               ret = kernel_sendmsg(trans->local->socket, &msg, iov, 1,
+                                    iov[0].iov_len);
+
+               up_read(&trans->local->defrag_sem);
+               if (ret == -EMSGSIZE)
+                       goto send_fragmentable;
+
+               _leave(" = %d [%u]", ret, trans->peer->maxdata);
+               return ret;
+       }
+
+send_fragmentable:
+       /* attempt to send this message with fragmentation enabled */
+       _debug("send fragment");
+
+       down_write(&trans->local->defrag_sem);
+       opt = IP_PMTUDISC_DONT;
+       ret = kernel_setsockopt(trans->local->socket, SOL_IP, IP_MTU_DISCOVER,
+                               (char *) &opt, sizeof(opt));
+       if (ret == 0) {
+               ret = kernel_sendmsg(trans->local->socket, &msg, iov, 1,
+                                    iov[0].iov_len);
+
+               opt = IP_PMTUDISC_DO;
+               kernel_setsockopt(trans->local->socket, SOL_IP,
+                                 IP_MTU_DISCOVER, (char *) &opt, sizeof(opt));
+       }
+
+       up_write(&trans->local->defrag_sem);
+       _leave(" = %d [frag %u]", ret, trans->peer->maxdata);
+       return ret;
+}
+
+/*
+ * wait for space to appear in the transmit/ACK window
+ * - caller holds the socket locked
+ */
+static int rxrpc_wait_for_tx_window(struct rxrpc_sock *rx,
+                                   struct rxrpc_call *call,
+                                   long *timeo)
+{
+       DECLARE_WAITQUEUE(myself, current);
+       int ret;
+
+       _enter(",{%d},%ld",
+              CIRC_SPACE(call->acks_head, ACCESS_ONCE(call->acks_tail),
+                         call->acks_winsz),
+              *timeo);
+
+       add_wait_queue(&call->tx_waitq, &myself);
+
+       for (;;) {
+               set_current_state(TASK_INTERRUPTIBLE);
+               ret = 0;
+               if (CIRC_SPACE(call->acks_head, ACCESS_ONCE(call->acks_tail),
+                              call->acks_winsz) > 0)
+                       break;
+               if (signal_pending(current)) {
+                       ret = sock_intr_errno(*timeo);
+                       break;
+               }
+
+               release_sock(&rx->sk);
+               *timeo = schedule_timeout(*timeo);
+               lock_sock(&rx->sk);
+       }
+
+       remove_wait_queue(&call->tx_waitq, &myself);
+       set_current_state(TASK_RUNNING);
+       _leave(" = %d", ret);
+       return ret;
+}
+
+/*
+ * attempt to schedule an instant Tx resend
+ */
+static inline void rxrpc_instant_resend(struct rxrpc_call *call)
+{
+       read_lock_bh(&call->state_lock);
+       if (try_to_del_timer_sync(&call->resend_timer) >= 0) {
+               clear_bit(RXRPC_CALL_RUN_RTIMER, &call->flags);
+               if (call->state < RXRPC_CALL_COMPLETE &&
+                   !test_and_set_bit(RXRPC_CALL_EV_RESEND_TIMER, &call->events))
+                       rxrpc_queue_call(call);
+       }
+       read_unlock_bh(&call->state_lock);
+}
+
+/*
+ * queue a packet for transmission, set the resend timer and attempt
+ * to send the packet immediately
+ */
+static void rxrpc_queue_packet(struct rxrpc_call *call, struct sk_buff *skb,
+                              bool last)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       int ret;
+
+       _net("queue skb %p [%d]", skb, call->acks_head);
+
+       ASSERT(call->acks_window != NULL);
+       call->acks_window[call->acks_head] = (unsigned long) skb;
+       smp_wmb();
+       call->acks_head = (call->acks_head + 1) & (call->acks_winsz - 1);
+
+       if (last || call->state == RXRPC_CALL_SERVER_ACK_REQUEST) {
+               _debug("________awaiting reply/ACK__________");
+               write_lock_bh(&call->state_lock);
+               switch (call->state) {
+               case RXRPC_CALL_CLIENT_SEND_REQUEST:
+                       call->state = RXRPC_CALL_CLIENT_AWAIT_REPLY;
+                       break;
+               case RXRPC_CALL_SERVER_ACK_REQUEST:
+                       call->state = RXRPC_CALL_SERVER_SEND_REPLY;
+                       if (!last)
+                               break;
+               case RXRPC_CALL_SERVER_SEND_REPLY:
+                       call->state = RXRPC_CALL_SERVER_AWAIT_ACK;
+                       break;
+               default:
+                       break;
+               }
+               write_unlock_bh(&call->state_lock);
+       }
+
+       _proto("Tx DATA %%%u { #%u }", sp->hdr.serial, sp->hdr.seq);
+
+       sp->need_resend = false;
+       sp->resend_at = jiffies + rxrpc_resend_timeout;
+       if (!test_and_set_bit(RXRPC_CALL_RUN_RTIMER, &call->flags)) {
+               _debug("run timer");
+               call->resend_timer.expires = sp->resend_at;
+               add_timer(&call->resend_timer);
+       }
+
+       /* attempt to cancel the rx-ACK timer, deferring reply transmission if
+        * we're ACK'ing the request phase of an incoming call */
+       ret = -EAGAIN;
+       if (try_to_del_timer_sync(&call->ack_timer) >= 0) {
+               /* the packet may be freed by rxrpc_process_call() before this
+                * returns */
+               ret = rxrpc_send_packet(call->conn->trans, skb);
+               _net("sent skb %p", skb);
+       } else {
+               _debug("failed to delete ACK timer");
+       }
+
+       if (ret < 0) {
+               _debug("need instant resend %d", ret);
+               sp->need_resend = true;
+               rxrpc_instant_resend(call);
+       }
+
+       _leave("");
+}
+
+/*
+ * Convert a host-endian header into a network-endian header.
+ */
+static void rxrpc_insert_header(struct sk_buff *skb)
+{
+       struct rxrpc_wire_header whdr;
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+
+       whdr.epoch      = htonl(sp->hdr.epoch);
+       whdr.cid        = htonl(sp->hdr.cid);
+       whdr.callNumber = htonl(sp->hdr.callNumber);
+       whdr.seq        = htonl(sp->hdr.seq);
+       whdr.serial     = htonl(sp->hdr.serial);
+       whdr.type       = sp->hdr.type;
+       whdr.flags      = sp->hdr.flags;
+       whdr.userStatus = sp->hdr.userStatus;
+       whdr.securityIndex = sp->hdr.securityIndex;
+       whdr._rsvd      = htons(sp->hdr._rsvd);
+       whdr.serviceId  = htons(sp->hdr.serviceId);
+
+       memcpy(skb->head, &whdr, sizeof(whdr));
+}
+
+/*
+ * send data through a socket
+ * - must be called in process context
+ * - caller holds the socket locked
+ */
+static int rxrpc_send_data(struct rxrpc_sock *rx,
+                          struct rxrpc_call *call,
+                          struct msghdr *msg, size_t len)
+{
+       struct rxrpc_skb_priv *sp;
+       struct sk_buff *skb;
+       struct sock *sk = &rx->sk;
+       long timeo;
+       bool more;
+       int ret, copied;
+
+       timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
+
+       /* this should be in poll */
+       sk_clear_bit(SOCKWQ_ASYNC_NOSPACE, sk);
+
+       if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN))
+               return -EPIPE;
+
+       more = msg->msg_flags & MSG_MORE;
+
+       skb = call->tx_pending;
+       call->tx_pending = NULL;
+
+       copied = 0;
+       do {
+               if (!skb) {
+                       size_t size, chunk, max, space;
+
+                       _debug("alloc");
+
+                       if (CIRC_SPACE(call->acks_head,
+                                      ACCESS_ONCE(call->acks_tail),
+                                      call->acks_winsz) <= 0) {
+                               ret = -EAGAIN;
+                               if (msg->msg_flags & MSG_DONTWAIT)
+                                       goto maybe_error;
+                               ret = rxrpc_wait_for_tx_window(rx, call,
+                                                              &timeo);
+                               if (ret < 0)
+                                       goto maybe_error;
+                       }
+
+                       max = call->conn->trans->peer->maxdata;
+                       max -= call->conn->security_size;
+                       max &= ~(call->conn->size_align - 1UL);
+
+                       chunk = max;
+                       if (chunk > msg_data_left(msg) && !more)
+                               chunk = msg_data_left(msg);
+
+                       space = chunk + call->conn->size_align;
+                       space &= ~(call->conn->size_align - 1UL);
+
+                       size = space + call->conn->header_size;
+
+                       _debug("SIZE: %zu/%zu/%zu", chunk, space, size);
+
+                       /* create a buffer that we can retain until it's ACK'd */
+                       skb = sock_alloc_send_skb(
+                               sk, size, msg->msg_flags & MSG_DONTWAIT, &ret);
+                       if (!skb)
+                               goto maybe_error;
+
+                       rxrpc_new_skb(skb);
+
+                       _debug("ALLOC SEND %p", skb);
+
+                       ASSERTCMP(skb->mark, ==, 0);
+
+                       _debug("HS: %u", call->conn->header_size);
+                       skb_reserve(skb, call->conn->header_size);
+                       skb->len += call->conn->header_size;
+
+                       sp = rxrpc_skb(skb);
+                       sp->remain = chunk;
+                       if (sp->remain > skb_tailroom(skb))
+                               sp->remain = skb_tailroom(skb);
+
+                       _net("skb: hr %d, tr %d, hl %d, rm %d",
+                              skb_headroom(skb),
+                              skb_tailroom(skb),
+                              skb_headlen(skb),
+                              sp->remain);
+
+                       skb->ip_summed = CHECKSUM_UNNECESSARY;
+               }
+
+               _debug("append");
+               sp = rxrpc_skb(skb);
+
+               /* append next segment of data to the current buffer */
+               if (msg_data_left(msg) > 0) {
+                       int copy = skb_tailroom(skb);
+                       ASSERTCMP(copy, >, 0);
+                       if (copy > msg_data_left(msg))
+                               copy = msg_data_left(msg);
+                       if (copy > sp->remain)
+                               copy = sp->remain;
+
+                       _debug("add");
+                       ret = skb_add_data(skb, &msg->msg_iter, copy);
+                       _debug("added");
+                       if (ret < 0)
+                               goto efault;
+                       sp->remain -= copy;
+                       skb->mark += copy;
+                       copied += copy;
+               }
+
+               /* check for the far side aborting the call or a network error
+                * occurring */
+               if (call->state > RXRPC_CALL_COMPLETE)
+                       goto call_aborted;
+
+               /* add the packet to the send queue if it's now full */
+               if (sp->remain <= 0 ||
+                   (msg_data_left(msg) == 0 && !more)) {
+                       struct rxrpc_connection *conn = call->conn;
+                       uint32_t seq;
+                       size_t pad;
+
+                       /* pad out if we're using security */
+                       if (conn->security_ix) {
+                               pad = conn->security_size + skb->mark;
+                               pad = conn->size_align - pad;
+                               pad &= conn->size_align - 1;
+                               _debug("pad %zu", pad);
+                               if (pad)
+                                       memset(skb_put(skb, pad), 0, pad);
+                       }
+
+                       seq = atomic_inc_return(&call->sequence);
+
+                       sp->hdr.epoch   = conn->epoch;
+                       sp->hdr.cid     = call->cid;
+                       sp->hdr.callNumber = call->call_id;
+                       sp->hdr.seq     = seq;
+                       sp->hdr.serial  = atomic_inc_return(&conn->serial);
+                       sp->hdr.type    = RXRPC_PACKET_TYPE_DATA;
+                       sp->hdr.userStatus = 0;
+                       sp->hdr.securityIndex = conn->security_ix;
+                       sp->hdr._rsvd   = 0;
+                       sp->hdr.serviceId = call->service_id;
+
+                       sp->hdr.flags = conn->out_clientflag;
+                       if (msg_data_left(msg) == 0 && !more)
+                               sp->hdr.flags |= RXRPC_LAST_PACKET;
+                       else if (CIRC_SPACE(call->acks_head,
+                                           ACCESS_ONCE(call->acks_tail),
+                                           call->acks_winsz) > 1)
+                               sp->hdr.flags |= RXRPC_MORE_PACKETS;
+                       if (more && seq & 1)
+                               sp->hdr.flags |= RXRPC_REQUEST_ACK;
+
+                       ret = conn->security->secure_packet(
+                               call, skb, skb->mark,
+                               skb->head + sizeof(struct rxrpc_wire_header));
+                       if (ret < 0)
+                               goto out;
+
+                       rxrpc_insert_header(skb);
+                       rxrpc_queue_packet(call, skb, !msg_data_left(msg) && !more);
+                       skb = NULL;
+               }
+       } while (msg_data_left(msg) > 0);
+
+success:
+       ret = copied;
+out:
+       call->tx_pending = skb;
+       _leave(" = %d", ret);
+       return ret;
+
+call_aborted:
+       rxrpc_free_skb(skb);
+       if (call->state == RXRPC_CALL_NETWORK_ERROR)
+               ret = call->conn->trans->peer->net_error;
+       else
+               ret = -ECONNABORTED;
+       _leave(" = %d", ret);
+       return ret;
+
+maybe_error:
+       if (copied)
+               goto success;
+       goto out;
+
+efault:
+       ret = -EFAULT;
+       goto out;
+}
diff --git a/net/rxrpc/peer_event.c b/net/rxrpc/peer_event.c
new file mode 100644 (file)
index 0000000..3e82d6f
--- /dev/null
@@ -0,0 +1,230 @@
+/* Error message handling (ICMP)
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/errqueue.h>
+#include <linux/udp.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/icmp.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <net/ip.h>
+#include "ar-internal.h"
+
+/*
+ * handle an error received on the local endpoint
+ */
+void rxrpc_UDP_error_report(struct sock *sk)
+{
+       struct sock_exterr_skb *serr;
+       struct rxrpc_transport *trans;
+       struct rxrpc_local *local = sk->sk_user_data;
+       struct rxrpc_peer *peer;
+       struct sk_buff *skb;
+       __be32 addr;
+       __be16 port;
+
+       _enter("%p{%d}", sk, local->debug_id);
+
+       skb = sock_dequeue_err_skb(sk);
+       if (!skb) {
+               _leave("UDP socket errqueue empty");
+               return;
+       }
+       serr = SKB_EXT_ERR(skb);
+       if (!skb->len && serr->ee.ee_origin == SO_EE_ORIGIN_TIMESTAMPING) {
+               _leave("UDP empty message");
+               kfree_skb(skb);
+               return;
+       }
+
+       rxrpc_new_skb(skb);
+
+       addr = *(__be32 *)(skb_network_header(skb) + serr->addr_offset);
+       port = serr->port;
+
+       _net("Rx UDP Error from %pI4:%hu", &addr, ntohs(port));
+       _debug("Msg l:%d d:%d", skb->len, skb->data_len);
+
+       peer = rxrpc_find_peer(local, addr, port);
+       if (IS_ERR(peer)) {
+               rxrpc_free_skb(skb);
+               _leave(" [no peer]");
+               return;
+       }
+
+       trans = rxrpc_find_transport(local, peer);
+       if (!trans) {
+               rxrpc_put_peer(peer);
+               rxrpc_free_skb(skb);
+               _leave(" [no trans]");
+               return;
+       }
+
+       if (serr->ee.ee_origin == SO_EE_ORIGIN_ICMP &&
+           serr->ee.ee_type == ICMP_DEST_UNREACH &&
+           serr->ee.ee_code == ICMP_FRAG_NEEDED
+           ) {
+               u32 mtu = serr->ee.ee_info;
+
+               _net("Rx Received ICMP Fragmentation Needed (%d)", mtu);
+
+               /* wind down the local interface MTU */
+               if (mtu > 0 && peer->if_mtu == 65535 && mtu < peer->if_mtu) {
+                       peer->if_mtu = mtu;
+                       _net("I/F MTU %u", mtu);
+               }
+
+               if (mtu == 0) {
+                       /* they didn't give us a size, estimate one */
+                       mtu = peer->if_mtu;
+                       if (mtu > 1500) {
+                               mtu >>= 1;
+                               if (mtu < 1500)
+                                       mtu = 1500;
+                       } else {
+                               mtu -= 100;
+                               if (mtu < peer->hdrsize)
+                                       mtu = peer->hdrsize + 4;
+                       }
+               }
+
+               if (mtu < peer->mtu) {
+                       spin_lock_bh(&peer->lock);
+                       peer->mtu = mtu;
+                       peer->maxdata = peer->mtu - peer->hdrsize;
+                       spin_unlock_bh(&peer->lock);
+                       _net("Net MTU %u (maxdata %u)",
+                            peer->mtu, peer->maxdata);
+               }
+       }
+
+       rxrpc_put_peer(peer);
+
+       /* pass the transport ref to error_handler to release */
+       skb_queue_tail(&trans->error_queue, skb);
+       rxrpc_queue_work(&trans->error_handler);
+       _leave("");
+}
+
+/*
+ * deal with UDP error messages
+ */
+void rxrpc_UDP_error_handler(struct work_struct *work)
+{
+       struct sock_extended_err *ee;
+       struct sock_exterr_skb *serr;
+       struct rxrpc_transport *trans =
+               container_of(work, struct rxrpc_transport, error_handler);
+       struct sk_buff *skb;
+       int err;
+
+       _enter("");
+
+       skb = skb_dequeue(&trans->error_queue);
+       if (!skb)
+               return;
+
+       serr = SKB_EXT_ERR(skb);
+       ee = &serr->ee;
+
+       _net("Rx Error o=%d t=%d c=%d e=%d",
+            ee->ee_origin, ee->ee_type, ee->ee_code, ee->ee_errno);
+
+       err = ee->ee_errno;
+
+       switch (ee->ee_origin) {
+       case SO_EE_ORIGIN_ICMP:
+               switch (ee->ee_type) {
+               case ICMP_DEST_UNREACH:
+                       switch (ee->ee_code) {
+                       case ICMP_NET_UNREACH:
+                               _net("Rx Received ICMP Network Unreachable");
+                               break;
+                       case ICMP_HOST_UNREACH:
+                               _net("Rx Received ICMP Host Unreachable");
+                               break;
+                       case ICMP_PORT_UNREACH:
+                               _net("Rx Received ICMP Port Unreachable");
+                               break;
+                       case ICMP_NET_UNKNOWN:
+                               _net("Rx Received ICMP Unknown Network");
+                               break;
+                       case ICMP_HOST_UNKNOWN:
+                               _net("Rx Received ICMP Unknown Host");
+                               break;
+                       default:
+                               _net("Rx Received ICMP DestUnreach code=%u",
+                                    ee->ee_code);
+                               break;
+                       }
+                       break;
+
+               case ICMP_TIME_EXCEEDED:
+                       _net("Rx Received ICMP TTL Exceeded");
+                       break;
+
+               default:
+                       _proto("Rx Received ICMP error { type=%u code=%u }",
+                              ee->ee_type, ee->ee_code);
+                       break;
+               }
+               break;
+
+       case SO_EE_ORIGIN_LOCAL:
+               _proto("Rx Received local error { error=%d }",
+                      ee->ee_errno);
+               break;
+
+       case SO_EE_ORIGIN_NONE:
+       case SO_EE_ORIGIN_ICMP6:
+       default:
+               _proto("Rx Received error report { orig=%u }",
+                      ee->ee_origin);
+               break;
+       }
+
+       /* terminate all the affected calls if there's an unrecoverable
+        * error */
+       if (err) {
+               struct rxrpc_call *call, *_n;
+
+               _debug("ISSUE ERROR %d", err);
+
+               spin_lock_bh(&trans->peer->lock);
+               trans->peer->net_error = err;
+
+               list_for_each_entry_safe(call, _n, &trans->peer->error_targets,
+                                        error_link) {
+                       write_lock(&call->state_lock);
+                       if (call->state != RXRPC_CALL_COMPLETE &&
+                           call->state < RXRPC_CALL_NETWORK_ERROR) {
+                               call->state = RXRPC_CALL_NETWORK_ERROR;
+                               set_bit(RXRPC_CALL_EV_RCVD_ERROR, &call->events);
+                               rxrpc_queue_call(call);
+                       }
+                       write_unlock(&call->state_lock);
+                       list_del_init(&call->error_link);
+               }
+
+               spin_unlock_bh(&trans->peer->lock);
+       }
+
+       if (!skb_queue_empty(&trans->error_queue))
+               rxrpc_queue_work(&trans->error_handler);
+
+       rxrpc_free_skb(skb);
+       rxrpc_put_transport(trans);
+       _leave("");
+}
diff --git a/net/rxrpc/peer_object.c b/net/rxrpc/peer_object.c
new file mode 100644 (file)
index 0000000..0b54cda
--- /dev/null
@@ -0,0 +1,305 @@
+/* RxRPC remote transport endpoint management
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/udp.h>
+#include <linux/in.h>
+#include <linux/in6.h>
+#include <linux/icmp.h>
+#include <linux/slab.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <net/ip.h>
+#include <net/route.h>
+#include "ar-internal.h"
+
+static LIST_HEAD(rxrpc_peers);
+static DEFINE_RWLOCK(rxrpc_peer_lock);
+static DECLARE_WAIT_QUEUE_HEAD(rxrpc_peer_wq);
+
+static void rxrpc_destroy_peer(struct work_struct *work);
+
+/*
+ * assess the MTU size for the network interface through which this peer is
+ * reached
+ */
+static void rxrpc_assess_MTU_size(struct rxrpc_peer *peer)
+{
+       struct rtable *rt;
+       struct flowi4 fl4;
+
+       peer->if_mtu = 1500;
+
+       rt = ip_route_output_ports(&init_net, &fl4, NULL,
+                                  peer->srx.transport.sin.sin_addr.s_addr, 0,
+                                  htons(7000), htons(7001),
+                                  IPPROTO_UDP, 0, 0);
+       if (IS_ERR(rt)) {
+               _leave(" [route err %ld]", PTR_ERR(rt));
+               return;
+       }
+
+       peer->if_mtu = dst_mtu(&rt->dst);
+       dst_release(&rt->dst);
+
+       _leave(" [if_mtu %u]", peer->if_mtu);
+}
+
+/*
+ * allocate a new peer
+ */
+static struct rxrpc_peer *rxrpc_alloc_peer(struct sockaddr_rxrpc *srx,
+                                          gfp_t gfp)
+{
+       struct rxrpc_peer *peer;
+
+       _enter("");
+
+       peer = kzalloc(sizeof(struct rxrpc_peer), gfp);
+       if (peer) {
+               INIT_WORK(&peer->destroyer, &rxrpc_destroy_peer);
+               INIT_LIST_HEAD(&peer->link);
+               INIT_LIST_HEAD(&peer->error_targets);
+               spin_lock_init(&peer->lock);
+               atomic_set(&peer->usage, 1);
+               peer->debug_id = atomic_inc_return(&rxrpc_debug_id);
+               memcpy(&peer->srx, srx, sizeof(*srx));
+
+               rxrpc_assess_MTU_size(peer);
+               peer->mtu = peer->if_mtu;
+
+               if (srx->transport.family == AF_INET) {
+                       peer->hdrsize = sizeof(struct iphdr);
+                       switch (srx->transport_type) {
+                       case SOCK_DGRAM:
+                               peer->hdrsize += sizeof(struct udphdr);
+                               break;
+                       default:
+                               BUG();
+                               break;
+                       }
+               } else {
+                       BUG();
+               }
+
+               peer->hdrsize += sizeof(struct rxrpc_wire_header);
+               peer->maxdata = peer->mtu - peer->hdrsize;
+       }
+
+       _leave(" = %p", peer);
+       return peer;
+}
+
+/*
+ * obtain a remote transport endpoint for the specified address
+ */
+struct rxrpc_peer *rxrpc_get_peer(struct sockaddr_rxrpc *srx, gfp_t gfp)
+{
+       struct rxrpc_peer *peer, *candidate;
+       const char *new = "old";
+       int usage;
+
+       _enter("{%d,%d,%pI4+%hu}",
+              srx->transport_type,
+              srx->transport_len,
+              &srx->transport.sin.sin_addr,
+              ntohs(srx->transport.sin.sin_port));
+
+       /* search the peer list first */
+       read_lock_bh(&rxrpc_peer_lock);
+       list_for_each_entry(peer, &rxrpc_peers, link) {
+               _debug("check PEER %d { u=%d t=%d l=%d }",
+                      peer->debug_id,
+                      atomic_read(&peer->usage),
+                      peer->srx.transport_type,
+                      peer->srx.transport_len);
+
+               if (atomic_read(&peer->usage) > 0 &&
+                   peer->srx.transport_type == srx->transport_type &&
+                   peer->srx.transport_len == srx->transport_len &&
+                   memcmp(&peer->srx.transport,
+                          &srx->transport,
+                          srx->transport_len) == 0)
+                       goto found_extant_peer;
+       }
+       read_unlock_bh(&rxrpc_peer_lock);
+
+       /* not yet present - create a candidate for a new record and then
+        * redo the search */
+       candidate = rxrpc_alloc_peer(srx, gfp);
+       if (!candidate) {
+               _leave(" = -ENOMEM");
+               return ERR_PTR(-ENOMEM);
+       }
+
+       write_lock_bh(&rxrpc_peer_lock);
+
+       list_for_each_entry(peer, &rxrpc_peers, link) {
+               if (atomic_read(&peer->usage) > 0 &&
+                   peer->srx.transport_type == srx->transport_type &&
+                   peer->srx.transport_len == srx->transport_len &&
+                   memcmp(&peer->srx.transport,
+                          &srx->transport,
+                          srx->transport_len) == 0)
+                       goto found_extant_second;
+       }
+
+       /* we can now add the new candidate to the list */
+       peer = candidate;
+       candidate = NULL;
+       usage = atomic_read(&peer->usage);
+
+       list_add_tail(&peer->link, &rxrpc_peers);
+       write_unlock_bh(&rxrpc_peer_lock);
+       new = "new";
+
+success:
+       _net("PEER %s %d {%d,%u,%pI4+%hu}",
+            new,
+            peer->debug_id,
+            peer->srx.transport_type,
+            peer->srx.transport.family,
+            &peer->srx.transport.sin.sin_addr,
+            ntohs(peer->srx.transport.sin.sin_port));
+
+       _leave(" = %p {u=%d}", peer, usage);
+       return peer;
+
+       /* we found the peer in the list immediately */
+found_extant_peer:
+       usage = atomic_inc_return(&peer->usage);
+       read_unlock_bh(&rxrpc_peer_lock);
+       goto success;
+
+       /* we found the peer on the second time through the list */
+found_extant_second:
+       usage = atomic_inc_return(&peer->usage);
+       write_unlock_bh(&rxrpc_peer_lock);
+       kfree(candidate);
+       goto success;
+}
+
+/*
+ * find the peer associated with a packet
+ */
+struct rxrpc_peer *rxrpc_find_peer(struct rxrpc_local *local,
+                                  __be32 addr, __be16 port)
+{
+       struct rxrpc_peer *peer;
+
+       _enter("");
+
+       /* search the peer list */
+       read_lock_bh(&rxrpc_peer_lock);
+
+       if (local->srx.transport.family == AF_INET &&
+           local->srx.transport_type == SOCK_DGRAM
+           ) {
+               list_for_each_entry(peer, &rxrpc_peers, link) {
+                       if (atomic_read(&peer->usage) > 0 &&
+                           peer->srx.transport_type == SOCK_DGRAM &&
+                           peer->srx.transport.family == AF_INET &&
+                           peer->srx.transport.sin.sin_port == port &&
+                           peer->srx.transport.sin.sin_addr.s_addr == addr)
+                               goto found_UDP_peer;
+               }
+
+               goto new_UDP_peer;
+       }
+
+       read_unlock_bh(&rxrpc_peer_lock);
+       _leave(" = -EAFNOSUPPORT");
+       return ERR_PTR(-EAFNOSUPPORT);
+
+found_UDP_peer:
+       _net("Rx UDP DGRAM from peer %d", peer->debug_id);
+       atomic_inc(&peer->usage);
+       read_unlock_bh(&rxrpc_peer_lock);
+       _leave(" = %p", peer);
+       return peer;
+
+new_UDP_peer:
+       _net("Rx UDP DGRAM from NEW peer");
+       read_unlock_bh(&rxrpc_peer_lock);
+       _leave(" = -EBUSY [new]");
+       return ERR_PTR(-EBUSY);
+}
+
+/*
+ * release a remote transport endpoint
+ */
+void rxrpc_put_peer(struct rxrpc_peer *peer)
+{
+       _enter("%p{u=%d}", peer, atomic_read(&peer->usage));
+
+       ASSERTCMP(atomic_read(&peer->usage), >, 0);
+
+       if (likely(!atomic_dec_and_test(&peer->usage))) {
+               _leave(" [in use]");
+               return;
+       }
+
+       rxrpc_queue_work(&peer->destroyer);
+       _leave("");
+}
+
+/*
+ * destroy a remote transport endpoint
+ */
+static void rxrpc_destroy_peer(struct work_struct *work)
+{
+       struct rxrpc_peer *peer =
+               container_of(work, struct rxrpc_peer, destroyer);
+
+       _enter("%p{%d}", peer, atomic_read(&peer->usage));
+
+       write_lock_bh(&rxrpc_peer_lock);
+       list_del(&peer->link);
+       write_unlock_bh(&rxrpc_peer_lock);
+
+       _net("DESTROY PEER %d", peer->debug_id);
+       kfree(peer);
+
+       if (list_empty(&rxrpc_peers))
+               wake_up_all(&rxrpc_peer_wq);
+       _leave("");
+}
+
+/*
+ * preemptively destroy all the peer records from a transport endpoint rather
+ * than waiting for them to time out
+ */
+void __exit rxrpc_destroy_all_peers(void)
+{
+       DECLARE_WAITQUEUE(myself,current);
+
+       _enter("");
+
+       /* we simply have to wait for them to go away */
+       if (!list_empty(&rxrpc_peers)) {
+               set_current_state(TASK_UNINTERRUPTIBLE);
+               add_wait_queue(&rxrpc_peer_wq, &myself);
+
+               while (!list_empty(&rxrpc_peers)) {
+                       schedule();
+                       set_current_state(TASK_UNINTERRUPTIBLE);
+               }
+
+               remove_wait_queue(&rxrpc_peer_wq, &myself);
+               set_current_state(TASK_RUNNING);
+       }
+
+       _leave("");
+}
diff --git a/net/rxrpc/proc.c b/net/rxrpc/proc.c
new file mode 100644 (file)
index 0000000..225163b
--- /dev/null
@@ -0,0 +1,192 @@
+/* /proc/net/ support for AF_RXRPC
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+static const char *const rxrpc_conn_states[] = {
+       [RXRPC_CONN_UNUSED]             = "Unused  ",
+       [RXRPC_CONN_CLIENT]             = "Client  ",
+       [RXRPC_CONN_SERVER_UNSECURED]   = "SvUnsec ",
+       [RXRPC_CONN_SERVER_CHALLENGING] = "SvChall ",
+       [RXRPC_CONN_SERVER]             = "SvSecure",
+       [RXRPC_CONN_REMOTELY_ABORTED]   = "RmtAbort",
+       [RXRPC_CONN_LOCALLY_ABORTED]    = "LocAbort",
+       [RXRPC_CONN_NETWORK_ERROR]      = "NetError",
+};
+
+/*
+ * generate a list of extant and dead calls in /proc/net/rxrpc_calls
+ */
+static void *rxrpc_call_seq_start(struct seq_file *seq, loff_t *_pos)
+{
+       read_lock(&rxrpc_call_lock);
+       return seq_list_start_head(&rxrpc_calls, *_pos);
+}
+
+static void *rxrpc_call_seq_next(struct seq_file *seq, void *v, loff_t *pos)
+{
+       return seq_list_next(v, &rxrpc_calls, pos);
+}
+
+static void rxrpc_call_seq_stop(struct seq_file *seq, void *v)
+{
+       read_unlock(&rxrpc_call_lock);
+}
+
+static int rxrpc_call_seq_show(struct seq_file *seq, void *v)
+{
+       struct rxrpc_transport *trans;
+       struct rxrpc_call *call;
+       char lbuff[4 + 4 + 4 + 4 + 5 + 1], rbuff[4 + 4 + 4 + 4 + 5 + 1];
+
+       if (v == &rxrpc_calls) {
+               seq_puts(seq,
+                        "Proto Local                  Remote                "
+                        " SvID ConnID   CallID   End Use State    Abort   "
+                        " UserID\n");
+               return 0;
+       }
+
+       call = list_entry(v, struct rxrpc_call, link);
+       trans = call->conn->trans;
+
+       sprintf(lbuff, "%pI4:%u",
+               &trans->local->srx.transport.sin.sin_addr,
+               ntohs(trans->local->srx.transport.sin.sin_port));
+
+       sprintf(rbuff, "%pI4:%u",
+               &trans->peer->srx.transport.sin.sin_addr,
+               ntohs(trans->peer->srx.transport.sin.sin_port));
+
+       seq_printf(seq,
+                  "UDP   %-22.22s %-22.22s %4x %08x %08x %s %3u"
+                  " %-8.8s %08x %lx\n",
+                  lbuff,
+                  rbuff,
+                  call->conn->service_id,
+                  call->cid,
+                  call->call_id,
+                  call->conn->in_clientflag ? "Svc" : "Clt",
+                  atomic_read(&call->usage),
+                  rxrpc_call_states[call->state],
+                  call->remote_abort ?: call->local_abort,
+                  call->user_call_ID);
+
+       return 0;
+}
+
+static const struct seq_operations rxrpc_call_seq_ops = {
+       .start  = rxrpc_call_seq_start,
+       .next   = rxrpc_call_seq_next,
+       .stop   = rxrpc_call_seq_stop,
+       .show   = rxrpc_call_seq_show,
+};
+
+static int rxrpc_call_seq_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &rxrpc_call_seq_ops);
+}
+
+const struct file_operations rxrpc_call_seq_fops = {
+       .owner          = THIS_MODULE,
+       .open           = rxrpc_call_seq_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
+
+/*
+ * generate a list of extant virtual connections in /proc/net/rxrpc_conns
+ */
+static void *rxrpc_connection_seq_start(struct seq_file *seq, loff_t *_pos)
+{
+       read_lock(&rxrpc_connection_lock);
+       return seq_list_start_head(&rxrpc_connections, *_pos);
+}
+
+static void *rxrpc_connection_seq_next(struct seq_file *seq, void *v,
+                                      loff_t *pos)
+{
+       return seq_list_next(v, &rxrpc_connections, pos);
+}
+
+static void rxrpc_connection_seq_stop(struct seq_file *seq, void *v)
+{
+       read_unlock(&rxrpc_connection_lock);
+}
+
+static int rxrpc_connection_seq_show(struct seq_file *seq, void *v)
+{
+       struct rxrpc_connection *conn;
+       struct rxrpc_transport *trans;
+       char lbuff[4 + 4 + 4 + 4 + 5 + 1], rbuff[4 + 4 + 4 + 4 + 5 + 1];
+
+       if (v == &rxrpc_connections) {
+               seq_puts(seq,
+                        "Proto Local                  Remote                "
+                        " SvID ConnID   Calls    End Use State    Key     "
+                        " Serial   ISerial\n"
+                        );
+               return 0;
+       }
+
+       conn = list_entry(v, struct rxrpc_connection, link);
+       trans = conn->trans;
+
+       sprintf(lbuff, "%pI4:%u",
+               &trans->local->srx.transport.sin.sin_addr,
+               ntohs(trans->local->srx.transport.sin.sin_port));
+
+       sprintf(rbuff, "%pI4:%u",
+               &trans->peer->srx.transport.sin.sin_addr,
+               ntohs(trans->peer->srx.transport.sin.sin_port));
+
+       seq_printf(seq,
+                  "UDP   %-22.22s %-22.22s %4x %08x %08x %s %3u"
+                  " %s %08x %08x %08x\n",
+                  lbuff,
+                  rbuff,
+                  conn->service_id,
+                  conn->cid,
+                  conn->call_counter,
+                  conn->in_clientflag ? "Svc" : "Clt",
+                  atomic_read(&conn->usage),
+                  rxrpc_conn_states[conn->state],
+                  key_serial(conn->key),
+                  atomic_read(&conn->serial),
+                  atomic_read(&conn->hi_serial));
+
+       return 0;
+}
+
+static const struct seq_operations rxrpc_connection_seq_ops = {
+       .start  = rxrpc_connection_seq_start,
+       .next   = rxrpc_connection_seq_next,
+       .stop   = rxrpc_connection_seq_stop,
+       .show   = rxrpc_connection_seq_show,
+};
+
+
+static int rxrpc_connection_seq_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &rxrpc_connection_seq_ops);
+}
+
+const struct file_operations rxrpc_connection_seq_fops = {
+       .owner          = THIS_MODULE,
+       .open           = rxrpc_connection_seq_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
diff --git a/net/rxrpc/recvmsg.c b/net/rxrpc/recvmsg.c
new file mode 100644 (file)
index 0000000..59706b9
--- /dev/null
@@ -0,0 +1,436 @@
+/* RxRPC recvmsg() implementation
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/export.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * removal a call's user ID from the socket tree to make the user ID available
+ * again and so that it won't be seen again in association with that call
+ */
+void rxrpc_remove_user_ID(struct rxrpc_sock *rx, struct rxrpc_call *call)
+{
+       _debug("RELEASE CALL %d", call->debug_id);
+
+       if (test_bit(RXRPC_CALL_HAS_USERID, &call->flags)) {
+               write_lock_bh(&rx->call_lock);
+               rb_erase(&call->sock_node, &call->socket->calls);
+               clear_bit(RXRPC_CALL_HAS_USERID, &call->flags);
+               write_unlock_bh(&rx->call_lock);
+       }
+
+       read_lock_bh(&call->state_lock);
+       if (!test_bit(RXRPC_CALL_RELEASED, &call->flags) &&
+           !test_and_set_bit(RXRPC_CALL_EV_RELEASE, &call->events))
+               rxrpc_queue_call(call);
+       read_unlock_bh(&call->state_lock);
+}
+
+/*
+ * receive a message from an RxRPC socket
+ * - we need to be careful about two or more threads calling recvmsg
+ *   simultaneously
+ */
+int rxrpc_recvmsg(struct socket *sock, struct msghdr *msg, size_t len,
+                 int flags)
+{
+       struct rxrpc_skb_priv *sp;
+       struct rxrpc_call *call = NULL, *continue_call = NULL;
+       struct rxrpc_sock *rx = rxrpc_sk(sock->sk);
+       struct sk_buff *skb;
+       long timeo;
+       int copy, ret, ullen, offset, copied = 0;
+       u32 abort_code;
+
+       DEFINE_WAIT(wait);
+
+       _enter(",,,%zu,%d", len, flags);
+
+       if (flags & (MSG_OOB | MSG_TRUNC))
+               return -EOPNOTSUPP;
+
+       ullen = msg->msg_flags & MSG_CMSG_COMPAT ? 4 : sizeof(unsigned long);
+
+       timeo = sock_rcvtimeo(&rx->sk, flags & MSG_DONTWAIT);
+       msg->msg_flags |= MSG_MORE;
+
+       lock_sock(&rx->sk);
+
+       for (;;) {
+               /* return immediately if a client socket has no outstanding
+                * calls */
+               if (RB_EMPTY_ROOT(&rx->calls)) {
+                       if (copied)
+                               goto out;
+                       if (rx->sk.sk_state != RXRPC_SERVER_LISTENING) {
+                               release_sock(&rx->sk);
+                               if (continue_call)
+                                       rxrpc_put_call(continue_call);
+                               return -ENODATA;
+                       }
+               }
+
+               /* get the next message on the Rx queue */
+               skb = skb_peek(&rx->sk.sk_receive_queue);
+               if (!skb) {
+                       /* nothing remains on the queue */
+                       if (copied &&
+                           (flags & MSG_PEEK || timeo == 0))
+                               goto out;
+
+                       /* wait for a message to turn up */
+                       release_sock(&rx->sk);
+                       prepare_to_wait_exclusive(sk_sleep(&rx->sk), &wait,
+                                                 TASK_INTERRUPTIBLE);
+                       ret = sock_error(&rx->sk);
+                       if (ret)
+                               goto wait_error;
+
+                       if (skb_queue_empty(&rx->sk.sk_receive_queue)) {
+                               if (signal_pending(current))
+                                       goto wait_interrupted;
+                               timeo = schedule_timeout(timeo);
+                       }
+                       finish_wait(sk_sleep(&rx->sk), &wait);
+                       lock_sock(&rx->sk);
+                       continue;
+               }
+
+       peek_next_packet:
+               sp = rxrpc_skb(skb);
+               call = sp->call;
+               ASSERT(call != NULL);
+
+               _debug("next pkt %s", rxrpc_pkts[sp->hdr.type]);
+
+               /* make sure we wait for the state to be updated in this call */
+               spin_lock_bh(&call->lock);
+               spin_unlock_bh(&call->lock);
+
+               if (test_bit(RXRPC_CALL_RELEASED, &call->flags)) {
+                       _debug("packet from released call");
+                       if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
+                               BUG();
+                       rxrpc_free_skb(skb);
+                       continue;
+               }
+
+               /* determine whether to continue last data receive */
+               if (continue_call) {
+                       _debug("maybe cont");
+                       if (call != continue_call ||
+                           skb->mark != RXRPC_SKB_MARK_DATA) {
+                               release_sock(&rx->sk);
+                               rxrpc_put_call(continue_call);
+                               _leave(" = %d [noncont]", copied);
+                               return copied;
+                       }
+               }
+
+               rxrpc_get_call(call);
+
+               /* copy the peer address and timestamp */
+               if (!continue_call) {
+                       if (msg->msg_name) {
+                               size_t len =
+                                       sizeof(call->conn->trans->peer->srx);
+                               memcpy(msg->msg_name,
+                                      &call->conn->trans->peer->srx, len);
+                               msg->msg_namelen = len;
+                       }
+                       sock_recv_timestamp(msg, &rx->sk, skb);
+               }
+
+               /* receive the message */
+               if (skb->mark != RXRPC_SKB_MARK_DATA)
+                       goto receive_non_data_message;
+
+               _debug("recvmsg DATA #%u { %d, %d }",
+                      sp->hdr.seq, skb->len, sp->offset);
+
+               if (!continue_call) {
+                       /* only set the control data once per recvmsg() */
+                       ret = put_cmsg(msg, SOL_RXRPC, RXRPC_USER_CALL_ID,
+                                      ullen, &call->user_call_ID);
+                       if (ret < 0)
+                               goto copy_error;
+                       ASSERT(test_bit(RXRPC_CALL_HAS_USERID, &call->flags));
+               }
+
+               ASSERTCMP(sp->hdr.seq, >=, call->rx_data_recv);
+               ASSERTCMP(sp->hdr.seq, <=, call->rx_data_recv + 1);
+               call->rx_data_recv = sp->hdr.seq;
+
+               ASSERTCMP(sp->hdr.seq, >, call->rx_data_eaten);
+
+               offset = sp->offset;
+               copy = skb->len - offset;
+               if (copy > len - copied)
+                       copy = len - copied;
+
+               ret = skb_copy_datagram_msg(skb, offset, msg, copy);
+
+               if (ret < 0)
+                       goto copy_error;
+
+               /* handle piecemeal consumption of data packets */
+               _debug("copied %d+%d", copy, copied);
+
+               offset += copy;
+               copied += copy;
+
+               if (!(flags & MSG_PEEK))
+                       sp->offset = offset;
+
+               if (sp->offset < skb->len) {
+                       _debug("buffer full");
+                       ASSERTCMP(copied, ==, len);
+                       break;
+               }
+
+               /* we transferred the whole data packet */
+               if (sp->hdr.flags & RXRPC_LAST_PACKET) {
+                       _debug("last");
+                       if (call->conn->out_clientflag) {
+                                /* last byte of reply received */
+                               ret = copied;
+                               goto terminal_message;
+                       }
+
+                       /* last bit of request received */
+                       if (!(flags & MSG_PEEK)) {
+                               _debug("eat packet");
+                               if (skb_dequeue(&rx->sk.sk_receive_queue) !=
+                                   skb)
+                                       BUG();
+                               rxrpc_free_skb(skb);
+                       }
+                       msg->msg_flags &= ~MSG_MORE;
+                       break;
+               }
+
+               /* move on to the next data message */
+               _debug("next");
+               if (!continue_call)
+                       continue_call = sp->call;
+               else
+                       rxrpc_put_call(call);
+               call = NULL;
+
+               if (flags & MSG_PEEK) {
+                       _debug("peek next");
+                       skb = skb->next;
+                       if (skb == (struct sk_buff *) &rx->sk.sk_receive_queue)
+                               break;
+                       goto peek_next_packet;
+               }
+
+               _debug("eat packet");
+               if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
+                       BUG();
+               rxrpc_free_skb(skb);
+       }
+
+       /* end of non-terminal data packet reception for the moment */
+       _debug("end rcv data");
+out:
+       release_sock(&rx->sk);
+       if (call)
+               rxrpc_put_call(call);
+       if (continue_call)
+               rxrpc_put_call(continue_call);
+       _leave(" = %d [data]", copied);
+       return copied;
+
+       /* handle non-DATA messages such as aborts, incoming connections and
+        * final ACKs */
+receive_non_data_message:
+       _debug("non-data");
+
+       if (skb->mark == RXRPC_SKB_MARK_NEW_CALL) {
+               _debug("RECV NEW CALL");
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_NEW_CALL, 0, &abort_code);
+               if (ret < 0)
+                       goto copy_error;
+               if (!(flags & MSG_PEEK)) {
+                       if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
+                               BUG();
+                       rxrpc_free_skb(skb);
+               }
+               goto out;
+       }
+
+       ret = put_cmsg(msg, SOL_RXRPC, RXRPC_USER_CALL_ID,
+                      ullen, &call->user_call_ID);
+       if (ret < 0)
+               goto copy_error;
+       ASSERT(test_bit(RXRPC_CALL_HAS_USERID, &call->flags));
+
+       switch (skb->mark) {
+       case RXRPC_SKB_MARK_DATA:
+               BUG();
+       case RXRPC_SKB_MARK_FINAL_ACK:
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ACK, 0, &abort_code);
+               break;
+       case RXRPC_SKB_MARK_BUSY:
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_BUSY, 0, &abort_code);
+               break;
+       case RXRPC_SKB_MARK_REMOTE_ABORT:
+               abort_code = call->remote_abort;
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ABORT, 4, &abort_code);
+               break;
+       case RXRPC_SKB_MARK_LOCAL_ABORT:
+               abort_code = call->local_abort;
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_ABORT, 4, &abort_code);
+               break;
+       case RXRPC_SKB_MARK_NET_ERROR:
+               _debug("RECV NET ERROR %d", sp->error);
+               abort_code = sp->error;
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_NET_ERROR, 4, &abort_code);
+               break;
+       case RXRPC_SKB_MARK_LOCAL_ERROR:
+               _debug("RECV LOCAL ERROR %d", sp->error);
+               abort_code = sp->error;
+               ret = put_cmsg(msg, SOL_RXRPC, RXRPC_LOCAL_ERROR, 4,
+                              &abort_code);
+               break;
+       default:
+               pr_err("Unknown packet mark %u\n", skb->mark);
+               BUG();
+               break;
+       }
+
+       if (ret < 0)
+               goto copy_error;
+
+terminal_message:
+       _debug("terminal");
+       msg->msg_flags &= ~MSG_MORE;
+       msg->msg_flags |= MSG_EOR;
+
+       if (!(flags & MSG_PEEK)) {
+               _net("free terminal skb %p", skb);
+               if (skb_dequeue(&rx->sk.sk_receive_queue) != skb)
+                       BUG();
+               rxrpc_free_skb(skb);
+               rxrpc_remove_user_ID(rx, call);
+       }
+
+       release_sock(&rx->sk);
+       rxrpc_put_call(call);
+       if (continue_call)
+               rxrpc_put_call(continue_call);
+       _leave(" = %d", ret);
+       return ret;
+
+copy_error:
+       _debug("copy error");
+       release_sock(&rx->sk);
+       rxrpc_put_call(call);
+       if (continue_call)
+               rxrpc_put_call(continue_call);
+       _leave(" = %d", ret);
+       return ret;
+
+wait_interrupted:
+       ret = sock_intr_errno(timeo);
+wait_error:
+       finish_wait(sk_sleep(&rx->sk), &wait);
+       if (continue_call)
+               rxrpc_put_call(continue_call);
+       if (copied)
+               copied = ret;
+       _leave(" = %d [waitfail %d]", copied, ret);
+       return copied;
+
+}
+
+/**
+ * rxrpc_kernel_data_delivered - Record delivery of data message
+ * @skb: Message holding data
+ *
+ * Record the delivery of a data message.  This permits RxRPC to keep its
+ * tracking correct.  The socket buffer will be deleted.
+ */
+void rxrpc_kernel_data_delivered(struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       struct rxrpc_call *call = sp->call;
+
+       ASSERTCMP(sp->hdr.seq, >=, call->rx_data_recv);
+       ASSERTCMP(sp->hdr.seq, <=, call->rx_data_recv + 1);
+       call->rx_data_recv = sp->hdr.seq;
+
+       ASSERTCMP(sp->hdr.seq, >, call->rx_data_eaten);
+       rxrpc_free_skb(skb);
+}
+
+EXPORT_SYMBOL(rxrpc_kernel_data_delivered);
+
+/**
+ * rxrpc_kernel_is_data_last - Determine if data message is last one
+ * @skb: Message holding data
+ *
+ * Determine if data message is last one for the parent call.
+ */
+bool rxrpc_kernel_is_data_last(struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+
+       ASSERTCMP(skb->mark, ==, RXRPC_SKB_MARK_DATA);
+
+       return sp->hdr.flags & RXRPC_LAST_PACKET;
+}
+
+EXPORT_SYMBOL(rxrpc_kernel_is_data_last);
+
+/**
+ * rxrpc_kernel_get_abort_code - Get the abort code from an RxRPC abort message
+ * @skb: Message indicating an abort
+ *
+ * Get the abort code from an RxRPC abort message.
+ */
+u32 rxrpc_kernel_get_abort_code(struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+
+       switch (skb->mark) {
+       case RXRPC_SKB_MARK_REMOTE_ABORT:
+               return sp->call->remote_abort;
+       case RXRPC_SKB_MARK_LOCAL_ABORT:
+               return sp->call->local_abort;
+       default:
+               BUG();
+       }
+}
+
+EXPORT_SYMBOL(rxrpc_kernel_get_abort_code);
+
+/**
+ * rxrpc_kernel_get_error - Get the error number from an RxRPC error message
+ * @skb: Message indicating an error
+ *
+ * Get the error number from an RxRPC error message.
+ */
+int rxrpc_kernel_get_error_number(struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+
+       return sp->error;
+}
+
+EXPORT_SYMBOL(rxrpc_kernel_get_error_number);
diff --git a/net/rxrpc/security.c b/net/rxrpc/security.c
new file mode 100644 (file)
index 0000000..d223253
--- /dev/null
@@ -0,0 +1,168 @@
+/* RxRPC security handling
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/udp.h>
+#include <linux/crypto.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include <keys/rxrpc-type.h>
+#include "ar-internal.h"
+
+static LIST_HEAD(rxrpc_security_methods);
+static DECLARE_RWSEM(rxrpc_security_sem);
+
+static const struct rxrpc_security *rxrpc_security_types[] = {
+       [RXRPC_SECURITY_NONE]   = &rxrpc_no_security,
+#ifdef CONFIG_RXKAD
+       [RXRPC_SECURITY_RXKAD]  = &rxkad,
+#endif
+};
+
+int __init rxrpc_init_security(void)
+{
+       int i, ret;
+
+       for (i = 0; i < ARRAY_SIZE(rxrpc_security_types); i++) {
+               if (rxrpc_security_types[i]) {
+                       ret = rxrpc_security_types[i]->init();
+                       if (ret < 0)
+                               goto failed;
+               }
+       }
+
+       return 0;
+
+failed:
+       for (i--; i >= 0; i--)
+               if (rxrpc_security_types[i])
+                       rxrpc_security_types[i]->exit();
+       return ret;
+}
+
+void rxrpc_exit_security(void)
+{
+       int i;
+
+       for (i = 0; i < ARRAY_SIZE(rxrpc_security_types); i++)
+               if (rxrpc_security_types[i])
+                       rxrpc_security_types[i]->exit();
+}
+
+/*
+ * look up an rxrpc security module
+ */
+static const struct rxrpc_security *rxrpc_security_lookup(u8 security_index)
+{
+       if (security_index >= ARRAY_SIZE(rxrpc_security_types))
+               return NULL;
+       return rxrpc_security_types[security_index];
+}
+
+/*
+ * initialise the security on a client connection
+ */
+int rxrpc_init_client_conn_security(struct rxrpc_connection *conn)
+{
+       const struct rxrpc_security *sec;
+       struct rxrpc_key_token *token;
+       struct key *key = conn->key;
+       int ret;
+
+       _enter("{%d},{%x}", conn->debug_id, key_serial(key));
+
+       if (!key)
+               return 0;
+
+       ret = key_validate(key);
+       if (ret < 0)
+               return ret;
+
+       token = key->payload.data[0];
+       if (!token)
+               return -EKEYREJECTED;
+
+       sec = rxrpc_security_lookup(token->security_index);
+       if (!sec)
+               return -EKEYREJECTED;
+       conn->security = sec;
+
+       ret = conn->security->init_connection_security(conn);
+       if (ret < 0) {
+               conn->security = &rxrpc_no_security;
+               return ret;
+       }
+
+       _leave(" = 0");
+       return 0;
+}
+
+/*
+ * initialise the security on a server connection
+ */
+int rxrpc_init_server_conn_security(struct rxrpc_connection *conn)
+{
+       const struct rxrpc_security *sec;
+       struct rxrpc_local *local = conn->trans->local;
+       struct rxrpc_sock *rx;
+       struct key *key;
+       key_ref_t kref;
+       char kdesc[5 + 1 + 3 + 1];
+
+       _enter("");
+
+       sprintf(kdesc, "%u:%u", conn->service_id, conn->security_ix);
+
+       sec = rxrpc_security_lookup(conn->security_ix);
+       if (!sec) {
+               _leave(" = -ENOKEY [lookup]");
+               return -ENOKEY;
+       }
+
+       /* find the service */
+       read_lock_bh(&local->services_lock);
+       list_for_each_entry(rx, &local->services, listen_link) {
+               if (rx->srx.srx_service == conn->service_id)
+                       goto found_service;
+       }
+
+       /* the service appears to have died */
+       read_unlock_bh(&local->services_lock);
+       _leave(" = -ENOENT");
+       return -ENOENT;
+
+found_service:
+       if (!rx->securities) {
+               read_unlock_bh(&local->services_lock);
+               _leave(" = -ENOKEY");
+               return -ENOKEY;
+       }
+
+       /* look through the service's keyring */
+       kref = keyring_search(make_key_ref(rx->securities, 1UL),
+                             &key_type_rxrpc_s, kdesc);
+       if (IS_ERR(kref)) {
+               read_unlock_bh(&local->services_lock);
+               _leave(" = %ld [search]", PTR_ERR(kref));
+               return PTR_ERR(kref);
+       }
+
+       key = key_ref_to_ptr(kref);
+       read_unlock_bh(&local->services_lock);
+
+       conn->server_key = key;
+       conn->security = sec;
+
+       _leave(" = 0");
+       return 0;
+}
diff --git a/net/rxrpc/skbuff.c b/net/rxrpc/skbuff.c
new file mode 100644 (file)
index 0000000..eee0cfd
--- /dev/null
@@ -0,0 +1,138 @@
+/* ar-skbuff.c: socket buffer destruction handling
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * set up for the ACK at the end of the receive phase when we discard the final
+ * receive phase data packet
+ * - called with softirqs disabled
+ */
+static void rxrpc_request_final_ACK(struct rxrpc_call *call)
+{
+       /* the call may be aborted before we have a chance to ACK it */
+       write_lock(&call->state_lock);
+
+       switch (call->state) {
+       case RXRPC_CALL_CLIENT_RECV_REPLY:
+               call->state = RXRPC_CALL_CLIENT_FINAL_ACK;
+               _debug("request final ACK");
+
+               /* get an extra ref on the call for the final-ACK generator to
+                * release */
+               rxrpc_get_call(call);
+               set_bit(RXRPC_CALL_EV_ACK_FINAL, &call->events);
+               if (try_to_del_timer_sync(&call->ack_timer) >= 0)
+                       rxrpc_queue_call(call);
+               break;
+
+       case RXRPC_CALL_SERVER_RECV_REQUEST:
+               call->state = RXRPC_CALL_SERVER_ACK_REQUEST;
+       default:
+               break;
+       }
+
+       write_unlock(&call->state_lock);
+}
+
+/*
+ * drop the bottom ACK off of the call ACK window and advance the window
+ */
+static void rxrpc_hard_ACK_data(struct rxrpc_call *call,
+                               struct rxrpc_skb_priv *sp)
+{
+       int loop;
+       u32 seq;
+
+       spin_lock_bh(&call->lock);
+
+       _debug("hard ACK #%u", sp->hdr.seq);
+
+       for (loop = 0; loop < RXRPC_ACKR_WINDOW_ASZ; loop++) {
+               call->ackr_window[loop] >>= 1;
+               call->ackr_window[loop] |=
+                       call->ackr_window[loop + 1] << (BITS_PER_LONG - 1);
+       }
+
+       seq = sp->hdr.seq;
+       ASSERTCMP(seq, ==, call->rx_data_eaten + 1);
+       call->rx_data_eaten = seq;
+
+       if (call->ackr_win_top < UINT_MAX)
+               call->ackr_win_top++;
+
+       ASSERTIFCMP(call->state <= RXRPC_CALL_COMPLETE,
+                   call->rx_data_post, >=, call->rx_data_recv);
+       ASSERTIFCMP(call->state <= RXRPC_CALL_COMPLETE,
+                   call->rx_data_recv, >=, call->rx_data_eaten);
+
+       if (sp->hdr.flags & RXRPC_LAST_PACKET) {
+               rxrpc_request_final_ACK(call);
+       } else if (atomic_dec_and_test(&call->ackr_not_idle) &&
+                  test_and_clear_bit(RXRPC_CALL_TX_SOFT_ACK, &call->flags)) {
+               /* We previously soft-ACK'd some received packets that have now
+                * been consumed, so send a hard-ACK if no more packets are
+                * immediately forthcoming to allow the transmitter to free up
+                * its Tx bufferage.
+                */
+               _debug("send Rx idle ACK");
+               __rxrpc_propose_ACK(call, RXRPC_ACK_IDLE, sp->hdr.serial,
+                                   false);
+       }
+
+       spin_unlock_bh(&call->lock);
+}
+
+/*
+ * destroy a packet that has an RxRPC control buffer
+ * - advance the hard-ACK state of the parent call (done here in case something
+ *   in the kernel bypasses recvmsg() and steals the packet directly off of the
+ *   socket receive queue)
+ */
+void rxrpc_packet_destructor(struct sk_buff *skb)
+{
+       struct rxrpc_skb_priv *sp = rxrpc_skb(skb);
+       struct rxrpc_call *call = sp->call;
+
+       _enter("%p{%p}", skb, call);
+
+       if (call) {
+               /* send the final ACK on a client call */
+               if (sp->hdr.type == RXRPC_PACKET_TYPE_DATA)
+                       rxrpc_hard_ACK_data(call, sp);
+               rxrpc_put_call(call);
+               sp->call = NULL;
+       }
+
+       if (skb->sk)
+               sock_rfree(skb);
+       _leave("");
+}
+
+/**
+ * rxrpc_kernel_free_skb - Free an RxRPC socket buffer
+ * @skb: The socket buffer to be freed
+ *
+ * Let RxRPC free its own socket buffer, permitting it to maintain debug
+ * accounting.
+ */
+void rxrpc_kernel_free_skb(struct sk_buff *skb)
+{
+       rxrpc_free_skb(skb);
+}
+EXPORT_SYMBOL(rxrpc_kernel_free_skb);
diff --git a/net/rxrpc/transport.c b/net/rxrpc/transport.c
new file mode 100644 (file)
index 0000000..a1b6518
--- /dev/null
@@ -0,0 +1,286 @@
+/* RxRPC point-to-point transport session management
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
+#include <linux/module.h>
+#include <linux/net.h>
+#include <linux/skbuff.h>
+#include <linux/slab.h>
+#include <net/sock.h>
+#include <net/af_rxrpc.h>
+#include "ar-internal.h"
+
+/*
+ * Time after last use at which transport record is cleaned up.
+ */
+unsigned int rxrpc_transport_expiry = 3600 * 24;
+
+static void rxrpc_transport_reaper(struct work_struct *work);
+
+static LIST_HEAD(rxrpc_transports);
+static DEFINE_RWLOCK(rxrpc_transport_lock);
+static DECLARE_DELAYED_WORK(rxrpc_transport_reap, rxrpc_transport_reaper);
+
+/*
+ * allocate a new transport session manager
+ */
+static struct rxrpc_transport *rxrpc_alloc_transport(struct rxrpc_local *local,
+                                                    struct rxrpc_peer *peer,
+                                                    gfp_t gfp)
+{
+       struct rxrpc_transport *trans;
+
+       _enter("");
+
+       trans = kzalloc(sizeof(struct rxrpc_transport), gfp);
+       if (trans) {
+               trans->local = local;
+               trans->peer = peer;
+               INIT_LIST_HEAD(&trans->link);
+               trans->bundles = RB_ROOT;
+               trans->client_conns = RB_ROOT;
+               trans->server_conns = RB_ROOT;
+               skb_queue_head_init(&trans->error_queue);
+               spin_lock_init(&trans->client_lock);
+               rwlock_init(&trans->conn_lock);
+               atomic_set(&trans->usage, 1);
+               trans->conn_idcounter = peer->srx.srx_service << 16;
+               trans->debug_id = atomic_inc_return(&rxrpc_debug_id);
+
+               if (peer->srx.transport.family == AF_INET) {
+                       switch (peer->srx.transport_type) {
+                       case SOCK_DGRAM:
+                               INIT_WORK(&trans->error_handler,
+                                         rxrpc_UDP_error_handler);
+                               break;
+                       default:
+                               BUG();
+                               break;
+                       }
+               } else {
+                       BUG();
+               }
+       }
+
+       _leave(" = %p", trans);
+       return trans;
+}
+
+/*
+ * obtain a transport session for the nominated endpoints
+ */
+struct rxrpc_transport *rxrpc_get_transport(struct rxrpc_local *local,
+                                           struct rxrpc_peer *peer,
+                                           gfp_t gfp)
+{
+       struct rxrpc_transport *trans, *candidate;
+       const char *new = "old";
+       int usage;
+
+       _enter("{%pI4+%hu},{%pI4+%hu},",
+              &local->srx.transport.sin.sin_addr,
+              ntohs(local->srx.transport.sin.sin_port),
+              &peer->srx.transport.sin.sin_addr,
+              ntohs(peer->srx.transport.sin.sin_port));
+
+       /* search the transport list first */
+       read_lock_bh(&rxrpc_transport_lock);
+       list_for_each_entry(trans, &rxrpc_transports, link) {
+               if (trans->local == local && trans->peer == peer)
+                       goto found_extant_transport;
+       }
+       read_unlock_bh(&rxrpc_transport_lock);
+
+       /* not yet present - create a candidate for a new record and then
+        * redo the search */
+       candidate = rxrpc_alloc_transport(local, peer, gfp);
+       if (!candidate) {
+               _leave(" = -ENOMEM");
+               return ERR_PTR(-ENOMEM);
+       }
+
+       write_lock_bh(&rxrpc_transport_lock);
+
+       list_for_each_entry(trans, &rxrpc_transports, link) {
+               if (trans->local == local && trans->peer == peer)
+                       goto found_extant_second;
+       }
+
+       /* we can now add the new candidate to the list */
+       trans = candidate;
+       candidate = NULL;
+       usage = atomic_read(&trans->usage);
+
+       rxrpc_get_local(trans->local);
+       atomic_inc(&trans->peer->usage);
+       list_add_tail(&trans->link, &rxrpc_transports);
+       write_unlock_bh(&rxrpc_transport_lock);
+       new = "new";
+
+success:
+       _net("TRANSPORT %s %d local %d -> peer %d",
+            new,
+            trans->debug_id,
+            trans->local->debug_id,
+            trans->peer->debug_id);
+
+       _leave(" = %p {u=%d}", trans, usage);
+       return trans;
+
+       /* we found the transport in the list immediately */
+found_extant_transport:
+       usage = atomic_inc_return(&trans->usage);
+       read_unlock_bh(&rxrpc_transport_lock);
+       goto success;
+
+       /* we found the transport on the second time through the list */
+found_extant_second:
+       usage = atomic_inc_return(&trans->usage);
+       write_unlock_bh(&rxrpc_transport_lock);
+       kfree(candidate);
+       goto success;
+}
+
+/*
+ * find the transport connecting two endpoints
+ */
+struct rxrpc_transport *rxrpc_find_transport(struct rxrpc_local *local,
+                                            struct rxrpc_peer *peer)
+{
+       struct rxrpc_transport *trans;
+
+       _enter("{%pI4+%hu},{%pI4+%hu},",
+              &local->srx.transport.sin.sin_addr,
+              ntohs(local->srx.transport.sin.sin_port),
+              &peer->srx.transport.sin.sin_addr,
+              ntohs(peer->srx.transport.sin.sin_port));
+
+       /* search the transport list */
+       read_lock_bh(&rxrpc_transport_lock);
+
+       list_for_each_entry(trans, &rxrpc_transports, link) {
+               if (trans->local == local && trans->peer == peer)
+                       goto found_extant_transport;
+       }
+
+       read_unlock_bh(&rxrpc_transport_lock);
+       _leave(" = NULL");
+       return NULL;
+
+found_extant_transport:
+       atomic_inc(&trans->usage);
+       read_unlock_bh(&rxrpc_transport_lock);
+       _leave(" = %p", trans);
+       return trans;
+}
+
+/*
+ * release a transport session
+ */
+void rxrpc_put_transport(struct rxrpc_transport *trans)
+{
+       _enter("%p{u=%d}", trans, atomic_read(&trans->usage));
+
+       ASSERTCMP(atomic_read(&trans->usage), >, 0);
+
+       trans->put_time = ktime_get_seconds();
+       if (unlikely(atomic_dec_and_test(&trans->usage))) {
+               _debug("zombie");
+               /* let the reaper determine the timeout to avoid a race with
+                * overextending the timeout if the reaper is running at the
+                * same time */
+               rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
+       }
+       _leave("");
+}
+
+/*
+ * clean up a transport session
+ */
+static void rxrpc_cleanup_transport(struct rxrpc_transport *trans)
+{
+       _net("DESTROY TRANS %d", trans->debug_id);
+
+       rxrpc_purge_queue(&trans->error_queue);
+
+       rxrpc_put_local(trans->local);
+       rxrpc_put_peer(trans->peer);
+       kfree(trans);
+}
+
+/*
+ * reap dead transports that have passed their expiry date
+ */
+static void rxrpc_transport_reaper(struct work_struct *work)
+{
+       struct rxrpc_transport *trans, *_p;
+       unsigned long now, earliest, reap_time;
+
+       LIST_HEAD(graveyard);
+
+       _enter("");
+
+       now = ktime_get_seconds();
+       earliest = ULONG_MAX;
+
+       /* extract all the transports that have been dead too long */
+       write_lock_bh(&rxrpc_transport_lock);
+       list_for_each_entry_safe(trans, _p, &rxrpc_transports, link) {
+               _debug("reap TRANS %d { u=%d t=%ld }",
+                      trans->debug_id, atomic_read(&trans->usage),
+                      (long) now - (long) trans->put_time);
+
+               if (likely(atomic_read(&trans->usage) > 0))
+                       continue;
+
+               reap_time = trans->put_time + rxrpc_transport_expiry;
+               if (reap_time <= now)
+                       list_move_tail(&trans->link, &graveyard);
+               else if (reap_time < earliest)
+                       earliest = reap_time;
+       }
+       write_unlock_bh(&rxrpc_transport_lock);
+
+       if (earliest != ULONG_MAX) {
+               _debug("reschedule reaper %ld", (long) earliest - now);
+               ASSERTCMP(earliest, >, now);
+               rxrpc_queue_delayed_work(&rxrpc_transport_reap,
+                                        (earliest - now) * HZ);
+       }
+
+       /* then destroy all those pulled out */
+       while (!list_empty(&graveyard)) {
+               trans = list_entry(graveyard.next, struct rxrpc_transport,
+                                  link);
+               list_del_init(&trans->link);
+
+               ASSERTCMP(atomic_read(&trans->usage), ==, 0);
+               rxrpc_cleanup_transport(trans);
+       }
+
+       _leave("");
+}
+
+/*
+ * preemptively destroy all the transport session records rather than waiting
+ * for them to time out
+ */
+void __exit rxrpc_destroy_all_transports(void)
+{
+       _enter("");
+
+       rxrpc_transport_expiry = 0;
+       cancel_delayed_work(&rxrpc_transport_reap);
+       rxrpc_queue_delayed_work(&rxrpc_transport_reap, 0);
+
+       _leave("");
+}