| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <176169812119.1426649.12984974079694194172.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 17:56:42 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: djwong@...nel.org, miklos@...redi.hu
Cc: joannelkoong@...il.com, bernd@...ernd.com, neal@...pa.dev,
linux-ext4@...r.kernel.org, linux-fsdevel@...r.kernel.org
Subject: [PATCH 02/10] fuse_trace: cache iomaps
From: Darrick J. Wong <djwong@...nel.org>
Add tracepoints for the previous patch.
Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
fs/fuse/fuse_trace.h | 295 +++++++++++++++++++++++++++++++++++++++++++++++++
fs/fuse/iomap_cache.c | 31 +++++
2 files changed, 325 insertions(+), 1 deletion(-)
diff --git a/fs/fuse/fuse_trace.h b/fs/fuse/fuse_trace.h
index c4bf5a70594cf6..f6c0ff37e7d570 100644
--- a/fs/fuse/fuse_trace.h
+++ b/fs/fuse/fuse_trace.h
@@ -315,6 +315,8 @@ DEFINE_FUSE_BACKING_EVENT(fuse_backing_close);
struct iomap_writepage_ctx;
struct iomap_ioend;
struct iomap;
+struct fuse_iext_cursor;
+struct fuse_iomap_lookup;
/* tracepoint boilerplate so we don't have to keep doing this */
#define FUSE_IOMAP_OPFLAGS_FIELD \
@@ -345,6 +347,16 @@ struct iomap;
__entry->prefix##addr, \
__print_flags(__entry->prefix##flags, "|", FUSE_IOMAP_F_STRINGS)
+#define FUSE_IOMAP_IODIR_FIELD \
+ __field(enum fuse_iomap_iodir, iodir)
+
+#define FUSE_IOMAP_IODIR_FMT \
+ " iodir %s"
+
+#define FUSE_IOMAP_IODIR_PRINTK_ARGS \
+ __print_symbolic(__entry->iodir, FUSE_IOMAP_FORK_STRINGS)
+
+
/* combinations of boilerplate to reduce typing further */
#define FUSE_IOMAP_OP_FIELDS(prefix) \
FUSE_INODE_FIELDS \
@@ -416,6 +428,7 @@ TRACE_DEFINE_ENUM(FUSE_I_CACHE_IO_MODE);
TRACE_DEFINE_ENUM(FUSE_I_EXCLUSIVE);
TRACE_DEFINE_ENUM(FUSE_I_IOMAP);
TRACE_DEFINE_ENUM(FUSE_I_ATOMIC);
+TRACE_DEFINE_ENUM(FUSE_I_IOMAP_CACHE);
#define FUSE_IFLAG_STRINGS \
{ 1 << FUSE_I_ADVISE_RDPLUS, "advise_rdplus" }, \
@@ -426,7 +439,8 @@ TRACE_DEFINE_ENUM(FUSE_I_ATOMIC);
{ 1 << FUSE_I_CACHE_IO_MODE, "cacheio" }, \
{ 1 << FUSE_I_EXCLUSIVE, "excl" }, \
{ 1 << FUSE_I_IOMAP, "iomap" }, \
- { 1 << FUSE_I_ATOMIC, "atomic" }
+ { 1 << FUSE_I_ATOMIC, "atomic" }, \
+ { 1 << FUSE_I_IOMAP_CACHE, "iomap_cache" }
#define IOMAP_IOEND_STRINGS \
{ IOMAP_IOEND_SHARED, "shared" }, \
@@ -442,6 +456,22 @@ TRACE_DEFINE_ENUM(FUSE_I_ATOMIC);
{ FUSE_IOMAP_CONFIG_TIME, "time" }, \
{ FUSE_IOMAP_CONFIG_MAXBYTES, "maxbytes" }
+TRACE_DEFINE_ENUM(READ_MAPPING);
+TRACE_DEFINE_ENUM(WRITE_MAPPING);
+
+#define FUSE_IOMAP_FORK_STRINGS \
+ { READ_MAPPING, "read" }, \
+ { WRITE_MAPPING, "write" }
+
+#define FUSE_IEXT_STATE_STRINGS \
+ { FUSE_IEXT_LEFT_CONTIG, "l_cont" }, \
+ { FUSE_IEXT_RIGHT_CONTIG, "r_cont" }, \
+ { FUSE_IEXT_LEFT_FILLING, "l_fill" }, \
+ { FUSE_IEXT_RIGHT_FILLING, "r_fill" }, \
+ { FUSE_IEXT_LEFT_VALID, "l_valid" }, \
+ { FUSE_IEXT_RIGHT_VALID, "r_valid" }, \
+ { FUSE_IEXT_WRITE_MAPPING, "write" }
+
DECLARE_EVENT_CLASS(fuse_iomap_check_class,
TP_PROTO(const char *func, int line, const char *condition),
@@ -1181,6 +1211,269 @@ DEFINE_FUSE_IOMAP_INLINE_EVENT(fuse_iomap_inline_read);
DEFINE_FUSE_IOMAP_INLINE_EVENT(fuse_iomap_inline_write);
DEFINE_FUSE_IOMAP_INLINE_EVENT(fuse_iomap_set_inline_iomap);
DEFINE_FUSE_IOMAP_INLINE_EVENT(fuse_iomap_set_inline_srcmap);
+
+DECLARE_EVENT_CLASS(fuse_iext_class,
+ TP_PROTO(const struct inode *inode, const struct fuse_iext_cursor *cur,
+ int state, unsigned long caller_ip),
+
+ TP_ARGS(inode, cur, state, caller_ip),
+
+ TP_STRUCT__entry(
+ FUSE_INODE_FIELDS
+ FUSE_IOMAP_MAP_FIELDS(map)
+ __field(void *, leaf)
+ __field(int, pos)
+ __field(int, iext_state)
+ __field(unsigned long, caller_ip)
+ ),
+ TP_fast_assign(
+ const struct fuse_ifork *ifp;
+ struct fuse_iomap_io r = { };
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+
+ if (state & FUSE_IEXT_WRITE_MAPPING)
+ ifp = fi->cache.im_write;
+ else
+ ifp = &fi->cache.im_read;
+ if (ifp)
+ fuse_iext_get_extent(ifp, cur, &r);
+
+ __entry->mapoffset = r.offset;
+ __entry->mapaddr = r.addr;
+ __entry->maplength = r.length;
+ __entry->mapdev = r.dev;
+ __entry->maptype = r.type;
+ __entry->mapflags = r.flags;
+
+ __entry->leaf = cur->leaf;
+ __entry->pos = cur->pos;
+
+ __entry->iext_state = state;
+ __entry->caller_ip = caller_ip;
+ ),
+ TP_printk(FUSE_INODE_FMT " state (%s) cur %p/%d " FUSE_IOMAP_MAP_FMT() " caller %pS",
+ FUSE_INODE_PRINTK_ARGS,
+ __print_flags(__entry->iext_state, "|", FUSE_IEXT_STATE_STRINGS),
+ __entry->leaf,
+ __entry->pos,
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map),
+ (void *)__entry->caller_ip)
+)
+
+#define DEFINE_IEXT_EVENT(name) \
+DEFINE_EVENT(fuse_iext_class, name, \
+ TP_PROTO(const struct inode *inode, const struct fuse_iext_cursor *cur, \
+ int state, unsigned long caller_ip), \
+ TP_ARGS(inode, cur, state, caller_ip))
+DEFINE_IEXT_EVENT(fuse_iext_insert);
+DEFINE_IEXT_EVENT(fuse_iext_remove);
+DEFINE_IEXT_EVENT(fuse_iext_pre_update);
+DEFINE_IEXT_EVENT(fuse_iext_post_update);
+
+TRACE_EVENT(fuse_iext_update_class,
+ TP_PROTO(const struct inode *inode, uint32_t iext_state,
+ const struct fuse_iomap_io *map),
+ TP_ARGS(inode, iext_state, map),
+
+ TP_STRUCT__entry(
+ FUSE_INODE_FIELDS
+ FUSE_IOMAP_MAP_FIELDS(map)
+ __field(uint32_t, iext_state)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->mapoffset = map->offset;
+ __entry->maplength = map->length;
+ __entry->maptype = map->type;
+ __entry->mapflags = map->flags;
+ __entry->mapdev = map->dev;
+ __entry->mapaddr = map->addr;
+
+ __entry->iext_state = iext_state;
+ ),
+
+ TP_printk(FUSE_INODE_FMT " state (%s)" FUSE_IOMAP_MAP_FMT(),
+ FUSE_INODE_PRINTK_ARGS,
+ __print_flags(__entry->iext_state, "|", FUSE_IEXT_STATE_STRINGS),
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map))
+);
+#define DEFINE_IEXT_UPDATE_EVENT(name) \
+DEFINE_EVENT(fuse_iext_update_class, name, \
+ TP_PROTO(const struct inode *inode, uint32_t iext_state, \
+ const struct fuse_iomap_io *map), \
+ TP_ARGS(inode, iext_state, map))
+DEFINE_IEXT_UPDATE_EVENT(fuse_iext_del_mapping);
+DEFINE_IEXT_UPDATE_EVENT(fuse_iext_add_mapping);
+
+TRACE_EVENT(fuse_iext_alt_update_class,
+ TP_PROTO(const struct inode *inode, const struct fuse_iomap_io *map),
+ TP_ARGS(inode, map),
+
+ TP_STRUCT__entry(
+ FUSE_INODE_FIELDS
+ FUSE_IOMAP_MAP_FIELDS(map)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+
+ __entry->mapoffset = map->offset;
+ __entry->maplength = map->length;
+ __entry->maptype = map->type;
+ __entry->mapflags = map->flags;
+ __entry->mapdev = map->dev;
+ __entry->mapaddr = map->addr;
+ ),
+
+ TP_printk(FUSE_INODE_FMT FUSE_IOMAP_MAP_FMT(),
+ FUSE_INODE_PRINTK_ARGS,
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map))
+);
+#define DEFINE_IEXT_ALT_UPDATE_EVENT(name) \
+DEFINE_EVENT(fuse_iext_alt_update_class, name, \
+ TP_PROTO(const struct inode *inode, const struct fuse_iomap_io *map), \
+ TP_ARGS(inode, map))
+DEFINE_IEXT_ALT_UPDATE_EVENT(fuse_iext_del_mapping_got);
+DEFINE_IEXT_ALT_UPDATE_EVENT(fuse_iext_add_mapping_left);
+DEFINE_IEXT_ALT_UPDATE_EVENT(fuse_iext_add_mapping_right);
+
+TRACE_EVENT(fuse_iomap_cache_remove,
+ TP_PROTO(const struct inode *inode, enum fuse_iomap_iodir iodir,
+ loff_t offset, uint64_t length, unsigned long caller_ip),
+ TP_ARGS(inode, iodir, offset, length, caller_ip),
+
+ TP_STRUCT__entry(
+ FUSE_IO_RANGE_FIELDS()
+ FUSE_IOMAP_IODIR_FIELD
+ __field(unsigned long, caller_ip)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->iodir = iodir;
+ __entry->offset = offset;
+ __entry->length = length;
+ __entry->caller_ip = caller_ip;
+ ),
+
+ TP_printk(FUSE_IO_RANGE_FMT() FUSE_IOMAP_IODIR_FMT " caller %pS",
+ FUSE_IO_RANGE_PRINTK_ARGS(),
+ FUSE_IOMAP_IODIR_PRINTK_ARGS,
+ (void *)__entry->caller_ip)
+);
+
+TRACE_EVENT(fuse_iomap_cached_mapping_class,
+ TP_PROTO(const struct inode *inode, enum fuse_iomap_iodir iodir,
+ const struct fuse_iomap_io *map, unsigned long caller_ip),
+ TP_ARGS(inode, iodir, map, caller_ip),
+
+ TP_STRUCT__entry(
+ FUSE_INODE_FIELDS
+ FUSE_IOMAP_IODIR_FIELD
+ FUSE_IOMAP_MAP_FIELDS(map)
+ __field(unsigned long, caller_ip)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->iodir = iodir;
+
+ __entry->mapoffset = map->offset;
+ __entry->maplength = map->length;
+ __entry->maptype = map->type;
+ __entry->mapflags = map->flags;
+ __entry->mapdev = map->dev;
+ __entry->mapaddr = map->addr;
+
+ __entry->caller_ip = caller_ip;
+ ),
+
+ TP_printk(FUSE_INODE_FMT FUSE_IOMAP_IODIR_FMT FUSE_IOMAP_MAP_FMT() " caller %pS",
+ FUSE_INODE_PRINTK_ARGS,
+ FUSE_IOMAP_IODIR_PRINTK_ARGS,
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map),
+ (void *)__entry->caller_ip)
+);
+#define DEFINE_FUSE_IOMAP_CACHED_MAPPING_EVENT(name) \
+DEFINE_EVENT(fuse_iomap_cached_mapping_class, name, \
+ TP_PROTO(const struct inode *inode, enum fuse_iomap_iodir iodir, \
+ const struct fuse_iomap_io *map, unsigned long caller_ip), \
+ TP_ARGS(inode, iodir, map, caller_ip))
+DEFINE_FUSE_IOMAP_CACHED_MAPPING_EVENT(fuse_iomap_cache_add);
+DEFINE_FUSE_IOMAP_CACHED_MAPPING_EVENT(fuse_iext_check_mapping);
+
+TRACE_EVENT(fuse_iomap_cache_lookup,
+ TP_PROTO(const struct inode *inode, enum fuse_iomap_iodir iodir,
+ loff_t pos, uint64_t count, unsigned long caller_ip),
+ TP_ARGS(inode, iodir, pos, count, caller_ip),
+
+ TP_STRUCT__entry(
+ FUSE_IO_RANGE_FIELDS()
+ FUSE_IOMAP_IODIR_FIELD
+ __field(unsigned long, caller_ip)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->iodir = iodir;
+ __entry->offset = pos;
+ __entry->length = count;
+ __entry->caller_ip = caller_ip;
+ ),
+
+ TP_printk(FUSE_IO_RANGE_FMT() FUSE_IOMAP_IODIR_FMT " caller %pS",
+ FUSE_IO_RANGE_PRINTK_ARGS(),
+ FUSE_IOMAP_IODIR_PRINTK_ARGS,
+ (void *)__entry->caller_ip)
+);
+
+TRACE_EVENT(fuse_iomap_cache_lookup_result,
+ TP_PROTO(const struct inode *inode, enum fuse_iomap_iodir iodir,
+ loff_t pos, uint64_t count, const struct fuse_iomap_io *got,
+ const struct fuse_iomap_lookup *map),
+ TP_ARGS(inode, iodir, pos, count, got, map),
+
+ TP_STRUCT__entry(
+ FUSE_IO_RANGE_FIELDS()
+
+ FUSE_IOMAP_MAP_FIELDS(got)
+ FUSE_IOMAP_MAP_FIELDS(map)
+
+ FUSE_IOMAP_IODIR_FIELD
+ __field(uint64_t, validity_cookie)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->iodir = iodir;
+ __entry->offset = pos;
+ __entry->length = count;
+
+ __entry->gotoffset = got->offset;
+ __entry->gotlength = got->length;
+ __entry->gottype = got->type;
+ __entry->gotflags = got->flags;
+ __entry->gotdev = got->dev;
+ __entry->gotaddr = got->addr;
+
+ __entry->mapoffset = map->map.offset;
+ __entry->maplength = map->map.length;
+ __entry->maptype = map->map.type;
+ __entry->mapflags = map->map.flags;
+ __entry->mapdev = map->map.dev;
+ __entry->mapaddr = map->map.addr;
+
+ __entry->validity_cookie= map->validity_cookie;
+ ),
+
+ TP_printk(FUSE_IO_RANGE_FMT() FUSE_IOMAP_IODIR_FMT FUSE_IOMAP_MAP_FMT("map") FUSE_IOMAP_MAP_FMT("got") " cookie 0x%llx",
+ FUSE_IO_RANGE_PRINTK_ARGS(),
+ FUSE_IOMAP_IODIR_PRINTK_ARGS,
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map),
+ FUSE_IOMAP_MAP_PRINTK_ARGS(got),
+ __entry->validity_cookie)
+);
#endif /* CONFIG_FUSE_IOMAP */
#endif /* _TRACE_FUSE_H */
diff --git a/fs/fuse/iomap_cache.c b/fs/fuse/iomap_cache.c
index d1b0b545b1185e..24888f3db7858d 100644
--- a/fs/fuse/iomap_cache.c
+++ b/fs/fuse/iomap_cache.c
@@ -717,6 +717,7 @@ fuse_iext_insert(
struct fuse_ifork *ifp = fuse_iext_state_to_fork(ip, state);
fuse_iext_insert_raw(ip, ifp, cur, irec);
+ trace_fuse_iext_insert(VFS_I(ip), cur, state, _RET_IP_);
}
static struct fuse_iext_node *
@@ -920,6 +921,8 @@ fuse_iext_remove(
loff_t offset = fuse_iext_leaf_key(leaf, 0);
int i, nr_entries;
+ trace_fuse_iext_remove(VFS_I(ip), cur, state, _RET_IP_);
+
ASSERT(ifp->if_height > 0);
ASSERT(ifp->if_data != NULL);
ASSERT(fuse_iext_valid(ifp, cur));
@@ -1042,7 +1045,9 @@ fuse_iext_update_extent(
}
}
+ trace_fuse_iext_pre_update(VFS_I(ip), cur, state, _RET_IP_);
fuse_iext_set(cur_rec(cur), new);
+ trace_fuse_iext_post_update(VFS_I(ip), cur, state, _RET_IP_);
}
/*
@@ -1150,17 +1155,25 @@ static void fuse_iext_check_mappings(struct inode *inode,
struct fuse_iext_cursor icur;
struct fuse_iomap_io prev, got;
unsigned long long nr = 0;
+ enum fuse_iomap_iodir iodir;
if (!ifp || !static_branch_unlikely(&fuse_iomap_debug))
return;
+ if (ifp == ip->im_write)
+ iodir = WRITE_MAPPING;
+ else
+ iodir = READ_MAPPING;
+
fuse_iext_first(ifp, &icur);
if (!fuse_iext_get_extent(ifp, &icur, &prev))
return;
+ trace_fuse_iext_check_mapping(inode, iodir, &prev, _RET_IP_);
nr++;
fuse_iext_next(ifp, &icur);
while (fuse_iext_get_extent(ifp, &icur, &got)) {
+ trace_fuse_iext_check_mapping(inode, iodir, &got, _RET_IP_);
if (got.length == 0 ||
got.offset < prev.offset + prev.length ||
fuse_iomap_can_merge(&prev, &got)) {
@@ -1219,6 +1232,9 @@ fuse_iext_del_mapping(
if (got_endoff == del_endoff)
state |= FUSE_IEXT_RIGHT_FILLING;
+ trace_fuse_iext_del_mapping(VFS_I(ip), state, del);
+ trace_fuse_iext_del_mapping_got(VFS_I(ip), got);
+
switch (state & (FUSE_IEXT_LEFT_FILLING | FUSE_IEXT_RIGHT_FILLING)) {
case FUSE_IEXT_LEFT_FILLING | FUSE_IEXT_RIGHT_FILLING:
/*
@@ -1283,6 +1299,8 @@ fuse_iomap_cache_remove(
assert_cache_locked(ip);
+ trace_fuse_iomap_cache_remove(inode, iodir, start, len, _RET_IP_);
+
if (!ifp || fuse_iext_count(ifp) == 0)
return 0;
@@ -1427,6 +1445,12 @@ fuse_iext_add_mapping(
fuse_iomap_can_merge3(&left, new, &right)))
state |= FUSE_IEXT_RIGHT_CONTIG;
+ trace_fuse_iext_add_mapping(VFS_I(ip), state, new);
+ if (state & FUSE_IEXT_LEFT_VALID)
+ trace_fuse_iext_add_mapping_left(VFS_I(ip), &left);
+ if (state & FUSE_IEXT_RIGHT_VALID)
+ trace_fuse_iext_add_mapping_right(VFS_I(ip), &right);
+
/*
* Select which case we're in here, and implement it.
*/
@@ -1495,6 +1519,8 @@ fuse_iomap_cache_add(
ASSERT(new->length > 0);
ASSERT(new->offset < inode->i_sb->s_maxbytes);
+ trace_fuse_iomap_cache_add(inode, iodir, new, _RET_IP_);
+
if (!ifp) {
ifp = kzalloc(sizeof(struct fuse_ifork),
GFP_KERNEL | __GFP_NOFAIL);
@@ -1599,6 +1625,8 @@ fuse_iomap_cache_lookup(
assert_cache_locked_shared(ip);
+ trace_fuse_iomap_cache_lookup(inode, iodir, off, len, _RET_IP_);
+
if (!ifp) {
/*
* No write fork at all means this filesystem doesn't do out of
@@ -1625,5 +1653,8 @@ fuse_iomap_cache_lookup(
/* Found a mapping in the cache, return it */
fuse_iomap_trim(fi, mval, &got, off, len);
+
+ trace_fuse_iomap_cache_lookup_result(inode, iodir, off, len, &got,
+ mval);
return LOOKUP_HIT;
}
Powered by blists - more mailing lists