Commit 11cfaf37 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

tools headers: Update the fs headers with the kernel sources 

To pick up changes from:

  5d894321 ("fs: add atomic write unit max opt to statx")
  a5164037 ("fs/proc: extend the PAGEMAP_SCAN ioctl to report guard regions")
  c07d3aed ("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 <adrian.hunter@intel.com>
Cc: Andrei Vagin <avagin@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Darrick J. Wong <djwong@kernel.org>
Cc: Eric Biggers <ebiggers@google.com>
Cc: Ian Rogers <irogers@google.com>
Cc: James Clark <james.clark@linaro.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Liam R. Howlett <liam.howlett@oracle.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lore.kernel.org/r/aEce1keWdO-vGeqe@x1


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 070b3153

tools/include/uapi/linux/fscrypt.h

+4 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ struct fscrypt_key_specifier { 
 */

struct fscrypt_provisioning_key_payload {

	__u32 type;

	__u32 __reserved;

	__u32 flags;

	__u8 raw[];

};
@@ -128,7 +128,9 @@ struct fscrypt_add_key_arg { 
	struct fscrypt_key_specifier key_spec;

	__u32 raw_size;

	__u32 key_id;

	__u32 __reserved[8];

#define FSCRYPT_ADD_KEY_FLAG_HW_WRAPPED	0x00000001

	__u32 flags;

	__u32 __reserved[7];

	__u8 raw[];

};

tools/include/uapi/linux/stat.h

+6 −2
Original line number Diff line number Diff line
@@ -182,8 +182,12 @@ struct statx { 
	/* File offset alignment for direct I/O reads */

	__u32	stx_dio_read_offset_align;



	/* 0xb8 */

	__u64	__spare3[9];	/* Spare space for future expansion */

	/* Optimised max atomic write unit in bytes */

	__u32	stx_atomic_write_unit_max_opt;

	__u32	__spare2[1];



	/* 0xc0 */

	__u64	__spare3[8];	/* Spare space for future expansion */



	/* 0x100 */

};

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

+1 −0
Original line number Diff line number Diff line
@@ -361,6 +361,7 @@ typedef int __bitwise __kernel_rwf_t; 
#define PAGE_IS_PFNZERO		(1 << 5)

#define PAGE_IS_HUGE		(1 << 6)

#define PAGE_IS_SOFT_DIRTY	(1 << 7)

#define PAGE_IS_GUARD		(1 << 8)



/*

 * struct page_region - Page region with flags

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

+6 −2
Original line number Diff line number Diff line
@@ -182,8 +182,12 @@ struct statx { 
	/* File offset alignment for direct I/O reads */

	__u32	stx_dio_read_offset_align;



	/* 0xb8 */

	__u64	__spare3[9];	/* Spare space for future expansion */

	/* Optimised max atomic write unit in bytes */

	__u32	stx_atomic_write_unit_max_opt;

	__u32	__spare2[1];



	/* 0xc0 */

	__u64	__spare3[8];	/* Spare space for future expansion */



	/* 0x100 */

};