Skip to content

Commit 743108e

Browse files
committed
tools headers: Update syscall.tbl files to support mount_setattr
To pick the changes from: 9caccd4 ("fs: introduce MOUNT_ATTR_IDMAP") This adds this new syscall to the tables used by tools such as 'perf trace', so that one can specify it by name and have it filtered, etc. Addressing these perf build warnings: Warning: Kernel ABI header at 'tools/perf/arch/x86/entry/syscalls/syscall_64.tbl' differs from latest version at 'arch/x86/entry/syscalls/syscall_64.tbl' diff -u tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl' diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl Warning: Kernel ABI header at 'tools/perf/arch/s390/entry/syscalls/syscall.tbl' differs from latest version at 'arch/s390/kernel/syscalls/syscall.tbl' diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Christian Brauner <christian.brauner@ubuntu.com> Cc: Ian Rogers <irogers@google.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lore.kernel.org/lkml/YD6Wsxr9ByUbab/a@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
1 parent 846580c commit 743108e

File tree

4 files changed

+19
-0
lines changed

4 files changed

+19
-0
lines changed

tools/include/uapi/linux/mount.h

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef _UAPI_LINUX_MOUNT_H
22
#define _UAPI_LINUX_MOUNT_H
33

4+
#include <linux/types.h>
5+
46
/*
57
* These are the fs-independent mount-flags: up to 32 flags are supported
68
*
@@ -117,5 +119,19 @@ enum fsconfig_command {
117119
#define MOUNT_ATTR_NOATIME 0x00000010 /* - Do not update access times. */
118120
#define MOUNT_ATTR_STRICTATIME 0x00000020 /* - Always perform atime updates */
119121
#define MOUNT_ATTR_NODIRATIME 0x00000080 /* Do not update directory access times */
122+
#define MOUNT_ATTR_IDMAP 0x00100000 /* Idmap mount to @userns_fd in struct mount_attr. */
123+
124+
/*
125+
* mount_setattr()
126+
*/
127+
struct mount_attr {
128+
__u64 attr_set;
129+
__u64 attr_clr;
130+
__u64 propagation;
131+
__u64 userns_fd;
132+
};
133+
134+
/* List of all mount_attr versions. */
135+
#define MOUNT_ATTR_SIZE_VER0 32 /* sizeof first published struct */
120136

121137
#endif /* _UAPI_LINUX_MOUNT_H */

tools/perf/arch/powerpc/entry/syscalls/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -521,3 +521,4 @@
521521
439 common faccessat2 sys_faccessat2
522522
440 common process_madvise sys_process_madvise
523523
441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2
524+
442 common mount_setattr sys_mount_setattr

tools/perf/arch/s390/entry/syscalls/syscall.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,3 +444,4 @@
444444
439 common faccessat2 sys_faccessat2 sys_faccessat2
445445
440 common process_madvise sys_process_madvise sys_process_madvise
446446
441 common epoll_pwait2 sys_epoll_pwait2 compat_sys_epoll_pwait2
447+
442 common mount_setattr sys_mount_setattr sys_mount_setattr

tools/perf/arch/x86/entry/syscalls/syscall_64.tbl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,6 +363,7 @@
363363
439 common faccessat2 sys_faccessat2
364364
440 common process_madvise sys_process_madvise
365365
441 common epoll_pwait2 sys_epoll_pwait2
366+
442 common mount_setattr sys_mount_setattr
366367

367368
#
368369
# Due to a historical design error, certain syscalls are numbered differently

0 commit comments

Comments
 (0)