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

Commit 2f09c242 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

SUNRPC: Ensure that we can trace waitqueues when !defined(CONFIG_SYSCTL) 



The tracepoint code relies on the queue->name being defined in order to
be able to display the name of the waitqueue on which an RPC task is
sleeping.

Reported-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
Reported-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Acked-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Acked-by: default avatarRandy Dunlap <rdunlap@xenotime.net>
parent 685f50f9

include/linux/sunrpc/debug.h

+3 −0
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ 
#ifdef CONFIG_SYSCTL

#define  RPC_DEBUG

#endif

#ifdef CONFIG_TRACEPOINTS

#define RPC_TRACEPOINTS

#endif

/* #define  RPC_PROFILE */



/*

include/linux/sunrpc/sched.h

+13 −2
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ struct rpc_wait_queue { 
	unsigned char		nr;			/* # tasks remaining for cookie */

	unsigned short		qlen;			/* total # tasks waiting in queue */

	struct rpc_timer	timer_list;

#ifdef RPC_DEBUG

#if defined(RPC_DEBUG) || defined(RPC_TRACEPOINTS)

	const char *		name;

#endif

};
@@ -270,11 +270,22 @@ static inline int rpc_task_has_priority(struct rpc_task *task, unsigned char pri 
	return (task->tk_priority + RPC_PRIORITY_LOW == prio);

}



#ifdef RPC_DEBUG

#if defined(RPC_DEBUG) || defined (RPC_TRACEPOINTS)

static inline const char * rpc_qname(const struct rpc_wait_queue *q)

{

	return ((q && q->name) ? q->name : "unknown");

}



static inline void rpc_assign_waitqueue_name(struct rpc_wait_queue *q,

		const char *name)

{

	q->name = name;

}

#else

static inline void rpc_assign_waitqueue_name(struct rpc_wait_queue *q,

		const char *name)

{

}

#endif



#endif /* _LINUX_SUNRPC_SCHED_H_ */

net/sunrpc/sched.c

+1 −3
Original line number Diff line number Diff line
@@ -208,9 +208,7 @@ static void __rpc_init_priority_wait_queue(struct rpc_wait_queue *queue, const c 
	queue->qlen = 0;

	setup_timer(&queue->timer_list.timer, __rpc_queue_timer_fn, (unsigned long)queue);

	INIT_LIST_HEAD(&queue->timer_list.list);

#ifdef RPC_DEBUG

	queue->name = qname;

#endif

	rpc_assign_waitqueue_name(queue, qname);

}



void rpc_init_priority_wait_queue(struct rpc_wait_queue *queue, const char *qname)