Skip to content

Commit abce659

Browse files
bharathsm-mssmfrench
authored andcommitted
smb: client: add tracepoints for deferred handle caching
Add tracepoints to observe handle caching behavior. smb3_open_cached: emitted when an open reuses a cached handle from a previous deferred close, avoiding a network round-trip smb3_close_cached: emitted when a close is deferred (handle cached for potential reuse by subsequent opens) Signed-off-by: Bharath SM <bharathsm@microsoft.com> Signed-off-by: Steve French <stfrench@microsoft.com>
1 parent 4c46b67 commit abce659

2 files changed

Lines changed: 59 additions & 0 deletions

File tree

fs/smb/client/file.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1083,6 +1083,9 @@ int cifs_open(struct inode *inode, struct file *file)
10831083
rc = cfile ? 0 : -ENOENT;
10841084
}
10851085
if (rc == 0) {
1086+
trace_smb3_open_cached(xid, tcon->tid, tcon->ses->Suid,
1087+
cfile->fid.persistent_fid,
1088+
file->f_flags, cfile->f_flags);
10861089
file->private_data = cfile;
10871090
spin_lock(&CIFS_I(inode)->deferred_lock);
10881091
cifs_del_deferred_close(cfile);
@@ -1442,6 +1445,7 @@ int cifs_close(struct inode *inode, struct file *file)
14421445
struct cifsInodeInfo *cinode = CIFS_I(inode);
14431446
struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb);
14441447
struct cifs_deferred_close *dclose;
1448+
struct cifs_tcon *tcon;
14451449

14461450
cifs_fscache_unuse_inode_cookie(inode, file->f_mode & FMODE_WRITE);
14471451

@@ -1468,6 +1472,10 @@ int cifs_close(struct inode *inode, struct file *file)
14681472
cifsFileInfo_get(cfile);
14691473
} else {
14701474
/* Deferred close for files */
1475+
tcon = tlink_tcon(cfile->tlink);
1476+
trace_smb3_close_cached(tcon->tid, tcon->ses->Suid,
1477+
cfile->fid.persistent_fid,
1478+
cifs_sb->ctx->closetimeo);
14711479
queue_delayed_work(deferredclose_wq,
14721480
&cfile->deferred, cifs_sb->ctx->closetimeo);
14731481
cfile->deferred_close_scheduled = true;

fs/smb/client/trace.h

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1361,6 +1361,57 @@ DEFINE_EVENT(smb3_open_done_class, smb3_##name, \
13611361
DEFINE_SMB3_OPEN_DONE_EVENT(open_done);
13621362
DEFINE_SMB3_OPEN_DONE_EVENT(posix_mkdir_done);
13631363

1364+
TRACE_EVENT(smb3_open_cached,
1365+
TP_PROTO(unsigned int xid,
1366+
__u32 tid,
1367+
__u64 sesid,
1368+
__u64 fid,
1369+
unsigned int oflags,
1370+
unsigned int cflags),
1371+
TP_ARGS(xid, tid, sesid, fid, oflags, cflags),
1372+
TP_STRUCT__entry(
1373+
__field(unsigned int, xid)
1374+
__field(__u32, tid)
1375+
__field(__u64, sesid)
1376+
__field(__u64, fid)
1377+
__field(unsigned int, oflags)
1378+
__field(unsigned int, cflags)
1379+
),
1380+
TP_fast_assign(
1381+
__entry->xid = xid;
1382+
__entry->tid = tid;
1383+
__entry->sesid = sesid;
1384+
__entry->fid = fid;
1385+
__entry->oflags = oflags;
1386+
__entry->cflags = cflags;
1387+
),
1388+
TP_printk("xid=%u sid=0x%llx tid=0x%x fid=0x%llx oflags=0x%x cflags=0x%x",
1389+
__entry->xid, __entry->sesid, __entry->tid, __entry->fid,
1390+
__entry->oflags, __entry->cflags)
1391+
);
1392+
1393+
TRACE_EVENT(smb3_close_cached,
1394+
TP_PROTO(__u32 tid,
1395+
__u64 sesid,
1396+
__u64 fid,
1397+
unsigned long delay_jiffies),
1398+
TP_ARGS(tid, sesid, fid, delay_jiffies),
1399+
TP_STRUCT__entry(
1400+
__field(__u32, tid)
1401+
__field(__u64, sesid)
1402+
__field(__u64, fid)
1403+
__field(unsigned long, delay_jiffies)
1404+
),
1405+
TP_fast_assign(
1406+
__entry->tid = tid;
1407+
__entry->sesid = sesid;
1408+
__entry->fid = fid;
1409+
__entry->delay_jiffies = delay_jiffies;
1410+
),
1411+
TP_printk("sid=0x%llx tid=0x%x fid=0x%llx delay_jiffies=%lu",
1412+
__entry->sesid, __entry->tid, __entry->fid, __entry->delay_jiffies)
1413+
);
1414+
13641415

13651416
DECLARE_EVENT_CLASS(smb3_lease_done_class,
13661417
TP_PROTO(__u32 lease_state,

0 commit comments

Comments
 (0)