SUNRPC: Refresh the show_rqstp_flags() macro

Ensure that show_rqstp_flags() can recognize and display the
RQ_AUTHERR flag, added in commit 83dd59a0b9 ("SUNRPC/nfs: Fix
return value for nfs4_callback_compound()") and the RQ_DATA flag,
added in commit ff3ac5c3dc ("SUNRPC: Add a server side
per-connection limit").

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2020-07-24 15:26:47 -04:00
parent 94a4beaa6b
commit a68d5a502b

View File

@ -1250,15 +1250,34 @@ DECLARE_EVENT_CLASS(svc_xdr_buf_class,
DEFINE_SVCXDRBUF_EVENT(recvfrom);
DEFINE_SVCXDRBUF_EVENT(sendto);
/*
* from include/linux/sunrpc/svc.h
*/
#define SVC_RQST_FLAG_LIST \
svc_rqst_flag(SECURE) \
svc_rqst_flag(LOCAL) \
svc_rqst_flag(USEDEFERRAL) \
svc_rqst_flag(DROPME) \
svc_rqst_flag(SPLICE_OK) \
svc_rqst_flag(VICTIM) \
svc_rqst_flag(BUSY) \
svc_rqst_flag(DATA) \
svc_rqst_flag_end(AUTHERR)
#undef svc_rqst_flag
#undef svc_rqst_flag_end
#define svc_rqst_flag(x) TRACE_DEFINE_ENUM(RQ_##x);
#define svc_rqst_flag_end(x) TRACE_DEFINE_ENUM(RQ_##x);
SVC_RQST_FLAG_LIST
#undef svc_rqst_flag
#undef svc_rqst_flag_end
#define svc_rqst_flag(x) { BIT(RQ_##x), #x },
#define svc_rqst_flag_end(x) { BIT(RQ_##x), #x }
#define show_rqstp_flags(flags) \
__print_flags(flags, "|", \
{ (1UL << RQ_SECURE), "RQ_SECURE"}, \
{ (1UL << RQ_LOCAL), "RQ_LOCAL"}, \
{ (1UL << RQ_USEDEFERRAL), "RQ_USEDEFERRAL"}, \
{ (1UL << RQ_DROPME), "RQ_DROPME"}, \
{ (1UL << RQ_SPLICE_OK), "RQ_SPLICE_OK"}, \
{ (1UL << RQ_VICTIM), "RQ_VICTIM"}, \
{ (1UL << RQ_BUSY), "RQ_BUSY"})
__print_flags(flags, "|", SVC_RQST_FLAG_LIST)
TRACE_EVENT(svc_recv,
TP_PROTO(struct svc_rqst *rqst, int len),