Skip to content

Commit 110cb2d

Browse files
chuckleverTrond Myklebust
authored andcommitted
NFS: Instrument i_size_write()
Generate a trace event whenever the NFS client modifies the size of a file. These new events aid troubleshooting workloads that trigger races around size updates. There are four new trace points, all named nfs_size_something so they are easy to grep for or enable as a group with a single glob. Size updated on the server: kworker/u24:10-194 [010] 369.939174: nfs_size_update: fileid=00:28:2 fhandle=0x36fbbe51 version=1752899344277980615 cursize=250471 newsize=172083 Server-side size update reported via NFSv3 WCC attributes: fsx-1387 [006] 380.760686: nfs_size_wcc: fileid=00:28:2 fhandle=0x36fbbe51 version=1752899355909932456 cursize=146792 newsize=171216 File has been truncated locally: fsx-1387 [007] 369.437421: nfs_size_truncate: fileid=00:28:2 fhandle=0x36fbbe51 version=1752899231200117272 cursize=215244 newsize=0 File has been extended locally: fsx-1387 [007] 369.439213: nfs_size_grow: fileid=00:28:2 fhandle=0x36fbbe51 version=1752899343704248410 cursize=258048 newsize=262144 Signed-off-by: Chuck Lever <[email protected]> Signed-off-by: Trond Myklebust <[email protected]>
1 parent 0392dd5 commit 110cb2d

File tree

3 files changed

+54
-6
lines changed

3 files changed

+54
-6
lines changed

fs/nfs/inode.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@ static int nfs_vmtruncate(struct inode * inode, loff_t offset)
671671
if (err)
672672
goto out;
673673

674+
trace_nfs_size_truncate(inode, offset);
674675
i_size_write(inode, offset);
675676
/* Optimisation */
676677
if (offset == 0)
@@ -1456,6 +1457,7 @@ static void nfs_wcc_update_inode(struct inode *inode, struct nfs_fattr *fattr)
14561457
&& (fattr->valid & NFS_ATTR_FATTR_SIZE)
14571458
&& i_size_read(inode) == nfs_size_to_loff_t(fattr->pre_size)
14581459
&& !nfs_have_writebacks(inode)) {
1460+
trace_nfs_size_wcc(inode, fattr->size);
14591461
i_size_write(inode, nfs_size_to_loff_t(fattr->size));
14601462
}
14611463
}
@@ -2100,16 +2102,11 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
21002102
/* Do we perhaps have any outstanding writes, or has
21012103
* the file grown beyond our last write? */
21022104
if (!nfs_have_writebacks(inode) || new_isize > cur_isize) {
2105+
trace_nfs_size_update(inode, new_isize);
21032106
i_size_write(inode, new_isize);
21042107
if (!have_writers)
21052108
invalid |= NFS_INO_INVALID_DATA;
21062109
}
2107-
dprintk("NFS: isize change on server for file %s/%ld "
2108-
"(%Ld to %Ld)\n",
2109-
inode->i_sb->s_id,
2110-
inode->i_ino,
2111-
(long long)cur_isize,
2112-
(long long)new_isize);
21132110
}
21142111
if (new_isize == 0 &&
21152112
!(fattr->valid & (NFS_ATTR_FATTR_SPACE_USED |

fs/nfs/nfstrace.h

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,56 @@ TRACE_EVENT(nfs_access_exit,
231231
)
232232
);
233233

234+
DECLARE_EVENT_CLASS(nfs_update_size_class,
235+
TP_PROTO(
236+
const struct inode *inode,
237+
loff_t new_size
238+
),
239+
240+
TP_ARGS(inode, new_size),
241+
242+
TP_STRUCT__entry(
243+
__field(dev_t, dev)
244+
__field(u32, fhandle)
245+
__field(u64, fileid)
246+
__field(u64, version)
247+
__field(loff_t, cur_size)
248+
__field(loff_t, new_size)
249+
),
250+
251+
TP_fast_assign(
252+
const struct nfs_inode *nfsi = NFS_I(inode);
253+
254+
__entry->dev = inode->i_sb->s_dev;
255+
__entry->fhandle = nfs_fhandle_hash(&nfsi->fh);
256+
__entry->fileid = nfsi->fileid;
257+
__entry->version = inode_peek_iversion_raw(inode);
258+
__entry->cur_size = i_size_read(inode);
259+
__entry->new_size = new_size;
260+
),
261+
262+
TP_printk(
263+
"fileid=%02x:%02x:%llu fhandle=0x%08x version=%llu cursize=%lld newsize=%lld",
264+
MAJOR(__entry->dev), MINOR(__entry->dev),
265+
(unsigned long long)__entry->fileid,
266+
__entry->fhandle, __entry->version,
267+
__entry->cur_size, __entry->new_size
268+
)
269+
);
270+
271+
#define DEFINE_NFS_UPDATE_SIZE_EVENT(name) \
272+
DEFINE_EVENT(nfs_update_size_class, nfs_size_##name, \
273+
TP_PROTO( \
274+
const struct inode *inode, \
275+
loff_t new_size \
276+
), \
277+
TP_ARGS(inode, new_size))
278+
279+
DEFINE_NFS_UPDATE_SIZE_EVENT(truncate);
280+
DEFINE_NFS_UPDATE_SIZE_EVENT(wcc);
281+
DEFINE_NFS_UPDATE_SIZE_EVENT(update);
282+
DEFINE_NFS_UPDATE_SIZE_EVENT(grow);
283+
234284
#define show_lookup_flags(flags) \
235285
__print_flags(flags, "|", \
236286
{ LOOKUP_FOLLOW, "FOLLOW" }, \

fs/nfs/write.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ static void nfs_grow_file(struct page *page, unsigned int offset, unsigned int c
288288
end = page_file_offset(page) + ((loff_t)offset+count);
289289
if (i_size >= end)
290290
goto out;
291+
trace_nfs_size_grow(inode, end);
291292
i_size_write(inode, end);
292293
NFS_I(inode)->cache_validity &= ~NFS_INO_INVALID_SIZE;
293294
nfs_inc_stats(inode, NFSIOS_EXTENDWRITE);

0 commit comments

Comments
 (0)