Commit 30df927b authored by David Howells's avatar David Howells
Browse files

rxrpc: Separate call retransmission from other conn events 



Call the rxrpc_conn_retransmit_call() directly from rxrpc_input_packet()
rather than calling it via connection event handling.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
parent 5040011d

net/rxrpc/ar-internal.h

+2 −0
Original line number Diff line number Diff line
@@ -897,6 +897,8 @@ void rxrpc_clean_up_local_conns(struct rxrpc_local *); 
/*

 * conn_event.c

 */

void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn, struct sk_buff *skb,

				unsigned int channel);

void rxrpc_process_connection(struct work_struct *);

void rxrpc_process_delayed_final_acks(struct rxrpc_connection *, bool);

int rxrpc_input_conn_packet(struct rxrpc_connection *conn, struct sk_buff *skb);

net/rxrpc/conn_event.c

+5 −29
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
/*

 * Retransmit terminal ACK or ABORT of the previous call.

 */

static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,

void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn,

				struct sk_buff *skb,

				unsigned int channel)

{
@@ -292,24 +292,6 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, 
	_enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, sp->hdr.serial);



	switch (sp->hdr.type) {

	case RXRPC_PACKET_TYPE_DATA:

	case RXRPC_PACKET_TYPE_ACK:

		rxrpc_conn_retransmit_call(conn, skb,

					   sp->hdr.cid & RXRPC_CHANNELMASK);

		return 0;



	case RXRPC_PACKET_TYPE_BUSY:

		/* Just ignore BUSY packets for now. */

		return 0;



	case RXRPC_PACKET_TYPE_ABORT:

		conn->error = -ECONNABORTED;

		conn->abort_code = skb->priority;

		conn->state = RXRPC_CONN_REMOTELY_ABORTED;

		set_bit(RXRPC_CONN_DONT_REUSE, &conn->flags);

		rxrpc_abort_calls(conn, RXRPC_CALL_REMOTELY_ABORTED, sp->hdr.serial);

		return -ECONNABORTED;



	case RXRPC_PACKET_TYPE_CHALLENGE:

		return conn->security->respond_to_challenge(conn, skb,

							    _abort_code);
@@ -504,18 +486,12 @@ int rxrpc_input_conn_packet(struct rxrpc_connection *conn, struct sk_buff *skb) 


	if (conn->state >= RXRPC_CONN_REMOTELY_ABORTED) {

		_leave(" = -ECONNABORTED [%u]", conn->state);

		return -ECONNABORTED;

		return 0;

	}



	_enter("{%d},{%u,%%%u},", conn->debug_id, sp->hdr.type, sp->hdr.serial);



	switch (sp->hdr.type) {

	case RXRPC_PACKET_TYPE_DATA:

	case RXRPC_PACKET_TYPE_ACK:

		rxrpc_conn_retransmit_call(conn, skb,

					   sp->hdr.cid & RXRPC_CHANNELMASK);

		return 0;



	case RXRPC_PACKET_TYPE_BUSY:

		/* Just ignore BUSY packets for now. */

		return 0;
@@ -526,7 +502,7 @@ int rxrpc_input_conn_packet(struct rxrpc_connection *conn, struct sk_buff *skb) 
		conn->state = RXRPC_CONN_REMOTELY_ABORTED;

		set_bit(RXRPC_CONN_DONT_REUSE, &conn->flags);

		rxrpc_abort_calls(conn, RXRPC_CALL_REMOTELY_ABORTED, sp->hdr.serial);

		return -ECONNABORTED;

		return 0;



	case RXRPC_PACKET_TYPE_CHALLENGE:

	case RXRPC_PACKET_TYPE_RESPONSE:

net/rxrpc/io_thread.c

+1 −1
Original line number Diff line number Diff line
@@ -358,7 +358,7 @@ static int rxrpc_input_packet_on_conn(struct rxrpc_connection *conn, 
					    sp->hdr.seq,

					    sp->hdr.serial,

					    sp->hdr.flags);

		rxrpc_input_conn_packet(conn, skb);

		rxrpc_conn_retransmit_call(conn, skb, channel);

		return 0;

	}