Skip to content

Commit 2f90e18

Browse files
jtlaytonchucklever
jtlayton
authored and
chucklever
committed
lockd: add some client-side tracepoints
Signed-off-by: Jeff Layton <jlayton@kernel.org> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
1 parent e59fb67 commit 2f90e18

File tree

5 files changed

+131
-2
lines changed

5 files changed

+131
-2
lines changed

‎fs/lockd/Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
# Makefile for the linux lock manager stuff
44
#
55

6+
ccflags-y += -I$(src) # needed for trace events
7+
68
obj-$(CONFIG_LOCKD) += lockd.o
79

8-
lockd-objs-y := clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
9-
svcshare.o svcproc.o svcsubs.o mon.o xdr.o
10+
lockd-objs-y += clntlock.o clntproc.o clntxdr.o host.o svc.o svclock.o \
11+
svcshare.o svcproc.o svcsubs.o mon.o trace.o xdr.o
1012
lockd-objs-$(CONFIG_LOCKD_V4) += clnt4xdr.o xdr4.o svc4proc.o
1113
lockd-objs-$(CONFIG_PROC_FS) += procfs.o
1214
lockd-objs := $(lockd-objs-y)

‎fs/lockd/clntlock.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,12 @@
1414
#include <linux/nfs_fs.h>
1515
#include <linux/sunrpc/addr.h>
1616
#include <linux/sunrpc/svc.h>
17+
#include <linux/sunrpc/svc_xprt.h>
1718
#include <linux/lockd/lockd.h>
1819
#include <linux/kthread.h>
1920

21+
#include "trace.h"
22+
2023
#define NLMDBG_FACILITY NLMDBG_CLIENT
2124

2225
/*
@@ -186,6 +189,7 @@ __be32 nlmclnt_grant(const struct sockaddr *addr, const struct nlm_lock *lock)
186189
res = nlm_granted;
187190
}
188191
spin_unlock(&nlm_blocked_lock);
192+
trace_nlmclnt_grant(lock, addr, svc_addr_len(addr), res);
189193
return res;
190194
}
191195

‎fs/lockd/clntproc.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
#include <linux/sunrpc/svc.h>
2121
#include <linux/lockd/lockd.h>
2222

23+
#include "trace.h"
24+
2325
#define NLMDBG_FACILITY NLMDBG_CLIENT
2426
#define NLMCLNT_GRACE_WAIT (5*HZ)
2527
#define NLMCLNT_POLL_TIMEOUT (30*HZ)
@@ -451,6 +453,9 @@ nlmclnt_test(struct nlm_rqst *req, struct file_lock *fl)
451453
status = nlm_stat_to_errno(req->a_res.status);
452454
}
453455
out:
456+
trace_nlmclnt_test(&req->a_args.lock,
457+
(const struct sockaddr *)&req->a_host->h_addr,
458+
req->a_host->h_addrlen, req->a_res.status);
454459
nlmclnt_release_call(req);
455460
return status;
456461
}
@@ -605,10 +610,16 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
605610
else
606611
status = nlm_stat_to_errno(resp->status);
607612
out:
613+
trace_nlmclnt_lock(&req->a_args.lock,
614+
(const struct sockaddr *)&req->a_host->h_addr,
615+
req->a_host->h_addrlen, req->a_res.status);
608616
nlmclnt_release_call(req);
609617
return status;
610618
out_unlock:
611619
/* Fatal error: ensure that we remove the lock altogether */
620+
trace_nlmclnt_lock(&req->a_args.lock,
621+
(const struct sockaddr *)&req->a_host->h_addr,
622+
req->a_host->h_addrlen, req->a_res.status);
612623
dprintk("lockd: lock attempt ended in fatal error.\n"
613624
" Attempting to unlock.\n");
614625
fl_type = fl->fl_type;
@@ -704,6 +715,9 @@ nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)
704715
/* What to do now? I'm out of my depth... */
705716
status = -ENOLCK;
706717
out:
718+
trace_nlmclnt_unlock(&req->a_args.lock,
719+
(const struct sockaddr *)&req->a_host->h_addr,
720+
req->a_host->h_addrlen, req->a_res.status);
707721
nlmclnt_release_call(req);
708722
return status;
709723
}

‎fs/lockd/trace.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
#define CREATE_TRACE_POINTS
3+
#include "trace.h"

‎fs/lockd/trace.h

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
#undef TRACE_SYSTEM
3+
#define TRACE_SYSTEM lockd
4+
5+
#if !defined(_TRACE_LOCKD_H) || defined(TRACE_HEADER_MULTI_READ)
6+
#define _TRACE_LOCKD_H
7+
8+
#include <linux/tracepoint.h>
9+
#include <linux/crc32.h>
10+
#include <linux/nfs.h>
11+
#include <linux/lockd/lockd.h>
12+
13+
#ifdef CONFIG_LOCKD_V4
14+
#define NLM_STATUS_LIST \
15+
nlm_status_code(LCK_GRANTED) \
16+
nlm_status_code(LCK_DENIED) \
17+
nlm_status_code(LCK_DENIED_NOLOCKS) \
18+
nlm_status_code(LCK_BLOCKED) \
19+
nlm_status_code(LCK_DENIED_GRACE_PERIOD) \
20+
nlm_status_code(DEADLCK) \
21+
nlm_status_code(ROFS) \
22+
nlm_status_code(STALE_FH) \
23+
nlm_status_code(FBIG) \
24+
nlm_status_code_end(FAILED)
25+
#else
26+
#define NLM_STATUS_LIST \
27+
nlm_status_code(LCK_GRANTED) \
28+
nlm_status_code(LCK_DENIED) \
29+
nlm_status_code(LCK_DENIED_NOLOCKS) \
30+
nlm_status_code(LCK_BLOCKED) \
31+
nlm_status_code_end(LCK_DENIED_GRACE_PERIOD)
32+
#endif
33+
34+
#undef nlm_status_code
35+
#undef nlm_status_code_end
36+
#define nlm_status_code(x) TRACE_DEFINE_ENUM(NLM_##x);
37+
#define nlm_status_code_end(x) TRACE_DEFINE_ENUM(NLM_##x);
38+
39+
NLM_STATUS_LIST
40+
41+
#undef nlm_status_code
42+
#undef nlm_status_code_end
43+
#define nlm_status_code(x) { NLM_##x, #x },
44+
#define nlm_status_code_end(x) { NLM_##x, #x }
45+
46+
#define show_nlm_status(x) __print_symbolic(x, NLM_STATUS_LIST)
47+
48+
DECLARE_EVENT_CLASS(nlmclnt_lock_event,
49+
TP_PROTO(
50+
const struct nlm_lock *lock,
51+
const struct sockaddr *addr,
52+
unsigned int addrlen,
53+
__be32 status
54+
),
55+
56+
TP_ARGS(lock, addr, addrlen, status),
57+
58+
TP_STRUCT__entry(
59+
__field(u32, oh)
60+
__field(u32, svid)
61+
__field(u32, fh)
62+
__field(unsigned long, status)
63+
__field(u64, start)
64+
__field(u64, len)
65+
__sockaddr(addr, addrlen)
66+
),
67+
68+
TP_fast_assign(
69+
__entry->oh = ~crc32_le(0xffffffff, lock->oh.data, lock->oh.len);
70+
__entry->svid = lock->svid;
71+
__entry->fh = nfs_fhandle_hash(&lock->fh);
72+
__entry->start = lock->lock_start;
73+
__entry->len = lock->lock_len;
74+
__entry->status = be32_to_cpu(status);
75+
__assign_sockaddr(addr, addr, addrlen);
76+
),
77+
78+
TP_printk(
79+
"addr=%pISpc oh=0x%08x svid=0x%08x fh=0x%08x start=%llu len=%llu status=%s",
80+
__get_sockaddr(addr), __entry->oh, __entry->svid,
81+
__entry->fh, __entry->start, __entry->len,
82+
show_nlm_status(__entry->status)
83+
)
84+
);
85+
86+
#define DEFINE_NLMCLNT_EVENT(name) \
87+
DEFINE_EVENT(nlmclnt_lock_event, name, \
88+
TP_PROTO( \
89+
const struct nlm_lock *lock, \
90+
const struct sockaddr *addr, \
91+
unsigned int addrlen, \
92+
__be32 status \
93+
), \
94+
TP_ARGS(lock, addr, addrlen, status))
95+
96+
DEFINE_NLMCLNT_EVENT(nlmclnt_test);
97+
DEFINE_NLMCLNT_EVENT(nlmclnt_lock);
98+
DEFINE_NLMCLNT_EVENT(nlmclnt_unlock);
99+
DEFINE_NLMCLNT_EVENT(nlmclnt_grant);
100+
101+
#endif /* _TRACE_LOCKD_H */
102+
103+
#undef TRACE_INCLUDE_PATH
104+
#define TRACE_INCLUDE_PATH .
105+
#define TRACE_INCLUDE_FILE trace
106+
#include <trace/define_trace.h>

0 commit comments

Comments
 (0)