From: Chuck Lever Date: Sat, 26 Nov 2022 20:55:36 +0000 (-0500) Subject: SUNRPC: Make the svc_authenticate tracepoint conditional X-Git-Tag: v6.6.7~3576^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c65d9df0c4a0e150d97aff363cbd0363f21f9466;p=platform%2Fkernel%2Flinux-starfive.git SUNRPC: Make the svc_authenticate tracepoint conditional Clean up: Simplify the tracepoint's only call site. Also, I noticed that when svc_authenticate() returns SVC_COMPLETE, it leaves rq_auth_stat set to an error value. That doesn't need to be recorded in the trace log. Signed-off-by: Chuck Lever Reviewed-by: Jeff Layton --- diff --git a/include/trace/events/sunrpc.h b/include/trace/events/sunrpc.h index ffe2679..37604e0 100644 --- a/include/trace/events/sunrpc.h +++ b/include/trace/events/sunrpc.h @@ -1666,11 +1666,13 @@ TRACE_DEFINE_ENUM(SVC_COMPLETE); #define SVC_RQST_ENDPOINT_VARARGS \ __entry->xid, __get_sockaddr(server), __get_sockaddr(client) -TRACE_EVENT(svc_authenticate, +TRACE_EVENT_CONDITION(svc_authenticate, TP_PROTO(const struct svc_rqst *rqst, int auth_res), TP_ARGS(rqst, auth_res), + TP_CONDITION(auth_res != SVC_OK && auth_res != SVC_COMPLETE), + TP_STRUCT__entry( SVC_RQST_ENDPOINT_FIELDS(rqst) diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c index 34383c3..8f1b596 100644 --- a/net/sunrpc/svc.c +++ b/net/sunrpc/svc.c @@ -1280,8 +1280,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv) /* Also give the program a chance to reject this call: */ if (auth_res == SVC_OK && progp) auth_res = progp->pg_authenticate(rqstp); - if (auth_res != SVC_OK) - trace_svc_authenticate(rqstp, auth_res); + trace_svc_authenticate(rqstp, auth_res); switch (auth_res) { case SVC_OK: break;