rxrpc, afs: Use debug_ids rather than pointers in traces (a25e21f0) · Commits · 戴 / test

fs/afs/internal.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -118,6 +118,7 @@ struct afs_call {
	bool ret_reply0; /* T if should return reply[0] on success */		bool ret_reply0; /* T if should return reply[0] on success */
	bool upgrade; /* T to request service upgrade */		bool upgrade; /* T to request service upgrade */
	u16 service_id; /* Actual service ID (after upgrade) */		u16 service_id; /* Actual service ID (after upgrade) */
			unsigned int debug_id; /* Trace ID */
	u32 operation_ID; /* operation ID for an incoming call */		u32 operation_ID; /* operation ID for an incoming call */
	u32 count; /* count for use in unmarshalling */		u32 count; /* count for use in unmarshalling */
	__be32 tmp; /* place to extract temporary data */		__be32 tmp; /* place to extract temporary data */

fs/afs/rxrpc.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -131,6 +131,7 @@ static struct afs_call afs_alloc_call(struct afs_net net,

	call->type = type;		call->type = type;
	call->net = net;		call->net = net;
			call->debug_id = atomic_inc_return(&rxrpc_debug_id);
	atomic_set(&call->usage, 1);		atomic_set(&call->usage, 1);
	INIT_WORK(&call->async_work, afs_process_async_call);		INIT_WORK(&call->async_work, afs_process_async_call);
	init_waitqueue_head(&call->waitq);		init_waitqueue_head(&call->waitq);
	@@ -169,11 +170,12 @@ void afs_put_call(struct afs_call *call)
	afs_put_server(call->net, call->cm_server);		afs_put_server(call->net, call->cm_server);
	afs_put_cb_interest(call->net, call->cbi);		afs_put_cb_interest(call->net, call->cbi);
	kfree(call->request);		kfree(call->request);
	kfree(call);

	o = atomic_dec_return(&net->nr_outstanding_calls);
	trace_afs_call(call, afs_call_trace_free, 0, o,		trace_afs_call(call, afs_call_trace_free, 0, o,
	__builtin_return_address(0));		__builtin_return_address(0));
			kfree(call);

			o = atomic_dec_return(&net->nr_outstanding_calls);
	if (o == 0)		if (o == 0)
	wake_up_atomic_t(&net->nr_outstanding_calls);		wake_up_atomic_t(&net->nr_outstanding_calls);
	}		}
	@@ -378,7 +380,8 @@ long afs_make_call(struct afs_addr_cursor ac, struct afs_call call,
	(async ?		(async ?
	afs_wake_up_async_call :		afs_wake_up_async_call :
	afs_wake_up_call_waiter),		afs_wake_up_call_waiter),
	call->upgrade);		call->upgrade,
			call->debug_id);
	if (IS_ERR(rxcall)) {		if (IS_ERR(rxcall)) {
	ret = PTR_ERR(rxcall);		ret = PTR_ERR(rxcall);
	goto error_kill_call;		goto error_kill_call;
	@@ -727,7 +730,8 @@ void afs_charge_preallocation(struct work_struct *work)
	afs_wake_up_async_call,		afs_wake_up_async_call,
	afs_rx_attach,		afs_rx_attach,
	(unsigned long)call,		(unsigned long)call,
	GFP_KERNEL) < 0)		GFP_KERNEL,
			call->debug_id) < 0)
	break;		break;
	call = NULL;		call = NULL;
	}		}

include/net/af_rxrpc.h

+9 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,6 +31,11 @@ enum rxrpc_call_completion {
	NR__RXRPC_CALL_COMPLETIONS		NR__RXRPC_CALL_COMPLETIONS
	};		};

			/*
			* Debug ID counter for tracing.
			*/
			extern atomic_t rxrpc_debug_id;

	typedef void (rxrpc_notify_rx_t)(struct sock , struct rxrpc_call *,		typedef void (rxrpc_notify_rx_t)(struct sock , struct rxrpc_call *,
	unsigned long);		unsigned long);
	typedef void (rxrpc_notify_end_tx_t)(struct sock , struct rxrpc_call *,		typedef void (rxrpc_notify_end_tx_t)(struct sock , struct rxrpc_call *,
	@@ -50,7 +55,8 @@ struct rxrpc_call rxrpc_kernel_begin_call(struct socket ,
	s64,		s64,
	gfp_t,		gfp_t,
	rxrpc_notify_rx_t,		rxrpc_notify_rx_t,
	bool);		bool,
			unsigned int);
	int rxrpc_kernel_send_data(struct socket , struct rxrpc_call ,		int rxrpc_kernel_send_data(struct socket , struct rxrpc_call ,
	struct msghdr *, size_t,		struct msghdr *, size_t,
	rxrpc_notify_end_tx_t);		rxrpc_notify_end_tx_t);
	@@ -63,7 +69,8 @@ void rxrpc_kernel_get_peer(struct socket , struct rxrpc_call ,
	struct sockaddr_rxrpc *);		struct sockaddr_rxrpc *);
	u64 rxrpc_kernel_get_rtt(struct socket , struct rxrpc_call );		u64 rxrpc_kernel_get_rtt(struct socket , struct rxrpc_call );
	int rxrpc_kernel_charge_accept(struct socket *, rxrpc_notify_rx_t,		int rxrpc_kernel_charge_accept(struct socket *, rxrpc_notify_rx_t,
	rxrpc_user_attach_call_t, unsigned long, gfp_t);		rxrpc_user_attach_call_t, unsigned long, gfp_t,
			unsigned int);
	void rxrpc_kernel_set_tx_length(struct socket , struct rxrpc_call , s64);		void rxrpc_kernel_set_tx_length(struct socket , struct rxrpc_call , s64);
	int rxrpc_kernel_retry_call(struct socket , struct rxrpc_call ,		int rxrpc_kernel_retry_call(struct socket , struct rxrpc_call ,
	struct sockaddr_rxrpc , struct key );		struct sockaddr_rxrpc , struct key );

include/trace/events/afs.h

+30 −39

Original line number	Original line	Diff line number	Diff line
	@@ -133,8 +133,7 @@ TRACE_EVENT(afs_recv_data,
	TP_ARGS(call, count, offset, want_more, ret),		TP_ARGS(call, count, offset, want_more, ret),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct rxrpc_call *, rxcall )		__field(unsigned int, call )
	__field(struct afs_call *, call )
	__field(enum afs_call_state, state )		__field(enum afs_call_state, state )
	__field(unsigned int, count )		__field(unsigned int, count )
	__field(unsigned int, offset )		__field(unsigned int, offset )
	@@ -144,8 +143,7 @@ TRACE_EVENT(afs_recv_data,
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->rxcall = call->rxcall;		__entry->call = call->debug_id;
	__entry->call = call;
	__entry->state = call->state;		__entry->state = call->state;
	__entry->unmarshall = call->unmarshall;		__entry->unmarshall = call->unmarshall;
	__entry->count = count;		__entry->count = count;
	@@ -154,8 +152,7 @@ TRACE_EVENT(afs_recv_data,
	__entry->ret = ret;		__entry->ret = ret;
	),		),

	TP_printk("c=%p ac=%p s=%u u=%u %u/%u wm=%u ret=%d",		TP_printk("c=%08x s=%u u=%u %u/%u wm=%u ret=%d",
	__entry->rxcall,
	__entry->call,		__entry->call,
	__entry->state, __entry->unmarshall,		__entry->state, __entry->unmarshall,
	__entry->offset, __entry->count,		__entry->offset, __entry->count,
	@@ -168,21 +165,18 @@ TRACE_EVENT(afs_notify_call,
	TP_ARGS(rxcall, call),		TP_ARGS(rxcall, call),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct rxrpc_call *, rxcall )		__field(unsigned int, call )
	__field(struct afs_call *, call )
	__field(enum afs_call_state, state )		__field(enum afs_call_state, state )
	__field(unsigned short, unmarshall )		__field(unsigned short, unmarshall )
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->rxcall = rxcall;		__entry->call = call->debug_id;
	__entry->call = call;
	__entry->state = call->state;		__entry->state = call->state;
	__entry->unmarshall = call->unmarshall;		__entry->unmarshall = call->unmarshall;
	),		),

	TP_printk("c=%p ac=%p s=%u u=%u",		TP_printk("c=%08x s=%u u=%u",
	__entry->rxcall,
	__entry->call,		__entry->call,
	__entry->state, __entry->unmarshall)		__entry->state, __entry->unmarshall)
	);		);
	@@ -193,21 +187,18 @@ TRACE_EVENT(afs_cb_call,
	TP_ARGS(call),		TP_ARGS(call),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct rxrpc_call *, rxcall )		__field(unsigned int, call )
	__field(struct afs_call *, call )
	__field(const char *, name )		__field(const char *, name )
	__field(u32, op )		__field(u32, op )
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->rxcall = call->rxcall;		__entry->call = call->debug_id;
	__entry->call = call;
	__entry->name = call->type->name;		__entry->name = call->type->name;
	__entry->op = call->operation_ID;		__entry->op = call->operation_ID;
	),		),

	TP_printk("c=%p ac=%p %s o=%u",		TP_printk("c=%08x %s o=%u",
	__entry->rxcall,
	__entry->call,		__entry->call,
	__entry->name,		__entry->name,
	__entry->op)		__entry->op)
	@@ -220,7 +211,7 @@ TRACE_EVENT(afs_call,
	TP_ARGS(call, op, usage, outstanding, where),		TP_ARGS(call, op, usage, outstanding, where),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(int, op )		__field(int, op )
	__field(int, usage )		__field(int, usage )
	__field(int, outstanding )		__field(int, outstanding )
	@@ -228,14 +219,14 @@ TRACE_EVENT(afs_call,
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->op = op;		__entry->op = op;
	__entry->usage = usage;		__entry->usage = usage;
	__entry->outstanding = outstanding;		__entry->outstanding = outstanding;
	__entry->where = where;		__entry->where = where;
	),		),

	TP_printk("c=%p %s u=%d o=%d sp=%pSR",		TP_printk("c=%08x %s u=%d o=%d sp=%pSR",
	__entry->call,		__entry->call,
	__print_symbolic(__entry->op, afs_call_traces),		__print_symbolic(__entry->op, afs_call_traces),
	__entry->usage,		__entry->usage,
	@@ -249,13 +240,13 @@ TRACE_EVENT(afs_make_fs_call,
	TP_ARGS(call, fid),		TP_ARGS(call, fid),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(enum afs_fs_operation, op )		__field(enum afs_fs_operation, op )
	__field_struct(struct afs_fid, fid )		__field_struct(struct afs_fid, fid )
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->op = call->operation_ID;		__entry->op = call->operation_ID;
	if (fid) {		if (fid) {
	__entry->fid = *fid;		__entry->fid = *fid;
	@@ -266,7 +257,7 @@ TRACE_EVENT(afs_make_fs_call,
	}		}
	),		),

	TP_printk("c=%p %06x:%06x:%06x %s",		TP_printk("c=%08x %06x:%06x:%06x %s",
	__entry->call,		__entry->call,
	__entry->fid.vid,		__entry->fid.vid,
	__entry->fid.vnode,		__entry->fid.vnode,
	@@ -280,16 +271,16 @@ TRACE_EVENT(afs_make_vl_call,
	TP_ARGS(call),		TP_ARGS(call),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(enum afs_vl_operation, op )		__field(enum afs_vl_operation, op )
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->op = call->operation_ID;		__entry->op = call->operation_ID;
	),		),

	TP_printk("c=%p %s",		TP_printk("c=%08x %s",
	__entry->call,		__entry->call,
	__print_symbolic(__entry->op, afs_vl_operations))		__print_symbolic(__entry->op, afs_vl_operations))
	);		);
	@@ -300,20 +291,20 @@ TRACE_EVENT(afs_call_done,
	TP_ARGS(call),		TP_ARGS(call),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(struct rxrpc_call *, rx_call )		__field(struct rxrpc_call *, rx_call )
	__field(int, ret )		__field(int, ret )
	__field(u32, abort_code )		__field(u32, abort_code )
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->rx_call = call->rxcall;		__entry->rx_call = call->rxcall;
	__entry->ret = call->error;		__entry->ret = call->error;
	__entry->abort_code = call->abort_code;		__entry->abort_code = call->abort_code;
	),		),

	TP_printk(" c=%p ret=%d ab=%d [%p]",		TP_printk(" c=%08x ret=%d ab=%d [%p]",
	__entry->call,		__entry->call,
	__entry->ret,		__entry->ret,
	__entry->abort_code,		__entry->abort_code,
	@@ -327,7 +318,7 @@ TRACE_EVENT(afs_send_pages,
	TP_ARGS(call, msg, first, last, offset),		TP_ARGS(call, msg, first, last, offset),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(pgoff_t, first )		__field(pgoff_t, first )
	__field(pgoff_t, last )		__field(pgoff_t, last )
	__field(unsigned int, nr )		__field(unsigned int, nr )
	@@ -337,7 +328,7 @@ TRACE_EVENT(afs_send_pages,
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->first = first;		__entry->first = first;
	__entry->last = last;		__entry->last = last;
	__entry->nr = msg->msg_iter.nr_segs;		__entry->nr = msg->msg_iter.nr_segs;
	@@ -346,7 +337,7 @@ TRACE_EVENT(afs_send_pages,
	__entry->flags = msg->msg_flags;		__entry->flags = msg->msg_flags;
	),		),

	TP_printk(" c=%p %lx-%lx-%lx b=%x o=%x f=%x",		TP_printk(" c=%08x %lx-%lx-%lx b=%x o=%x f=%x",
	__entry->call,		__entry->call,
	__entry->first, __entry->first + __entry->nr - 1, __entry->last,		__entry->first, __entry->first + __entry->nr - 1, __entry->last,
	__entry->bytes, __entry->offset,		__entry->bytes, __entry->offset,
	@@ -360,7 +351,7 @@ TRACE_EVENT(afs_sent_pages,
	TP_ARGS(call, first, last, cursor, ret),		TP_ARGS(call, first, last, cursor, ret),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(pgoff_t, first )		__field(pgoff_t, first )
	__field(pgoff_t, last )		__field(pgoff_t, last )
	__field(pgoff_t, cursor )		__field(pgoff_t, cursor )
	@@ -368,14 +359,14 @@ TRACE_EVENT(afs_sent_pages,
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->first = first;		__entry->first = first;
	__entry->last = last;		__entry->last = last;
	__entry->cursor = cursor;		__entry->cursor = cursor;
	__entry->ret = ret;		__entry->ret = ret;
	),		),

	TP_printk(" c=%p %lx-%lx c=%lx r=%d",		TP_printk(" c=%08x %lx-%lx c=%lx r=%d",
	__entry->call,		__entry->call,
	__entry->first, __entry->last,		__entry->first, __entry->last,
	__entry->cursor, __entry->ret)		__entry->cursor, __entry->ret)
	@@ -450,7 +441,7 @@ TRACE_EVENT(afs_call_state,
	TP_ARGS(call, from, to, ret, remote_abort),		TP_ARGS(call, from, to, ret, remote_abort),

	TP_STRUCT__entry(		TP_STRUCT__entry(
	__field(struct afs_call *, call )		__field(unsigned int, call )
	__field(enum afs_call_state, from )		__field(enum afs_call_state, from )
	__field(enum afs_call_state, to )		__field(enum afs_call_state, to )
	__field(int, ret )		__field(int, ret )
	@@ -458,14 +449,14 @@ TRACE_EVENT(afs_call_state,
	),		),

	TP_fast_assign(		TP_fast_assign(
	__entry->call = call;		__entry->call = call->debug_id;
	__entry->from = from;		__entry->from = from;
	__entry->to = to;		__entry->to = to;
	__entry->ret = ret;		__entry->ret = ret;
	__entry->abort = remote_abort;		__entry->abort = remote_abort;
	),		),

	TP_printk("c=%p %u->%u r=%d ab=%d",		TP_printk("c=%08x %u->%u r=%d ab=%d",
	__entry->call,		__entry->call,
	__entry->from, __entry->to,		__entry->from, __entry->to,
	__entry->ret, __entry->abort)		__entry->ret, __entry->abort)

include/trace/events/rxrpc.h

+79 −76

File changed.

Preview size limit exceeded, changes collapsed.

Admin message