From c1c07d681a68ba37da066d6f0456129957073169 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Genevi=C3=A8ve=20Bastien?= Date: Wed, 11 Mar 2020 12:38:51 -0400 Subject: [PATCH] syscalls: Make the cmd field of fcntl an enum MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The fcntl system call has a cmd parameter which is one of multiple values defined in the linux/fcntl.h file. This field is now an enumeration of the various possible values. Here's an example babeltrace output of the fcntl system call: [...] syscall_entry_fcntl: { cpu_id = 3 }, { fd = 35, cmd = ( "F_GETFL" : container = 3 ), arg = 140388746332169 } Change-Id: I06f511d5dba986aaf01b50057cbe6eac789bbea7 Signed-off-by: Geneviève Bastien Signed-off-by: Mathieu Desnoyers --- .../headers/syscalls_integers_override.h | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/instrumentation/syscalls/headers/syscalls_integers_override.h b/instrumentation/syscalls/headers/syscalls_integers_override.h index b5842649..a96d6003 100644 --- a/instrumentation/syscalls/headers/syscalls_integers_override.h +++ b/instrumentation/syscalls/headers/syscalls_integers_override.h @@ -20,4 +20,65 @@ SC_LTTNG_TRACEPOINT_EVENT(mmap, ) ) +/* + * Enumeration of the open flags, as described in the 'open' + * system call man page. + */ +SC_LTTNG_TRACEPOINT_ENUM(lttng_fcntl_cmd_flags, + TP_ENUM_VALUES( + ctf_enum_value("F_DUPFD", F_DUPFD) + ctf_enum_value("F_GETFD", F_GETFD) + ctf_enum_value("F_SETFD", F_SETFD) + ctf_enum_value("F_GETFL", F_GETFL) + ctf_enum_value("F_SETFL", F_SETFL) + ctf_enum_value("F_GETLK", F_GETLK) + ctf_enum_value("F_SETLK", F_SETLK) + ctf_enum_value("F_SETLKW", F_SETLKW) + ctf_enum_value("F_SETOWN", F_SETOWN) + ctf_enum_value("F_GETOWN", F_GETOWN) + ctf_enum_value("F_SETSIG", F_SETSIG) + ctf_enum_value("F_GETSIG", F_GETSIG) + ctf_enum_value("F_GETLK64", F_GETLK64) + ctf_enum_value("F_SETLK64", F_SETLK64) + ctf_enum_value("F_SETLKW64", F_SETLKW64) + ctf_enum_value("F_SETOWN_EX", F_SETOWN_EX) + ctf_enum_value("F_GETOWN_EX", F_GETOWN_EX) + ctf_enum_value("F_GETOWNER_UIDS", F_GETOWNER_UIDS) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) + ctf_enum_value("F_OFD_GETLK", F_OFD_GETLK) + ctf_enum_value("F_OFD_SETLK", F_OFD_SETLK) + ctf_enum_value("F_OFD_SETLKW", F_OFD_SETLKW) +#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ + ctf_enum_value("F_SETLEASE", F_SETLEASE) + ctf_enum_value("F_GETLEASE", F_GETLEASE) + ctf_enum_value("F_NOTIFY", F_NOTIFY) + ctf_enum_value("F_CANCELLK", F_CANCELLK) + ctf_enum_value("F_DUPFD_CLOEXEC", F_DUPFD_CLOEXEC) + ctf_enum_value("F_SETPIPE_SZ", F_SETPIPE_SZ) + ctf_enum_value("F_GETPIPE_SZ", F_GETPIPE_SZ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) + ctf_enum_value("F_ADD_SEALS", F_ADD_SEALS) + ctf_enum_value("F_GET_SEALS", F_GET_SEALS) +#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0)) */ +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) + ctf_enum_value("F_GET_RW_HINT", F_GET_RW_HINT) + ctf_enum_value("F_SET_RW_HINT", F_SET_RW_HINT) + ctf_enum_value("F_GET_FILE_RW_HINT", F_GET_FILE_RW_HINT) + ctf_enum_value("F_SET_FILE_RW_HINT", F_SET_FILE_RW_HINT) +#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0)) */ + ) +) + +#define OVERRIDE_32_fcntl +#define OVERRIDE_64_fcntl +SC_LTTNG_TRACEPOINT_EVENT(fcntl, + TP_PROTO(sc_exit(long ret,) unsigned int fd, unsigned int cmd, unsigned long arg), + TP_ARGS(sc_exit(ret,) fd, cmd, arg), + TP_FIELDS( + sc_exit(ctf_integer(long, ret, ret)) + sc_in(ctf_integer(unsigned int, fd, fd)) + sc_in(ctf_enum(lttng_fcntl_cmd_flags, unsigned int, cmd, cmd)) + sc_inout(ctf_integer(unsigned long, arg, arg))) +) + #endif /* CREATE_SYSCALL_TABLE */ -- 2.34.1