Refactor: Surface useful show_ macros for use by other trace
subsystems.
Signed-off-by: Chuck Lever <[email protected]>
---
fs/nfs/nfs4trace.h | 67 ++++++---------------
fs/nfs/nfstrace.h | 118 +++++-------------------------------
include/trace/events/fs.h | 146 +++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 180 insertions(+), 151 deletions(-)
create mode 100644 include/trace/events/fs.h
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index 7a2567aa2b86..b2f45c825f37 100644
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -10,6 +10,8 @@
#include <linux/tracepoint.h>
+#include <trace/events/fs.h>
+
TRACE_DEFINE_ENUM(EPERM);
TRACE_DEFINE_ENUM(ENOENT);
TRACE_DEFINE_ENUM(EIO);
@@ -313,19 +315,6 @@ TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_PNFS);
{ NFS4ERR_RESET_TO_MDS, "RESET_TO_MDS" }, \
{ NFS4ERR_RESET_TO_PNFS, "RESET_TO_PNFS" })
-#define show_open_flags(flags) \
- __print_flags(flags, "|", \
- { O_CREAT, "O_CREAT" }, \
- { O_EXCL, "O_EXCL" }, \
- { O_TRUNC, "O_TRUNC" }, \
- { O_DIRECT, "O_DIRECT" })
-
-#define show_fmode_flags(mode) \
- __print_flags(mode, "|", \
- { ((__force unsigned long)FMODE_READ), "READ" }, \
- { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
- { ((__force unsigned long)FMODE_EXEC), "EXEC" })
-
#define show_nfs_fattr_flags(valid) \
__print_flags((unsigned long)valid, "|", \
{ NFS_ATTR_FATTR_TYPE, "TYPE" }, \
@@ -793,8 +782,8 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
TP_STRUCT__entry(
__field(unsigned long, error)
- __field(unsigned int, flags)
- __field(unsigned int, fmode)
+ __field(unsigned long, flags)
+ __field(unsigned long, fmode)
__field(dev_t, dev)
__field(u32, fhandle)
__field(u64, fileid)
@@ -812,7 +801,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
__entry->error = -error;
__entry->flags = flags;
- __entry->fmode = (__force unsigned int)ctx->mode;
+ __entry->fmode = (__force unsigned long)ctx->mode;
__entry->dev = ctx->dentry->d_sb->s_dev;
if (!IS_ERR_OR_NULL(state)) {
inode = state->inode;
@@ -842,15 +831,15 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
),
TP_printk(
- "error=%ld (%s) flags=%d (%s) fmode=%s "
+ "error=%ld (%s) flags=%lu (%s) fmode=%s "
"fileid=%02x:%02x:%llu fhandle=0x%08x "
"name=%02x:%02x:%llu/%s stateid=%d:0x%08x "
"openstateid=%d:0x%08x",
-__entry->error,
show_nfsv4_errors(__entry->error),
__entry->flags,
- show_open_flags(__entry->flags),
- show_fmode_flags(__entry->fmode),
+ show_fs_fcntl_open_flags(__entry->flags),
+ show_fs_fmode_flags(__entry->fmode),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -904,7 +893,7 @@ TRACE_EVENT(nfs4_cached_open,
TP_printk(
"fmode=%s fileid=%02x:%02x:%llu "
"fhandle=0x%08x stateid=%d:0x%08x",
- __entry->fmode ? show_fmode_flags(__entry->fmode) :
+ __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
"closed",
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
@@ -952,7 +941,7 @@ TRACE_EVENT(nfs4_close,
"fhandle=0x%08x openstateid=%d:0x%08x",
-__entry->error,
show_nfsv4_errors(__entry->error),
- __entry->fmode ? show_fmode_flags(__entry->fmode) :
+ __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
"closed",
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
@@ -961,24 +950,6 @@ TRACE_EVENT(nfs4_close,
)
);
-TRACE_DEFINE_ENUM(F_GETLK);
-TRACE_DEFINE_ENUM(F_SETLK);
-TRACE_DEFINE_ENUM(F_SETLKW);
-TRACE_DEFINE_ENUM(F_RDLCK);
-TRACE_DEFINE_ENUM(F_WRLCK);
-TRACE_DEFINE_ENUM(F_UNLCK);
-
-#define show_lock_cmd(type) \
- __print_symbolic((int)type, \
- { F_GETLK, "GETLK" }, \
- { F_SETLK, "SETLK" }, \
- { F_SETLKW, "SETLKW" })
-#define show_lock_type(type) \
- __print_symbolic((int)type, \
- { F_RDLCK, "RDLCK" }, \
- { F_WRLCK, "WRLCK" }, \
- { F_UNLCK, "UNLCK" })
-
DECLARE_EVENT_CLASS(nfs4_lock_event,
TP_PROTO(
const struct file_lock *request,
@@ -991,8 +962,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
TP_STRUCT__entry(
__field(unsigned long, error)
- __field(int, cmd)
- __field(char, type)
+ __field(unsigned long, cmd)
+ __field(unsigned long, type)
__field(loff_t, start)
__field(loff_t, end)
__field(dev_t, dev)
@@ -1025,8 +996,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
"stateid=%d:0x%08x",
-__entry->error,
show_nfsv4_errors(__entry->error),
- show_lock_cmd(__entry->cmd),
- show_lock_type(__entry->type),
+ show_fs_fcntl_cmd(__entry->cmd),
+ show_fs_fcntl_lock_type(__entry->type),
(long long)__entry->start,
(long long)__entry->end,
MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -1061,8 +1032,8 @@ TRACE_EVENT(nfs4_set_lock,
TP_STRUCT__entry(
__field(unsigned long, error)
- __field(int, cmd)
- __field(char, type)
+ __field(unsigned long, cmd)
+ __field(unsigned long, type)
__field(loff_t, start)
__field(loff_t, end)
__field(dev_t, dev)
@@ -1101,8 +1072,8 @@ TRACE_EVENT(nfs4_set_lock,
"stateid=%d:0x%08x lockstateid=%d:0x%08x",
-__entry->error,
show_nfsv4_errors(__entry->error),
- show_lock_cmd(__entry->cmd),
- show_lock_type(__entry->type),
+ show_fs_fcntl_cmd(__entry->cmd),
+ show_fs_fcntl_lock_type(__entry->type),
(long long)__entry->start,
(long long)__entry->end,
MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -1219,7 +1190,7 @@ DECLARE_EVENT_CLASS(nfs4_set_delegation_event,
TP_printk(
"fmode=%s fileid=%02x:%02x:%llu fhandle=0x%08x",
- show_fmode_flags(__entry->fmode),
+ show_fs_fmode_flags(__entry->fmode),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle
diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 8a224871be74..49d432c00bde 100644
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -11,27 +11,7 @@
#include <linux/tracepoint.h>
#include <linux/iversion.h>
-TRACE_DEFINE_ENUM(DT_UNKNOWN);
-TRACE_DEFINE_ENUM(DT_FIFO);
-TRACE_DEFINE_ENUM(DT_CHR);
-TRACE_DEFINE_ENUM(DT_DIR);
-TRACE_DEFINE_ENUM(DT_BLK);
-TRACE_DEFINE_ENUM(DT_REG);
-TRACE_DEFINE_ENUM(DT_LNK);
-TRACE_DEFINE_ENUM(DT_SOCK);
-TRACE_DEFINE_ENUM(DT_WHT);
-
-#define nfs_show_file_type(ftype) \
- __print_symbolic(ftype, \
- { DT_UNKNOWN, "UNKNOWN" }, \
- { DT_FIFO, "FIFO" }, \
- { DT_CHR, "CHR" }, \
- { DT_DIR, "DIR" }, \
- { DT_BLK, "BLK" }, \
- { DT_REG, "REG" }, \
- { DT_LNK, "LNK" }, \
- { DT_SOCK, "SOCK" }, \
- { DT_WHT, "WHT" })
+#include <trace/events/fs.h>
TRACE_DEFINE_ENUM(NFS_INO_INVALID_DATA);
TRACE_DEFINE_ENUM(NFS_INO_INVALID_ATIME);
@@ -168,7 +148,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event_done,
(unsigned long long)__entry->fileid,
__entry->fhandle,
__entry->type,
- nfs_show_file_type(__entry->type),
+ show_fs_dirent_type(__entry->type),
(unsigned long long)__entry->version,
(long long)__entry->size,
__entry->cache_validity,
@@ -259,7 +239,7 @@ TRACE_EVENT(nfs_access_exit,
(unsigned long long)__entry->fileid,
__entry->fhandle,
__entry->type,
- nfs_show_file_type(__entry->type),
+ show_fs_dirent_type(__entry->type),
(unsigned long long)__entry->version,
(long long)__entry->size,
__entry->cache_validity,
@@ -270,34 +250,6 @@ TRACE_EVENT(nfs_access_exit,
)
);
-TRACE_DEFINE_ENUM(LOOKUP_FOLLOW);
-TRACE_DEFINE_ENUM(LOOKUP_DIRECTORY);
-TRACE_DEFINE_ENUM(LOOKUP_AUTOMOUNT);
-TRACE_DEFINE_ENUM(LOOKUP_PARENT);
-TRACE_DEFINE_ENUM(LOOKUP_REVAL);
-TRACE_DEFINE_ENUM(LOOKUP_RCU);
-TRACE_DEFINE_ENUM(LOOKUP_OPEN);
-TRACE_DEFINE_ENUM(LOOKUP_CREATE);
-TRACE_DEFINE_ENUM(LOOKUP_EXCL);
-TRACE_DEFINE_ENUM(LOOKUP_RENAME_TARGET);
-TRACE_DEFINE_ENUM(LOOKUP_EMPTY);
-TRACE_DEFINE_ENUM(LOOKUP_DOWN);
-
-#define show_lookup_flags(flags) \
- __print_flags(flags, "|", \
- { LOOKUP_FOLLOW, "FOLLOW" }, \
- { LOOKUP_DIRECTORY, "DIRECTORY" }, \
- { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
- { LOOKUP_PARENT, "PARENT" }, \
- { LOOKUP_REVAL, "REVAL" }, \
- { LOOKUP_RCU, "RCU" }, \
- { LOOKUP_OPEN, "OPEN" }, \
- { LOOKUP_CREATE, "CREATE" }, \
- { LOOKUP_EXCL, "EXCL" }, \
- { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
- { LOOKUP_EMPTY, "EMPTY" }, \
- { LOOKUP_DOWN, "DOWN" })
-
DECLARE_EVENT_CLASS(nfs_lookup_event,
TP_PROTO(
const struct inode *dir,
@@ -324,7 +276,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event,
TP_printk(
"flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
__entry->flags,
- show_lookup_flags(__entry->flags),
+ show_fs_lookup_flags(__entry->flags),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -370,7 +322,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,
"error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
-__entry->error, nfs_show_status(__entry->error),
__entry->flags,
- show_lookup_flags(__entry->flags),
+ show_fs_lookup_flags(__entry->flags),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -392,46 +344,6 @@ DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit);
DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_enter);
DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revalidate_exit);
-TRACE_DEFINE_ENUM(O_WRONLY);
-TRACE_DEFINE_ENUM(O_RDWR);
-TRACE_DEFINE_ENUM(O_CREAT);
-TRACE_DEFINE_ENUM(O_EXCL);
-TRACE_DEFINE_ENUM(O_NOCTTY);
-TRACE_DEFINE_ENUM(O_TRUNC);
-TRACE_DEFINE_ENUM(O_APPEND);
-TRACE_DEFINE_ENUM(O_NONBLOCK);
-TRACE_DEFINE_ENUM(O_DSYNC);
-TRACE_DEFINE_ENUM(O_DIRECT);
-TRACE_DEFINE_ENUM(O_LARGEFILE);
-TRACE_DEFINE_ENUM(O_DIRECTORY);
-TRACE_DEFINE_ENUM(O_NOFOLLOW);
-TRACE_DEFINE_ENUM(O_NOATIME);
-TRACE_DEFINE_ENUM(O_CLOEXEC);
-
-#define show_open_flags(flags) \
- __print_flags(flags, "|", \
- { O_WRONLY, "O_WRONLY" }, \
- { O_RDWR, "O_RDWR" }, \
- { O_CREAT, "O_CREAT" }, \
- { O_EXCL, "O_EXCL" }, \
- { O_NOCTTY, "O_NOCTTY" }, \
- { O_TRUNC, "O_TRUNC" }, \
- { O_APPEND, "O_APPEND" }, \
- { O_NONBLOCK, "O_NONBLOCK" }, \
- { O_DSYNC, "O_DSYNC" }, \
- { O_DIRECT, "O_DIRECT" }, \
- { O_LARGEFILE, "O_LARGEFILE" }, \
- { O_DIRECTORY, "O_DIRECTORY" }, \
- { O_NOFOLLOW, "O_NOFOLLOW" }, \
- { O_NOATIME, "O_NOATIME" }, \
- { O_CLOEXEC, "O_CLOEXEC" })
-
-#define show_fmode_flags(mode) \
- __print_flags(mode, "|", \
- { ((__force unsigned long)FMODE_READ), "READ" }, \
- { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
- { ((__force unsigned long)FMODE_EXEC), "EXEC" })
-
TRACE_EVENT(nfs_atomic_open_enter,
TP_PROTO(
const struct inode *dir,
@@ -443,7 +355,7 @@ TRACE_EVENT(nfs_atomic_open_enter,
TP_STRUCT__entry(
__field(unsigned long, flags)
- __field(unsigned int, fmode)
+ __field(unsigned long, fmode)
__field(dev_t, dev)
__field(u64, dir)
__string(name, ctx->dentry->d_name.name)
@@ -453,15 +365,15 @@ TRACE_EVENT(nfs_atomic_open_enter,
__entry->dev = dir->i_sb->s_dev;
__entry->dir = NFS_FILEID(dir);
__entry->flags = flags;
- __entry->fmode = (__force unsigned int)ctx->mode;
+ __entry->fmode = (__force unsigned long)ctx->mode;
__assign_str(name, ctx->dentry->d_name.name);
),
TP_printk(
"flags=0x%lx (%s) fmode=%s name=%02x:%02x:%llu/%s",
__entry->flags,
- show_open_flags(__entry->flags),
- show_fmode_flags(__entry->fmode),
+ show_fs_fcntl_open_flags(__entry->flags),
+ show_fs_fmode_flags(__entry->fmode),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -481,7 +393,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
TP_STRUCT__entry(
__field(unsigned long, error)
__field(unsigned long, flags)
- __field(unsigned int, fmode)
+ __field(unsigned long, fmode)
__field(dev_t, dev)
__field(u64, dir)
__string(name, ctx->dentry->d_name.name)
@@ -492,7 +404,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
__entry->dev = dir->i_sb->s_dev;
__entry->dir = NFS_FILEID(dir);
__entry->flags = flags;
- __entry->fmode = (__force unsigned int)ctx->mode;
+ __entry->fmode = (__force unsigned long)ctx->mode;
__assign_str(name, ctx->dentry->d_name.name);
),
@@ -501,8 +413,8 @@ TRACE_EVENT(nfs_atomic_open_exit,
"name=%02x:%02x:%llu/%s",
-__entry->error, nfs_show_status(__entry->error),
__entry->flags,
- show_open_flags(__entry->flags),
- show_fmode_flags(__entry->fmode),
+ show_fs_fcntl_open_flags(__entry->flags),
+ show_fs_fmode_flags(__entry->fmode),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -535,7 +447,7 @@ TRACE_EVENT(nfs_create_enter,
TP_printk(
"flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
__entry->flags,
- show_open_flags(__entry->flags),
+ show_fs_fcntl_open_flags(__entry->flags),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -572,7 +484,7 @@ TRACE_EVENT(nfs_create_exit,
"error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
-__entry->error, nfs_show_status(__entry->error),
__entry->flags,
- show_open_flags(__entry->flags),
+ show_fs_fcntl_open_flags(__entry->flags),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
new file mode 100644
index 000000000000..84e20c43d0c3
--- /dev/null
+++ b/include/trace/events/fs.h
@@ -0,0 +1,146 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Display helpers for generic filesystem items
+ *
+ * Author: Chuck Lever <[email protected]>
+ *
+ * Copyright (c) 2020, Oracle and/or its affiliates.
+ */
+
+#include <linux/fs.h>
+
+#define show_fs_dirent_type(x) \
+ __print_symbolic(x, \
+ { DT_UNKNOWN, "UNKNOWN" }, \
+ { DT_FIFO, "FIFO" }, \
+ { DT_CHR, "CHR" }, \
+ { DT_DIR, "DIR" }, \
+ { DT_BLK, "BLK" }, \
+ { DT_REG, "REG" }, \
+ { DT_LNK, "LNK" }, \
+ { DT_SOCK, "SOCK" }, \
+ { DT_WHT, "WHT" })
+
+#define show_fs_fcntl_open_flags(x) \
+ __print_flags(x, "|", \
+ { O_WRONLY, "O_WRONLY" }, \
+ { O_RDWR, "O_RDWR" }, \
+ { O_CREAT, "O_CREAT" }, \
+ { O_EXCL, "O_EXCL" }, \
+ { O_NOCTTY, "O_NOCTTY" }, \
+ { O_TRUNC, "O_TRUNC" }, \
+ { O_APPEND, "O_APPEND" }, \
+ { O_NONBLOCK, "O_NONBLOCK" }, \
+ { O_DSYNC, "O_DSYNC" }, \
+ { O_DIRECT, "O_DIRECT" }, \
+ { O_LARGEFILE, "O_LARGEFILE" }, \
+ { O_DIRECTORY, "O_DIRECTORY" }, \
+ { O_NOFOLLOW, "O_NOFOLLOW" }, \
+ { O_NOATIME, "O_NOATIME" }, \
+ { O_CLOEXEC, "O_CLOEXEC" })
+
+#define __fmode_flag(x) { (__force unsigned long)FMODE_##x, #x }
+#define show_fs_fmode_flags(x) \
+ __print_flags(x, "|", \
+ __fmode_flag(READ), \
+ __fmode_flag(WRITE), \
+ __fmode_flag(LSEEK), \
+ __fmode_flag(PREAD), \
+ __fmode_flag(PWRITE), \
+ __fmode_flag(EXEC), \
+ __fmode_flag(NDELAY), \
+ __fmode_flag(EXCL), \
+ __fmode_flag(WRITE_IOCTL), \
+ __fmode_flag(32BITHASH), \
+ __fmode_flag(64BITHASH), \
+ __fmode_flag(NOCMTIME), \
+ __fmode_flag(RANDOM), \
+ __fmode_flag(UNSIGNED_OFFSET), \
+ __fmode_flag(PATH), \
+ __fmode_flag(ATOMIC_POS), \
+ __fmode_flag(WRITER), \
+ __fmode_flag(CAN_READ), \
+ __fmode_flag(CAN_WRITE), \
+ __fmode_flag(OPENED), \
+ __fmode_flag(CREATED), \
+ __fmode_flag(STREAM), \
+ __fmode_flag(NONOTIFY), \
+ __fmode_flag(NOWAIT), \
+ __fmode_flag(NEED_UNMOUNT), \
+ __fmode_flag(NOACCOUNT), \
+ __fmode_flag(BUF_RASYNC))
+
+#ifdef CONFIG_64BIT
+#define show_fs_fcntl_cmd(x) \
+ __print_symbolic(x, \
+ { F_DUPFD, "DUPFD" }, \
+ { F_GETFD, "GETFD" }, \
+ { F_SETFD, "SETFD" }, \
+ { F_GETFL, "GETFL" }, \
+ { F_SETFL, "SETFL" }, \
+ { F_GETLK, "GETLK" }, \
+ { F_SETLK, "SETLK" }, \
+ { F_SETLKW, "SETLKW" }, \
+ { F_SETOWN, "SETOWN" }, \
+ { F_GETOWN, "GETOWN" }, \
+ { F_SETSIG, "SETSIG" }, \
+ { F_GETSIG, "GETSIG" }, \
+ { F_SETOWN_EX, "SETOWN_EX" }, \
+ { F_GETOWN_EX, "GETOWN_EX" }, \
+ { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
+ { F_OFD_GETLK, "OFD_GETLK" }, \
+ { F_OFD_SETLK, "OFD_SETLK" }, \
+ { F_OFD_SETLKW, "OFD_SETLKW" })
+#else /* CONFIG_64BIT */
+#define show_fs_fcntl_cmd(x) \
+ __print_symbolic(x, \
+ { F_DUPFD, "DUPFD" }, \
+ { F_GETFD, "GETFD" }, \
+ { F_SETFD, "SETFD" }, \
+ { F_GETFL, "GETFL" }, \
+ { F_SETFL, "SETFL" }, \
+ { F_GETLK, "GETLK" }, \
+ { F_SETLK, "SETLK" }, \
+ { F_SETLKW, "SETLKW" }, \
+ { F_SETOWN, "SETOWN" }, \
+ { F_GETOWN, "GETOWN" }, \
+ { F_SETSIG, "SETSIG" }, \
+ { F_GETSIG, "GETSIG" }, \
+ { F_GETLK64, "GETLK64" }, \
+ { F_SETLK64, "SETLK64" }, \
+ { F_SETLKW64, "SETLKW64" }, \
+ { F_SETOWN_EX, "SETOWN_EX" }, \
+ { F_GETOWN_EX, "GETOWN_EX" }, \
+ { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
+ { F_OFD_GETLK, "OFD_GETLK" }, \
+ { F_OFD_SETLK, "OFD_SETLK" }, \
+ { F_OFD_SETLKW, "OFD_SETLKW" })
+#endif /* CONFIG_64BIT */
+
+#define show_fs_fcntl_lock_type(x) \
+ __print_symbolic(x, \
+ { F_RDLCK, "RDLCK" }, \
+ { F_WRLCK, "WRLCK" }, \
+ { F_UNLCK, "UNLCK" })
+
+#define show_fs_lookup_flags(flags) \
+ __print_flags(flags, "|", \
+ { LOOKUP_FOLLOW, "FOLLOW" }, \
+ { LOOKUP_DIRECTORY, "DIRECTORY" }, \
+ { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
+ { LOOKUP_EMPTY, "EMPTY" }, \
+ { LOOKUP_DOWN, "DOWN" }, \
+ { LOOKUP_MOUNTPOINT, "MOUNTPOINT" }, \
+ { LOOKUP_REVAL, "REVAL" }, \
+ { LOOKUP_RCU, "RCU" }, \
+ { LOOKUP_OPEN, "OPEN" }, \
+ { LOOKUP_CREATE, "CREATE" }, \
+ { LOOKUP_EXCL, "EXCL" }, \
+ { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
+ { LOOKUP_PARENT, "PARENT" }, \
+ { LOOKUP_NO_SYMLINKS, "NO_SYMLINKS" }, \
+ { LOOKUP_NO_MAGICLINKS, "NO_MAGICLINKS" }, \
+ { LOOKUP_NO_XDEV, "NO_XDEV" }, \
+ { LOOKUP_BENEATH, "BENEATH" }, \
+ { LOOKUP_IN_ROOT, "IN_ROOT" }, \
+ { LOOKUP_CACHED, "CACHED" })
Refactor: surface useful show_ macros so they can be shared between
the client and server trace code.
Additional clean up:
- Housekeeping: ensure the correct #include files are pulled in
and add proper TRACE_DEFINE_ENUM where they are missing
- Use a consistent naming scheme for the helpers
- Store values to be displayed symbolically as unsigned long, as
that is the type that the __print_yada() functions take
Signed-off-by: Chuck Lever <[email protected]>
---
fs/nfs/nfs4trace.h | 403 ++++----------------------------------------
fs/nfs/nfstrace.h | 117 ++-----------
fs/nfs/pnfs.h | 4
fs/nfsd/trace.h | 1
include/linux/nfs4.h | 4
include/trace/events/nfs.h | 375 +++++++++++++++++++++++++++++++++++++++++
6 files changed, 433 insertions(+), 471 deletions(-)
create mode 100644 include/trace/events/nfs.h
diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
index b2f45c825f37..ab077c2f82ac 100644
--- a/fs/nfs/nfs4trace.h
+++ b/fs/nfs/nfs4trace.h
@@ -11,309 +11,7 @@
#include <linux/tracepoint.h>
#include <trace/events/fs.h>
-
-TRACE_DEFINE_ENUM(EPERM);
-TRACE_DEFINE_ENUM(ENOENT);
-TRACE_DEFINE_ENUM(EIO);
-TRACE_DEFINE_ENUM(ENXIO);
-TRACE_DEFINE_ENUM(EACCES);
-TRACE_DEFINE_ENUM(EEXIST);
-TRACE_DEFINE_ENUM(EXDEV);
-TRACE_DEFINE_ENUM(ENOTDIR);
-TRACE_DEFINE_ENUM(EISDIR);
-TRACE_DEFINE_ENUM(EFBIG);
-TRACE_DEFINE_ENUM(ENOSPC);
-TRACE_DEFINE_ENUM(EROFS);
-TRACE_DEFINE_ENUM(EMLINK);
-TRACE_DEFINE_ENUM(ENAMETOOLONG);
-TRACE_DEFINE_ENUM(ENOTEMPTY);
-TRACE_DEFINE_ENUM(EDQUOT);
-TRACE_DEFINE_ENUM(ESTALE);
-TRACE_DEFINE_ENUM(EBADHANDLE);
-TRACE_DEFINE_ENUM(EBADCOOKIE);
-TRACE_DEFINE_ENUM(ENOTSUPP);
-TRACE_DEFINE_ENUM(ETOOSMALL);
-TRACE_DEFINE_ENUM(EREMOTEIO);
-TRACE_DEFINE_ENUM(EBADTYPE);
-TRACE_DEFINE_ENUM(EAGAIN);
-TRACE_DEFINE_ENUM(ELOOP);
-TRACE_DEFINE_ENUM(EOPNOTSUPP);
-TRACE_DEFINE_ENUM(EDEADLK);
-TRACE_DEFINE_ENUM(ENOMEM);
-TRACE_DEFINE_ENUM(EKEYEXPIRED);
-TRACE_DEFINE_ENUM(ETIMEDOUT);
-TRACE_DEFINE_ENUM(ERESTARTSYS);
-TRACE_DEFINE_ENUM(ECONNREFUSED);
-TRACE_DEFINE_ENUM(ECONNRESET);
-TRACE_DEFINE_ENUM(ENETUNREACH);
-TRACE_DEFINE_ENUM(EHOSTUNREACH);
-TRACE_DEFINE_ENUM(EHOSTDOWN);
-TRACE_DEFINE_ENUM(EPIPE);
-TRACE_DEFINE_ENUM(EPFNOSUPPORT);
-TRACE_DEFINE_ENUM(EPROTONOSUPPORT);
-
-TRACE_DEFINE_ENUM(NFS4_OK);
-TRACE_DEFINE_ENUM(NFS4ERR_ACCESS);
-TRACE_DEFINE_ENUM(NFS4ERR_ATTRNOTSUPP);
-TRACE_DEFINE_ENUM(NFS4ERR_ADMIN_REVOKED);
-TRACE_DEFINE_ENUM(NFS4ERR_BACK_CHAN_BUSY);
-TRACE_DEFINE_ENUM(NFS4ERR_BADCHAR);
-TRACE_DEFINE_ENUM(NFS4ERR_BADHANDLE);
-TRACE_DEFINE_ENUM(NFS4ERR_BADIOMODE);
-TRACE_DEFINE_ENUM(NFS4ERR_BADLAYOUT);
-TRACE_DEFINE_ENUM(NFS4ERR_BADLABEL);
-TRACE_DEFINE_ENUM(NFS4ERR_BADNAME);
-TRACE_DEFINE_ENUM(NFS4ERR_BADOWNER);
-TRACE_DEFINE_ENUM(NFS4ERR_BADSESSION);
-TRACE_DEFINE_ENUM(NFS4ERR_BADSLOT);
-TRACE_DEFINE_ENUM(NFS4ERR_BADTYPE);
-TRACE_DEFINE_ENUM(NFS4ERR_BADXDR);
-TRACE_DEFINE_ENUM(NFS4ERR_BAD_COOKIE);
-TRACE_DEFINE_ENUM(NFS4ERR_BAD_HIGH_SLOT);
-TRACE_DEFINE_ENUM(NFS4ERR_BAD_RANGE);
-TRACE_DEFINE_ENUM(NFS4ERR_BAD_SEQID);
-TRACE_DEFINE_ENUM(NFS4ERR_BAD_SESSION_DIGEST);
-TRACE_DEFINE_ENUM(NFS4ERR_BAD_STATEID);
-TRACE_DEFINE_ENUM(NFS4ERR_CB_PATH_DOWN);
-TRACE_DEFINE_ENUM(NFS4ERR_CLID_INUSE);
-TRACE_DEFINE_ENUM(NFS4ERR_CLIENTID_BUSY);
-TRACE_DEFINE_ENUM(NFS4ERR_COMPLETE_ALREADY);
-TRACE_DEFINE_ENUM(NFS4ERR_CONN_NOT_BOUND_TO_SESSION);
-TRACE_DEFINE_ENUM(NFS4ERR_DEADLOCK);
-TRACE_DEFINE_ENUM(NFS4ERR_DEADSESSION);
-TRACE_DEFINE_ENUM(NFS4ERR_DELAY);
-TRACE_DEFINE_ENUM(NFS4ERR_DELEG_ALREADY_WANTED);
-TRACE_DEFINE_ENUM(NFS4ERR_DELEG_REVOKED);
-TRACE_DEFINE_ENUM(NFS4ERR_DENIED);
-TRACE_DEFINE_ENUM(NFS4ERR_DIRDELEG_UNAVAIL);
-TRACE_DEFINE_ENUM(NFS4ERR_DQUOT);
-TRACE_DEFINE_ENUM(NFS4ERR_ENCR_ALG_UNSUPP);
-TRACE_DEFINE_ENUM(NFS4ERR_EXIST);
-TRACE_DEFINE_ENUM(NFS4ERR_EXPIRED);
-TRACE_DEFINE_ENUM(NFS4ERR_FBIG);
-TRACE_DEFINE_ENUM(NFS4ERR_FHEXPIRED);
-TRACE_DEFINE_ENUM(NFS4ERR_FILE_OPEN);
-TRACE_DEFINE_ENUM(NFS4ERR_GRACE);
-TRACE_DEFINE_ENUM(NFS4ERR_HASH_ALG_UNSUPP);
-TRACE_DEFINE_ENUM(NFS4ERR_INVAL);
-TRACE_DEFINE_ENUM(NFS4ERR_IO);
-TRACE_DEFINE_ENUM(NFS4ERR_ISDIR);
-TRACE_DEFINE_ENUM(NFS4ERR_LAYOUTTRYLATER);
-TRACE_DEFINE_ENUM(NFS4ERR_LAYOUTUNAVAILABLE);
-TRACE_DEFINE_ENUM(NFS4ERR_LEASE_MOVED);
-TRACE_DEFINE_ENUM(NFS4ERR_LOCKED);
-TRACE_DEFINE_ENUM(NFS4ERR_LOCKS_HELD);
-TRACE_DEFINE_ENUM(NFS4ERR_LOCK_RANGE);
-TRACE_DEFINE_ENUM(NFS4ERR_MINOR_VERS_MISMATCH);
-TRACE_DEFINE_ENUM(NFS4ERR_MLINK);
-TRACE_DEFINE_ENUM(NFS4ERR_MOVED);
-TRACE_DEFINE_ENUM(NFS4ERR_NAMETOOLONG);
-TRACE_DEFINE_ENUM(NFS4ERR_NOENT);
-TRACE_DEFINE_ENUM(NFS4ERR_NOFILEHANDLE);
-TRACE_DEFINE_ENUM(NFS4ERR_NOMATCHING_LAYOUT);
-TRACE_DEFINE_ENUM(NFS4ERR_NOSPC);
-TRACE_DEFINE_ENUM(NFS4ERR_NOTDIR);
-TRACE_DEFINE_ENUM(NFS4ERR_NOTEMPTY);
-TRACE_DEFINE_ENUM(NFS4ERR_NOTSUPP);
-TRACE_DEFINE_ENUM(NFS4ERR_NOT_ONLY_OP);
-TRACE_DEFINE_ENUM(NFS4ERR_NOT_SAME);
-TRACE_DEFINE_ENUM(NFS4ERR_NO_GRACE);
-TRACE_DEFINE_ENUM(NFS4ERR_NXIO);
-TRACE_DEFINE_ENUM(NFS4ERR_OLD_STATEID);
-TRACE_DEFINE_ENUM(NFS4ERR_OPENMODE);
-TRACE_DEFINE_ENUM(NFS4ERR_OP_ILLEGAL);
-TRACE_DEFINE_ENUM(NFS4ERR_OP_NOT_IN_SESSION);
-TRACE_DEFINE_ENUM(NFS4ERR_PERM);
-TRACE_DEFINE_ENUM(NFS4ERR_PNFS_IO_HOLE);
-TRACE_DEFINE_ENUM(NFS4ERR_PNFS_NO_LAYOUT);
-TRACE_DEFINE_ENUM(NFS4ERR_RECALLCONFLICT);
-TRACE_DEFINE_ENUM(NFS4ERR_RECLAIM_BAD);
-TRACE_DEFINE_ENUM(NFS4ERR_RECLAIM_CONFLICT);
-TRACE_DEFINE_ENUM(NFS4ERR_REJECT_DELEG);
-TRACE_DEFINE_ENUM(NFS4ERR_REP_TOO_BIG);
-TRACE_DEFINE_ENUM(NFS4ERR_REP_TOO_BIG_TO_CACHE);
-TRACE_DEFINE_ENUM(NFS4ERR_REQ_TOO_BIG);
-TRACE_DEFINE_ENUM(NFS4ERR_RESOURCE);
-TRACE_DEFINE_ENUM(NFS4ERR_RESTOREFH);
-TRACE_DEFINE_ENUM(NFS4ERR_RETRY_UNCACHED_REP);
-TRACE_DEFINE_ENUM(NFS4ERR_RETURNCONFLICT);
-TRACE_DEFINE_ENUM(NFS4ERR_ROFS);
-TRACE_DEFINE_ENUM(NFS4ERR_SAME);
-TRACE_DEFINE_ENUM(NFS4ERR_SHARE_DENIED);
-TRACE_DEFINE_ENUM(NFS4ERR_SEQUENCE_POS);
-TRACE_DEFINE_ENUM(NFS4ERR_SEQ_FALSE_RETRY);
-TRACE_DEFINE_ENUM(NFS4ERR_SEQ_MISORDERED);
-TRACE_DEFINE_ENUM(NFS4ERR_SERVERFAULT);
-TRACE_DEFINE_ENUM(NFS4ERR_STALE);
-TRACE_DEFINE_ENUM(NFS4ERR_STALE_CLIENTID);
-TRACE_DEFINE_ENUM(NFS4ERR_STALE_STATEID);
-TRACE_DEFINE_ENUM(NFS4ERR_SYMLINK);
-TRACE_DEFINE_ENUM(NFS4ERR_TOOSMALL);
-TRACE_DEFINE_ENUM(NFS4ERR_TOO_MANY_OPS);
-TRACE_DEFINE_ENUM(NFS4ERR_UNKNOWN_LAYOUTTYPE);
-TRACE_DEFINE_ENUM(NFS4ERR_UNSAFE_COMPOUND);
-TRACE_DEFINE_ENUM(NFS4ERR_WRONGSEC);
-TRACE_DEFINE_ENUM(NFS4ERR_WRONG_CRED);
-TRACE_DEFINE_ENUM(NFS4ERR_WRONG_TYPE);
-TRACE_DEFINE_ENUM(NFS4ERR_XDEV);
-
-TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_MDS);
-TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_PNFS);
-
-#define show_nfsv4_errors(error) \
- __print_symbolic(error, \
- { NFS4_OK, "OK" }, \
- /* Mapped by nfs4_stat_to_errno() */ \
- { EPERM, "EPERM" }, \
- { ENOENT, "ENOENT" }, \
- { EIO, "EIO" }, \
- { ENXIO, "ENXIO" }, \
- { EACCES, "EACCES" }, \
- { EEXIST, "EEXIST" }, \
- { EXDEV, "EXDEV" }, \
- { ENOTDIR, "ENOTDIR" }, \
- { EISDIR, "EISDIR" }, \
- { EFBIG, "EFBIG" }, \
- { ENOSPC, "ENOSPC" }, \
- { EROFS, "EROFS" }, \
- { EMLINK, "EMLINK" }, \
- { ENAMETOOLONG, "ENAMETOOLONG" }, \
- { ENOTEMPTY, "ENOTEMPTY" }, \
- { EDQUOT, "EDQUOT" }, \
- { ESTALE, "ESTALE" }, \
- { EBADHANDLE, "EBADHANDLE" }, \
- { EBADCOOKIE, "EBADCOOKIE" }, \
- { ENOTSUPP, "ENOTSUPP" }, \
- { ETOOSMALL, "ETOOSMALL" }, \
- { EREMOTEIO, "EREMOTEIO" }, \
- { EBADTYPE, "EBADTYPE" }, \
- { EAGAIN, "EAGAIN" }, \
- { ELOOP, "ELOOP" }, \
- { EOPNOTSUPP, "EOPNOTSUPP" }, \
- { EDEADLK, "EDEADLK" }, \
- /* RPC errors */ \
- { ENOMEM, "ENOMEM" }, \
- { EKEYEXPIRED, "EKEYEXPIRED" }, \
- { ETIMEDOUT, "ETIMEDOUT" }, \
- { ERESTARTSYS, "ERESTARTSYS" }, \
- { ECONNREFUSED, "ECONNREFUSED" }, \
- { ECONNRESET, "ECONNRESET" }, \
- { ENETUNREACH, "ENETUNREACH" }, \
- { EHOSTUNREACH, "EHOSTUNREACH" }, \
- { EHOSTDOWN, "EHOSTDOWN" }, \
- { EPIPE, "EPIPE" }, \
- { EPFNOSUPPORT, "EPFNOSUPPORT" }, \
- { EPROTONOSUPPORT, "EPROTONOSUPPORT" }, \
- /* NFSv4 native errors */ \
- { NFS4ERR_ACCESS, "ACCESS" }, \
- { NFS4ERR_ATTRNOTSUPP, "ATTRNOTSUPP" }, \
- { NFS4ERR_ADMIN_REVOKED, "ADMIN_REVOKED" }, \
- { NFS4ERR_BACK_CHAN_BUSY, "BACK_CHAN_BUSY" }, \
- { NFS4ERR_BADCHAR, "BADCHAR" }, \
- { NFS4ERR_BADHANDLE, "BADHANDLE" }, \
- { NFS4ERR_BADIOMODE, "BADIOMODE" }, \
- { NFS4ERR_BADLAYOUT, "BADLAYOUT" }, \
- { NFS4ERR_BADLABEL, "BADLABEL" }, \
- { NFS4ERR_BADNAME, "BADNAME" }, \
- { NFS4ERR_BADOWNER, "BADOWNER" }, \
- { NFS4ERR_BADSESSION, "BADSESSION" }, \
- { NFS4ERR_BADSLOT, "BADSLOT" }, \
- { NFS4ERR_BADTYPE, "BADTYPE" }, \
- { NFS4ERR_BADXDR, "BADXDR" }, \
- { NFS4ERR_BAD_COOKIE, "BAD_COOKIE" }, \
- { NFS4ERR_BAD_HIGH_SLOT, "BAD_HIGH_SLOT" }, \
- { NFS4ERR_BAD_RANGE, "BAD_RANGE" }, \
- { NFS4ERR_BAD_SEQID, "BAD_SEQID" }, \
- { NFS4ERR_BAD_SESSION_DIGEST, "BAD_SESSION_DIGEST" }, \
- { NFS4ERR_BAD_STATEID, "BAD_STATEID" }, \
- { NFS4ERR_CB_PATH_DOWN, "CB_PATH_DOWN" }, \
- { NFS4ERR_CLID_INUSE, "CLID_INUSE" }, \
- { NFS4ERR_CLIENTID_BUSY, "CLIENTID_BUSY" }, \
- { NFS4ERR_COMPLETE_ALREADY, "COMPLETE_ALREADY" }, \
- { NFS4ERR_CONN_NOT_BOUND_TO_SESSION, \
- "CONN_NOT_BOUND_TO_SESSION" }, \
- { NFS4ERR_DEADLOCK, "DEADLOCK" }, \
- { NFS4ERR_DEADSESSION, "DEAD_SESSION" }, \
- { NFS4ERR_DELAY, "DELAY" }, \
- { NFS4ERR_DELEG_ALREADY_WANTED, \
- "DELEG_ALREADY_WANTED" }, \
- { NFS4ERR_DELEG_REVOKED, "DELEG_REVOKED" }, \
- { NFS4ERR_DENIED, "DENIED" }, \
- { NFS4ERR_DIRDELEG_UNAVAIL, "DIRDELEG_UNAVAIL" }, \
- { NFS4ERR_DQUOT, "DQUOT" }, \
- { NFS4ERR_ENCR_ALG_UNSUPP, "ENCR_ALG_UNSUPP" }, \
- { NFS4ERR_EXIST, "EXIST" }, \
- { NFS4ERR_EXPIRED, "EXPIRED" }, \
- { NFS4ERR_FBIG, "FBIG" }, \
- { NFS4ERR_FHEXPIRED, "FHEXPIRED" }, \
- { NFS4ERR_FILE_OPEN, "FILE_OPEN" }, \
- { NFS4ERR_GRACE, "GRACE" }, \
- { NFS4ERR_HASH_ALG_UNSUPP, "HASH_ALG_UNSUPP" }, \
- { NFS4ERR_INVAL, "INVAL" }, \
- { NFS4ERR_IO, "IO" }, \
- { NFS4ERR_ISDIR, "ISDIR" }, \
- { NFS4ERR_LAYOUTTRYLATER, "LAYOUTTRYLATER" }, \
- { NFS4ERR_LAYOUTUNAVAILABLE, "LAYOUTUNAVAILABLE" }, \
- { NFS4ERR_LEASE_MOVED, "LEASE_MOVED" }, \
- { NFS4ERR_LOCKED, "LOCKED" }, \
- { NFS4ERR_LOCKS_HELD, "LOCKS_HELD" }, \
- { NFS4ERR_LOCK_RANGE, "LOCK_RANGE" }, \
- { NFS4ERR_MINOR_VERS_MISMATCH, "MINOR_VERS_MISMATCH" }, \
- { NFS4ERR_MLINK, "MLINK" }, \
- { NFS4ERR_MOVED, "MOVED" }, \
- { NFS4ERR_NAMETOOLONG, "NAMETOOLONG" }, \
- { NFS4ERR_NOENT, "NOENT" }, \
- { NFS4ERR_NOFILEHANDLE, "NOFILEHANDLE" }, \
- { NFS4ERR_NOMATCHING_LAYOUT, "NOMATCHING_LAYOUT" }, \
- { NFS4ERR_NOSPC, "NOSPC" }, \
- { NFS4ERR_NOTDIR, "NOTDIR" }, \
- { NFS4ERR_NOTEMPTY, "NOTEMPTY" }, \
- { NFS4ERR_NOTSUPP, "NOTSUPP" }, \
- { NFS4ERR_NOT_ONLY_OP, "NOT_ONLY_OP" }, \
- { NFS4ERR_NOT_SAME, "NOT_SAME" }, \
- { NFS4ERR_NO_GRACE, "NO_GRACE" }, \
- { NFS4ERR_NXIO, "NXIO" }, \
- { NFS4ERR_OLD_STATEID, "OLD_STATEID" }, \
- { NFS4ERR_OPENMODE, "OPENMODE" }, \
- { NFS4ERR_OP_ILLEGAL, "OP_ILLEGAL" }, \
- { NFS4ERR_OP_NOT_IN_SESSION, "OP_NOT_IN_SESSION" }, \
- { NFS4ERR_PERM, "PERM" }, \
- { NFS4ERR_PNFS_IO_HOLE, "PNFS_IO_HOLE" }, \
- { NFS4ERR_PNFS_NO_LAYOUT, "PNFS_NO_LAYOUT" }, \
- { NFS4ERR_RECALLCONFLICT, "RECALLCONFLICT" }, \
- { NFS4ERR_RECLAIM_BAD, "RECLAIM_BAD" }, \
- { NFS4ERR_RECLAIM_CONFLICT, "RECLAIM_CONFLICT" }, \
- { NFS4ERR_REJECT_DELEG, "REJECT_DELEG" }, \
- { NFS4ERR_REP_TOO_BIG, "REP_TOO_BIG" }, \
- { NFS4ERR_REP_TOO_BIG_TO_CACHE, \
- "REP_TOO_BIG_TO_CACHE" }, \
- { NFS4ERR_REQ_TOO_BIG, "REQ_TOO_BIG" }, \
- { NFS4ERR_RESOURCE, "RESOURCE" }, \
- { NFS4ERR_RESTOREFH, "RESTOREFH" }, \
- { NFS4ERR_RETRY_UNCACHED_REP, "RETRY_UNCACHED_REP" }, \
- { NFS4ERR_RETURNCONFLICT, "RETURNCONFLICT" }, \
- { NFS4ERR_ROFS, "ROFS" }, \
- { NFS4ERR_SAME, "SAME" }, \
- { NFS4ERR_SHARE_DENIED, "SHARE_DENIED" }, \
- { NFS4ERR_SEQUENCE_POS, "SEQUENCE_POS" }, \
- { NFS4ERR_SEQ_FALSE_RETRY, "SEQ_FALSE_RETRY" }, \
- { NFS4ERR_SEQ_MISORDERED, "SEQ_MISORDERED" }, \
- { NFS4ERR_SERVERFAULT, "SERVERFAULT" }, \
- { NFS4ERR_STALE, "STALE" }, \
- { NFS4ERR_STALE_CLIENTID, "STALE_CLIENTID" }, \
- { NFS4ERR_STALE_STATEID, "STALE_STATEID" }, \
- { NFS4ERR_SYMLINK, "SYMLINK" }, \
- { NFS4ERR_TOOSMALL, "TOOSMALL" }, \
- { NFS4ERR_TOO_MANY_OPS, "TOO_MANY_OPS" }, \
- { NFS4ERR_UNKNOWN_LAYOUTTYPE, "UNKNOWN_LAYOUTTYPE" }, \
- { NFS4ERR_UNSAFE_COMPOUND, "UNSAFE_COMPOUND" }, \
- { NFS4ERR_WRONGSEC, "WRONGSEC" }, \
- { NFS4ERR_WRONG_CRED, "WRONG_CRED" }, \
- { NFS4ERR_WRONG_TYPE, "WRONG_TYPE" }, \
- { NFS4ERR_XDEV, "XDEV" }, \
- /* ***** Internal to Linux NFS client ***** */ \
- { NFS4ERR_RESET_TO_MDS, "RESET_TO_MDS" }, \
- { NFS4ERR_RESET_TO_PNFS, "RESET_TO_PNFS" })
+#include <trace/events/nfs.h>
#define show_nfs_fattr_flags(valid) \
__print_flags((unsigned long)valid, "|", \
@@ -354,7 +52,7 @@ DECLARE_EVENT_CLASS(nfs4_clientid_event,
TP_printk(
"error=%ld (%s) dstaddr=%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
__get_str(dstaddr)
)
);
@@ -378,29 +76,6 @@ DEFINE_NFS4_CLIENTID_EVENT(nfs4_bind_conn_to_session);
DEFINE_NFS4_CLIENTID_EVENT(nfs4_sequence);
DEFINE_NFS4_CLIENTID_EVENT(nfs4_reclaim_complete);
-#define show_nfs4_sequence_status_flags(status) \
- __print_flags((unsigned long)status, "|", \
- { SEQ4_STATUS_CB_PATH_DOWN, "CB_PATH_DOWN" }, \
- { SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING, \
- "CB_GSS_CONTEXTS_EXPIRING" }, \
- { SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED, \
- "CB_GSS_CONTEXTS_EXPIRED" }, \
- { SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED, \
- "EXPIRED_ALL_STATE_REVOKED" }, \
- { SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED, \
- "EXPIRED_SOME_STATE_REVOKED" }, \
- { SEQ4_STATUS_ADMIN_STATE_REVOKED, \
- "ADMIN_STATE_REVOKED" }, \
- { SEQ4_STATUS_RECALLABLE_STATE_REVOKED, \
- "RECALLABLE_STATE_REVOKED" }, \
- { SEQ4_STATUS_LEASE_MOVED, "LEASE_MOVED" }, \
- { SEQ4_STATUS_RESTART_RECLAIM_NEEDED, \
- "RESTART_RECLAIM_NEEDED" }, \
- { SEQ4_STATUS_CB_PATH_DOWN_SESSION, \
- "CB_PATH_DOWN_SESSION" }, \
- { SEQ4_STATUS_BACKCHANNEL_FAULT, \
- "BACKCHANNEL_FAULT" })
-
TRACE_EVENT(nfs4_sequence_done,
TP_PROTO(
const struct nfs4_session *session,
@@ -414,7 +89,7 @@ TRACE_EVENT(nfs4_sequence_done,
__field(unsigned int, seq_nr)
__field(unsigned int, highest_slotid)
__field(unsigned int, target_highest_slotid)
- __field(unsigned int, status_flags)
+ __field(unsigned long, status_flags)
__field(unsigned long, error)
),
@@ -433,16 +108,16 @@ TRACE_EVENT(nfs4_sequence_done,
TP_printk(
"error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "
"highest_slotid=%u target_highest_slotid=%u "
- "status_flags=%u (%s)",
+ "status_flags=0x%lx (%s)",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
__entry->session,
__entry->slot_nr,
__entry->seq_nr,
__entry->highest_slotid,
__entry->target_highest_slotid,
__entry->status_flags,
- show_nfs4_sequence_status_flags(__entry->status_flags)
+ show_nfs4_seq4_status(__entry->status_flags)
)
);
@@ -479,7 +154,7 @@ TRACE_EVENT(nfs4_cb_sequence,
"error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "
"highest_slotid=%u",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
__entry->session,
__entry->slot_nr,
__entry->seq_nr,
@@ -516,7 +191,7 @@ TRACE_EVENT(nfs4_cb_seqid_err,
"error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "
"highest_slotid=%u",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
__entry->session,
__entry->slot_nr,
__entry->seq_nr,
@@ -650,7 +325,7 @@ TRACE_EVENT(nfs4_state_mgr_failed,
"hostname=%s clp state=%s error=%ld (%s) section=%s",
__get_str(hostname),
show_nfs4_clp_state(__entry->state), -__entry->error,
- show_nfsv4_errors(__entry->error), __get_str(section)
+ show_nfs4_status(__entry->error), __get_str(section)
)
)
@@ -721,7 +396,7 @@ DECLARE_EVENT_CLASS(nfs4_xdr_event,
TP_printk(
"task:%u@%d xid=0x%08x error=%ld (%s) operation=%u",
__entry->task_id, __entry->client_id, __entry->xid,
- -__entry->error, show_nfsv4_errors(__entry->error),
+ -__entry->error, show_nfs4_status(__entry->error),
__entry->op
)
);
@@ -836,7 +511,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
"name=%02x:%02x:%llu/%s stateid=%d:0x%08x "
"openstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
__entry->flags,
show_fs_fcntl_open_flags(__entry->flags),
show_fs_fmode_flags(__entry->fmode),
@@ -940,7 +615,7 @@ TRACE_EVENT(nfs4_close,
"error=%ld (%s) fmode=%s fileid=%02x:%02x:%llu "
"fhandle=0x%08x openstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
__entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
"closed",
MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -995,7 +670,7 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
"fileid=%02x:%02x:%llu fhandle=0x%08x "
"stateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
show_fs_fcntl_cmd(__entry->cmd),
show_fs_fcntl_lock_type(__entry->type),
(long long)__entry->start,
@@ -1071,7 +746,7 @@ TRACE_EVENT(nfs4_set_lock,
"fileid=%02x:%02x:%llu fhandle=0x%08x "
"stateid=%d:0x%08x lockstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
show_fs_fcntl_cmd(__entry->cmd),
show_fs_fcntl_lock_type(__entry->type),
(long long)__entry->start,
@@ -1237,7 +912,7 @@ TRACE_EVENT(nfs4_delegreturn_exit,
"error=%ld (%s) dev=%02x:%02x fhandle=0x%08x "
"stateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->fhandle,
__entry->stateid_seq, __entry->stateid_hash
@@ -1280,7 +955,7 @@ DECLARE_EVENT_CLASS(nfs4_test_stateid_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"stateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1327,7 +1002,7 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event,
TP_printk(
"error=%ld (%s) name=%02x:%02x:%llu/%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -1374,7 +1049,7 @@ TRACE_EVENT(nfs4_lookupp,
TP_printk(
"error=%ld (%s) inode=%02x:%02x:%llu",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->ino
)
@@ -1413,7 +1088,7 @@ TRACE_EVENT(nfs4_rename,
"error=%ld (%s) oldname=%02x:%02x:%llu/%s "
"newname=%02x:%02x:%llu/%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->olddir,
__get_str(oldname),
@@ -1448,7 +1123,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_event,
TP_printk(
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle
@@ -1506,7 +1181,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"stateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1559,7 +1234,7 @@ DECLARE_EVENT_CLASS(nfs4_getattr_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"valid=%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1615,7 +1290,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"dstaddr=%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1676,7 +1351,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"stateid=%d:0x%08x dstaddr=%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1725,7 +1400,7 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event,
TP_printk(
"error=%ld (%s) id=%u name=%s",
- -__entry->error, show_nfsv4_errors(__entry->error),
+ -__entry->error, show_nfs4_status(__entry->error),
__entry->id,
__get_str(name)
)
@@ -1803,7 +1478,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event,
"offset=%lld count=%u res=%u stateid=%d:0x%08x "
"layoutstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1877,7 +1552,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event,
"offset=%lld count=%u res=%u stateid=%d:0x%08x "
"layoutstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1941,7 +1616,7 @@ DECLARE_EVENT_CLASS(nfs4_commit_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"offset=%lld count=%u layoutstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -1961,16 +1636,6 @@ DEFINE_NFS4_COMMIT_EVENT(nfs4_commit);
#ifdef CONFIG_NFS_V4_1
DEFINE_NFS4_COMMIT_EVENT(nfs4_pnfs_commit_ds);
-TRACE_DEFINE_ENUM(IOMODE_READ);
-TRACE_DEFINE_ENUM(IOMODE_RW);
-TRACE_DEFINE_ENUM(IOMODE_ANY);
-
-#define show_pnfs_iomode(iomode) \
- __print_symbolic(iomode, \
- { IOMODE_READ, "READ" }, \
- { IOMODE_RW, "RW" }, \
- { IOMODE_ANY, "ANY" })
-
TRACE_EVENT(nfs4_layoutget,
TP_PROTO(
const struct nfs_open_context *ctx,
@@ -2026,11 +1691,11 @@ TRACE_EVENT(nfs4_layoutget,
"iomode=%s offset=%llu count=%llu stateid=%d:0x%08x "
"layoutstateid=%d:0x%08x",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
- show_pnfs_iomode(__entry->iomode),
+ show_pnfs_layout_iomode(__entry->iomode),
(unsigned long long)__entry->offset,
(unsigned long long)__entry->count,
__entry->stateid_seq, __entry->stateid_hash,
@@ -2124,7 +1789,7 @@ TRACE_EVENT(pnfs_update_layout,
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
- show_pnfs_iomode(__entry->iomode),
+ show_pnfs_layout_iomode(__entry->iomode),
(unsigned long long)__entry->pos,
(unsigned long long)__entry->count,
__entry->layoutstateid_seq, __entry->layoutstateid_hash,
@@ -2178,7 +1843,7 @@ DECLARE_EVENT_CLASS(pnfs_layout_event,
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
- show_pnfs_iomode(__entry->iomode),
+ show_pnfs_layout_iomode(__entry->iomode),
(unsigned long long)__entry->pos,
(unsigned long long)__entry->count,
__entry->layoutstateid_seq, __entry->layoutstateid_hash,
@@ -2323,7 +1988,7 @@ DECLARE_EVENT_CLASS(nfs4_flexfiles_io_event,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"offset=%llu count=%u stateid=%d:0x%08x dstaddr=%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -2379,7 +2044,7 @@ TRACE_EVENT(ff_layout_commit_error,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"offset=%llu count=%u dstaddr=%s",
-__entry->error,
- show_nfsv4_errors(__entry->error),
+ show_nfs4_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
index 49d432c00bde..8af91a95d7d1 100644
--- a/fs/nfs/nfstrace.h
+++ b/fs/nfs/nfstrace.h
@@ -12,6 +12,7 @@
#include <linux/iversion.h>
#include <trace/events/fs.h>
+#include <trace/events/nfs.h>
TRACE_DEFINE_ENUM(NFS_INO_INVALID_DATA);
TRACE_DEFINE_ENUM(NFS_INO_INVALID_ATIME);
@@ -143,7 +144,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event_done,
"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "
"type=%u (%s) version=%llu size=%lld "
"cache_validity=0x%lx (%s) nfs_flags=0x%lx (%s)",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -234,7 +235,7 @@ TRACE_EVENT(nfs_access_exit,
"type=%u (%s) version=%llu size=%lld "
"cache_validity=0x%lx (%s) nfs_flags=0x%lx (%s) "
"mask=0x%x permitted=0x%x",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->fileid,
__entry->fhandle,
@@ -320,7 +321,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,
TP_printk(
"error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
__entry->flags,
show_fs_lookup_flags(__entry->flags),
MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -411,7 +412,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
TP_printk(
"error=%ld (%s) flags=0x%lx (%s) fmode=%s "
"name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
__entry->flags,
show_fs_fcntl_open_flags(__entry->flags),
show_fs_fmode_flags(__entry->fmode),
@@ -482,7 +483,7 @@ TRACE_EVENT(nfs_create_exit,
TP_printk(
"error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
__entry->flags,
show_fs_fcntl_open_flags(__entry->flags),
MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -552,7 +553,7 @@ DECLARE_EVENT_CLASS(nfs_directory_event_done,
TP_printk(
"error=%ld (%s) name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -642,7 +643,7 @@ TRACE_EVENT(nfs_link_exit,
TP_printk(
"error=%ld (%s) fileid=%02x:%02x:%llu name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->fileid,
MAJOR(__entry->dev), MINOR(__entry->dev),
@@ -729,7 +730,7 @@ DECLARE_EVENT_CLASS(nfs_rename_event_done,
TP_printk(
"error=%ld (%s) old_name=%02x:%02x:%llu/%s "
"new_name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->old_dir,
__get_str(old_name),
@@ -783,7 +784,7 @@ TRACE_EVENT(nfs_sillyrename_unlink,
TP_printk(
"error=%ld (%s) name=%02x:%02x:%llu/%s",
- -__entry->error, nfs_show_status(__entry->error),
+ -__entry->error, show_nfs_status(__entry->error),
MAJOR(__entry->dev), MINOR(__entry->dev),
(unsigned long long)__entry->dir,
__get_str(name)
@@ -966,16 +967,6 @@ TRACE_EVENT(nfs_pgio_error,
)
);
-TRACE_DEFINE_ENUM(NFS_UNSTABLE);
-TRACE_DEFINE_ENUM(NFS_DATA_SYNC);
-TRACE_DEFINE_ENUM(NFS_FILE_SYNC);
-
-#define nfs_show_stable(stable) \
- __print_symbolic(stable, \
- { NFS_UNSTABLE, "UNSTABLE" }, \
- { NFS_DATA_SYNC, "DATA_SYNC" }, \
- { NFS_FILE_SYNC, "FILE_SYNC" })
-
TRACE_EVENT(nfs_initiate_write,
TP_PROTO(
const struct nfs_pgio_header *hdr
@@ -989,7 +980,7 @@ TRACE_EVENT(nfs_initiate_write,
__field(u64, fileid)
__field(loff_t, offset)
__field(u32, count)
- __field(enum nfs3_stable_how, stable)
+ __field(unsigned long, stable)
),
TP_fast_assign(
@@ -1013,7 +1004,7 @@ TRACE_EVENT(nfs_initiate_write,
(unsigned long long)__entry->fileid,
__entry->fhandle,
(long long)__entry->offset, __entry->count,
- nfs_show_stable(__entry->stable)
+ show_nfs_stable_how(__entry->stable)
)
);
@@ -1033,7 +1024,7 @@ TRACE_EVENT(nfs_writeback_done,
__field(u32, arg_count)
__field(u32, res_count)
__field(int, status)
- __field(enum nfs3_stable_how, stable)
+ __field(unsigned long, stable)
__array(char, verifier, NFS4_VERIFIER_SIZE)
),
@@ -1066,8 +1057,8 @@ TRACE_EVENT(nfs_writeback_done,
__entry->fhandle,
(long long)__entry->offset, __entry->arg_count,
__entry->res_count, __entry->status,
- nfs_show_stable(__entry->stable),
- __print_hex_str(__entry->verifier, NFS4_VERIFIER_SIZE)
+ show_nfs_stable_how(__entry->stable),
+ show_nfs4_verifier(__entry->verifier)
)
);
@@ -1168,7 +1159,7 @@ TRACE_EVENT(nfs_commit_done,
__field(u64, fileid)
__field(loff_t, offset)
__field(int, status)
- __field(enum nfs3_stable_how, stable)
+ __field(unsigned long, stable)
__array(char, verifier, NFS4_VERIFIER_SIZE)
),
@@ -1197,8 +1188,8 @@ TRACE_EVENT(nfs_commit_done,
(unsigned long long)__entry->fileid,
__entry->fhandle,
(long long)__entry->offset, __entry->status,
- nfs_show_stable(__entry->stable),
- __print_hex_str(__entry->verifier, NFS4_VERIFIER_SIZE)
+ show_nfs_stable_how(__entry->stable),
+ show_nfs4_verifier(__entry->verifier)
)
);
@@ -1235,76 +1226,6 @@ TRACE_EVENT(nfs_fh_to_dentry,
)
);
-TRACE_DEFINE_ENUM(NFS_OK);
-TRACE_DEFINE_ENUM(NFSERR_PERM);
-TRACE_DEFINE_ENUM(NFSERR_NOENT);
-TRACE_DEFINE_ENUM(NFSERR_IO);
-TRACE_DEFINE_ENUM(NFSERR_NXIO);
-TRACE_DEFINE_ENUM(ECHILD);
-TRACE_DEFINE_ENUM(NFSERR_EAGAIN);
-TRACE_DEFINE_ENUM(NFSERR_ACCES);
-TRACE_DEFINE_ENUM(NFSERR_EXIST);
-TRACE_DEFINE_ENUM(NFSERR_XDEV);
-TRACE_DEFINE_ENUM(NFSERR_NODEV);
-TRACE_DEFINE_ENUM(NFSERR_NOTDIR);
-TRACE_DEFINE_ENUM(NFSERR_ISDIR);
-TRACE_DEFINE_ENUM(NFSERR_INVAL);
-TRACE_DEFINE_ENUM(NFSERR_FBIG);
-TRACE_DEFINE_ENUM(NFSERR_NOSPC);
-TRACE_DEFINE_ENUM(NFSERR_ROFS);
-TRACE_DEFINE_ENUM(NFSERR_MLINK);
-TRACE_DEFINE_ENUM(NFSERR_OPNOTSUPP);
-TRACE_DEFINE_ENUM(NFSERR_NAMETOOLONG);
-TRACE_DEFINE_ENUM(NFSERR_NOTEMPTY);
-TRACE_DEFINE_ENUM(NFSERR_DQUOT);
-TRACE_DEFINE_ENUM(NFSERR_STALE);
-TRACE_DEFINE_ENUM(NFSERR_REMOTE);
-TRACE_DEFINE_ENUM(NFSERR_WFLUSH);
-TRACE_DEFINE_ENUM(NFSERR_BADHANDLE);
-TRACE_DEFINE_ENUM(NFSERR_NOT_SYNC);
-TRACE_DEFINE_ENUM(NFSERR_BAD_COOKIE);
-TRACE_DEFINE_ENUM(NFSERR_NOTSUPP);
-TRACE_DEFINE_ENUM(NFSERR_TOOSMALL);
-TRACE_DEFINE_ENUM(NFSERR_SERVERFAULT);
-TRACE_DEFINE_ENUM(NFSERR_BADTYPE);
-TRACE_DEFINE_ENUM(NFSERR_JUKEBOX);
-
-#define nfs_show_status(x) \
- __print_symbolic(x, \
- { NFS_OK, "OK" }, \
- { NFSERR_PERM, "PERM" }, \
- { NFSERR_NOENT, "NOENT" }, \
- { NFSERR_IO, "IO" }, \
- { NFSERR_NXIO, "NXIO" }, \
- { ECHILD, "CHILD" }, \
- { NFSERR_EAGAIN, "AGAIN" }, \
- { NFSERR_ACCES, "ACCES" }, \
- { NFSERR_EXIST, "EXIST" }, \
- { NFSERR_XDEV, "XDEV" }, \
- { NFSERR_NODEV, "NODEV" }, \
- { NFSERR_NOTDIR, "NOTDIR" }, \
- { NFSERR_ISDIR, "ISDIR" }, \
- { NFSERR_INVAL, "INVAL" }, \
- { NFSERR_FBIG, "FBIG" }, \
- { NFSERR_NOSPC, "NOSPC" }, \
- { NFSERR_ROFS, "ROFS" }, \
- { NFSERR_MLINK, "MLINK" }, \
- { NFSERR_OPNOTSUPP, "OPNOTSUPP" }, \
- { NFSERR_NAMETOOLONG, "NAMETOOLONG" }, \
- { NFSERR_NOTEMPTY, "NOTEMPTY" }, \
- { NFSERR_DQUOT, "DQUOT" }, \
- { NFSERR_STALE, "STALE" }, \
- { NFSERR_REMOTE, "REMOTE" }, \
- { NFSERR_WFLUSH, "WFLUSH" }, \
- { NFSERR_BADHANDLE, "BADHANDLE" }, \
- { NFSERR_NOT_SYNC, "NOTSYNC" }, \
- { NFSERR_BAD_COOKIE, "BADCOOKIE" }, \
- { NFSERR_NOTSUPP, "NOTSUPP" }, \
- { NFSERR_TOOSMALL, "TOOSMALL" }, \
- { NFSERR_SERVERFAULT, "REMOTEIO" }, \
- { NFSERR_BADTYPE, "BADTYPE" }, \
- { NFSERR_JUKEBOX, "JUKEBOX" })
-
DECLARE_EVENT_CLASS(nfs_xdr_event,
TP_PROTO(
const struct xdr_stream *xdr,
@@ -1344,7 +1265,7 @@ DECLARE_EVENT_CLASS(nfs_xdr_event,
__entry->task_id, __entry->client_id, __entry->xid,
__get_str(program), __entry->version,
__get_str(procedure), -__entry->error,
- nfs_show_status(__entry->error)
+ show_nfs_status(__entry->error)
)
);
#define DEFINE_NFS_XDR_EVENT(name) \
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index d810ae674f4e..821ded7eec1f 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -82,10 +82,6 @@ enum pnfs_try_status {
PNFS_TRY_AGAIN = 2,
};
-/* error codes for internal use */
-#define NFS4ERR_RESET_TO_MDS 12001
-#define NFS4ERR_RESET_TO_PNFS 12002
-
#ifdef CONFIG_NFS_V4_1
#define LAYOUT_NFSV4_1_MODULE_PREFIX "nfs-layouttype4"
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h
index 538520957a81..f1e0d3c51bc2 100644
--- a/fs/nfsd/trace.h
+++ b/fs/nfsd/trace.h
@@ -9,6 +9,7 @@
#define _NFSD_TRACE_H
#include <linux/tracepoint.h>
+
#include "export.h"
#include "nfsfh.h"
diff --git a/include/linux/nfs4.h b/include/linux/nfs4.h
index 15004c469807..5662d8be04eb 100644
--- a/include/linux/nfs4.h
+++ b/include/linux/nfs4.h
@@ -292,6 +292,10 @@ enum nfsstat4 {
NFS4ERR_XATTR2BIG = 10096,
};
+/* error codes for internal client use */
+#define NFS4ERR_RESET_TO_MDS 12001
+#define NFS4ERR_RESET_TO_PNFS 12002
+
static inline bool seqid_mutating_err(u32 err)
{
/* See RFC 7530, section 9.1.7 */
diff --git a/include/trace/events/nfs.h b/include/trace/events/nfs.h
new file mode 100644
index 000000000000..09ffdbb04134
--- /dev/null
+++ b/include/trace/events/nfs.h
@@ -0,0 +1,375 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * Display helpers for NFS protocol elements
+ *
+ * Author: Chuck Lever <[email protected]>
+ *
+ * Copyright (c) 2020, Oracle and/or its affiliates.
+ */
+
+#include <linux/nfs.h>
+#include <linux/nfs4.h>
+#include <uapi/linux/nfs.h>
+
+TRACE_DEFINE_ENUM(NFS_OK);
+TRACE_DEFINE_ENUM(NFSERR_PERM);
+TRACE_DEFINE_ENUM(NFSERR_NOENT);
+TRACE_DEFINE_ENUM(NFSERR_IO);
+TRACE_DEFINE_ENUM(NFSERR_NXIO);
+TRACE_DEFINE_ENUM(NFSERR_EAGAIN);
+TRACE_DEFINE_ENUM(NFSERR_ACCES);
+TRACE_DEFINE_ENUM(NFSERR_EXIST);
+TRACE_DEFINE_ENUM(NFSERR_XDEV);
+TRACE_DEFINE_ENUM(NFSERR_NODEV);
+TRACE_DEFINE_ENUM(NFSERR_NOTDIR);
+TRACE_DEFINE_ENUM(NFSERR_ISDIR);
+TRACE_DEFINE_ENUM(NFSERR_INVAL);
+TRACE_DEFINE_ENUM(NFSERR_FBIG);
+TRACE_DEFINE_ENUM(NFSERR_NOSPC);
+TRACE_DEFINE_ENUM(NFSERR_ROFS);
+TRACE_DEFINE_ENUM(NFSERR_MLINK);
+TRACE_DEFINE_ENUM(NFSERR_OPNOTSUPP);
+TRACE_DEFINE_ENUM(NFSERR_NAMETOOLONG);
+TRACE_DEFINE_ENUM(NFSERR_NOTEMPTY);
+TRACE_DEFINE_ENUM(NFSERR_DQUOT);
+TRACE_DEFINE_ENUM(NFSERR_STALE);
+TRACE_DEFINE_ENUM(NFSERR_REMOTE);
+TRACE_DEFINE_ENUM(NFSERR_WFLUSH);
+TRACE_DEFINE_ENUM(NFSERR_BADHANDLE);
+TRACE_DEFINE_ENUM(NFSERR_NOT_SYNC);
+TRACE_DEFINE_ENUM(NFSERR_BAD_COOKIE);
+TRACE_DEFINE_ENUM(NFSERR_NOTSUPP);
+TRACE_DEFINE_ENUM(NFSERR_TOOSMALL);
+TRACE_DEFINE_ENUM(NFSERR_SERVERFAULT);
+TRACE_DEFINE_ENUM(NFSERR_BADTYPE);
+TRACE_DEFINE_ENUM(NFSERR_JUKEBOX);
+
+#define show_nfs_status(x) \
+ __print_symbolic(x, \
+ { NFS_OK, "OK" }, \
+ { NFSERR_PERM, "PERM" }, \
+ { NFSERR_NOENT, "NOENT" }, \
+ { NFSERR_IO, "IO" }, \
+ { NFSERR_NXIO, "NXIO" }, \
+ { ECHILD, "CHILD" }, \
+ { NFSERR_EAGAIN, "AGAIN" }, \
+ { NFSERR_ACCES, "ACCES" }, \
+ { NFSERR_EXIST, "EXIST" }, \
+ { NFSERR_XDEV, "XDEV" }, \
+ { NFSERR_NODEV, "NODEV" }, \
+ { NFSERR_NOTDIR, "NOTDIR" }, \
+ { NFSERR_ISDIR, "ISDIR" }, \
+ { NFSERR_INVAL, "INVAL" }, \
+ { NFSERR_FBIG, "FBIG" }, \
+ { NFSERR_NOSPC, "NOSPC" }, \
+ { NFSERR_ROFS, "ROFS" }, \
+ { NFSERR_MLINK, "MLINK" }, \
+ { NFSERR_OPNOTSUPP, "OPNOTSUPP" }, \
+ { NFSERR_NAMETOOLONG, "NAMETOOLONG" }, \
+ { NFSERR_NOTEMPTY, "NOTEMPTY" }, \
+ { NFSERR_DQUOT, "DQUOT" }, \
+ { NFSERR_STALE, "STALE" }, \
+ { NFSERR_REMOTE, "REMOTE" }, \
+ { NFSERR_WFLUSH, "WFLUSH" }, \
+ { NFSERR_BADHANDLE, "BADHANDLE" }, \
+ { NFSERR_NOT_SYNC, "NOTSYNC" }, \
+ { NFSERR_BAD_COOKIE, "BADCOOKIE" }, \
+ { NFSERR_NOTSUPP, "NOTSUPP" }, \
+ { NFSERR_TOOSMALL, "TOOSMALL" }, \
+ { NFSERR_SERVERFAULT, "REMOTEIO" }, \
+ { NFSERR_BADTYPE, "BADTYPE" }, \
+ { NFSERR_JUKEBOX, "JUKEBOX" })
+
+TRACE_DEFINE_ENUM(NFS_UNSTABLE);
+TRACE_DEFINE_ENUM(NFS_DATA_SYNC);
+TRACE_DEFINE_ENUM(NFS_FILE_SYNC);
+
+#define show_nfs_stable_how(x) \
+ __print_symbolic(x, \
+ { NFS_UNSTABLE, "UNSTABLE" }, \
+ { NFS_DATA_SYNC, "DATA_SYNC" }, \
+ { NFS_FILE_SYNC, "FILE_SYNC" })
+
+TRACE_DEFINE_ENUM(NFS4_OK);
+TRACE_DEFINE_ENUM(NFS4ERR_ACCESS);
+TRACE_DEFINE_ENUM(NFS4ERR_ATTRNOTSUPP);
+TRACE_DEFINE_ENUM(NFS4ERR_ADMIN_REVOKED);
+TRACE_DEFINE_ENUM(NFS4ERR_BACK_CHAN_BUSY);
+TRACE_DEFINE_ENUM(NFS4ERR_BADCHAR);
+TRACE_DEFINE_ENUM(NFS4ERR_BADHANDLE);
+TRACE_DEFINE_ENUM(NFS4ERR_BADIOMODE);
+TRACE_DEFINE_ENUM(NFS4ERR_BADLAYOUT);
+TRACE_DEFINE_ENUM(NFS4ERR_BADLABEL);
+TRACE_DEFINE_ENUM(NFS4ERR_BADNAME);
+TRACE_DEFINE_ENUM(NFS4ERR_BADOWNER);
+TRACE_DEFINE_ENUM(NFS4ERR_BADSESSION);
+TRACE_DEFINE_ENUM(NFS4ERR_BADSLOT);
+TRACE_DEFINE_ENUM(NFS4ERR_BADTYPE);
+TRACE_DEFINE_ENUM(NFS4ERR_BADXDR);
+TRACE_DEFINE_ENUM(NFS4ERR_BAD_COOKIE);
+TRACE_DEFINE_ENUM(NFS4ERR_BAD_HIGH_SLOT);
+TRACE_DEFINE_ENUM(NFS4ERR_BAD_RANGE);
+TRACE_DEFINE_ENUM(NFS4ERR_BAD_SEQID);
+TRACE_DEFINE_ENUM(NFS4ERR_BAD_SESSION_DIGEST);
+TRACE_DEFINE_ENUM(NFS4ERR_BAD_STATEID);
+TRACE_DEFINE_ENUM(NFS4ERR_CB_PATH_DOWN);
+TRACE_DEFINE_ENUM(NFS4ERR_CLID_INUSE);
+TRACE_DEFINE_ENUM(NFS4ERR_CLIENTID_BUSY);
+TRACE_DEFINE_ENUM(NFS4ERR_COMPLETE_ALREADY);
+TRACE_DEFINE_ENUM(NFS4ERR_CONN_NOT_BOUND_TO_SESSION);
+TRACE_DEFINE_ENUM(NFS4ERR_DEADLOCK);
+TRACE_DEFINE_ENUM(NFS4ERR_DEADSESSION);
+TRACE_DEFINE_ENUM(NFS4ERR_DELAY);
+TRACE_DEFINE_ENUM(NFS4ERR_DELEG_ALREADY_WANTED);
+TRACE_DEFINE_ENUM(NFS4ERR_DELEG_REVOKED);
+TRACE_DEFINE_ENUM(NFS4ERR_DENIED);
+TRACE_DEFINE_ENUM(NFS4ERR_DIRDELEG_UNAVAIL);
+TRACE_DEFINE_ENUM(NFS4ERR_DQUOT);
+TRACE_DEFINE_ENUM(NFS4ERR_ENCR_ALG_UNSUPP);
+TRACE_DEFINE_ENUM(NFS4ERR_EXIST);
+TRACE_DEFINE_ENUM(NFS4ERR_EXPIRED);
+TRACE_DEFINE_ENUM(NFS4ERR_FBIG);
+TRACE_DEFINE_ENUM(NFS4ERR_FHEXPIRED);
+TRACE_DEFINE_ENUM(NFS4ERR_FILE_OPEN);
+TRACE_DEFINE_ENUM(NFS4ERR_GRACE);
+TRACE_DEFINE_ENUM(NFS4ERR_HASH_ALG_UNSUPP);
+TRACE_DEFINE_ENUM(NFS4ERR_INVAL);
+TRACE_DEFINE_ENUM(NFS4ERR_IO);
+TRACE_DEFINE_ENUM(NFS4ERR_ISDIR);
+TRACE_DEFINE_ENUM(NFS4ERR_LAYOUTTRYLATER);
+TRACE_DEFINE_ENUM(NFS4ERR_LAYOUTUNAVAILABLE);
+TRACE_DEFINE_ENUM(NFS4ERR_LEASE_MOVED);
+TRACE_DEFINE_ENUM(NFS4ERR_LOCKED);
+TRACE_DEFINE_ENUM(NFS4ERR_LOCKS_HELD);
+TRACE_DEFINE_ENUM(NFS4ERR_LOCK_RANGE);
+TRACE_DEFINE_ENUM(NFS4ERR_MINOR_VERS_MISMATCH);
+TRACE_DEFINE_ENUM(NFS4ERR_MLINK);
+TRACE_DEFINE_ENUM(NFS4ERR_MOVED);
+TRACE_DEFINE_ENUM(NFS4ERR_NAMETOOLONG);
+TRACE_DEFINE_ENUM(NFS4ERR_NOENT);
+TRACE_DEFINE_ENUM(NFS4ERR_NOFILEHANDLE);
+TRACE_DEFINE_ENUM(NFS4ERR_NOMATCHING_LAYOUT);
+TRACE_DEFINE_ENUM(NFS4ERR_NOSPC);
+TRACE_DEFINE_ENUM(NFS4ERR_NOTDIR);
+TRACE_DEFINE_ENUM(NFS4ERR_NOTEMPTY);
+TRACE_DEFINE_ENUM(NFS4ERR_NOTSUPP);
+TRACE_DEFINE_ENUM(NFS4ERR_NOT_ONLY_OP);
+TRACE_DEFINE_ENUM(NFS4ERR_NOT_SAME);
+TRACE_DEFINE_ENUM(NFS4ERR_NO_GRACE);
+TRACE_DEFINE_ENUM(NFS4ERR_NXIO);
+TRACE_DEFINE_ENUM(NFS4ERR_OLD_STATEID);
+TRACE_DEFINE_ENUM(NFS4ERR_OPENMODE);
+TRACE_DEFINE_ENUM(NFS4ERR_OP_ILLEGAL);
+TRACE_DEFINE_ENUM(NFS4ERR_OP_NOT_IN_SESSION);
+TRACE_DEFINE_ENUM(NFS4ERR_PERM);
+TRACE_DEFINE_ENUM(NFS4ERR_PNFS_IO_HOLE);
+TRACE_DEFINE_ENUM(NFS4ERR_PNFS_NO_LAYOUT);
+TRACE_DEFINE_ENUM(NFS4ERR_RECALLCONFLICT);
+TRACE_DEFINE_ENUM(NFS4ERR_RECLAIM_BAD);
+TRACE_DEFINE_ENUM(NFS4ERR_RECLAIM_CONFLICT);
+TRACE_DEFINE_ENUM(NFS4ERR_REJECT_DELEG);
+TRACE_DEFINE_ENUM(NFS4ERR_REP_TOO_BIG);
+TRACE_DEFINE_ENUM(NFS4ERR_REP_TOO_BIG_TO_CACHE);
+TRACE_DEFINE_ENUM(NFS4ERR_REQ_TOO_BIG);
+TRACE_DEFINE_ENUM(NFS4ERR_RESOURCE);
+TRACE_DEFINE_ENUM(NFS4ERR_RESTOREFH);
+TRACE_DEFINE_ENUM(NFS4ERR_RETRY_UNCACHED_REP);
+TRACE_DEFINE_ENUM(NFS4ERR_RETURNCONFLICT);
+TRACE_DEFINE_ENUM(NFS4ERR_ROFS);
+TRACE_DEFINE_ENUM(NFS4ERR_SAME);
+TRACE_DEFINE_ENUM(NFS4ERR_SHARE_DENIED);
+TRACE_DEFINE_ENUM(NFS4ERR_SEQUENCE_POS);
+TRACE_DEFINE_ENUM(NFS4ERR_SEQ_FALSE_RETRY);
+TRACE_DEFINE_ENUM(NFS4ERR_SEQ_MISORDERED);
+TRACE_DEFINE_ENUM(NFS4ERR_SERVERFAULT);
+TRACE_DEFINE_ENUM(NFS4ERR_STALE);
+TRACE_DEFINE_ENUM(NFS4ERR_STALE_CLIENTID);
+TRACE_DEFINE_ENUM(NFS4ERR_STALE_STATEID);
+TRACE_DEFINE_ENUM(NFS4ERR_SYMLINK);
+TRACE_DEFINE_ENUM(NFS4ERR_TOOSMALL);
+TRACE_DEFINE_ENUM(NFS4ERR_TOO_MANY_OPS);
+TRACE_DEFINE_ENUM(NFS4ERR_UNKNOWN_LAYOUTTYPE);
+TRACE_DEFINE_ENUM(NFS4ERR_UNSAFE_COMPOUND);
+TRACE_DEFINE_ENUM(NFS4ERR_WRONGSEC);
+TRACE_DEFINE_ENUM(NFS4ERR_WRONG_CRED);
+TRACE_DEFINE_ENUM(NFS4ERR_WRONG_TYPE);
+TRACE_DEFINE_ENUM(NFS4ERR_XDEV);
+
+TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_MDS);
+TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_PNFS);
+
+#define show_nfs4_status(x) \
+ __print_symbolic(x, \
+ { NFS4_OK, "OK" }, \
+ { EPERM, "EPERM" }, \
+ { ENOENT, "ENOENT" }, \
+ { EIO, "EIO" }, \
+ { ENXIO, "ENXIO" }, \
+ { EACCES, "EACCES" }, \
+ { EEXIST, "EEXIST" }, \
+ { EXDEV, "EXDEV" }, \
+ { ENOTDIR, "ENOTDIR" }, \
+ { EISDIR, "EISDIR" }, \
+ { EFBIG, "EFBIG" }, \
+ { ENOSPC, "ENOSPC" }, \
+ { EROFS, "EROFS" }, \
+ { EMLINK, "EMLINK" }, \
+ { ENAMETOOLONG, "ENAMETOOLONG" }, \
+ { ENOTEMPTY, "ENOTEMPTY" }, \
+ { EDQUOT, "EDQUOT" }, \
+ { ESTALE, "ESTALE" }, \
+ { EBADHANDLE, "EBADHANDLE" }, \
+ { EBADCOOKIE, "EBADCOOKIE" }, \
+ { ENOTSUPP, "ENOTSUPP" }, \
+ { ETOOSMALL, "ETOOSMALL" }, \
+ { EREMOTEIO, "EREMOTEIO" }, \
+ { EBADTYPE, "EBADTYPE" }, \
+ { EAGAIN, "EAGAIN" }, \
+ { ELOOP, "ELOOP" }, \
+ { EOPNOTSUPP, "EOPNOTSUPP" }, \
+ { EDEADLK, "EDEADLK" }, \
+ { ENOMEM, "ENOMEM" }, \
+ { EKEYEXPIRED, "EKEYEXPIRED" }, \
+ { ETIMEDOUT, "ETIMEDOUT" }, \
+ { ERESTARTSYS, "ERESTARTSYS" }, \
+ { ECONNREFUSED, "ECONNREFUSED" }, \
+ { ECONNRESET, "ECONNRESET" }, \
+ { ENETUNREACH, "ENETUNREACH" }, \
+ { EHOSTUNREACH, "EHOSTUNREACH" }, \
+ { EHOSTDOWN, "EHOSTDOWN" }, \
+ { EPIPE, "EPIPE" }, \
+ { EPFNOSUPPORT, "EPFNOSUPPORT" }, \
+ { EPROTONOSUPPORT, "EPROTONOSUPPORT" }, \
+ { NFS4ERR_ACCESS, "ACCESS" }, \
+ { NFS4ERR_ATTRNOTSUPP, "ATTRNOTSUPP" }, \
+ { NFS4ERR_ADMIN_REVOKED, "ADMIN_REVOKED" }, \
+ { NFS4ERR_BACK_CHAN_BUSY, "BACK_CHAN_BUSY" }, \
+ { NFS4ERR_BADCHAR, "BADCHAR" }, \
+ { NFS4ERR_BADHANDLE, "BADHANDLE" }, \
+ { NFS4ERR_BADIOMODE, "BADIOMODE" }, \
+ { NFS4ERR_BADLAYOUT, "BADLAYOUT" }, \
+ { NFS4ERR_BADLABEL, "BADLABEL" }, \
+ { NFS4ERR_BADNAME, "BADNAME" }, \
+ { NFS4ERR_BADOWNER, "BADOWNER" }, \
+ { NFS4ERR_BADSESSION, "BADSESSION" }, \
+ { NFS4ERR_BADSLOT, "BADSLOT" }, \
+ { NFS4ERR_BADTYPE, "BADTYPE" }, \
+ { NFS4ERR_BADXDR, "BADXDR" }, \
+ { NFS4ERR_BAD_COOKIE, "BAD_COOKIE" }, \
+ { NFS4ERR_BAD_HIGH_SLOT, "BAD_HIGH_SLOT" }, \
+ { NFS4ERR_BAD_RANGE, "BAD_RANGE" }, \
+ { NFS4ERR_BAD_SEQID, "BAD_SEQID" }, \
+ { NFS4ERR_BAD_SESSION_DIGEST, "BAD_SESSION_DIGEST" }, \
+ { NFS4ERR_BAD_STATEID, "BAD_STATEID" }, \
+ { NFS4ERR_CB_PATH_DOWN, "CB_PATH_DOWN" }, \
+ { NFS4ERR_CLID_INUSE, "CLID_INUSE" }, \
+ { NFS4ERR_CLIENTID_BUSY, "CLIENTID_BUSY" }, \
+ { NFS4ERR_COMPLETE_ALREADY, "COMPLETE_ALREADY" }, \
+ { NFS4ERR_CONN_NOT_BOUND_TO_SESSION, "CONN_NOT_BOUND_TO_SESSION" }, \
+ { NFS4ERR_DEADLOCK, "DEADLOCK" }, \
+ { NFS4ERR_DEADSESSION, "DEAD_SESSION" }, \
+ { NFS4ERR_DELAY, "DELAY" }, \
+ { NFS4ERR_DELEG_ALREADY_WANTED, "DELEG_ALREADY_WANTED" }, \
+ { NFS4ERR_DELEG_REVOKED, "DELEG_REVOKED" }, \
+ { NFS4ERR_DENIED, "DENIED" }, \
+ { NFS4ERR_DIRDELEG_UNAVAIL, "DIRDELEG_UNAVAIL" }, \
+ { NFS4ERR_DQUOT, "DQUOT" }, \
+ { NFS4ERR_ENCR_ALG_UNSUPP, "ENCR_ALG_UNSUPP" }, \
+ { NFS4ERR_EXIST, "EXIST" }, \
+ { NFS4ERR_EXPIRED, "EXPIRED" }, \
+ { NFS4ERR_FBIG, "FBIG" }, \
+ { NFS4ERR_FHEXPIRED, "FHEXPIRED" }, \
+ { NFS4ERR_FILE_OPEN, "FILE_OPEN" }, \
+ { NFS4ERR_GRACE, "GRACE" }, \
+ { NFS4ERR_HASH_ALG_UNSUPP, "HASH_ALG_UNSUPP" }, \
+ { NFS4ERR_INVAL, "INVAL" }, \
+ { NFS4ERR_IO, "IO" }, \
+ { NFS4ERR_ISDIR, "ISDIR" }, \
+ { NFS4ERR_LAYOUTTRYLATER, "LAYOUTTRYLATER" }, \
+ { NFS4ERR_LAYOUTUNAVAILABLE, "LAYOUTUNAVAILABLE" }, \
+ { NFS4ERR_LEASE_MOVED, "LEASE_MOVED" }, \
+ { NFS4ERR_LOCKED, "LOCKED" }, \
+ { NFS4ERR_LOCKS_HELD, "LOCKS_HELD" }, \
+ { NFS4ERR_LOCK_RANGE, "LOCK_RANGE" }, \
+ { NFS4ERR_MINOR_VERS_MISMATCH, "MINOR_VERS_MISMATCH" }, \
+ { NFS4ERR_MLINK, "MLINK" }, \
+ { NFS4ERR_MOVED, "MOVED" }, \
+ { NFS4ERR_NAMETOOLONG, "NAMETOOLONG" }, \
+ { NFS4ERR_NOENT, "NOENT" }, \
+ { NFS4ERR_NOFILEHANDLE, "NOFILEHANDLE" }, \
+ { NFS4ERR_NOMATCHING_LAYOUT, "NOMATCHING_LAYOUT" }, \
+ { NFS4ERR_NOSPC, "NOSPC" }, \
+ { NFS4ERR_NOTDIR, "NOTDIR" }, \
+ { NFS4ERR_NOTEMPTY, "NOTEMPTY" }, \
+ { NFS4ERR_NOTSUPP, "NOTSUPP" }, \
+ { NFS4ERR_NOT_ONLY_OP, "NOT_ONLY_OP" }, \
+ { NFS4ERR_NOT_SAME, "NOT_SAME" }, \
+ { NFS4ERR_NO_GRACE, "NO_GRACE" }, \
+ { NFS4ERR_NXIO, "NXIO" }, \
+ { NFS4ERR_OLD_STATEID, "OLD_STATEID" }, \
+ { NFS4ERR_OPENMODE, "OPENMODE" }, \
+ { NFS4ERR_OP_ILLEGAL, "OP_ILLEGAL" }, \
+ { NFS4ERR_OP_NOT_IN_SESSION, "OP_NOT_IN_SESSION" }, \
+ { NFS4ERR_PERM, "PERM" }, \
+ { NFS4ERR_PNFS_IO_HOLE, "PNFS_IO_HOLE" }, \
+ { NFS4ERR_PNFS_NO_LAYOUT, "PNFS_NO_LAYOUT" }, \
+ { NFS4ERR_RECALLCONFLICT, "RECALLCONFLICT" }, \
+ { NFS4ERR_RECLAIM_BAD, "RECLAIM_BAD" }, \
+ { NFS4ERR_RECLAIM_CONFLICT, "RECLAIM_CONFLICT" }, \
+ { NFS4ERR_REJECT_DELEG, "REJECT_DELEG" }, \
+ { NFS4ERR_REP_TOO_BIG, "REP_TOO_BIG" }, \
+ { NFS4ERR_REP_TOO_BIG_TO_CACHE, "REP_TOO_BIG_TO_CACHE" }, \
+ { NFS4ERR_REQ_TOO_BIG, "REQ_TOO_BIG" }, \
+ { NFS4ERR_RESOURCE, "RESOURCE" }, \
+ { NFS4ERR_RESTOREFH, "RESTOREFH" }, \
+ { NFS4ERR_RETRY_UNCACHED_REP, "RETRY_UNCACHED_REP" }, \
+ { NFS4ERR_RETURNCONFLICT, "RETURNCONFLICT" }, \
+ { NFS4ERR_ROFS, "ROFS" }, \
+ { NFS4ERR_SAME, "SAME" }, \
+ { NFS4ERR_SHARE_DENIED, "SHARE_DENIED" }, \
+ { NFS4ERR_SEQUENCE_POS, "SEQUENCE_POS" }, \
+ { NFS4ERR_SEQ_FALSE_RETRY, "SEQ_FALSE_RETRY" }, \
+ { NFS4ERR_SEQ_MISORDERED, "SEQ_MISORDERED" }, \
+ { NFS4ERR_SERVERFAULT, "SERVERFAULT" }, \
+ { NFS4ERR_STALE, "STALE" }, \
+ { NFS4ERR_STALE_CLIENTID, "STALE_CLIENTID" }, \
+ { NFS4ERR_STALE_STATEID, "STALE_STATEID" }, \
+ { NFS4ERR_SYMLINK, "SYMLINK" }, \
+ { NFS4ERR_TOOSMALL, "TOOSMALL" }, \
+ { NFS4ERR_TOO_MANY_OPS, "TOO_MANY_OPS" }, \
+ { NFS4ERR_UNKNOWN_LAYOUTTYPE, "UNKNOWN_LAYOUTTYPE" }, \
+ { NFS4ERR_UNSAFE_COMPOUND, "UNSAFE_COMPOUND" }, \
+ { NFS4ERR_WRONGSEC, "WRONGSEC" }, \
+ { NFS4ERR_WRONG_CRED, "WRONG_CRED" }, \
+ { NFS4ERR_WRONG_TYPE, "WRONG_TYPE" }, \
+ { NFS4ERR_XDEV, "XDEV" }, \
+ /* ***** Internal to Linux NFS client ***** */ \
+ { NFS4ERR_RESET_TO_MDS, "RESET_TO_MDS" }, \
+ { NFS4ERR_RESET_TO_PNFS, "RESET_TO_PNFS" })
+
+#define show_nfs4_verifier(x) \
+ __print_hex_str(x, NFS4_VERIFIER_SIZE)
+
+TRACE_DEFINE_ENUM(IOMODE_READ);
+TRACE_DEFINE_ENUM(IOMODE_RW);
+TRACE_DEFINE_ENUM(IOMODE_ANY);
+
+#define show_pnfs_layout_iomode(x) \
+ __print_symbolic(x, \
+ { IOMODE_READ, "READ" }, \
+ { IOMODE_RW, "RW" }, \
+ { IOMODE_ANY, "ANY" })
+
+#define show_nfs4_seq4_status(x) \
+ __print_flags(x, "|", \
+ { SEQ4_STATUS_CB_PATH_DOWN, "CB_PATH_DOWN" }, \
+ { SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRING, "CB_GSS_CONTEXTS_EXPIRING" }, \
+ { SEQ4_STATUS_CB_GSS_CONTEXTS_EXPIRED, "CB_GSS_CONTEXTS_EXPIRED" }, \
+ { SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED, "EXPIRED_ALL_STATE_REVOKED" }, \
+ { SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED, "EXPIRED_SOME_STATE_REVOKED" }, \
+ { SEQ4_STATUS_ADMIN_STATE_REVOKED, "ADMIN_STATE_REVOKED" }, \
+ { SEQ4_STATUS_RECALLABLE_STATE_REVOKED, "RECALLABLE_STATE_REVOKED" }, \
+ { SEQ4_STATUS_LEASE_MOVED, "LEASE_MOVED" }, \
+ { SEQ4_STATUS_RESTART_RECLAIM_NEEDED, "RESTART_RECLAIM_NEEDED" }, \
+ { SEQ4_STATUS_CB_PATH_DOWN_SESSION, "CB_PATH_DOWN_SESSION" }, \
+ { SEQ4_STATUS_BACKCHANNEL_FAULT, "BACKCHANNEL_FAULT" })
On Tue, Oct 19, 2021 at 12:46 PM Chuck Lever <[email protected]> wrote:
>
> Refactor: Surface useful show_ macros for use by other trace
> subsystems.
This doesn't apply on top of Trond's origin/testing. Are there some
other dependencies I'm missing?
>
> Signed-off-by: Chuck Lever <[email protected]>
> ---
> fs/nfs/nfs4trace.h | 67 ++++++---------------
> fs/nfs/nfstrace.h | 118 +++++-------------------------------
> include/trace/events/fs.h | 146 +++++++++++++++++++++++++++++++++++++++++++++
> 3 files changed, 180 insertions(+), 151 deletions(-)
> create mode 100644 include/trace/events/fs.h
>
> diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
> index 7a2567aa2b86..b2f45c825f37 100644
> --- a/fs/nfs/nfs4trace.h
> +++ b/fs/nfs/nfs4trace.h
> @@ -10,6 +10,8 @@
>
> #include <linux/tracepoint.h>
>
> +#include <trace/events/fs.h>
> +
> TRACE_DEFINE_ENUM(EPERM);
> TRACE_DEFINE_ENUM(ENOENT);
> TRACE_DEFINE_ENUM(EIO);
> @@ -313,19 +315,6 @@ TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_PNFS);
> { NFS4ERR_RESET_TO_MDS, "RESET_TO_MDS" }, \
> { NFS4ERR_RESET_TO_PNFS, "RESET_TO_PNFS" })
>
> -#define show_open_flags(flags) \
> - __print_flags(flags, "|", \
> - { O_CREAT, "O_CREAT" }, \
> - { O_EXCL, "O_EXCL" }, \
> - { O_TRUNC, "O_TRUNC" }, \
> - { O_DIRECT, "O_DIRECT" })
> -
> -#define show_fmode_flags(mode) \
> - __print_flags(mode, "|", \
> - { ((__force unsigned long)FMODE_READ), "READ" }, \
> - { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
> - { ((__force unsigned long)FMODE_EXEC), "EXEC" })
> -
> #define show_nfs_fattr_flags(valid) \
> __print_flags((unsigned long)valid, "|", \
> { NFS_ATTR_FATTR_TYPE, "TYPE" }, \
> @@ -793,8 +782,8 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
>
> TP_STRUCT__entry(
> __field(unsigned long, error)
> - __field(unsigned int, flags)
> - __field(unsigned int, fmode)
> + __field(unsigned long, flags)
> + __field(unsigned long, fmode)
> __field(dev_t, dev)
> __field(u32, fhandle)
> __field(u64, fileid)
> @@ -812,7 +801,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
>
> __entry->error = -error;
> __entry->flags = flags;
> - __entry->fmode = (__force unsigned int)ctx->mode;
> + __entry->fmode = (__force unsigned long)ctx->mode;
> __entry->dev = ctx->dentry->d_sb->s_dev;
> if (!IS_ERR_OR_NULL(state)) {
> inode = state->inode;
> @@ -842,15 +831,15 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
> ),
>
> TP_printk(
> - "error=%ld (%s) flags=%d (%s) fmode=%s "
> + "error=%ld (%s) flags=%lu (%s) fmode=%s "
> "fileid=%02x:%02x:%llu fhandle=0x%08x "
> "name=%02x:%02x:%llu/%s stateid=%d:0x%08x "
> "openstateid=%d:0x%08x",
> -__entry->error,
> show_nfsv4_errors(__entry->error),
> __entry->flags,
> - show_open_flags(__entry->flags),
> - show_fmode_flags(__entry->fmode),
> + show_fs_fcntl_open_flags(__entry->flags),
> + show_fs_fmode_flags(__entry->fmode),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->fileid,
> __entry->fhandle,
> @@ -904,7 +893,7 @@ TRACE_EVENT(nfs4_cached_open,
> TP_printk(
> "fmode=%s fileid=%02x:%02x:%llu "
> "fhandle=0x%08x stateid=%d:0x%08x",
> - __entry->fmode ? show_fmode_flags(__entry->fmode) :
> + __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
> "closed",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->fileid,
> @@ -952,7 +941,7 @@ TRACE_EVENT(nfs4_close,
> "fhandle=0x%08x openstateid=%d:0x%08x",
> -__entry->error,
> show_nfsv4_errors(__entry->error),
> - __entry->fmode ? show_fmode_flags(__entry->fmode) :
> + __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
> "closed",
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->fileid,
> @@ -961,24 +950,6 @@ TRACE_EVENT(nfs4_close,
> )
> );
>
> -TRACE_DEFINE_ENUM(F_GETLK);
> -TRACE_DEFINE_ENUM(F_SETLK);
> -TRACE_DEFINE_ENUM(F_SETLKW);
> -TRACE_DEFINE_ENUM(F_RDLCK);
> -TRACE_DEFINE_ENUM(F_WRLCK);
> -TRACE_DEFINE_ENUM(F_UNLCK);
> -
> -#define show_lock_cmd(type) \
> - __print_symbolic((int)type, \
> - { F_GETLK, "GETLK" }, \
> - { F_SETLK, "SETLK" }, \
> - { F_SETLKW, "SETLKW" })
> -#define show_lock_type(type) \
> - __print_symbolic((int)type, \
> - { F_RDLCK, "RDLCK" }, \
> - { F_WRLCK, "WRLCK" }, \
> - { F_UNLCK, "UNLCK" })
> -
> DECLARE_EVENT_CLASS(nfs4_lock_event,
> TP_PROTO(
> const struct file_lock *request,
> @@ -991,8 +962,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
>
> TP_STRUCT__entry(
> __field(unsigned long, error)
> - __field(int, cmd)
> - __field(char, type)
> + __field(unsigned long, cmd)
> + __field(unsigned long, type)
> __field(loff_t, start)
> __field(loff_t, end)
> __field(dev_t, dev)
> @@ -1025,8 +996,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
> "stateid=%d:0x%08x",
> -__entry->error,
> show_nfsv4_errors(__entry->error),
> - show_lock_cmd(__entry->cmd),
> - show_lock_type(__entry->type),
> + show_fs_fcntl_cmd(__entry->cmd),
> + show_fs_fcntl_lock_type(__entry->type),
> (long long)__entry->start,
> (long long)__entry->end,
> MAJOR(__entry->dev), MINOR(__entry->dev),
> @@ -1061,8 +1032,8 @@ TRACE_EVENT(nfs4_set_lock,
>
> TP_STRUCT__entry(
> __field(unsigned long, error)
> - __field(int, cmd)
> - __field(char, type)
> + __field(unsigned long, cmd)
> + __field(unsigned long, type)
> __field(loff_t, start)
> __field(loff_t, end)
> __field(dev_t, dev)
> @@ -1101,8 +1072,8 @@ TRACE_EVENT(nfs4_set_lock,
> "stateid=%d:0x%08x lockstateid=%d:0x%08x",
> -__entry->error,
> show_nfsv4_errors(__entry->error),
> - show_lock_cmd(__entry->cmd),
> - show_lock_type(__entry->type),
> + show_fs_fcntl_cmd(__entry->cmd),
> + show_fs_fcntl_lock_type(__entry->type),
> (long long)__entry->start,
> (long long)__entry->end,
> MAJOR(__entry->dev), MINOR(__entry->dev),
> @@ -1219,7 +1190,7 @@ DECLARE_EVENT_CLASS(nfs4_set_delegation_event,
>
> TP_printk(
> "fmode=%s fileid=%02x:%02x:%llu fhandle=0x%08x",
> - show_fmode_flags(__entry->fmode),
> + show_fs_fmode_flags(__entry->fmode),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->fileid,
> __entry->fhandle
> diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
> index 8a224871be74..49d432c00bde 100644
> --- a/fs/nfs/nfstrace.h
> +++ b/fs/nfs/nfstrace.h
> @@ -11,27 +11,7 @@
> #include <linux/tracepoint.h>
> #include <linux/iversion.h>
>
> -TRACE_DEFINE_ENUM(DT_UNKNOWN);
> -TRACE_DEFINE_ENUM(DT_FIFO);
> -TRACE_DEFINE_ENUM(DT_CHR);
> -TRACE_DEFINE_ENUM(DT_DIR);
> -TRACE_DEFINE_ENUM(DT_BLK);
> -TRACE_DEFINE_ENUM(DT_REG);
> -TRACE_DEFINE_ENUM(DT_LNK);
> -TRACE_DEFINE_ENUM(DT_SOCK);
> -TRACE_DEFINE_ENUM(DT_WHT);
> -
> -#define nfs_show_file_type(ftype) \
> - __print_symbolic(ftype, \
> - { DT_UNKNOWN, "UNKNOWN" }, \
> - { DT_FIFO, "FIFO" }, \
> - { DT_CHR, "CHR" }, \
> - { DT_DIR, "DIR" }, \
> - { DT_BLK, "BLK" }, \
> - { DT_REG, "REG" }, \
> - { DT_LNK, "LNK" }, \
> - { DT_SOCK, "SOCK" }, \
> - { DT_WHT, "WHT" })
> +#include <trace/events/fs.h>
>
> TRACE_DEFINE_ENUM(NFS_INO_INVALID_DATA);
> TRACE_DEFINE_ENUM(NFS_INO_INVALID_ATIME);
> @@ -168,7 +148,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event_done,
> (unsigned long long)__entry->fileid,
> __entry->fhandle,
> __entry->type,
> - nfs_show_file_type(__entry->type),
> + show_fs_dirent_type(__entry->type),
> (unsigned long long)__entry->version,
> (long long)__entry->size,
> __entry->cache_validity,
> @@ -259,7 +239,7 @@ TRACE_EVENT(nfs_access_exit,
> (unsigned long long)__entry->fileid,
> __entry->fhandle,
> __entry->type,
> - nfs_show_file_type(__entry->type),
> + show_fs_dirent_type(__entry->type),
> (unsigned long long)__entry->version,
> (long long)__entry->size,
> __entry->cache_validity,
> @@ -270,34 +250,6 @@ TRACE_EVENT(nfs_access_exit,
> )
> );
>
> -TRACE_DEFINE_ENUM(LOOKUP_FOLLOW);
> -TRACE_DEFINE_ENUM(LOOKUP_DIRECTORY);
> -TRACE_DEFINE_ENUM(LOOKUP_AUTOMOUNT);
> -TRACE_DEFINE_ENUM(LOOKUP_PARENT);
> -TRACE_DEFINE_ENUM(LOOKUP_REVAL);
> -TRACE_DEFINE_ENUM(LOOKUP_RCU);
> -TRACE_DEFINE_ENUM(LOOKUP_OPEN);
> -TRACE_DEFINE_ENUM(LOOKUP_CREATE);
> -TRACE_DEFINE_ENUM(LOOKUP_EXCL);
> -TRACE_DEFINE_ENUM(LOOKUP_RENAME_TARGET);
> -TRACE_DEFINE_ENUM(LOOKUP_EMPTY);
> -TRACE_DEFINE_ENUM(LOOKUP_DOWN);
> -
> -#define show_lookup_flags(flags) \
> - __print_flags(flags, "|", \
> - { LOOKUP_FOLLOW, "FOLLOW" }, \
> - { LOOKUP_DIRECTORY, "DIRECTORY" }, \
> - { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
> - { LOOKUP_PARENT, "PARENT" }, \
> - { LOOKUP_REVAL, "REVAL" }, \
> - { LOOKUP_RCU, "RCU" }, \
> - { LOOKUP_OPEN, "OPEN" }, \
> - { LOOKUP_CREATE, "CREATE" }, \
> - { LOOKUP_EXCL, "EXCL" }, \
> - { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
> - { LOOKUP_EMPTY, "EMPTY" }, \
> - { LOOKUP_DOWN, "DOWN" })
> -
> DECLARE_EVENT_CLASS(nfs_lookup_event,
> TP_PROTO(
> const struct inode *dir,
> @@ -324,7 +276,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event,
> TP_printk(
> "flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> __entry->flags,
> - show_lookup_flags(__entry->flags),
> + show_fs_lookup_flags(__entry->flags),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->dir,
> __get_str(name)
> @@ -370,7 +322,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,
> "error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> -__entry->error, nfs_show_status(__entry->error),
> __entry->flags,
> - show_lookup_flags(__entry->flags),
> + show_fs_lookup_flags(__entry->flags),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->dir,
> __get_str(name)
> @@ -392,46 +344,6 @@ DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit);
> DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_enter);
> DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revalidate_exit);
>
> -TRACE_DEFINE_ENUM(O_WRONLY);
> -TRACE_DEFINE_ENUM(O_RDWR);
> -TRACE_DEFINE_ENUM(O_CREAT);
> -TRACE_DEFINE_ENUM(O_EXCL);
> -TRACE_DEFINE_ENUM(O_NOCTTY);
> -TRACE_DEFINE_ENUM(O_TRUNC);
> -TRACE_DEFINE_ENUM(O_APPEND);
> -TRACE_DEFINE_ENUM(O_NONBLOCK);
> -TRACE_DEFINE_ENUM(O_DSYNC);
> -TRACE_DEFINE_ENUM(O_DIRECT);
> -TRACE_DEFINE_ENUM(O_LARGEFILE);
> -TRACE_DEFINE_ENUM(O_DIRECTORY);
> -TRACE_DEFINE_ENUM(O_NOFOLLOW);
> -TRACE_DEFINE_ENUM(O_NOATIME);
> -TRACE_DEFINE_ENUM(O_CLOEXEC);
> -
> -#define show_open_flags(flags) \
> - __print_flags(flags, "|", \
> - { O_WRONLY, "O_WRONLY" }, \
> - { O_RDWR, "O_RDWR" }, \
> - { O_CREAT, "O_CREAT" }, \
> - { O_EXCL, "O_EXCL" }, \
> - { O_NOCTTY, "O_NOCTTY" }, \
> - { O_TRUNC, "O_TRUNC" }, \
> - { O_APPEND, "O_APPEND" }, \
> - { O_NONBLOCK, "O_NONBLOCK" }, \
> - { O_DSYNC, "O_DSYNC" }, \
> - { O_DIRECT, "O_DIRECT" }, \
> - { O_LARGEFILE, "O_LARGEFILE" }, \
> - { O_DIRECTORY, "O_DIRECTORY" }, \
> - { O_NOFOLLOW, "O_NOFOLLOW" }, \
> - { O_NOATIME, "O_NOATIME" }, \
> - { O_CLOEXEC, "O_CLOEXEC" })
> -
> -#define show_fmode_flags(mode) \
> - __print_flags(mode, "|", \
> - { ((__force unsigned long)FMODE_READ), "READ" }, \
> - { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
> - { ((__force unsigned long)FMODE_EXEC), "EXEC" })
> -
> TRACE_EVENT(nfs_atomic_open_enter,
> TP_PROTO(
> const struct inode *dir,
> @@ -443,7 +355,7 @@ TRACE_EVENT(nfs_atomic_open_enter,
>
> TP_STRUCT__entry(
> __field(unsigned long, flags)
> - __field(unsigned int, fmode)
> + __field(unsigned long, fmode)
> __field(dev_t, dev)
> __field(u64, dir)
> __string(name, ctx->dentry->d_name.name)
> @@ -453,15 +365,15 @@ TRACE_EVENT(nfs_atomic_open_enter,
> __entry->dev = dir->i_sb->s_dev;
> __entry->dir = NFS_FILEID(dir);
> __entry->flags = flags;
> - __entry->fmode = (__force unsigned int)ctx->mode;
> + __entry->fmode = (__force unsigned long)ctx->mode;
> __assign_str(name, ctx->dentry->d_name.name);
> ),
>
> TP_printk(
> "flags=0x%lx (%s) fmode=%s name=%02x:%02x:%llu/%s",
> __entry->flags,
> - show_open_flags(__entry->flags),
> - show_fmode_flags(__entry->fmode),
> + show_fs_fcntl_open_flags(__entry->flags),
> + show_fs_fmode_flags(__entry->fmode),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->dir,
> __get_str(name)
> @@ -481,7 +393,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
> TP_STRUCT__entry(
> __field(unsigned long, error)
> __field(unsigned long, flags)
> - __field(unsigned int, fmode)
> + __field(unsigned long, fmode)
> __field(dev_t, dev)
> __field(u64, dir)
> __string(name, ctx->dentry->d_name.name)
> @@ -492,7 +404,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
> __entry->dev = dir->i_sb->s_dev;
> __entry->dir = NFS_FILEID(dir);
> __entry->flags = flags;
> - __entry->fmode = (__force unsigned int)ctx->mode;
> + __entry->fmode = (__force unsigned long)ctx->mode;
> __assign_str(name, ctx->dentry->d_name.name);
> ),
>
> @@ -501,8 +413,8 @@ TRACE_EVENT(nfs_atomic_open_exit,
> "name=%02x:%02x:%llu/%s",
> -__entry->error, nfs_show_status(__entry->error),
> __entry->flags,
> - show_open_flags(__entry->flags),
> - show_fmode_flags(__entry->fmode),
> + show_fs_fcntl_open_flags(__entry->flags),
> + show_fs_fmode_flags(__entry->fmode),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->dir,
> __get_str(name)
> @@ -535,7 +447,7 @@ TRACE_EVENT(nfs_create_enter,
> TP_printk(
> "flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> __entry->flags,
> - show_open_flags(__entry->flags),
> + show_fs_fcntl_open_flags(__entry->flags),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->dir,
> __get_str(name)
> @@ -572,7 +484,7 @@ TRACE_EVENT(nfs_create_exit,
> "error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> -__entry->error, nfs_show_status(__entry->error),
> __entry->flags,
> - show_open_flags(__entry->flags),
> + show_fs_fcntl_open_flags(__entry->flags),
> MAJOR(__entry->dev), MINOR(__entry->dev),
> (unsigned long long)__entry->dir,
> __get_str(name)
> diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
> new file mode 100644
> index 000000000000..84e20c43d0c3
> --- /dev/null
> +++ b/include/trace/events/fs.h
> @@ -0,0 +1,146 @@
> +/* SPDX-License-Identifier: GPL-2.0 */
> +/*
> + * Display helpers for generic filesystem items
> + *
> + * Author: Chuck Lever <[email protected]>
> + *
> + * Copyright (c) 2020, Oracle and/or its affiliates.
> + */
> +
> +#include <linux/fs.h>
> +
> +#define show_fs_dirent_type(x) \
> + __print_symbolic(x, \
> + { DT_UNKNOWN, "UNKNOWN" }, \
> + { DT_FIFO, "FIFO" }, \
> + { DT_CHR, "CHR" }, \
> + { DT_DIR, "DIR" }, \
> + { DT_BLK, "BLK" }, \
> + { DT_REG, "REG" }, \
> + { DT_LNK, "LNK" }, \
> + { DT_SOCK, "SOCK" }, \
> + { DT_WHT, "WHT" })
> +
> +#define show_fs_fcntl_open_flags(x) \
> + __print_flags(x, "|", \
> + { O_WRONLY, "O_WRONLY" }, \
> + { O_RDWR, "O_RDWR" }, \
> + { O_CREAT, "O_CREAT" }, \
> + { O_EXCL, "O_EXCL" }, \
> + { O_NOCTTY, "O_NOCTTY" }, \
> + { O_TRUNC, "O_TRUNC" }, \
> + { O_APPEND, "O_APPEND" }, \
> + { O_NONBLOCK, "O_NONBLOCK" }, \
> + { O_DSYNC, "O_DSYNC" }, \
> + { O_DIRECT, "O_DIRECT" }, \
> + { O_LARGEFILE, "O_LARGEFILE" }, \
> + { O_DIRECTORY, "O_DIRECTORY" }, \
> + { O_NOFOLLOW, "O_NOFOLLOW" }, \
> + { O_NOATIME, "O_NOATIME" }, \
> + { O_CLOEXEC, "O_CLOEXEC" })
> +
> +#define __fmode_flag(x) { (__force unsigned long)FMODE_##x, #x }
> +#define show_fs_fmode_flags(x) \
> + __print_flags(x, "|", \
> + __fmode_flag(READ), \
> + __fmode_flag(WRITE), \
> + __fmode_flag(LSEEK), \
> + __fmode_flag(PREAD), \
> + __fmode_flag(PWRITE), \
> + __fmode_flag(EXEC), \
> + __fmode_flag(NDELAY), \
> + __fmode_flag(EXCL), \
> + __fmode_flag(WRITE_IOCTL), \
> + __fmode_flag(32BITHASH), \
> + __fmode_flag(64BITHASH), \
> + __fmode_flag(NOCMTIME), \
> + __fmode_flag(RANDOM), \
> + __fmode_flag(UNSIGNED_OFFSET), \
> + __fmode_flag(PATH), \
> + __fmode_flag(ATOMIC_POS), \
> + __fmode_flag(WRITER), \
> + __fmode_flag(CAN_READ), \
> + __fmode_flag(CAN_WRITE), \
> + __fmode_flag(OPENED), \
> + __fmode_flag(CREATED), \
> + __fmode_flag(STREAM), \
> + __fmode_flag(NONOTIFY), \
> + __fmode_flag(NOWAIT), \
> + __fmode_flag(NEED_UNMOUNT), \
> + __fmode_flag(NOACCOUNT), \
> + __fmode_flag(BUF_RASYNC))
> +
> +#ifdef CONFIG_64BIT
> +#define show_fs_fcntl_cmd(x) \
> + __print_symbolic(x, \
> + { F_DUPFD, "DUPFD" }, \
> + { F_GETFD, "GETFD" }, \
> + { F_SETFD, "SETFD" }, \
> + { F_GETFL, "GETFL" }, \
> + { F_SETFL, "SETFL" }, \
> + { F_GETLK, "GETLK" }, \
> + { F_SETLK, "SETLK" }, \
> + { F_SETLKW, "SETLKW" }, \
> + { F_SETOWN, "SETOWN" }, \
> + { F_GETOWN, "GETOWN" }, \
> + { F_SETSIG, "SETSIG" }, \
> + { F_GETSIG, "GETSIG" }, \
> + { F_SETOWN_EX, "SETOWN_EX" }, \
> + { F_GETOWN_EX, "GETOWN_EX" }, \
> + { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
> + { F_OFD_GETLK, "OFD_GETLK" }, \
> + { F_OFD_SETLK, "OFD_SETLK" }, \
> + { F_OFD_SETLKW, "OFD_SETLKW" })
> +#else /* CONFIG_64BIT */
> +#define show_fs_fcntl_cmd(x) \
> + __print_symbolic(x, \
> + { F_DUPFD, "DUPFD" }, \
> + { F_GETFD, "GETFD" }, \
> + { F_SETFD, "SETFD" }, \
> + { F_GETFL, "GETFL" }, \
> + { F_SETFL, "SETFL" }, \
> + { F_GETLK, "GETLK" }, \
> + { F_SETLK, "SETLK" }, \
> + { F_SETLKW, "SETLKW" }, \
> + { F_SETOWN, "SETOWN" }, \
> + { F_GETOWN, "GETOWN" }, \
> + { F_SETSIG, "SETSIG" }, \
> + { F_GETSIG, "GETSIG" }, \
> + { F_GETLK64, "GETLK64" }, \
> + { F_SETLK64, "SETLK64" }, \
> + { F_SETLKW64, "SETLKW64" }, \
> + { F_SETOWN_EX, "SETOWN_EX" }, \
> + { F_GETOWN_EX, "GETOWN_EX" }, \
> + { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
> + { F_OFD_GETLK, "OFD_GETLK" }, \
> + { F_OFD_SETLK, "OFD_SETLK" }, \
> + { F_OFD_SETLKW, "OFD_SETLKW" })
> +#endif /* CONFIG_64BIT */
> +
> +#define show_fs_fcntl_lock_type(x) \
> + __print_symbolic(x, \
> + { F_RDLCK, "RDLCK" }, \
> + { F_WRLCK, "WRLCK" }, \
> + { F_UNLCK, "UNLCK" })
> +
> +#define show_fs_lookup_flags(flags) \
> + __print_flags(flags, "|", \
> + { LOOKUP_FOLLOW, "FOLLOW" }, \
> + { LOOKUP_DIRECTORY, "DIRECTORY" }, \
> + { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
> + { LOOKUP_EMPTY, "EMPTY" }, \
> + { LOOKUP_DOWN, "DOWN" }, \
> + { LOOKUP_MOUNTPOINT, "MOUNTPOINT" }, \
> + { LOOKUP_REVAL, "REVAL" }, \
> + { LOOKUP_RCU, "RCU" }, \
> + { LOOKUP_OPEN, "OPEN" }, \
> + { LOOKUP_CREATE, "CREATE" }, \
> + { LOOKUP_EXCL, "EXCL" }, \
> + { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
> + { LOOKUP_PARENT, "PARENT" }, \
> + { LOOKUP_NO_SYMLINKS, "NO_SYMLINKS" }, \
> + { LOOKUP_NO_MAGICLINKS, "NO_MAGICLINKS" }, \
> + { LOOKUP_NO_XDEV, "NO_XDEV" }, \
> + { LOOKUP_BENEATH, "BENEATH" }, \
> + { LOOKUP_IN_ROOT, "IN_ROOT" }, \
> + { LOOKUP_CACHED, "CACHED" })
>
> On Oct 22, 2021, at 3:14 PM, Olga Kornievskaia <[email protected]> wrote:
>
> On Tue, Oct 19, 2021 at 12:46 PM Chuck Lever <[email protected]> wrote:
>>
>> Refactor: Surface useful show_ macros for use by other trace
>> subsystems.
>
> This doesn't apply on top of Trond's origin/testing. Are there some
> other dependencies I'm missing?
The patch applies on top of v5.15-rc6. What fails to apply?
>> Signed-off-by: Chuck Lever <[email protected]>
>> ---
>> fs/nfs/nfs4trace.h | 67 ++++++---------------
>> fs/nfs/nfstrace.h | 118 +++++-------------------------------
>> include/trace/events/fs.h | 146 +++++++++++++++++++++++++++++++++++++++++++++
>> 3 files changed, 180 insertions(+), 151 deletions(-)
>> create mode 100644 include/trace/events/fs.h
>>
>> diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
>> index 7a2567aa2b86..b2f45c825f37 100644
>> --- a/fs/nfs/nfs4trace.h
>> +++ b/fs/nfs/nfs4trace.h
>> @@ -10,6 +10,8 @@
>>
>> #include <linux/tracepoint.h>
>>
>> +#include <trace/events/fs.h>
>> +
>> TRACE_DEFINE_ENUM(EPERM);
>> TRACE_DEFINE_ENUM(ENOENT);
>> TRACE_DEFINE_ENUM(EIO);
>> @@ -313,19 +315,6 @@ TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_PNFS);
>> { NFS4ERR_RESET_TO_MDS, "RESET_TO_MDS" }, \
>> { NFS4ERR_RESET_TO_PNFS, "RESET_TO_PNFS" })
>>
>> -#define show_open_flags(flags) \
>> - __print_flags(flags, "|", \
>> - { O_CREAT, "O_CREAT" }, \
>> - { O_EXCL, "O_EXCL" }, \
>> - { O_TRUNC, "O_TRUNC" }, \
>> - { O_DIRECT, "O_DIRECT" })
>> -
>> -#define show_fmode_flags(mode) \
>> - __print_flags(mode, "|", \
>> - { ((__force unsigned long)FMODE_READ), "READ" }, \
>> - { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
>> - { ((__force unsigned long)FMODE_EXEC), "EXEC" })
>> -
>> #define show_nfs_fattr_flags(valid) \
>> __print_flags((unsigned long)valid, "|", \
>> { NFS_ATTR_FATTR_TYPE, "TYPE" }, \
>> @@ -793,8 +782,8 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
>>
>> TP_STRUCT__entry(
>> __field(unsigned long, error)
>> - __field(unsigned int, flags)
>> - __field(unsigned int, fmode)
>> + __field(unsigned long, flags)
>> + __field(unsigned long, fmode)
>> __field(dev_t, dev)
>> __field(u32, fhandle)
>> __field(u64, fileid)
>> @@ -812,7 +801,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
>>
>> __entry->error = -error;
>> __entry->flags = flags;
>> - __entry->fmode = (__force unsigned int)ctx->mode;
>> + __entry->fmode = (__force unsigned long)ctx->mode;
>> __entry->dev = ctx->dentry->d_sb->s_dev;
>> if (!IS_ERR_OR_NULL(state)) {
>> inode = state->inode;
>> @@ -842,15 +831,15 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
>> ),
>>
>> TP_printk(
>> - "error=%ld (%s) flags=%d (%s) fmode=%s "
>> + "error=%ld (%s) flags=%lu (%s) fmode=%s "
>> "fileid=%02x:%02x:%llu fhandle=0x%08x "
>> "name=%02x:%02x:%llu/%s stateid=%d:0x%08x "
>> "openstateid=%d:0x%08x",
>> -__entry->error,
>> show_nfsv4_errors(__entry->error),
>> __entry->flags,
>> - show_open_flags(__entry->flags),
>> - show_fmode_flags(__entry->fmode),
>> + show_fs_fcntl_open_flags(__entry->flags),
>> + show_fs_fmode_flags(__entry->fmode),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->fileid,
>> __entry->fhandle,
>> @@ -904,7 +893,7 @@ TRACE_EVENT(nfs4_cached_open,
>> TP_printk(
>> "fmode=%s fileid=%02x:%02x:%llu "
>> "fhandle=0x%08x stateid=%d:0x%08x",
>> - __entry->fmode ? show_fmode_flags(__entry->fmode) :
>> + __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
>> "closed",
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->fileid,
>> @@ -952,7 +941,7 @@ TRACE_EVENT(nfs4_close,
>> "fhandle=0x%08x openstateid=%d:0x%08x",
>> -__entry->error,
>> show_nfsv4_errors(__entry->error),
>> - __entry->fmode ? show_fmode_flags(__entry->fmode) :
>> + __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
>> "closed",
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->fileid,
>> @@ -961,24 +950,6 @@ TRACE_EVENT(nfs4_close,
>> )
>> );
>>
>> -TRACE_DEFINE_ENUM(F_GETLK);
>> -TRACE_DEFINE_ENUM(F_SETLK);
>> -TRACE_DEFINE_ENUM(F_SETLKW);
>> -TRACE_DEFINE_ENUM(F_RDLCK);
>> -TRACE_DEFINE_ENUM(F_WRLCK);
>> -TRACE_DEFINE_ENUM(F_UNLCK);
>> -
>> -#define show_lock_cmd(type) \
>> - __print_symbolic((int)type, \
>> - { F_GETLK, "GETLK" }, \
>> - { F_SETLK, "SETLK" }, \
>> - { F_SETLKW, "SETLKW" })
>> -#define show_lock_type(type) \
>> - __print_symbolic((int)type, \
>> - { F_RDLCK, "RDLCK" }, \
>> - { F_WRLCK, "WRLCK" }, \
>> - { F_UNLCK, "UNLCK" })
>> -
>> DECLARE_EVENT_CLASS(nfs4_lock_event,
>> TP_PROTO(
>> const struct file_lock *request,
>> @@ -991,8 +962,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
>>
>> TP_STRUCT__entry(
>> __field(unsigned long, error)
>> - __field(int, cmd)
>> - __field(char, type)
>> + __field(unsigned long, cmd)
>> + __field(unsigned long, type)
>> __field(loff_t, start)
>> __field(loff_t, end)
>> __field(dev_t, dev)
>> @@ -1025,8 +996,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
>> "stateid=%d:0x%08x",
>> -__entry->error,
>> show_nfsv4_errors(__entry->error),
>> - show_lock_cmd(__entry->cmd),
>> - show_lock_type(__entry->type),
>> + show_fs_fcntl_cmd(__entry->cmd),
>> + show_fs_fcntl_lock_type(__entry->type),
>> (long long)__entry->start,
>> (long long)__entry->end,
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> @@ -1061,8 +1032,8 @@ TRACE_EVENT(nfs4_set_lock,
>>
>> TP_STRUCT__entry(
>> __field(unsigned long, error)
>> - __field(int, cmd)
>> - __field(char, type)
>> + __field(unsigned long, cmd)
>> + __field(unsigned long, type)
>> __field(loff_t, start)
>> __field(loff_t, end)
>> __field(dev_t, dev)
>> @@ -1101,8 +1072,8 @@ TRACE_EVENT(nfs4_set_lock,
>> "stateid=%d:0x%08x lockstateid=%d:0x%08x",
>> -__entry->error,
>> show_nfsv4_errors(__entry->error),
>> - show_lock_cmd(__entry->cmd),
>> - show_lock_type(__entry->type),
>> + show_fs_fcntl_cmd(__entry->cmd),
>> + show_fs_fcntl_lock_type(__entry->type),
>> (long long)__entry->start,
>> (long long)__entry->end,
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> @@ -1219,7 +1190,7 @@ DECLARE_EVENT_CLASS(nfs4_set_delegation_event,
>>
>> TP_printk(
>> "fmode=%s fileid=%02x:%02x:%llu fhandle=0x%08x",
>> - show_fmode_flags(__entry->fmode),
>> + show_fs_fmode_flags(__entry->fmode),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->fileid,
>> __entry->fhandle
>> diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
>> index 8a224871be74..49d432c00bde 100644
>> --- a/fs/nfs/nfstrace.h
>> +++ b/fs/nfs/nfstrace.h
>> @@ -11,27 +11,7 @@
>> #include <linux/tracepoint.h>
>> #include <linux/iversion.h>
>>
>> -TRACE_DEFINE_ENUM(DT_UNKNOWN);
>> -TRACE_DEFINE_ENUM(DT_FIFO);
>> -TRACE_DEFINE_ENUM(DT_CHR);
>> -TRACE_DEFINE_ENUM(DT_DIR);
>> -TRACE_DEFINE_ENUM(DT_BLK);
>> -TRACE_DEFINE_ENUM(DT_REG);
>> -TRACE_DEFINE_ENUM(DT_LNK);
>> -TRACE_DEFINE_ENUM(DT_SOCK);
>> -TRACE_DEFINE_ENUM(DT_WHT);
>> -
>> -#define nfs_show_file_type(ftype) \
>> - __print_symbolic(ftype, \
>> - { DT_UNKNOWN, "UNKNOWN" }, \
>> - { DT_FIFO, "FIFO" }, \
>> - { DT_CHR, "CHR" }, \
>> - { DT_DIR, "DIR" }, \
>> - { DT_BLK, "BLK" }, \
>> - { DT_REG, "REG" }, \
>> - { DT_LNK, "LNK" }, \
>> - { DT_SOCK, "SOCK" }, \
>> - { DT_WHT, "WHT" })
>> +#include <trace/events/fs.h>
>>
>> TRACE_DEFINE_ENUM(NFS_INO_INVALID_DATA);
>> TRACE_DEFINE_ENUM(NFS_INO_INVALID_ATIME);
>> @@ -168,7 +148,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event_done,
>> (unsigned long long)__entry->fileid,
>> __entry->fhandle,
>> __entry->type,
>> - nfs_show_file_type(__entry->type),
>> + show_fs_dirent_type(__entry->type),
>> (unsigned long long)__entry->version,
>> (long long)__entry->size,
>> __entry->cache_validity,
>> @@ -259,7 +239,7 @@ TRACE_EVENT(nfs_access_exit,
>> (unsigned long long)__entry->fileid,
>> __entry->fhandle,
>> __entry->type,
>> - nfs_show_file_type(__entry->type),
>> + show_fs_dirent_type(__entry->type),
>> (unsigned long long)__entry->version,
>> (long long)__entry->size,
>> __entry->cache_validity,
>> @@ -270,34 +250,6 @@ TRACE_EVENT(nfs_access_exit,
>> )
>> );
>>
>> -TRACE_DEFINE_ENUM(LOOKUP_FOLLOW);
>> -TRACE_DEFINE_ENUM(LOOKUP_DIRECTORY);
>> -TRACE_DEFINE_ENUM(LOOKUP_AUTOMOUNT);
>> -TRACE_DEFINE_ENUM(LOOKUP_PARENT);
>> -TRACE_DEFINE_ENUM(LOOKUP_REVAL);
>> -TRACE_DEFINE_ENUM(LOOKUP_RCU);
>> -TRACE_DEFINE_ENUM(LOOKUP_OPEN);
>> -TRACE_DEFINE_ENUM(LOOKUP_CREATE);
>> -TRACE_DEFINE_ENUM(LOOKUP_EXCL);
>> -TRACE_DEFINE_ENUM(LOOKUP_RENAME_TARGET);
>> -TRACE_DEFINE_ENUM(LOOKUP_EMPTY);
>> -TRACE_DEFINE_ENUM(LOOKUP_DOWN);
>> -
>> -#define show_lookup_flags(flags) \
>> - __print_flags(flags, "|", \
>> - { LOOKUP_FOLLOW, "FOLLOW" }, \
>> - { LOOKUP_DIRECTORY, "DIRECTORY" }, \
>> - { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
>> - { LOOKUP_PARENT, "PARENT" }, \
>> - { LOOKUP_REVAL, "REVAL" }, \
>> - { LOOKUP_RCU, "RCU" }, \
>> - { LOOKUP_OPEN, "OPEN" }, \
>> - { LOOKUP_CREATE, "CREATE" }, \
>> - { LOOKUP_EXCL, "EXCL" }, \
>> - { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
>> - { LOOKUP_EMPTY, "EMPTY" }, \
>> - { LOOKUP_DOWN, "DOWN" })
>> -
>> DECLARE_EVENT_CLASS(nfs_lookup_event,
>> TP_PROTO(
>> const struct inode *dir,
>> @@ -324,7 +276,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event,
>> TP_printk(
>> "flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
>> __entry->flags,
>> - show_lookup_flags(__entry->flags),
>> + show_fs_lookup_flags(__entry->flags),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->dir,
>> __get_str(name)
>> @@ -370,7 +322,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,
>> "error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
>> -__entry->error, nfs_show_status(__entry->error),
>> __entry->flags,
>> - show_lookup_flags(__entry->flags),
>> + show_fs_lookup_flags(__entry->flags),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->dir,
>> __get_str(name)
>> @@ -392,46 +344,6 @@ DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit);
>> DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_enter);
>> DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revalidate_exit);
>>
>> -TRACE_DEFINE_ENUM(O_WRONLY);
>> -TRACE_DEFINE_ENUM(O_RDWR);
>> -TRACE_DEFINE_ENUM(O_CREAT);
>> -TRACE_DEFINE_ENUM(O_EXCL);
>> -TRACE_DEFINE_ENUM(O_NOCTTY);
>> -TRACE_DEFINE_ENUM(O_TRUNC);
>> -TRACE_DEFINE_ENUM(O_APPEND);
>> -TRACE_DEFINE_ENUM(O_NONBLOCK);
>> -TRACE_DEFINE_ENUM(O_DSYNC);
>> -TRACE_DEFINE_ENUM(O_DIRECT);
>> -TRACE_DEFINE_ENUM(O_LARGEFILE);
>> -TRACE_DEFINE_ENUM(O_DIRECTORY);
>> -TRACE_DEFINE_ENUM(O_NOFOLLOW);
>> -TRACE_DEFINE_ENUM(O_NOATIME);
>> -TRACE_DEFINE_ENUM(O_CLOEXEC);
>> -
>> -#define show_open_flags(flags) \
>> - __print_flags(flags, "|", \
>> - { O_WRONLY, "O_WRONLY" }, \
>> - { O_RDWR, "O_RDWR" }, \
>> - { O_CREAT, "O_CREAT" }, \
>> - { O_EXCL, "O_EXCL" }, \
>> - { O_NOCTTY, "O_NOCTTY" }, \
>> - { O_TRUNC, "O_TRUNC" }, \
>> - { O_APPEND, "O_APPEND" }, \
>> - { O_NONBLOCK, "O_NONBLOCK" }, \
>> - { O_DSYNC, "O_DSYNC" }, \
>> - { O_DIRECT, "O_DIRECT" }, \
>> - { O_LARGEFILE, "O_LARGEFILE" }, \
>> - { O_DIRECTORY, "O_DIRECTORY" }, \
>> - { O_NOFOLLOW, "O_NOFOLLOW" }, \
>> - { O_NOATIME, "O_NOATIME" }, \
>> - { O_CLOEXEC, "O_CLOEXEC" })
>> -
>> -#define show_fmode_flags(mode) \
>> - __print_flags(mode, "|", \
>> - { ((__force unsigned long)FMODE_READ), "READ" }, \
>> - { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
>> - { ((__force unsigned long)FMODE_EXEC), "EXEC" })
>> -
>> TRACE_EVENT(nfs_atomic_open_enter,
>> TP_PROTO(
>> const struct inode *dir,
>> @@ -443,7 +355,7 @@ TRACE_EVENT(nfs_atomic_open_enter,
>>
>> TP_STRUCT__entry(
>> __field(unsigned long, flags)
>> - __field(unsigned int, fmode)
>> + __field(unsigned long, fmode)
>> __field(dev_t, dev)
>> __field(u64, dir)
>> __string(name, ctx->dentry->d_name.name)
>> @@ -453,15 +365,15 @@ TRACE_EVENT(nfs_atomic_open_enter,
>> __entry->dev = dir->i_sb->s_dev;
>> __entry->dir = NFS_FILEID(dir);
>> __entry->flags = flags;
>> - __entry->fmode = (__force unsigned int)ctx->mode;
>> + __entry->fmode = (__force unsigned long)ctx->mode;
>> __assign_str(name, ctx->dentry->d_name.name);
>> ),
>>
>> TP_printk(
>> "flags=0x%lx (%s) fmode=%s name=%02x:%02x:%llu/%s",
>> __entry->flags,
>> - show_open_flags(__entry->flags),
>> - show_fmode_flags(__entry->fmode),
>> + show_fs_fcntl_open_flags(__entry->flags),
>> + show_fs_fmode_flags(__entry->fmode),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->dir,
>> __get_str(name)
>> @@ -481,7 +393,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
>> TP_STRUCT__entry(
>> __field(unsigned long, error)
>> __field(unsigned long, flags)
>> - __field(unsigned int, fmode)
>> + __field(unsigned long, fmode)
>> __field(dev_t, dev)
>> __field(u64, dir)
>> __string(name, ctx->dentry->d_name.name)
>> @@ -492,7 +404,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
>> __entry->dev = dir->i_sb->s_dev;
>> __entry->dir = NFS_FILEID(dir);
>> __entry->flags = flags;
>> - __entry->fmode = (__force unsigned int)ctx->mode;
>> + __entry->fmode = (__force unsigned long)ctx->mode;
>> __assign_str(name, ctx->dentry->d_name.name);
>> ),
>>
>> @@ -501,8 +413,8 @@ TRACE_EVENT(nfs_atomic_open_exit,
>> "name=%02x:%02x:%llu/%s",
>> -__entry->error, nfs_show_status(__entry->error),
>> __entry->flags,
>> - show_open_flags(__entry->flags),
>> - show_fmode_flags(__entry->fmode),
>> + show_fs_fcntl_open_flags(__entry->flags),
>> + show_fs_fmode_flags(__entry->fmode),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->dir,
>> __get_str(name)
>> @@ -535,7 +447,7 @@ TRACE_EVENT(nfs_create_enter,
>> TP_printk(
>> "flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
>> __entry->flags,
>> - show_open_flags(__entry->flags),
>> + show_fs_fcntl_open_flags(__entry->flags),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->dir,
>> __get_str(name)
>> @@ -572,7 +484,7 @@ TRACE_EVENT(nfs_create_exit,
>> "error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
>> -__entry->error, nfs_show_status(__entry->error),
>> __entry->flags,
>> - show_open_flags(__entry->flags),
>> + show_fs_fcntl_open_flags(__entry->flags),
>> MAJOR(__entry->dev), MINOR(__entry->dev),
>> (unsigned long long)__entry->dir,
>> __get_str(name)
>> diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
>> new file mode 100644
>> index 000000000000..84e20c43d0c3
>> --- /dev/null
>> +++ b/include/trace/events/fs.h
>> @@ -0,0 +1,146 @@
>> +/* SPDX-License-Identifier: GPL-2.0 */
>> +/*
>> + * Display helpers for generic filesystem items
>> + *
>> + * Author: Chuck Lever <[email protected]>
>> + *
>> + * Copyright (c) 2020, Oracle and/or its affiliates.
>> + */
>> +
>> +#include <linux/fs.h>
>> +
>> +#define show_fs_dirent_type(x) \
>> + __print_symbolic(x, \
>> + { DT_UNKNOWN, "UNKNOWN" }, \
>> + { DT_FIFO, "FIFO" }, \
>> + { DT_CHR, "CHR" }, \
>> + { DT_DIR, "DIR" }, \
>> + { DT_BLK, "BLK" }, \
>> + { DT_REG, "REG" }, \
>> + { DT_LNK, "LNK" }, \
>> + { DT_SOCK, "SOCK" }, \
>> + { DT_WHT, "WHT" })
>> +
>> +#define show_fs_fcntl_open_flags(x) \
>> + __print_flags(x, "|", \
>> + { O_WRONLY, "O_WRONLY" }, \
>> + { O_RDWR, "O_RDWR" }, \
>> + { O_CREAT, "O_CREAT" }, \
>> + { O_EXCL, "O_EXCL" }, \
>> + { O_NOCTTY, "O_NOCTTY" }, \
>> + { O_TRUNC, "O_TRUNC" }, \
>> + { O_APPEND, "O_APPEND" }, \
>> + { O_NONBLOCK, "O_NONBLOCK" }, \
>> + { O_DSYNC, "O_DSYNC" }, \
>> + { O_DIRECT, "O_DIRECT" }, \
>> + { O_LARGEFILE, "O_LARGEFILE" }, \
>> + { O_DIRECTORY, "O_DIRECTORY" }, \
>> + { O_NOFOLLOW, "O_NOFOLLOW" }, \
>> + { O_NOATIME, "O_NOATIME" }, \
>> + { O_CLOEXEC, "O_CLOEXEC" })
>> +
>> +#define __fmode_flag(x) { (__force unsigned long)FMODE_##x, #x }
>> +#define show_fs_fmode_flags(x) \
>> + __print_flags(x, "|", \
>> + __fmode_flag(READ), \
>> + __fmode_flag(WRITE), \
>> + __fmode_flag(LSEEK), \
>> + __fmode_flag(PREAD), \
>> + __fmode_flag(PWRITE), \
>> + __fmode_flag(EXEC), \
>> + __fmode_flag(NDELAY), \
>> + __fmode_flag(EXCL), \
>> + __fmode_flag(WRITE_IOCTL), \
>> + __fmode_flag(32BITHASH), \
>> + __fmode_flag(64BITHASH), \
>> + __fmode_flag(NOCMTIME), \
>> + __fmode_flag(RANDOM), \
>> + __fmode_flag(UNSIGNED_OFFSET), \
>> + __fmode_flag(PATH), \
>> + __fmode_flag(ATOMIC_POS), \
>> + __fmode_flag(WRITER), \
>> + __fmode_flag(CAN_READ), \
>> + __fmode_flag(CAN_WRITE), \
>> + __fmode_flag(OPENED), \
>> + __fmode_flag(CREATED), \
>> + __fmode_flag(STREAM), \
>> + __fmode_flag(NONOTIFY), \
>> + __fmode_flag(NOWAIT), \
>> + __fmode_flag(NEED_UNMOUNT), \
>> + __fmode_flag(NOACCOUNT), \
>> + __fmode_flag(BUF_RASYNC))
>> +
>> +#ifdef CONFIG_64BIT
>> +#define show_fs_fcntl_cmd(x) \
>> + __print_symbolic(x, \
>> + { F_DUPFD, "DUPFD" }, \
>> + { F_GETFD, "GETFD" }, \
>> + { F_SETFD, "SETFD" }, \
>> + { F_GETFL, "GETFL" }, \
>> + { F_SETFL, "SETFL" }, \
>> + { F_GETLK, "GETLK" }, \
>> + { F_SETLK, "SETLK" }, \
>> + { F_SETLKW, "SETLKW" }, \
>> + { F_SETOWN, "SETOWN" }, \
>> + { F_GETOWN, "GETOWN" }, \
>> + { F_SETSIG, "SETSIG" }, \
>> + { F_GETSIG, "GETSIG" }, \
>> + { F_SETOWN_EX, "SETOWN_EX" }, \
>> + { F_GETOWN_EX, "GETOWN_EX" }, \
>> + { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
>> + { F_OFD_GETLK, "OFD_GETLK" }, \
>> + { F_OFD_SETLK, "OFD_SETLK" }, \
>> + { F_OFD_SETLKW, "OFD_SETLKW" })
>> +#else /* CONFIG_64BIT */
>> +#define show_fs_fcntl_cmd(x) \
>> + __print_symbolic(x, \
>> + { F_DUPFD, "DUPFD" }, \
>> + { F_GETFD, "GETFD" }, \
>> + { F_SETFD, "SETFD" }, \
>> + { F_GETFL, "GETFL" }, \
>> + { F_SETFL, "SETFL" }, \
>> + { F_GETLK, "GETLK" }, \
>> + { F_SETLK, "SETLK" }, \
>> + { F_SETLKW, "SETLKW" }, \
>> + { F_SETOWN, "SETOWN" }, \
>> + { F_GETOWN, "GETOWN" }, \
>> + { F_SETSIG, "SETSIG" }, \
>> + { F_GETSIG, "GETSIG" }, \
>> + { F_GETLK64, "GETLK64" }, \
>> + { F_SETLK64, "SETLK64" }, \
>> + { F_SETLKW64, "SETLKW64" }, \
>> + { F_SETOWN_EX, "SETOWN_EX" }, \
>> + { F_GETOWN_EX, "GETOWN_EX" }, \
>> + { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
>> + { F_OFD_GETLK, "OFD_GETLK" }, \
>> + { F_OFD_SETLK, "OFD_SETLK" }, \
>> + { F_OFD_SETLKW, "OFD_SETLKW" })
>> +#endif /* CONFIG_64BIT */
>> +
>> +#define show_fs_fcntl_lock_type(x) \
>> + __print_symbolic(x, \
>> + { F_RDLCK, "RDLCK" }, \
>> + { F_WRLCK, "WRLCK" }, \
>> + { F_UNLCK, "UNLCK" })
>> +
>> +#define show_fs_lookup_flags(flags) \
>> + __print_flags(flags, "|", \
>> + { LOOKUP_FOLLOW, "FOLLOW" }, \
>> + { LOOKUP_DIRECTORY, "DIRECTORY" }, \
>> + { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
>> + { LOOKUP_EMPTY, "EMPTY" }, \
>> + { LOOKUP_DOWN, "DOWN" }, \
>> + { LOOKUP_MOUNTPOINT, "MOUNTPOINT" }, \
>> + { LOOKUP_REVAL, "REVAL" }, \
>> + { LOOKUP_RCU, "RCU" }, \
>> + { LOOKUP_OPEN, "OPEN" }, \
>> + { LOOKUP_CREATE, "CREATE" }, \
>> + { LOOKUP_EXCL, "EXCL" }, \
>> + { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
>> + { LOOKUP_PARENT, "PARENT" }, \
>> + { LOOKUP_NO_SYMLINKS, "NO_SYMLINKS" }, \
>> + { LOOKUP_NO_MAGICLINKS, "NO_MAGICLINKS" }, \
>> + { LOOKUP_NO_XDEV, "NO_XDEV" }, \
>> + { LOOKUP_BENEATH, "BENEATH" }, \
>> + { LOOKUP_IN_ROOT, "IN_ROOT" }, \
>> + { LOOKUP_CACHED, "CACHED" })
>>
--
Chuck Lever
On Fri, Oct 22, 2021 at 3:16 PM Chuck Lever III <[email protected]> wrote:
>
>
>
> > On Oct 22, 2021, at 3:14 PM, Olga Kornievskaia <[email protected]> wrote:
> >
> > On Tue, Oct 19, 2021 at 12:46 PM Chuck Lever <[email protected]> wrote:
> >>
> >> Refactor: Surface useful show_ macros for use by other trace
> >> subsystems.
> >
> > This doesn't apply on top of Trond's origin/testing. Are there some
> > other dependencies I'm missing?
>
> The patch applies on top of v5.15-rc6. What fails to apply?
checking file fs/nfs/nfs4trace.h
Hunk #1 succeeded at 11 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 316 (offset 1 line).
Hunk #3 succeeded at 783 (offset 1 line).
Hunk #4 succeeded at 802 (offset 1 line).
Hunk #5 succeeded at 832 (offset 1 line).
Hunk #6 succeeded at 894 (offset 1 line).
Hunk #7 succeeded at 942 (offset 1 line).
Hunk #8 succeeded at 951 (offset 1 line).
Hunk #9 succeeded at 963 (offset 1 line).
Hunk #10 succeeded at 997 (offset 1 line).
Hunk #11 succeeded at 1033 (offset 1 line).
Hunk #12 succeeded at 1073 (offset 1 line).
Hunk #13 succeeded at 1191 (offset 1 line).
(Stripping trailing CRs from patch; use --binary to disable.)
checking file fs/nfs/nfstrace.h
Hunk #1 FAILED at 11.
Hunk #2 succeeded at 131 (offset -37 lines).
Hunk #3 succeeded at 222 (offset -37 lines).
Hunk #4 FAILED at 270.
Hunk #7 FAILED at 392.
Hunk #8 succeeded at 427 (offset -16 lines).
Hunk #9 succeeded at 437 (offset -16 lines).
Hunk #10 succeeded at 465 (offset -16 lines).
Hunk #11 succeeded at 476 (offset -16 lines).
Hunk #12 succeeded at 485 (offset -16 lines).
Hunk #13 succeeded at 519 (offset -16 lines).
Hunk #14 succeeded at 556 (offset -16 lines).
3 out of 14 hunks FAILED
The next patch would create the file include/trace/events/fs.h,
>
>
> >> Signed-off-by: Chuck Lever <[email protected]>
> >> ---
> >> fs/nfs/nfs4trace.h | 67 ++++++---------------
> >> fs/nfs/nfstrace.h | 118 +++++-------------------------------
> >> include/trace/events/fs.h | 146 +++++++++++++++++++++++++++++++++++++++++++++
> >> 3 files changed, 180 insertions(+), 151 deletions(-)
> >> create mode 100644 include/trace/events/fs.h
> >>
> >> diff --git a/fs/nfs/nfs4trace.h b/fs/nfs/nfs4trace.h
> >> index 7a2567aa2b86..b2f45c825f37 100644
> >> --- a/fs/nfs/nfs4trace.h
> >> +++ b/fs/nfs/nfs4trace.h
> >> @@ -10,6 +10,8 @@
> >>
> >> #include <linux/tracepoint.h>
> >>
> >> +#include <trace/events/fs.h>
> >> +
> >> TRACE_DEFINE_ENUM(EPERM);
> >> TRACE_DEFINE_ENUM(ENOENT);
> >> TRACE_DEFINE_ENUM(EIO);
> >> @@ -313,19 +315,6 @@ TRACE_DEFINE_ENUM(NFS4ERR_RESET_TO_PNFS);
> >> { NFS4ERR_RESET_TO_MDS, "RESET_TO_MDS" }, \
> >> { NFS4ERR_RESET_TO_PNFS, "RESET_TO_PNFS" })
> >>
> >> -#define show_open_flags(flags) \
> >> - __print_flags(flags, "|", \
> >> - { O_CREAT, "O_CREAT" }, \
> >> - { O_EXCL, "O_EXCL" }, \
> >> - { O_TRUNC, "O_TRUNC" }, \
> >> - { O_DIRECT, "O_DIRECT" })
> >> -
> >> -#define show_fmode_flags(mode) \
> >> - __print_flags(mode, "|", \
> >> - { ((__force unsigned long)FMODE_READ), "READ" }, \
> >> - { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
> >> - { ((__force unsigned long)FMODE_EXEC), "EXEC" })
> >> -
> >> #define show_nfs_fattr_flags(valid) \
> >> __print_flags((unsigned long)valid, "|", \
> >> { NFS_ATTR_FATTR_TYPE, "TYPE" }, \
> >> @@ -793,8 +782,8 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
> >>
> >> TP_STRUCT__entry(
> >> __field(unsigned long, error)
> >> - __field(unsigned int, flags)
> >> - __field(unsigned int, fmode)
> >> + __field(unsigned long, flags)
> >> + __field(unsigned long, fmode)
> >> __field(dev_t, dev)
> >> __field(u32, fhandle)
> >> __field(u64, fileid)
> >> @@ -812,7 +801,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
> >>
> >> __entry->error = -error;
> >> __entry->flags = flags;
> >> - __entry->fmode = (__force unsigned int)ctx->mode;
> >> + __entry->fmode = (__force unsigned long)ctx->mode;
> >> __entry->dev = ctx->dentry->d_sb->s_dev;
> >> if (!IS_ERR_OR_NULL(state)) {
> >> inode = state->inode;
> >> @@ -842,15 +831,15 @@ DECLARE_EVENT_CLASS(nfs4_open_event,
> >> ),
> >>
> >> TP_printk(
> >> - "error=%ld (%s) flags=%d (%s) fmode=%s "
> >> + "error=%ld (%s) flags=%lu (%s) fmode=%s "
> >> "fileid=%02x:%02x:%llu fhandle=0x%08x "
> >> "name=%02x:%02x:%llu/%s stateid=%d:0x%08x "
> >> "openstateid=%d:0x%08x",
> >> -__entry->error,
> >> show_nfsv4_errors(__entry->error),
> >> __entry->flags,
> >> - show_open_flags(__entry->flags),
> >> - show_fmode_flags(__entry->fmode),
> >> + show_fs_fcntl_open_flags(__entry->flags),
> >> + show_fs_fmode_flags(__entry->fmode),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->fileid,
> >> __entry->fhandle,
> >> @@ -904,7 +893,7 @@ TRACE_EVENT(nfs4_cached_open,
> >> TP_printk(
> >> "fmode=%s fileid=%02x:%02x:%llu "
> >> "fhandle=0x%08x stateid=%d:0x%08x",
> >> - __entry->fmode ? show_fmode_flags(__entry->fmode) :
> >> + __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
> >> "closed",
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->fileid,
> >> @@ -952,7 +941,7 @@ TRACE_EVENT(nfs4_close,
> >> "fhandle=0x%08x openstateid=%d:0x%08x",
> >> -__entry->error,
> >> show_nfsv4_errors(__entry->error),
> >> - __entry->fmode ? show_fmode_flags(__entry->fmode) :
> >> + __entry->fmode ? show_fs_fmode_flags(__entry->fmode) :
> >> "closed",
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->fileid,
> >> @@ -961,24 +950,6 @@ TRACE_EVENT(nfs4_close,
> >> )
> >> );
> >>
> >> -TRACE_DEFINE_ENUM(F_GETLK);
> >> -TRACE_DEFINE_ENUM(F_SETLK);
> >> -TRACE_DEFINE_ENUM(F_SETLKW);
> >> -TRACE_DEFINE_ENUM(F_RDLCK);
> >> -TRACE_DEFINE_ENUM(F_WRLCK);
> >> -TRACE_DEFINE_ENUM(F_UNLCK);
> >> -
> >> -#define show_lock_cmd(type) \
> >> - __print_symbolic((int)type, \
> >> - { F_GETLK, "GETLK" }, \
> >> - { F_SETLK, "SETLK" }, \
> >> - { F_SETLKW, "SETLKW" })
> >> -#define show_lock_type(type) \
> >> - __print_symbolic((int)type, \
> >> - { F_RDLCK, "RDLCK" }, \
> >> - { F_WRLCK, "WRLCK" }, \
> >> - { F_UNLCK, "UNLCK" })
> >> -
> >> DECLARE_EVENT_CLASS(nfs4_lock_event,
> >> TP_PROTO(
> >> const struct file_lock *request,
> >> @@ -991,8 +962,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
> >>
> >> TP_STRUCT__entry(
> >> __field(unsigned long, error)
> >> - __field(int, cmd)
> >> - __field(char, type)
> >> + __field(unsigned long, cmd)
> >> + __field(unsigned long, type)
> >> __field(loff_t, start)
> >> __field(loff_t, end)
> >> __field(dev_t, dev)
> >> @@ -1025,8 +996,8 @@ DECLARE_EVENT_CLASS(nfs4_lock_event,
> >> "stateid=%d:0x%08x",
> >> -__entry->error,
> >> show_nfsv4_errors(__entry->error),
> >> - show_lock_cmd(__entry->cmd),
> >> - show_lock_type(__entry->type),
> >> + show_fs_fcntl_cmd(__entry->cmd),
> >> + show_fs_fcntl_lock_type(__entry->type),
> >> (long long)__entry->start,
> >> (long long)__entry->end,
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> @@ -1061,8 +1032,8 @@ TRACE_EVENT(nfs4_set_lock,
> >>
> >> TP_STRUCT__entry(
> >> __field(unsigned long, error)
> >> - __field(int, cmd)
> >> - __field(char, type)
> >> + __field(unsigned long, cmd)
> >> + __field(unsigned long, type)
> >> __field(loff_t, start)
> >> __field(loff_t, end)
> >> __field(dev_t, dev)
> >> @@ -1101,8 +1072,8 @@ TRACE_EVENT(nfs4_set_lock,
> >> "stateid=%d:0x%08x lockstateid=%d:0x%08x",
> >> -__entry->error,
> >> show_nfsv4_errors(__entry->error),
> >> - show_lock_cmd(__entry->cmd),
> >> - show_lock_type(__entry->type),
> >> + show_fs_fcntl_cmd(__entry->cmd),
> >> + show_fs_fcntl_lock_type(__entry->type),
> >> (long long)__entry->start,
> >> (long long)__entry->end,
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> @@ -1219,7 +1190,7 @@ DECLARE_EVENT_CLASS(nfs4_set_delegation_event,
> >>
> >> TP_printk(
> >> "fmode=%s fileid=%02x:%02x:%llu fhandle=0x%08x",
> >> - show_fmode_flags(__entry->fmode),
> >> + show_fs_fmode_flags(__entry->fmode),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->fileid,
> >> __entry->fhandle
> >> diff --git a/fs/nfs/nfstrace.h b/fs/nfs/nfstrace.h
> >> index 8a224871be74..49d432c00bde 100644
> >> --- a/fs/nfs/nfstrace.h
> >> +++ b/fs/nfs/nfstrace.h
> >> @@ -11,27 +11,7 @@
> >> #include <linux/tracepoint.h>
> >> #include <linux/iversion.h>
> >>
> >> -TRACE_DEFINE_ENUM(DT_UNKNOWN);
> >> -TRACE_DEFINE_ENUM(DT_FIFO);
> >> -TRACE_DEFINE_ENUM(DT_CHR);
> >> -TRACE_DEFINE_ENUM(DT_DIR);
> >> -TRACE_DEFINE_ENUM(DT_BLK);
> >> -TRACE_DEFINE_ENUM(DT_REG);
> >> -TRACE_DEFINE_ENUM(DT_LNK);
> >> -TRACE_DEFINE_ENUM(DT_SOCK);
> >> -TRACE_DEFINE_ENUM(DT_WHT);
> >> -
> >> -#define nfs_show_file_type(ftype) \
> >> - __print_symbolic(ftype, \
> >> - { DT_UNKNOWN, "UNKNOWN" }, \
> >> - { DT_FIFO, "FIFO" }, \
> >> - { DT_CHR, "CHR" }, \
> >> - { DT_DIR, "DIR" }, \
> >> - { DT_BLK, "BLK" }, \
> >> - { DT_REG, "REG" }, \
> >> - { DT_LNK, "LNK" }, \
> >> - { DT_SOCK, "SOCK" }, \
> >> - { DT_WHT, "WHT" })
> >> +#include <trace/events/fs.h>
> >>
> >> TRACE_DEFINE_ENUM(NFS_INO_INVALID_DATA);
> >> TRACE_DEFINE_ENUM(NFS_INO_INVALID_ATIME);
> >> @@ -168,7 +148,7 @@ DECLARE_EVENT_CLASS(nfs_inode_event_done,
> >> (unsigned long long)__entry->fileid,
> >> __entry->fhandle,
> >> __entry->type,
> >> - nfs_show_file_type(__entry->type),
> >> + show_fs_dirent_type(__entry->type),
> >> (unsigned long long)__entry->version,
> >> (long long)__entry->size,
> >> __entry->cache_validity,
> >> @@ -259,7 +239,7 @@ TRACE_EVENT(nfs_access_exit,
> >> (unsigned long long)__entry->fileid,
> >> __entry->fhandle,
> >> __entry->type,
> >> - nfs_show_file_type(__entry->type),
> >> + show_fs_dirent_type(__entry->type),
> >> (unsigned long long)__entry->version,
> >> (long long)__entry->size,
> >> __entry->cache_validity,
> >> @@ -270,34 +250,6 @@ TRACE_EVENT(nfs_access_exit,
> >> )
> >> );
> >>
> >> -TRACE_DEFINE_ENUM(LOOKUP_FOLLOW);
> >> -TRACE_DEFINE_ENUM(LOOKUP_DIRECTORY);
> >> -TRACE_DEFINE_ENUM(LOOKUP_AUTOMOUNT);
> >> -TRACE_DEFINE_ENUM(LOOKUP_PARENT);
> >> -TRACE_DEFINE_ENUM(LOOKUP_REVAL);
> >> -TRACE_DEFINE_ENUM(LOOKUP_RCU);
> >> -TRACE_DEFINE_ENUM(LOOKUP_OPEN);
> >> -TRACE_DEFINE_ENUM(LOOKUP_CREATE);
> >> -TRACE_DEFINE_ENUM(LOOKUP_EXCL);
> >> -TRACE_DEFINE_ENUM(LOOKUP_RENAME_TARGET);
> >> -TRACE_DEFINE_ENUM(LOOKUP_EMPTY);
> >> -TRACE_DEFINE_ENUM(LOOKUP_DOWN);
> >> -
> >> -#define show_lookup_flags(flags) \
> >> - __print_flags(flags, "|", \
> >> - { LOOKUP_FOLLOW, "FOLLOW" }, \
> >> - { LOOKUP_DIRECTORY, "DIRECTORY" }, \
> >> - { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
> >> - { LOOKUP_PARENT, "PARENT" }, \
> >> - { LOOKUP_REVAL, "REVAL" }, \
> >> - { LOOKUP_RCU, "RCU" }, \
> >> - { LOOKUP_OPEN, "OPEN" }, \
> >> - { LOOKUP_CREATE, "CREATE" }, \
> >> - { LOOKUP_EXCL, "EXCL" }, \
> >> - { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
> >> - { LOOKUP_EMPTY, "EMPTY" }, \
> >> - { LOOKUP_DOWN, "DOWN" })
> >> -
> >> DECLARE_EVENT_CLASS(nfs_lookup_event,
> >> TP_PROTO(
> >> const struct inode *dir,
> >> @@ -324,7 +276,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event,
> >> TP_printk(
> >> "flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> >> __entry->flags,
> >> - show_lookup_flags(__entry->flags),
> >> + show_fs_lookup_flags(__entry->flags),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->dir,
> >> __get_str(name)
> >> @@ -370,7 +322,7 @@ DECLARE_EVENT_CLASS(nfs_lookup_event_done,
> >> "error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> >> -__entry->error, nfs_show_status(__entry->error),
> >> __entry->flags,
> >> - show_lookup_flags(__entry->flags),
> >> + show_fs_lookup_flags(__entry->flags),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->dir,
> >> __get_str(name)
> >> @@ -392,46 +344,6 @@ DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_exit);
> >> DEFINE_NFS_LOOKUP_EVENT(nfs_lookup_revalidate_enter);
> >> DEFINE_NFS_LOOKUP_EVENT_DONE(nfs_lookup_revalidate_exit);
> >>
> >> -TRACE_DEFINE_ENUM(O_WRONLY);
> >> -TRACE_DEFINE_ENUM(O_RDWR);
> >> -TRACE_DEFINE_ENUM(O_CREAT);
> >> -TRACE_DEFINE_ENUM(O_EXCL);
> >> -TRACE_DEFINE_ENUM(O_NOCTTY);
> >> -TRACE_DEFINE_ENUM(O_TRUNC);
> >> -TRACE_DEFINE_ENUM(O_APPEND);
> >> -TRACE_DEFINE_ENUM(O_NONBLOCK);
> >> -TRACE_DEFINE_ENUM(O_DSYNC);
> >> -TRACE_DEFINE_ENUM(O_DIRECT);
> >> -TRACE_DEFINE_ENUM(O_LARGEFILE);
> >> -TRACE_DEFINE_ENUM(O_DIRECTORY);
> >> -TRACE_DEFINE_ENUM(O_NOFOLLOW);
> >> -TRACE_DEFINE_ENUM(O_NOATIME);
> >> -TRACE_DEFINE_ENUM(O_CLOEXEC);
> >> -
> >> -#define show_open_flags(flags) \
> >> - __print_flags(flags, "|", \
> >> - { O_WRONLY, "O_WRONLY" }, \
> >> - { O_RDWR, "O_RDWR" }, \
> >> - { O_CREAT, "O_CREAT" }, \
> >> - { O_EXCL, "O_EXCL" }, \
> >> - { O_NOCTTY, "O_NOCTTY" }, \
> >> - { O_TRUNC, "O_TRUNC" }, \
> >> - { O_APPEND, "O_APPEND" }, \
> >> - { O_NONBLOCK, "O_NONBLOCK" }, \
> >> - { O_DSYNC, "O_DSYNC" }, \
> >> - { O_DIRECT, "O_DIRECT" }, \
> >> - { O_LARGEFILE, "O_LARGEFILE" }, \
> >> - { O_DIRECTORY, "O_DIRECTORY" }, \
> >> - { O_NOFOLLOW, "O_NOFOLLOW" }, \
> >> - { O_NOATIME, "O_NOATIME" }, \
> >> - { O_CLOEXEC, "O_CLOEXEC" })
> >> -
> >> -#define show_fmode_flags(mode) \
> >> - __print_flags(mode, "|", \
> >> - { ((__force unsigned long)FMODE_READ), "READ" }, \
> >> - { ((__force unsigned long)FMODE_WRITE), "WRITE" }, \
> >> - { ((__force unsigned long)FMODE_EXEC), "EXEC" })
> >> -
> >> TRACE_EVENT(nfs_atomic_open_enter,
> >> TP_PROTO(
> >> const struct inode *dir,
> >> @@ -443,7 +355,7 @@ TRACE_EVENT(nfs_atomic_open_enter,
> >>
> >> TP_STRUCT__entry(
> >> __field(unsigned long, flags)
> >> - __field(unsigned int, fmode)
> >> + __field(unsigned long, fmode)
> >> __field(dev_t, dev)
> >> __field(u64, dir)
> >> __string(name, ctx->dentry->d_name.name)
> >> @@ -453,15 +365,15 @@ TRACE_EVENT(nfs_atomic_open_enter,
> >> __entry->dev = dir->i_sb->s_dev;
> >> __entry->dir = NFS_FILEID(dir);
> >> __entry->flags = flags;
> >> - __entry->fmode = (__force unsigned int)ctx->mode;
> >> + __entry->fmode = (__force unsigned long)ctx->mode;
> >> __assign_str(name, ctx->dentry->d_name.name);
> >> ),
> >>
> >> TP_printk(
> >> "flags=0x%lx (%s) fmode=%s name=%02x:%02x:%llu/%s",
> >> __entry->flags,
> >> - show_open_flags(__entry->flags),
> >> - show_fmode_flags(__entry->fmode),
> >> + show_fs_fcntl_open_flags(__entry->flags),
> >> + show_fs_fmode_flags(__entry->fmode),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->dir,
> >> __get_str(name)
> >> @@ -481,7 +393,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
> >> TP_STRUCT__entry(
> >> __field(unsigned long, error)
> >> __field(unsigned long, flags)
> >> - __field(unsigned int, fmode)
> >> + __field(unsigned long, fmode)
> >> __field(dev_t, dev)
> >> __field(u64, dir)
> >> __string(name, ctx->dentry->d_name.name)
> >> @@ -492,7 +404,7 @@ TRACE_EVENT(nfs_atomic_open_exit,
> >> __entry->dev = dir->i_sb->s_dev;
> >> __entry->dir = NFS_FILEID(dir);
> >> __entry->flags = flags;
> >> - __entry->fmode = (__force unsigned int)ctx->mode;
> >> + __entry->fmode = (__force unsigned long)ctx->mode;
> >> __assign_str(name, ctx->dentry->d_name.name);
> >> ),
> >>
> >> @@ -501,8 +413,8 @@ TRACE_EVENT(nfs_atomic_open_exit,
> >> "name=%02x:%02x:%llu/%s",
> >> -__entry->error, nfs_show_status(__entry->error),
> >> __entry->flags,
> >> - show_open_flags(__entry->flags),
> >> - show_fmode_flags(__entry->fmode),
> >> + show_fs_fcntl_open_flags(__entry->flags),
> >> + show_fs_fmode_flags(__entry->fmode),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->dir,
> >> __get_str(name)
> >> @@ -535,7 +447,7 @@ TRACE_EVENT(nfs_create_enter,
> >> TP_printk(
> >> "flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> >> __entry->flags,
> >> - show_open_flags(__entry->flags),
> >> + show_fs_fcntl_open_flags(__entry->flags),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->dir,
> >> __get_str(name)
> >> @@ -572,7 +484,7 @@ TRACE_EVENT(nfs_create_exit,
> >> "error=%ld (%s) flags=0x%lx (%s) name=%02x:%02x:%llu/%s",
> >> -__entry->error, nfs_show_status(__entry->error),
> >> __entry->flags,
> >> - show_open_flags(__entry->flags),
> >> + show_fs_fcntl_open_flags(__entry->flags),
> >> MAJOR(__entry->dev), MINOR(__entry->dev),
> >> (unsigned long long)__entry->dir,
> >> __get_str(name)
> >> diff --git a/include/trace/events/fs.h b/include/trace/events/fs.h
> >> new file mode 100644
> >> index 000000000000..84e20c43d0c3
> >> --- /dev/null
> >> +++ b/include/trace/events/fs.h
> >> @@ -0,0 +1,146 @@
> >> +/* SPDX-License-Identifier: GPL-2.0 */
> >> +/*
> >> + * Display helpers for generic filesystem items
> >> + *
> >> + * Author: Chuck Lever <[email protected]>
> >> + *
> >> + * Copyright (c) 2020, Oracle and/or its affiliates.
> >> + */
> >> +
> >> +#include <linux/fs.h>
> >> +
> >> +#define show_fs_dirent_type(x) \
> >> + __print_symbolic(x, \
> >> + { DT_UNKNOWN, "UNKNOWN" }, \
> >> + { DT_FIFO, "FIFO" }, \
> >> + { DT_CHR, "CHR" }, \
> >> + { DT_DIR, "DIR" }, \
> >> + { DT_BLK, "BLK" }, \
> >> + { DT_REG, "REG" }, \
> >> + { DT_LNK, "LNK" }, \
> >> + { DT_SOCK, "SOCK" }, \
> >> + { DT_WHT, "WHT" })
> >> +
> >> +#define show_fs_fcntl_open_flags(x) \
> >> + __print_flags(x, "|", \
> >> + { O_WRONLY, "O_WRONLY" }, \
> >> + { O_RDWR, "O_RDWR" }, \
> >> + { O_CREAT, "O_CREAT" }, \
> >> + { O_EXCL, "O_EXCL" }, \
> >> + { O_NOCTTY, "O_NOCTTY" }, \
> >> + { O_TRUNC, "O_TRUNC" }, \
> >> + { O_APPEND, "O_APPEND" }, \
> >> + { O_NONBLOCK, "O_NONBLOCK" }, \
> >> + { O_DSYNC, "O_DSYNC" }, \
> >> + { O_DIRECT, "O_DIRECT" }, \
> >> + { O_LARGEFILE, "O_LARGEFILE" }, \
> >> + { O_DIRECTORY, "O_DIRECTORY" }, \
> >> + { O_NOFOLLOW, "O_NOFOLLOW" }, \
> >> + { O_NOATIME, "O_NOATIME" }, \
> >> + { O_CLOEXEC, "O_CLOEXEC" })
> >> +
> >> +#define __fmode_flag(x) { (__force unsigned long)FMODE_##x, #x }
> >> +#define show_fs_fmode_flags(x) \
> >> + __print_flags(x, "|", \
> >> + __fmode_flag(READ), \
> >> + __fmode_flag(WRITE), \
> >> + __fmode_flag(LSEEK), \
> >> + __fmode_flag(PREAD), \
> >> + __fmode_flag(PWRITE), \
> >> + __fmode_flag(EXEC), \
> >> + __fmode_flag(NDELAY), \
> >> + __fmode_flag(EXCL), \
> >> + __fmode_flag(WRITE_IOCTL), \
> >> + __fmode_flag(32BITHASH), \
> >> + __fmode_flag(64BITHASH), \
> >> + __fmode_flag(NOCMTIME), \
> >> + __fmode_flag(RANDOM), \
> >> + __fmode_flag(UNSIGNED_OFFSET), \
> >> + __fmode_flag(PATH), \
> >> + __fmode_flag(ATOMIC_POS), \
> >> + __fmode_flag(WRITER), \
> >> + __fmode_flag(CAN_READ), \
> >> + __fmode_flag(CAN_WRITE), \
> >> + __fmode_flag(OPENED), \
> >> + __fmode_flag(CREATED), \
> >> + __fmode_flag(STREAM), \
> >> + __fmode_flag(NONOTIFY), \
> >> + __fmode_flag(NOWAIT), \
> >> + __fmode_flag(NEED_UNMOUNT), \
> >> + __fmode_flag(NOACCOUNT), \
> >> + __fmode_flag(BUF_RASYNC))
> >> +
> >> +#ifdef CONFIG_64BIT
> >> +#define show_fs_fcntl_cmd(x) \
> >> + __print_symbolic(x, \
> >> + { F_DUPFD, "DUPFD" }, \
> >> + { F_GETFD, "GETFD" }, \
> >> + { F_SETFD, "SETFD" }, \
> >> + { F_GETFL, "GETFL" }, \
> >> + { F_SETFL, "SETFL" }, \
> >> + { F_GETLK, "GETLK" }, \
> >> + { F_SETLK, "SETLK" }, \
> >> + { F_SETLKW, "SETLKW" }, \
> >> + { F_SETOWN, "SETOWN" }, \
> >> + { F_GETOWN, "GETOWN" }, \
> >> + { F_SETSIG, "SETSIG" }, \
> >> + { F_GETSIG, "GETSIG" }, \
> >> + { F_SETOWN_EX, "SETOWN_EX" }, \
> >> + { F_GETOWN_EX, "GETOWN_EX" }, \
> >> + { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
> >> + { F_OFD_GETLK, "OFD_GETLK" }, \
> >> + { F_OFD_SETLK, "OFD_SETLK" }, \
> >> + { F_OFD_SETLKW, "OFD_SETLKW" })
> >> +#else /* CONFIG_64BIT */
> >> +#define show_fs_fcntl_cmd(x) \
> >> + __print_symbolic(x, \
> >> + { F_DUPFD, "DUPFD" }, \
> >> + { F_GETFD, "GETFD" }, \
> >> + { F_SETFD, "SETFD" }, \
> >> + { F_GETFL, "GETFL" }, \
> >> + { F_SETFL, "SETFL" }, \
> >> + { F_GETLK, "GETLK" }, \
> >> + { F_SETLK, "SETLK" }, \
> >> + { F_SETLKW, "SETLKW" }, \
> >> + { F_SETOWN, "SETOWN" }, \
> >> + { F_GETOWN, "GETOWN" }, \
> >> + { F_SETSIG, "SETSIG" }, \
> >> + { F_GETSIG, "GETSIG" }, \
> >> + { F_GETLK64, "GETLK64" }, \
> >> + { F_SETLK64, "SETLK64" }, \
> >> + { F_SETLKW64, "SETLKW64" }, \
> >> + { F_SETOWN_EX, "SETOWN_EX" }, \
> >> + { F_GETOWN_EX, "GETOWN_EX" }, \
> >> + { F_GETOWNER_UIDS, "GETOWNER_UIDS" }, \
> >> + { F_OFD_GETLK, "OFD_GETLK" }, \
> >> + { F_OFD_SETLK, "OFD_SETLK" }, \
> >> + { F_OFD_SETLKW, "OFD_SETLKW" })
> >> +#endif /* CONFIG_64BIT */
> >> +
> >> +#define show_fs_fcntl_lock_type(x) \
> >> + __print_symbolic(x, \
> >> + { F_RDLCK, "RDLCK" }, \
> >> + { F_WRLCK, "WRLCK" }, \
> >> + { F_UNLCK, "UNLCK" })
> >> +
> >> +#define show_fs_lookup_flags(flags) \
> >> + __print_flags(flags, "|", \
> >> + { LOOKUP_FOLLOW, "FOLLOW" }, \
> >> + { LOOKUP_DIRECTORY, "DIRECTORY" }, \
> >> + { LOOKUP_AUTOMOUNT, "AUTOMOUNT" }, \
> >> + { LOOKUP_EMPTY, "EMPTY" }, \
> >> + { LOOKUP_DOWN, "DOWN" }, \
> >> + { LOOKUP_MOUNTPOINT, "MOUNTPOINT" }, \
> >> + { LOOKUP_REVAL, "REVAL" }, \
> >> + { LOOKUP_RCU, "RCU" }, \
> >> + { LOOKUP_OPEN, "OPEN" }, \
> >> + { LOOKUP_CREATE, "CREATE" }, \
> >> + { LOOKUP_EXCL, "EXCL" }, \
> >> + { LOOKUP_RENAME_TARGET, "RENAME_TARGET" }, \
> >> + { LOOKUP_PARENT, "PARENT" }, \
> >> + { LOOKUP_NO_SYMLINKS, "NO_SYMLINKS" }, \
> >> + { LOOKUP_NO_MAGICLINKS, "NO_MAGICLINKS" }, \
> >> + { LOOKUP_NO_XDEV, "NO_XDEV" }, \
> >> + { LOOKUP_BENEATH, "BENEATH" }, \
> >> + { LOOKUP_IN_ROOT, "IN_ROOT" }, \
> >> + { LOOKUP_CACHED, "CACHED" })
> >>
>
> --
> Chuck Lever
>
>
>