| 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: <176169810394.1424854.9157669895873356380.stgit@frogsfrogsfrogs>
Date: Tue, 28 Oct 2025 17:45:28 -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/31] fuse_trace: implement the basic iomap mechanisms
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_i.h | 6 +
fs/fuse/file_iomap.c | 12 ++
3 files changed, 312 insertions(+), 1 deletion(-)
diff --git a/fs/fuse/fuse_trace.h b/fs/fuse/fuse_trace.h
index 286a0845dc0898..c0878253e7c6ad 100644
--- a/fs/fuse/fuse_trace.h
+++ b/fs/fuse/fuse_trace.h
@@ -58,6 +58,8 @@
EM( FUSE_SYNCFS, "FUSE_SYNCFS") \
EM( FUSE_TMPFILE, "FUSE_TMPFILE") \
EM( FUSE_STATX, "FUSE_STATX") \
+ EM( FUSE_IOMAP_BEGIN, "FUSE_IOMAP_BEGIN") \
+ EM( FUSE_IOMAP_END, "FUSE_IOMAP_END") \
EMe(CUSE_INIT, "CUSE_INIT")
/*
@@ -77,6 +79,54 @@ OPCODES
#define EM(a, b) {a, b},
#define EMe(a, b) {a, b}
+/* tracepoint boilerplate so we don't have to keep doing this */
+#define FUSE_INODE_FIELDS \
+ __field(dev_t, connection) \
+ __field(uint64_t, ino) \
+ __field(uint64_t, nodeid) \
+ __field(loff_t, isize)
+
+#define FUSE_INODE_ASSIGN(inode, fi, fm) \
+ const struct fuse_inode *fi = get_fuse_inode(inode); \
+ const struct fuse_mount *fm = get_fuse_mount(inode); \
+\
+ __entry->connection = (fm)->fc->dev; \
+ __entry->ino = (fi)->orig_ino; \
+ __entry->nodeid = (fi)->nodeid; \
+ __entry->isize = i_size_read(inode)
+
+#define FUSE_INODE_FMT \
+ "connection %u ino %llu nodeid %llu isize 0x%llx"
+
+#define FUSE_INODE_PRINTK_ARGS \
+ __entry->connection, \
+ __entry->ino, \
+ __entry->nodeid, \
+ __entry->isize
+
+#define FUSE_FILE_RANGE_FIELDS(prefix) \
+ __field(loff_t, prefix##offset) \
+ __field(loff_t, prefix##length)
+
+#define FUSE_FILE_RANGE_FMT(prefix) \
+ " " prefix "pos 0x%llx length 0x%llx"
+
+#define FUSE_FILE_RANGE_PRINTK_ARGS(prefix) \
+ __entry->prefix##offset, \
+ __entry->prefix##length
+
+/* combinations of boilerplate to reduce typing further */
+#define FUSE_IO_RANGE_FIELDS(prefix) \
+ FUSE_INODE_FIELDS \
+ FUSE_FILE_RANGE_FIELDS(prefix)
+
+#define FUSE_IO_RANGE_FMT(prefix) \
+ FUSE_INODE_FMT FUSE_FILE_RANGE_FMT(prefix)
+
+#define FUSE_IO_RANGE_PRINTK_ARGS(prefix) \
+ FUSE_INODE_PRINTK_ARGS, \
+ FUSE_FILE_RANGE_PRINTK_ARGS(prefix)
+
TRACE_EVENT(fuse_request_send,
TP_PROTO(const struct fuse_req *req),
@@ -159,6 +209,251 @@ DEFINE_FUSE_BACKING_EVENT(fuse_backing_open);
DEFINE_FUSE_BACKING_EVENT(fuse_backing_close);
#endif /* CONFIG_FUSE_BACKING */
+#if IS_ENABLED(CONFIG_FUSE_IOMAP)
+
+/* tracepoint boilerplate so we don't have to keep doing this */
+#define FUSE_IOMAP_OPFLAGS_FIELD \
+ __field(unsigned, opflags)
+
+#define FUSE_IOMAP_OPFLAGS_FMT \
+ " opflags (%s)"
+
+#define FUSE_IOMAP_OPFLAGS_PRINTK_ARG \
+ __print_flags(__entry->opflags, "|", FUSE_IOMAP_OP_STRINGS)
+
+#define FUSE_IOMAP_MAP_FIELDS(prefix) \
+ __field(uint64_t, prefix##offset) \
+ __field(uint64_t, prefix##length) \
+ __field(uint64_t, prefix##addr) \
+ __field(uint32_t, prefix##dev) \
+ __field(uint16_t, prefix##type) \
+ __field(uint16_t, prefix##flags)
+
+#define FUSE_IOMAP_MAP_FMT(prefix) \
+ " " prefix "offset 0x%llx length 0x%llx type %s dev %u addr 0x%llx mapflags (%s)"
+
+#define FUSE_IOMAP_MAP_PRINTK_ARGS(prefix) \
+ __entry->prefix##offset, \
+ __entry->prefix##length, \
+ __print_symbolic(__entry->prefix##type, FUSE_IOMAP_TYPE_STRINGS), \
+ __entry->prefix##dev, \
+ __entry->prefix##addr, \
+ __print_flags(__entry->prefix##flags, "|", FUSE_IOMAP_F_STRINGS)
+
+/* combinations of boilerplate to reduce typing further */
+#define FUSE_IOMAP_OP_FIELDS(prefix) \
+ FUSE_INODE_FIELDS \
+ FUSE_IOMAP_OPFLAGS_FIELD \
+ FUSE_FILE_RANGE_FIELDS(prefix)
+
+#define FUSE_IOMAP_OP_FMT(prefix) \
+ FUSE_INODE_FMT FUSE_IOMAP_OPFLAGS_FMT FUSE_FILE_RANGE_FMT(prefix)
+
+#define FUSE_IOMAP_OP_PRINTK_ARGS(prefix) \
+ FUSE_INODE_PRINTK_ARGS, \
+ FUSE_IOMAP_OPFLAGS_PRINTK_ARG, \
+ FUSE_FILE_RANGE_PRINTK_ARGS(prefix)
+
+/* string decoding */
+#define FUSE_IOMAP_F_STRINGS \
+ { FUSE_IOMAP_F_NEW, "new" }, \
+ { FUSE_IOMAP_F_DIRTY, "dirty" }, \
+ { FUSE_IOMAP_F_SHARED, "shared" }, \
+ { FUSE_IOMAP_F_MERGED, "merged" }, \
+ { FUSE_IOMAP_F_BOUNDARY, "boundary" }, \
+ { FUSE_IOMAP_F_ANON_WRITE, "anon_write" }, \
+ { FUSE_IOMAP_F_ATOMIC_BIO, "atomic" }, \
+ { FUSE_IOMAP_F_WANT_IOMAP_END, "iomap_end" }, \
+ { FUSE_IOMAP_F_SIZE_CHANGED, "append" }, \
+ { FUSE_IOMAP_F_STALE, "stale" }
+
+#define FUSE_IOMAP_OP_STRINGS \
+ { FUSE_IOMAP_OP_WRITE, "write" }, \
+ { FUSE_IOMAP_OP_ZERO, "zero" }, \
+ { FUSE_IOMAP_OP_REPORT, "report" }, \
+ { FUSE_IOMAP_OP_FAULT, "fault" }, \
+ { FUSE_IOMAP_OP_DIRECT, "direct" }, \
+ { FUSE_IOMAP_OP_NOWAIT, "nowait" }, \
+ { FUSE_IOMAP_OP_OVERWRITE_ONLY, "overwrite" }, \
+ { FUSE_IOMAP_OP_UNSHARE, "unshare" }, \
+ { FUSE_IOMAP_OP_DAX, "fsdax" }, \
+ { FUSE_IOMAP_OP_ATOMIC, "atomic" }, \
+ { FUSE_IOMAP_OP_DONTCACHE, "dontcache" }
+
+#define FUSE_IOMAP_TYPE_STRINGS \
+ { FUSE_IOMAP_TYPE_PURE_OVERWRITE, "overwrite" }, \
+ { FUSE_IOMAP_TYPE_HOLE, "hole" }, \
+ { FUSE_IOMAP_TYPE_DELALLOC, "delalloc" }, \
+ { FUSE_IOMAP_TYPE_MAPPED, "mapped" }, \
+ { FUSE_IOMAP_TYPE_UNWRITTEN, "unwritten" }, \
+ { FUSE_IOMAP_TYPE_INLINE, "inline" }
+
+DECLARE_EVENT_CLASS(fuse_iomap_check_class,
+ TP_PROTO(const char *func, int line, const char *condition),
+
+ TP_ARGS(func, line, condition),
+
+ TP_STRUCT__entry(
+ __string(func, func)
+ __field(int, line)
+ __string(condition, condition)
+ ),
+
+ TP_fast_assign(
+ __assign_str(func);
+ __assign_str(condition);
+ __entry->line = line;
+ ),
+
+ TP_printk("func %s line %d condition %s", __get_str(func),
+ __entry->line, __get_str(condition))
+);
+#define DEFINE_FUSE_IOMAP_CHECK_EVENT(name) \
+DEFINE_EVENT(fuse_iomap_check_class, name, \
+ TP_PROTO(const char *func, int line, const char *condition), \
+ TP_ARGS(func, line, condition))
+#if IS_ENABLED(CONFIG_FUSE_IOMAP_DEBUG)
+DEFINE_FUSE_IOMAP_CHECK_EVENT(fuse_iomap_assert);
+#endif
+DEFINE_FUSE_IOMAP_CHECK_EVENT(fuse_iomap_bad_data);
+
+TRACE_EVENT(fuse_iomap_begin,
+ TP_PROTO(const struct inode *inode, loff_t pos, loff_t count,
+ unsigned opflags),
+
+ TP_ARGS(inode, pos, count, opflags),
+
+ TP_STRUCT__entry(
+ FUSE_IOMAP_OP_FIELDS()
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->offset = pos;
+ __entry->length = count;
+ __entry->opflags = opflags;
+ ),
+
+ TP_printk(FUSE_IOMAP_OP_FMT(),
+ FUSE_IOMAP_OP_PRINTK_ARGS())
+);
+
+TRACE_EVENT(fuse_iomap_begin_error,
+ TP_PROTO(const struct inode *inode, loff_t pos, loff_t count,
+ unsigned opflags, int error),
+
+ TP_ARGS(inode, pos, count, opflags, error),
+
+ TP_STRUCT__entry(
+ FUSE_IOMAP_OP_FIELDS()
+ __field(int, error)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->offset = pos;
+ __entry->length = count;
+ __entry->opflags = opflags;
+ __entry->error = error;
+ ),
+
+ TP_printk(FUSE_IOMAP_OP_FMT() " err %d",
+ FUSE_IOMAP_OP_PRINTK_ARGS(),
+ __entry->error)
+);
+
+DECLARE_EVENT_CLASS(fuse_iomap_mapping_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->mapdev = map->dev;
+ __entry->mapaddr = map->addr;
+ __entry->maptype = map->type;
+ __entry->mapflags = map->flags;
+ ),
+
+ TP_printk(FUSE_INODE_FMT FUSE_IOMAP_MAP_FMT(),
+ FUSE_INODE_PRINTK_ARGS,
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map))
+);
+#define DEFINE_FUSE_IOMAP_MAPPING_EVENT(name) \
+DEFINE_EVENT(fuse_iomap_mapping_class, name, \
+ TP_PROTO(const struct inode *inode, const struct fuse_iomap_io *map), \
+ TP_ARGS(inode, map))
+DEFINE_FUSE_IOMAP_MAPPING_EVENT(fuse_iomap_read_map);
+DEFINE_FUSE_IOMAP_MAPPING_EVENT(fuse_iomap_write_map);
+
+TRACE_EVENT(fuse_iomap_end,
+ TP_PROTO(const struct inode *inode,
+ const struct fuse_iomap_end_in *inarg),
+
+ TP_ARGS(inode, inarg),
+
+ TP_STRUCT__entry(
+ FUSE_IOMAP_OP_FIELDS()
+ __field(size_t, written)
+ FUSE_IOMAP_MAP_FIELDS(map)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->opflags = inarg->opflags;
+ __entry->written = inarg->written;
+ __entry->offset = inarg->pos;
+ __entry->length = inarg->count;
+
+ __entry->mapoffset = inarg->map.offset;
+ __entry->maplength = inarg->map.length;
+ __entry->mapdev = inarg->map.dev;
+ __entry->mapaddr = inarg->map.addr;
+ __entry->maptype = inarg->map.type;
+ __entry->mapflags = inarg->map.flags;
+ ),
+
+ TP_printk(FUSE_IOMAP_OP_FMT() " written %zd" FUSE_IOMAP_MAP_FMT(),
+ FUSE_IOMAP_OP_PRINTK_ARGS(),
+ __entry->written,
+ FUSE_IOMAP_MAP_PRINTK_ARGS(map))
+);
+
+TRACE_EVENT(fuse_iomap_end_error,
+ TP_PROTO(const struct inode *inode,
+ const struct fuse_iomap_end_in *inarg, int error),
+
+ TP_ARGS(inode, inarg, error),
+
+ TP_STRUCT__entry(
+ FUSE_IOMAP_OP_FIELDS()
+ __field(size_t, written)
+ __field(int, error)
+ ),
+
+ TP_fast_assign(
+ FUSE_INODE_ASSIGN(inode, fi, fm);
+ __entry->offset = inarg->pos;
+ __entry->length = inarg->count;
+ __entry->opflags = inarg->opflags;
+ __entry->written = inarg->written;
+ __entry->error = error;
+ ),
+
+ TP_printk(FUSE_IOMAP_OP_FMT() " written %zd error %d",
+ FUSE_IOMAP_OP_PRINTK_ARGS(),
+ __entry->written,
+ __entry->error)
+);
+#endif /* CONFIG_FUSE_IOMAP */
+
#endif /* _TRACE_FUSE_H */
#undef TRACE_INCLUDE_PATH
diff --git a/fs/fuse/iomap_i.h b/fs/fuse/iomap_i.h
index d773f728579d1d..6d9ce9c0f40a04 100644
--- a/fs/fuse/iomap_i.h
+++ b/fs/fuse/iomap_i.h
@@ -10,16 +10,22 @@
#if IS_ENABLED(CONFIG_FUSE_IOMAP_DEBUG)
# define ASSERT(condition) do { \
int __cond = !!(condition); \
+ if (unlikely(!__cond)) \
+ trace_fuse_iomap_assert(__func__, __LINE__, #condition); \
WARN(!__cond, "Assertion failed: %s, func: %s, line: %d", #condition, __func__, __LINE__); \
} while (0)
# define BAD_DATA(condition) ({ \
int __cond = !!(condition); \
+ if (unlikely(__cond)) \
+ trace_fuse_iomap_bad_data(__func__, __LINE__, #condition); \
WARN(__cond, "Bad mapping: %s, func: %s, line: %d", #condition, __func__, __LINE__); \
})
#else
# define ASSERT(condition)
# define BAD_DATA(condition) ({ \
int __cond = !!(condition); \
+ if (unlikely(__cond)) \
+ trace_fuse_iomap_bad_data(__func__, __LINE__, #condition); \
unlikely(__cond); \
})
#endif /* CONFIG_FUSE_IOMAP_DEBUG */
diff --git a/fs/fuse/file_iomap.c b/fs/fuse/file_iomap.c
index d564d60d0f1779..a88f5d8d2bce15 100644
--- a/fs/fuse/file_iomap.c
+++ b/fs/fuse/file_iomap.c
@@ -327,6 +327,8 @@ static int fuse_iomap_begin(struct inode *inode, loff_t pos, loff_t count,
FUSE_ARGS(args);
int err;
+ trace_fuse_iomap_begin(inode, pos, count, opflags);
+
args.opcode = FUSE_IOMAP_BEGIN;
args.nodeid = get_node_id(inode);
args.in_numargs = 1;
@@ -336,8 +338,13 @@ static int fuse_iomap_begin(struct inode *inode, loff_t pos, loff_t count,
args.out_args[0].size = sizeof(outarg);
args.out_args[0].value = &outarg;
err = fuse_simple_request(fm, &args);
- if (err)
+ if (err) {
+ trace_fuse_iomap_begin_error(inode, pos, count, opflags, err);
return err;
+ }
+
+ trace_fuse_iomap_read_map(inode, &outarg.read);
+ trace_fuse_iomap_write_map(inode, &outarg.write);
err = fuse_iomap_begin_validate(inode, opflags, pos, &outarg);
if (err)
@@ -404,6 +411,8 @@ static int fuse_iomap_end(struct inode *inode, loff_t pos, loff_t count,
fuse_iomap_to_server(&inarg.map, iomap);
+ trace_fuse_iomap_end(inode, &inarg);
+
args.opcode = FUSE_IOMAP_END;
args.nodeid = get_node_id(inode);
args.in_numargs = 1;
@@ -421,6 +430,7 @@ static int fuse_iomap_end(struct inode *inode, loff_t pos, loff_t count,
case 0:
break;
default:
+ trace_fuse_iomap_end_error(inode, &inarg, err);
break;
}
}
Powered by blists - more mailing lists