Commit dc44b3a0 authored by David Howells's avatar David Howells Committed by David S. Miller
Browse files

rxrpc: Differentiate local and remote abort codes in structs 



In the rxrpc_connection and rxrpc_call structs, there's one field to hold
the abort code, no matter whether that value was generated locally to be
sent or was received from the peer via an abort packet.

Split the abort code fields in two for cleanliness sake and add an error
field to hold the Linux error number to the rxrpc_call struct too
(sometimes this is generated in a context where we can't return it to
userspace directly).

Furthermore, add a skb mark to indicate a packet that caused a local abort
to be generated so that recvmsg() can pick up the correct abort code.  A
future addition will need to be to indicate to userspace the difference
between aborts via a control message.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b3e87f1

fs/afs/rxrpc.c

+11 −3
Original line number Diff line number Diff line
@@ -430,9 +430,11 @@ error_kill_call: 
}



/*

 * handles intercepted messages that were arriving in the socket's Rx queue

 * - called with the socket receive queue lock held to ensure message ordering

 * - called with softirqs disabled

 * Handles intercepted messages that were arriving in the socket's Rx queue.

 *

 * Called from the AF_RXRPC call processor in waitqueue process context.  For

 * each call, it is guaranteed this will be called in order of packet to be

 * delivered.

 */

static void afs_rx_interceptor(struct sock *sk, unsigned long user_call_ID,

			       struct sk_buff *skb)
@@ -523,6 +525,12 @@ static void afs_deliver_to_call(struct afs_call *call) 
			call->state = AFS_CALL_ABORTED;

			_debug("Rcv ABORT %u -> %d", abort_code, call->error);

			break;

		case RXRPC_SKB_MARK_LOCAL_ABORT:

			abort_code = rxrpc_kernel_get_abort_code(skb);

			call->error = call->type->abort_to_error(abort_code);

			call->state = AFS_CALL_ABORTED;

			_debug("Loc ABORT %u -> %d", abort_code, call->error);

			break;

		case RXRPC_SKB_MARK_NET_ERROR:

			call->error = -rxrpc_kernel_get_error_number(skb);

			call->state = AFS_CALL_ERROR;

include/net/af_rxrpc.h

+2 −1
Original line number Diff line number Diff line
@@ -20,11 +20,12 @@ struct rxrpc_call; 
/*

 * the mark applied to socket buffers that may be intercepted

 */

enum {

enum rxrpc_skb_mark {

	RXRPC_SKB_MARK_DATA,		/* data message */

	RXRPC_SKB_MARK_FINAL_ACK,	/* final ACK received message */

	RXRPC_SKB_MARK_BUSY,		/* server busy message */

	RXRPC_SKB_MARK_REMOTE_ABORT,	/* remote abort message */

	RXRPC_SKB_MARK_LOCAL_ABORT,	/* local abort message */

	RXRPC_SKB_MARK_NET_ERROR,	/* network error message */

	RXRPC_SKB_MARK_LOCAL_ERROR,	/* local error message */

	RXRPC_SKB_MARK_NEW_CALL,	/* local error message */

net/rxrpc/ar-ack.c

+2 −2
Original line number Diff line number Diff line
@@ -905,7 +905,7 @@ void rxrpc_process_call(struct work_struct *work) 
				       ECONNABORTED, true) < 0)

			goto no_mem;

		whdr.type = RXRPC_PACKET_TYPE_ABORT;

		data = htonl(call->abort_code);

		data = htonl(call->local_abort);

		iov[1].iov_base = &data;

		iov[1].iov_len = sizeof(data);

		genbit = RXRPC_CALL_EV_ABORT;
@@ -968,7 +968,7 @@ void rxrpc_process_call(struct work_struct *work) 
		write_lock_bh(&call->state_lock);

		if (call->state <= RXRPC_CALL_COMPLETE) {

			call->state = RXRPC_CALL_LOCALLY_ABORTED;

			call->abort_code = RX_CALL_TIMEOUT;

			call->local_abort = RX_CALL_TIMEOUT;

			set_bit(RXRPC_CALL_EV_ABORT, &call->events);

		}

		write_unlock_bh(&call->state_lock);

net/rxrpc/ar-call.c

+2 −2
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ void rxrpc_release_call(struct rxrpc_call *call) 
	    call->state != RXRPC_CALL_CLIENT_FINAL_ACK) {

		_debug("+++ ABORTING STATE %d +++\n", call->state);

		call->state = RXRPC_CALL_LOCALLY_ABORTED;

		call->abort_code = RX_CALL_DEAD;

		call->local_abort = RX_CALL_DEAD;

		set_bit(RXRPC_CALL_EV_ABORT, &call->events);

		rxrpc_queue_call(call);

	}
@@ -758,7 +758,7 @@ static void rxrpc_mark_call_released(struct rxrpc_call *call) 
		if (call->state < RXRPC_CALL_COMPLETE) {

			_debug("abort call %p", call);

			call->state = RXRPC_CALL_LOCALLY_ABORTED;

			call->abort_code = RX_CALL_DEAD;

			call->local_abort = RX_CALL_DEAD;

			if (!test_and_set_bit(RXRPC_CALL_EV_ABORT, &call->events))

				sched = true;

		}

net/rxrpc/ar-connevent.c

+7 −5
Original line number Diff line number Diff line
@@ -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);
@@ -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) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE