Merge branch 'rprpc-2nd-rewrite-part-1'

David Howells says:

====================
RxRPC: 2nd rewrite part 1

Okay, I'm in the process of rewriting the RxRPC rewrite.  The primary aim of
this second rewrite is to strictly control the number of active connections we
know about and to get rid of connections we don't need much more quickly.

On top of this, there are fixes to the protocol handling which will all occur
in later parts.

Here's the first set of patches from the second go, aimed at net-next.  These
are all fixes and cleanups preparatory to the main event.

Notable parts of this set include:

 (1) A fix for the AFS filesystem to wait for outstanding calls to complete
     before closing the RxRPC socket.

 (2) Differentiation of local and remote abort codes.  At a future point
     userspace will get to see this via control message data on recvmsg().

 (3) Absorb the rxkad module into the af_rxrpc module to prevent a dependency
     loop.

 (4) Create a null security module and unconditionalise calls into the
     security module that's in force (there will always be a security module
     applied to a connection, even if it's just the null one).
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 11 insertions, 16 deletions

diff --git a/net/rxrpc/ar-connevent.c b/net/rxrpc/ar-connevent.c
index 1bdaaed8cdc4..5f9563968a5b 100644
--- a/net/rxrpc/ar-connevent.c
+++ b/net/rxrpc/ar-connevent.c
@@ -40,11 +40,13 @@ static void rxrpc_abort_calls(struct rxrpc_connection *conn, int state,
                 write_lock(&call->state_lock);
                 if (call->state <= RXRPC_CALL_COMPLETE) {
                         call->state = state;
-                        call->abort_code = abort_code;
-                        if (state == RXRPC_CALL_LOCALLY_ABORTED)
+                        if (state == RXRPC_CALL_LOCALLY_ABORTED) {
+                                call->local_abort = conn->local_abort;
                                 set_bit(RXRPC_CALL_EV_CONN_ABORT, &call->events);
-                        else
+                        } 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);
@@ -84,8 +86,8 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
 
         rxrpc_abort_calls(conn, RXRPC_CALL_LOCALLY_ABORTED, abort_code);
 
-        msg.msg_name    = &conn->trans->peer->srx.transport.sin;
-        msg.msg_namelen = sizeof(conn->trans->peer->srx.transport.sin);
+        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;
@@ -101,7 +103,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
         whdr._rsvd      = 0;
         whdr.serviceId  = htons(conn->service_id);
 
-        word = htonl(abort_code);
+        word            = htonl(conn->local_abort);
 
         iov[0].iov_base = &whdr;
         iov[0].iov_len  = sizeof(whdr);
@@ -112,7 +114,7 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn,
 
         serial = atomic_inc_return(&conn->serial);
         whdr.serial = htonl(serial);
-        _proto("Tx CONN ABORT %%%u { %d }", serial, abort_code);
+        _proto("Tx CONN ABORT %%%u { %d }", serial, conn->local_abort);
 
         ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
         if (ret < 0) {
@@ -172,15 +174,10 @@ static int rxrpc_process_event(struct rxrpc_connection *conn,
                 return -ECONNABORTED;
 
         case RXRPC_PACKET_TYPE_CHALLENGE:
-                if (conn->security)
-                        return conn->security->respond_to_challenge(
-                                conn, skb, _abort_code);
-                return -EPROTO;
+                return conn->security->respond_to_challenge(conn, skb,
+                                                            _abort_code);
 
         case RXRPC_PACKET_TYPE_RESPONSE:
-                if (!conn->security)
-                        return -EPROTO;
-
                 ret = conn->security->verify_response(conn, skb, _abort_code);
                 if (ret < 0)
                         return ret;
@@ -236,8 +233,6 @@ static void rxrpc_secure_connection(struct rxrpc_connection *conn)
                 }
         }
 
-        ASSERT(conn->security != NULL);
-
         if (conn->security->issue_challenge(conn) < 0) {
                 abort_code = RX_CALL_DEAD;
                 ret = -ENOMEM;