Commit 2ebdb26e authored by David Howells's avatar David Howells
Browse files

rxrpc: Remove the [k_]proto() debugging macros 



Remove the kproto() and _proto() debugging macros in preference to using
tracepoints for this.

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

include/trace/events/rxrpc.h

+60 −0
Original line number Diff line number Diff line
@@ -733,6 +733,66 @@ TRACE_EVENT(rxrpc_rx_abort, 
		      __entry->abort_code)

	    );



TRACE_EVENT(rxrpc_rx_challenge,

	    TP_PROTO(struct rxrpc_connection *conn, rxrpc_serial_t serial,

		     u32 version, u32 nonce, u32 min_level),



	    TP_ARGS(conn, serial, version, nonce, min_level),



	    TP_STRUCT__entry(

		    __field(unsigned int,		conn		)

		    __field(rxrpc_serial_t,		serial		)

		    __field(u32,			version		)

		    __field(u32,			nonce		)

		    __field(u32,			min_level	)

			     ),



	    TP_fast_assign(

		    __entry->conn = conn->debug_id;

		    __entry->serial = serial;

		    __entry->version = version;

		    __entry->nonce = nonce;

		    __entry->min_level = min_level;

			   ),



	    TP_printk("C=%08x CHALLENGE %08x v=%x n=%x ml=%x",

		      __entry->conn,

		      __entry->serial,

		      __entry->version,

		      __entry->nonce,

		      __entry->min_level)

	    );



TRACE_EVENT(rxrpc_rx_response,

	    TP_PROTO(struct rxrpc_connection *conn, rxrpc_serial_t serial,

		     u32 version, u32 kvno, u32 ticket_len),



	    TP_ARGS(conn, serial, version, kvno, ticket_len),



	    TP_STRUCT__entry(

		    __field(unsigned int,		conn		)

		    __field(rxrpc_serial_t,		serial		)

		    __field(u32,			version		)

		    __field(u32,			kvno		)

		    __field(u32,			ticket_len	)

			     ),



	    TP_fast_assign(

		    __entry->conn = conn->debug_id;

		    __entry->serial = serial;

		    __entry->version = version;

		    __entry->kvno = kvno;

		    __entry->ticket_len = ticket_len;

			   ),



	    TP_printk("C=%08x RESPONSE %08x v=%x kvno=%x tl=%x",

		      __entry->conn,

		      __entry->serial,

		      __entry->version,

		      __entry->kvno,

		      __entry->ticket_len)

	    );



TRACE_EVENT(rxrpc_rx_rwind_change,

	    TP_PROTO(struct rxrpc_call *call, rxrpc_serial_t serial,

		     u32 rwind, bool wake),

net/rxrpc/ar-internal.h

+0 −10
Original line number Diff line number Diff line
@@ -1190,7 +1190,6 @@ extern unsigned int rxrpc_debug; 
#define kenter(FMT,...)	dbgprintk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define kleave(FMT,...)	dbgprintk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define kdebug(FMT,...)	dbgprintk("    "FMT ,##__VA_ARGS__)

#define kproto(FMT,...)	dbgprintk("### "FMT ,##__VA_ARGS__)

#define knet(FMT,...)	dbgprintk("@@@ "FMT ,##__VA_ARGS__)
@@ -1198,14 +1197,12 @@ extern unsigned int rxrpc_debug; 
#define _enter(FMT,...)	kenter(FMT,##__VA_ARGS__)

#define _leave(FMT,...)	kleave(FMT,##__VA_ARGS__)

#define _debug(FMT,...)	kdebug(FMT,##__VA_ARGS__)

#define _proto(FMT,...)	kproto(FMT,##__VA_ARGS__)

#define _net(FMT,...)	knet(FMT,##__VA_ARGS__)



#elif defined(CONFIG_AF_RXRPC_DEBUG)

#define RXRPC_DEBUG_KENTER	0x01

#define RXRPC_DEBUG_KLEAVE	0x02

#define RXRPC_DEBUG_KDEBUG	0x04

#define RXRPC_DEBUG_KPROTO	0x08

#define RXRPC_DEBUG_KNET	0x10



#define _enter(FMT,...)					\
@@ -1226,12 +1223,6 @@ do { \ 
		kdebug(FMT,##__VA_ARGS__);		\

} while (0)



#define _proto(FMT,...)					\

do {							\

	if (unlikely(rxrpc_debug & RXRPC_DEBUG_KPROTO))	\

		kproto(FMT,##__VA_ARGS__);		\

} while (0)



#define _net(FMT,...)					\

do {							\

	if (unlikely(rxrpc_debug & RXRPC_DEBUG_KNET))	\
@@ -1242,7 +1233,6 @@ do { \ 
#define _enter(FMT,...)	no_printk("==> %s("FMT")",__func__ ,##__VA_ARGS__)

#define _leave(FMT,...)	no_printk("<== %s()"FMT"",__func__ ,##__VA_ARGS__)

#define _debug(FMT,...)	no_printk("    "FMT ,##__VA_ARGS__)

#define _proto(FMT,...)	no_printk("### "FMT ,##__VA_ARGS__)

#define _net(FMT,...)	no_printk("@@@ "FMT ,##__VA_ARGS__)

#endif

net/rxrpc/conn_event.c

+0 −4
Original line number Diff line number Diff line
@@ -122,14 +122,12 @@ static void rxrpc_conn_retransmit_call(struct rxrpc_connection *conn, 


	switch (chan->last_type) {

	case RXRPC_PACKET_TYPE_ABORT:

		_proto("Tx ABORT %%%u { %d } [re]", serial, conn->abort_code);

		break;

	case RXRPC_PACKET_TYPE_ACK:

		trace_rxrpc_tx_ack(chan->call_debug_id, serial,

				   ntohl(pkt.ack.firstPacket),

				   ntohl(pkt.ack.serial),

				   pkt.ack.reason, 0);

		_proto("Tx ACK %%%u [re]", serial);

		break;

	}
@@ -242,7 +240,6 @@ static int rxrpc_abort_connection(struct rxrpc_connection *conn, 
	serial = atomic_inc_return(&conn->serial);

	rxrpc_abort_calls(conn, RXRPC_CALL_LOCALLY_ABORTED, serial);

	whdr.serial = htonl(serial);

	_proto("Tx CONN ABORT %%%u { %d }", serial, conn->abort_code);



	ret = kernel_sendmsg(conn->params.local->socket, &msg, iov, 2, len);

	if (ret < 0) {
@@ -315,7 +312,6 @@ static int rxrpc_process_event(struct rxrpc_connection *conn, 
			return -EPROTO;

		}

		abort_code = ntohl(wtmp);

		_proto("Rx ABORT %%%u { ac=%d }", sp->hdr.serial, abort_code);



		conn->error = -ECONNABORTED;

		conn->abort_code = abort_code;

net/rxrpc/input.c

+0 −17
Original line number Diff line number Diff line
@@ -551,9 +551,6 @@ static void rxrpc_input_data(struct rxrpc_call *call, struct sk_buff *skb) 
	       atomic64_read(&call->ackr_window), call->rx_highest_seq,

	       skb->len, seq0);



	_proto("Rx DATA %%%u { #%u f=%02x }",

	       sp->hdr.serial, seq0, sp->hdr.flags);



	state = READ_ONCE(call->state);

	if (state >= RXRPC_CALL_COMPLETE) {

		rxrpc_free_skb(skb, rxrpc_skb_freed);
@@ -708,11 +705,6 @@ static void rxrpc_input_ackinfo(struct rxrpc_call *call, struct sk_buff *skb, 
	bool wake = false;

	u32 rwind = ntohl(ackinfo->rwind);



	_proto("Rx ACK %%%u Info { rx=%u max=%u rwin=%u jm=%u }",

	       sp->hdr.serial,

	       ntohl(ackinfo->rxMTU), ntohl(ackinfo->maxMTU),

	       rwind, ntohl(ackinfo->jumbo_max));



	if (rwind > RXRPC_TX_MAX_WINDOW)

		rwind = RXRPC_TX_MAX_WINDOW;

	if (call->tx_winsize != rwind) {
@@ -855,7 +847,6 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb) 
	}



	if (ack.reason == RXRPC_ACK_PING) {

		_proto("Rx ACK %%%u PING Request", ack_serial);

		rxrpc_send_ACK(call, RXRPC_ACK_PING_RESPONSE, ack_serial,

			       rxrpc_propose_ack_respond_to_ping);

	} else if (sp->hdr.flags & RXRPC_REQUEST_ACK) {
@@ -1014,9 +1005,6 @@ static void rxrpc_input_ack(struct rxrpc_call *call, struct sk_buff *skb) 
static void rxrpc_input_ackall(struct rxrpc_call *call, struct sk_buff *skb)

{

	struct rxrpc_ack_summary summary = { 0 };

	struct rxrpc_skb_priv *sp = rxrpc_skb(skb);



	_proto("Rx ACKALL %%%u", sp->hdr.serial);



	spin_lock(&call->input_lock);
@@ -1044,8 +1032,6 @@ static void rxrpc_input_abort(struct rxrpc_call *call, struct sk_buff *skb) 


	trace_rxrpc_rx_abort(call, sp->hdr.serial, abort_code);



	_proto("Rx ABORT %%%u { %x }", sp->hdr.serial, abort_code);



	rxrpc_set_call_completion(call, RXRPC_CALL_REMOTELY_ABORTED,

				  abort_code, -ECONNABORTED);

}
@@ -1081,8 +1067,6 @@ static void rxrpc_input_call_packet(struct rxrpc_call *call, 
		goto no_free;



	case RXRPC_PACKET_TYPE_BUSY:

		_proto("Rx BUSY %%%u", sp->hdr.serial);



		/* Just ignore BUSY packets from the server; the retry and

		 * lifespan timers will take care of business.  BUSY packets

		 * from the client don't make sense.
@@ -1325,7 +1309,6 @@ int rxrpc_input_packet(struct sock *udp_sk, struct sk_buff *skb) 
		goto discard;



	default:

		_proto("Rx Bad Packet Type %u", sp->hdr.type);

		goto bad_message;

	}

net/rxrpc/local_event.c

+0 −3
Original line number Diff line number Diff line
@@ -63,8 +63,6 @@ static void rxrpc_send_version_request(struct rxrpc_local *local, 


	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)

		trace_rxrpc_tx_fail(local->debug_id, 0, ret,
@@ -98,7 +96,6 @@ void rxrpc_process_local_events(struct rxrpc_local *local) 
			if (skb_copy_bits(skb, sizeof(struct rxrpc_wire_header),

					  &v, 1) < 0)

				return;

			_proto("Rx VERSION { %02x }", v);

			if (v == 0)

				rxrpc_send_version_request(local, &sp->hdr, skb);

			break;