Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ec1af27e authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'rxrpc-rewrite-20170406' of... 

Merge tag 'rxrpc-rewrite-20170406' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs



David Howells says:

====================
rxrpc: Miscellany

Here's a set of patches that make some minor changes to AF_RXRPC:

 (1) Store error codes in struct rxrpc_call::error as negative codes and
     only convert to positive in recvmsg() to avoid confusion inside the
     kernel.

 (2) Note the result of trying to abort a call (this fails if the call is
     already 'completed').

 (3) Don't abort on temporary errors whilst processing challenge and
     response packets, but rather drop the packet and wait for
     retransmission.

And also adds some more tracing:

 (4) Protocol errors.

 (5) Received abort packets.

 (6) Changes in the Rx window size due to ACK packet information.

 (7) Client call initiation (to allow the rxrpc_call struct pointer, the
     wire call ID and the user ID/afs_call pointer to be cross-referenced).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents b4041278 89ca6948

fs/afs/rxrpc.c

+6 −6
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ int afs_make_call(struct in_addr *addr, struct afs_call *call, gfp_t gfp, 
	call->state = AFS_CALL_COMPLETE;

	if (ret != -ECONNABORTED) {

		rxrpc_kernel_abort_call(afs_socket, rxcall, RX_USER_ABORT,

					-ret, "KSD");

					ret, "KSD");

	} else {

		abort_code = 0;

		offset = 0;
@@ -478,12 +478,12 @@ static void afs_deliver_to_call(struct afs_call *call) 
		case -ENOTCONN:

			abort_code = RX_CALL_DEAD;

			rxrpc_kernel_abort_call(afs_socket, call->rxcall,

						abort_code, -ret, "KNC");

						abort_code, ret, "KNC");

			goto save_error;

		case -ENOTSUPP:

			abort_code = RXGEN_OPCODE;

			rxrpc_kernel_abort_call(afs_socket, call->rxcall,

						abort_code, -ret, "KIV");

						abort_code, ret, "KIV");

			goto save_error;

		case -ENODATA:

		case -EBADMSG:
@@ -493,7 +493,7 @@ static void afs_deliver_to_call(struct afs_call *call) 
			if (call->state != AFS_CALL_AWAIT_REPLY)

				abort_code = RXGEN_SS_UNMARSHAL;

			rxrpc_kernel_abort_call(afs_socket, call->rxcall,

						abort_code, EBADMSG, "KUM");

						abort_code, -EBADMSG, "KUM");

			goto save_error;

		}

	}
@@ -754,7 +754,7 @@ void afs_send_empty_reply(struct afs_call *call) 
	case -ENOMEM:

		_debug("oom");

		rxrpc_kernel_abort_call(afs_socket, call->rxcall,

					RX_USER_ABORT, ENOMEM, "KOO");

					RX_USER_ABORT, -ENOMEM, "KOO");

	default:

		_leave(" [error]");

		return;
@@ -792,7 +792,7 @@ void afs_send_simple_reply(struct afs_call *call, const void *buf, size_t len) 
	if (n == -ENOMEM) {

		_debug("oom");

		rxrpc_kernel_abort_call(afs_socket, call->rxcall,

					RX_USER_ABORT, ENOMEM, "KOO");

					RX_USER_ABORT, -ENOMEM, "KOO");

	}

	_leave(" [error]");

}

include/net/af_rxrpc.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ int rxrpc_kernel_send_data(struct socket *, struct rxrpc_call *, 
			   struct msghdr *, size_t);

int rxrpc_kernel_recv_data(struct socket *, struct rxrpc_call *,

			   void *, size_t, size_t *, bool, u32 *);

void rxrpc_kernel_abort_call(struct socket *, struct rxrpc_call *,

bool rxrpc_kernel_abort_call(struct socket *, struct rxrpc_call *,

			     u32, int, const char *);

void rxrpc_kernel_end_call(struct socket *, struct rxrpc_call *);

void rxrpc_kernel_get_peer(struct socket *, struct rxrpc_call *,

include/trace/events/rxrpc.h

+101 −0
Original line number Diff line number Diff line
@@ -683,6 +683,57 @@ TRACE_EVENT(rxrpc_rx_ack, 
		      __entry->n_acks)

	    );



TRACE_EVENT(rxrpc_rx_abort,

	    TP_PROTO(struct rxrpc_call *call, rxrpc_serial_t serial,

		     u32 abort_code),



	    TP_ARGS(call, serial, abort_code),



	    TP_STRUCT__entry(

		    __field(struct rxrpc_call *,	call		)

		    __field(rxrpc_serial_t,		serial		)

		    __field(u32,			abort_code	)

			     ),



	    TP_fast_assign(

		    __entry->call = call;

		    __entry->serial = serial;

		    __entry->abort_code = abort_code;

			   ),



	    TP_printk("c=%p ABORT %08x ac=%d",

		      __entry->call,

		      __entry->serial,

		      __entry->abort_code)

	    );



TRACE_EVENT(rxrpc_rx_rwind_change,

	    TP_PROTO(struct rxrpc_call *call, rxrpc_serial_t serial,

		     u32 rwind, bool wake),



	    TP_ARGS(call, serial, rwind, wake),



	    TP_STRUCT__entry(

		    __field(struct rxrpc_call *,	call		)

		    __field(rxrpc_serial_t,		serial		)

		    __field(u32,			rwind		)

		    __field(bool,			wake		)

			     ),



	    TP_fast_assign(

		    __entry->call = call;

		    __entry->serial = serial;

		    __entry->rwind = rwind;

		    __entry->wake = wake;

			   ),



	    TP_printk("c=%p %08x rw=%u%s",

		      __entry->call,

		      __entry->serial,

		      __entry->rwind,

		      __entry->wake ? " wake" : "")

	    );



TRACE_EVENT(rxrpc_tx_data,

	    TP_PROTO(struct rxrpc_call *call, rxrpc_seq_t seq,

		     rxrpc_serial_t serial, u8 flags, bool retrans, bool lose),
@@ -1087,6 +1138,56 @@ TRACE_EVENT(rxrpc_improper_term, 
		      __entry->abort_code)

	    );



TRACE_EVENT(rxrpc_rx_eproto,

	    TP_PROTO(struct rxrpc_call *call, rxrpc_serial_t serial,

		     const char *why),



	    TP_ARGS(call, serial, why),



	    TP_STRUCT__entry(

		    __field(struct rxrpc_call *,	call		)

		    __field(rxrpc_serial_t,		serial		)

		    __field(const char *,		why		)

			     ),



	    TP_fast_assign(

		    __entry->call = call;

		    __entry->serial = serial;

		    __entry->why = why;

			   ),



	    TP_printk("c=%p EPROTO %08x %s",

		      __entry->call,

		      __entry->serial,

		      __entry->why)

	    );



TRACE_EVENT(rxrpc_connect_call,

	    TP_PROTO(struct rxrpc_call *call),



	    TP_ARGS(call),



	    TP_STRUCT__entry(

		    __field(struct rxrpc_call *,	call		)

		    __field(unsigned long,		user_call_ID	)

		    __field(u32,			cid		)

		    __field(u32,			call_id		)

			     ),



	    TP_fast_assign(

		    __entry->call = call;

		    __entry->user_call_ID = call->user_call_ID;

		    __entry->cid = call->cid;

		    __entry->call_id = call->call_id;

			   ),



	    TP_printk("c=%p u=%p %08x:%08x",

		      __entry->call,

		      (void *)__entry->user_call_ID,

		      __entry->cid,

		      __entry->call_id)

	    );



#endif /* _TRACE_RXRPC_H */



/* This part must be outside protection */

net/rxrpc/ar-internal.h

+19 −0
Original line number Diff line number Diff line
@@ -739,6 +739,25 @@ static inline bool rxrpc_abort_call(const char *why, struct rxrpc_call *call, 
	return ret;

}



/*

 * Abort a call due to a protocol error.

 */

static inline bool __rxrpc_abort_eproto(struct rxrpc_call *call,

					struct sk_buff *skb,

					const char *eproto_why,

					const char *why,

					u32 abort_code)

{

	struct rxrpc_skb_priv *sp = rxrpc_skb(skb);



	trace_rxrpc_rx_eproto(call, sp->hdr.serial, eproto_why);

	return rxrpc_abort_call(why, call, sp->hdr.seq, abort_code, -EPROTO);

}



#define rxrpc_abort_eproto(call, skb, eproto_why, abort_why, abort_code) \

	__rxrpc_abort_eproto((call), (skb), tracepoint_string(eproto_why), \

			     (abort_why), (abort_code))



/*

 * conn_client.c

 */

net/rxrpc/call_accept.c

+3 −3
Original line number Diff line number Diff line
@@ -413,11 +413,11 @@ struct rxrpc_call *rxrpc_new_incoming_call(struct rxrpc_local *local, 


	case RXRPC_CONN_REMOTELY_ABORTED:

		rxrpc_set_call_completion(call, RXRPC_CALL_REMOTELY_ABORTED,

					  conn->remote_abort, ECONNABORTED);

					  conn->remote_abort, -ECONNABORTED);

		break;

	case RXRPC_CONN_LOCALLY_ABORTED:

		rxrpc_abort_call("CON", call, sp->hdr.seq,

				 conn->local_abort, ECONNABORTED);

				 conn->local_abort, -ECONNABORTED);

		break;

	default:

		BUG();
@@ -600,7 +600,7 @@ int rxrpc_reject_call(struct rxrpc_sock *rx) 
	write_lock_bh(&call->state_lock);

	switch (call->state) {

	case RXRPC_CALL_SERVER_ACCEPTING:

		__rxrpc_abort_call("REJ", call, 1, RX_USER_ABORT, ECONNABORTED);

		__rxrpc_abort_call("REJ", call, 1, RX_USER_ABORT, -ECONNABORTED);

		abort = true;

		/* fall through */

	case RXRPC_CALL_COMPLETE: