Skip to content

Commit 11cfaf3

Browse files
committed
tools headers: Update the fs headers with the kernel sources
To pick up changes from: 5d89432 ("fs: add atomic write unit max opt to statx") a516403 ("fs/proc: extend the PAGEMAP_SCAN ioctl to report guard regions") c07d3ae ("fscrypt: add support for hardware-wrapped keys") These are used to beautify fs syscall arguments, albeit the changes in this update are not affecting those beautifiers. This addresses these tools/ build warnings: Warning: Kernel ABI header differences: diff -u tools/include/uapi/linux/fscrypt.h include/uapi/linux/fscrypt.h diff -u tools/include/uapi/linux/stat.h include/uapi/linux/stat.h diff -u tools/perf/trace/beauty/include/uapi/linux/fs.h include/uapi/linux/fs.h diff -u tools/perf/trace/beauty/include/uapi/linux/stat.h include/uapi/linux/stat.h Please see tools/include/uapi/README for details (it's in the first patch of this series). Cc: Adrian Hunter <[email protected]> Cc: Andrei Vagin <[email protected]> Cc: Andrew Morton <[email protected]> Cc: Andrii Nakryiko <[email protected]> Cc: Darrick J. Wong <[email protected]> Cc: Eric Biggers <[email protected]> Cc: Ian Rogers <[email protected]> Cc: James Clark <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: John Garry <[email protected]> Cc: Kan Liang <[email protected]> Cc: Liam R. Howlett <[email protected]> Cc: Namhyung Kim <[email protected]> Link: https://lore.kernel.org/r/aEce1keWdO-vGeqe@x1 Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 070b315 commit 11cfaf3

File tree

4 files changed

+17
-6
lines changed

4 files changed

+17
-6
lines changed

tools/include/uapi/linux/fscrypt.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ struct fscrypt_key_specifier {
119119
*/
120120
struct fscrypt_provisioning_key_payload {
121121
__u32 type;
122-
__u32 __reserved;
122+
__u32 flags;
123123
__u8 raw[];
124124
};
125125

@@ -128,7 +128,9 @@ struct fscrypt_add_key_arg {
128128
struct fscrypt_key_specifier key_spec;
129129
__u32 raw_size;
130130
__u32 key_id;
131-
__u32 __reserved[8];
131+
#define FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED 0x00000001
132+
__u32 flags;
133+
__u32 __reserved[7];
132134
__u8 raw[];
133135
};
134136

tools/include/uapi/linux/stat.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,12 @@ struct statx {
182182
/* File offset alignment for direct I/O reads */
183183
__u32 stx_dio_read_offset_align;
184184

185-
/* 0xb8 */
186-
__u64 __spare3[9]; /* Spare space for future expansion */
185+
/* Optimised max atomic write unit in bytes */
186+
__u32 stx_atomic_write_unit_max_opt;
187+
__u32 __spare2[1];
188+
189+
/* 0xc0 */
190+
__u64 __spare3[8]; /* Spare space for future expansion */
187191

188192
/* 0x100 */
189193
};

tools/perf/trace/beauty/include/uapi/linux/fs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ typedef int __bitwise __kernel_rwf_t;
361361
#define PAGE_IS_PFNZERO (1 << 5)
362362
#define PAGE_IS_HUGE (1 << 6)
363363
#define PAGE_IS_SOFT_DIRTY (1 << 7)
364+
#define PAGE_IS_GUARD (1 << 8)
364365

365366
/*
366367
* struct page_region - Page region with flags

tools/perf/trace/beauty/include/uapi/linux/stat.h

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,12 @@ struct statx {
182182
/* File offset alignment for direct I/O reads */
183183
__u32 stx_dio_read_offset_align;
184184

185-
/* 0xb8 */
186-
__u64 __spare3[9]; /* Spare space for future expansion */
185+
/* Optimised max atomic write unit in bytes */
186+
__u32 stx_atomic_write_unit_max_opt;
187+
__u32 __spare2[1];
188+
189+
/* 0xc0 */
190+
__u64 __spare3[8]; /* Spare space for future expansion */
187191

188192
/* 0x100 */
189193
};

0 commit comments

Comments
 (0)