Skip to content

Commit 179e44d

Browse files
author
Steve French
committed
smb3: add tracepoint for sending lease break responses to server
Be able to log a ftrace message on success and/or failure of sending a lease break response to the server. Example output: TASK-PID CPU# |||| TIMESTAMP FUNCTION | | | |||| | | kworker/1:1-5681 [001] .... 11123.530457: smb3_lease_done: sid=0x291e3e0f tid=0x8ba43071 lease_key=0x1852ca0d3ecd9b55847750a86716fde lease_state=0x0 Signed-off-by: Steve French <stfrench@microsoft.com> Reviewed-by: Aurelien Aptel <aaptel@suse.com>
1 parent 9b9c5be commit 179e44d

File tree

2 files changed

+88
-1
lines changed

2 files changed

+88
-1
lines changed

‎fs/cifs/smb2pdu.c

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4277,6 +4277,8 @@ SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
42774277
struct kvec iov[1];
42784278
struct kvec rsp_iov;
42794279
int resp_buf_type;
4280+
__u64 *please_key_high;
4281+
__u64 *please_key_low;
42804282

42814283
cifs_dbg(FYI, "SMB2_lease_break\n");
42824284
rc = smb2_plain_req_init(SMB2_OPLOCK_BREAK, tcon, (void **) &req,
@@ -4306,10 +4308,16 @@ SMB2_lease_break(const unsigned int xid, struct cifs_tcon *tcon,
43064308
rc = cifs_send_recv(xid, ses, &rqst, &resp_buf_type, flags, &rsp_iov);
43074309
cifs_small_buf_release(req);
43084310

4311+
please_key_low = (__u64 *)req->LeaseKey;
4312+
please_key_high = (__u64 *)(req->LeaseKey+8);
43094313
if (rc) {
43104314
cifs_stats_fail_inc(tcon, SMB2_OPLOCK_BREAK_HE);
4315+
trace_smb3_lease_err(le32_to_cpu(lease_state), tcon->tid,
4316+
ses->Suid, *please_key_low, *please_key_high, rc);
43114317
cifs_dbg(FYI, "Send error in Lease Break = %d\n", rc);
4312-
}
4318+
} else
4319+
trace_smb3_lease_done(le32_to_cpu(lease_state), tcon->tid,
4320+
ses->Suid, *please_key_low, *please_key_high);
43134321

43144322
return rc;
43154323
}

‎fs/cifs/trace.h

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -460,6 +460,85 @@ DEFINE_EVENT(smb3_open_done_class, smb3_##name, \
460460
DEFINE_SMB3_OPEN_DONE_EVENT(open_done);
461461
DEFINE_SMB3_OPEN_DONE_EVENT(posix_mkdir_done);
462462

463+
464+
DECLARE_EVENT_CLASS(smb3_lease_done_class,
465+
TP_PROTO(__u32 lease_state,
466+
__u32 tid,
467+
__u64 sesid,
468+
__u64 lease_key_low,
469+
__u64 lease_key_high),
470+
TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high),
471+
TP_STRUCT__entry(
472+
__field(__u32, lease_state)
473+
__field(__u32, tid)
474+
__field(__u64, sesid)
475+
__field(__u64, lease_key_low)
476+
__field(__u64, lease_key_high)
477+
),
478+
TP_fast_assign(
479+
__entry->lease_state = lease_state;
480+
__entry->tid = tid;
481+
__entry->sesid = sesid;
482+
__entry->lease_key_low = lease_key_low;
483+
__entry->lease_key_high = lease_key_high;
484+
),
485+
TP_printk("sid=0x%llx tid=0x%x lease_key=0x%llx%llx lease_state=0x%x",
486+
__entry->sesid, __entry->tid, __entry->lease_key_high,
487+
__entry->lease_key_low, __entry->lease_state)
488+
)
489+
490+
#define DEFINE_SMB3_LEASE_DONE_EVENT(name) \
491+
DEFINE_EVENT(smb3_lease_done_class, smb3_##name, \
492+
TP_PROTO(__u32 lease_state, \
493+
__u32 tid, \
494+
__u64 sesid, \
495+
__u64 lease_key_low, \
496+
__u64 lease_key_high), \
497+
TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high))
498+
499+
DEFINE_SMB3_LEASE_DONE_EVENT(lease_done);
500+
501+
DECLARE_EVENT_CLASS(smb3_lease_err_class,
502+
TP_PROTO(__u32 lease_state,
503+
__u32 tid,
504+
__u64 sesid,
505+
__u64 lease_key_low,
506+
__u64 lease_key_high,
507+
int rc),
508+
TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high, rc),
509+
TP_STRUCT__entry(
510+
__field(__u32, lease_state)
511+
__field(__u32, tid)
512+
__field(__u64, sesid)
513+
__field(__u64, lease_key_low)
514+
__field(__u64, lease_key_high)
515+
__field(int, rc)
516+
),
517+
TP_fast_assign(
518+
__entry->lease_state = lease_state;
519+
__entry->tid = tid;
520+
__entry->sesid = sesid;
521+
__entry->lease_key_low = lease_key_low;
522+
__entry->lease_key_high = lease_key_high;
523+
__entry->rc = rc;
524+
),
525+
TP_printk("sid=0x%llx tid=0x%x lease_key=0x%llx%llx lease_state=0x%x rc=%d",
526+
__entry->sesid, __entry->tid, __entry->lease_key_high,
527+
__entry->lease_key_low, __entry->lease_state, __entry->rc)
528+
)
529+
530+
#define DEFINE_SMB3_LEASE_ERR_EVENT(name) \
531+
DEFINE_EVENT(smb3_lease_err_class, smb3_##name, \
532+
TP_PROTO(__u32 lease_state, \
533+
__u32 tid, \
534+
__u64 sesid, \
535+
__u64 lease_key_low, \
536+
__u64 lease_key_high, \
537+
int rc), \
538+
TP_ARGS(lease_state, tid, sesid, lease_key_low, lease_key_high, rc))
539+
540+
DEFINE_SMB3_LEASE_ERR_EVENT(lease_err);
541+
463542
DECLARE_EVENT_CLASS(smb3_reconnect_class,
464543
TP_PROTO(__u64 currmid,
465544
char *hostname),

0 commit comments

Comments
 (0)