tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
NFSD: Use sockaddr instead of a generic array
Record and emit presentation addresses using tracing helpers
designed for the task.
Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
+15
-14
+15
-14
fs/nfsd/trace.h
+15
-14
fs/nfsd/trace.h
···
18
18
#include "nfsfh.h"
19
19
#include "xdr4.h"
20
20
21
-
#define NFSD_TRACE_PROC_RES_FIELDS \
21
+
#define NFSD_TRACE_PROC_RES_FIELDS(r) \
22
22
__field(unsigned int, netns_ino) \
23
23
__field(u32, xid) \
24
24
__field(unsigned long, status) \
25
-
__array(unsigned char, server, sizeof(struct sockaddr_in6)) \
26
-
__array(unsigned char, client, sizeof(struct sockaddr_in6))
25
+
__sockaddr(server, (r)->rq_xprt->xpt_locallen) \
26
+
__sockaddr(client, (r)->rq_xprt->xpt_remotelen)
27
27
28
-
#define NFSD_TRACE_PROC_RES_ASSIGNMENTS(error) \
28
+
#define NFSD_TRACE_PROC_RES_ASSIGNMENTS(r, error) \
29
29
do { \
30
-
__entry->netns_ino = SVC_NET(rqstp)->ns.inum; \
31
-
__entry->xid = be32_to_cpu(rqstp->rq_xid); \
30
+
struct svc_xprt *xprt = (r)->rq_xprt; \
31
+
__entry->netns_ino = SVC_NET(r)->ns.inum; \
32
+
__entry->xid = be32_to_cpu((r)->rq_xid); \
32
33
__entry->status = be32_to_cpu(error); \
33
-
memcpy(__entry->server, &rqstp->rq_xprt->xpt_local, \
34
-
rqstp->rq_xprt->xpt_locallen); \
35
-
memcpy(__entry->client, &rqstp->rq_xprt->xpt_remote, \
36
-
rqstp->rq_xprt->xpt_remotelen); \
34
+
__assign_sockaddr(server, &xprt->xpt_local, \
35
+
xprt->xpt_locallen); \
36
+
__assign_sockaddr(client, &xprt->xpt_remote, \
37
+
xprt->xpt_remotelen); \
37
38
} while (0);
38
39
39
40
DECLARE_EVENT_CLASS(nfsd_xdr_err_class,
···
146
145
),
147
146
TP_ARGS(rqstp, args_opcnt, resp_opcnt, opnum, status),
148
147
TP_STRUCT__entry(
149
-
NFSD_TRACE_PROC_RES_FIELDS
148
+
NFSD_TRACE_PROC_RES_FIELDS(rqstp)
150
149
151
150
__field(u32, args_opcnt)
152
151
__field(u32, resp_opcnt)
153
152
__field(u32, opnum)
154
153
),
155
154
TP_fast_assign(
156
-
NFSD_TRACE_PROC_RES_ASSIGNMENTS(status)
155
+
NFSD_TRACE_PROC_RES_ASSIGNMENTS(rqstp, status)
157
156
158
157
__entry->args_opcnt = args_opcnt;
159
158
__entry->resp_opcnt = resp_opcnt;
···
172
171
),
173
172
TP_ARGS(rqstp, opnum, status),
174
173
TP_STRUCT__entry(
175
-
NFSD_TRACE_PROC_RES_FIELDS
174
+
NFSD_TRACE_PROC_RES_FIELDS(rqstp)
176
175
177
176
__field(u32, opnum)
178
177
),
179
178
TP_fast_assign(
180
-
NFSD_TRACE_PROC_RES_ASSIGNMENTS(status)
179
+
NFSD_TRACE_PROC_RES_ASSIGNMENTS(rqstp, status)
181
180
182
181
__entry->opnum = opnum;
183
182
),