linux-kernel - Re: [PATCH 1/1 FYI] tools headers: Update the fs headers with the kernel

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <aEcgQ_B5a5oY-jo8@x1>
Date: Mon, 9 Jun 2025 14:56:19 -0300
From: Arnaldo Carvalho de Melo <acme@...nel.org>
To: linux-kernel@...r.kernel.org
Cc: Andrei Vagin <avagin@...il.com>,
	Andrew Morton <akpm@...ux-foundation.org>,
	Andrii Nakryiko <andrii@...nel.org>,
	"Darrick J. Wong" <djwong@...nel.org>,
	Eric Biggers <ebiggers@...gle.com>, Ian Rogers <irogers@...gle.com>,
	James Clark <james.clark@...aro.org>, Jiri Olsa <jolsa@...nel.org>,
	John Garry <john.g.garry@...cle.com>,
	Kan Liang <kan.liang@...ux.intel.com>,
	"Liam R. Howlett" <liam.howlett@...cle.com>,
	Namhyung Kim <namhyung@...nel.org>,
	sources@...smtp.subspace.kernel.org,
	Adrian Hunter <adrian.hunter@...el.com>
Subject: Re: [PATCH 1/1 FYI] tools headers: Update the fs headers with the
 kernel

On Mon, Jun 09, 2025 at 02:50:18PM -0300, Arnaldo Carvalho de Melo wrote:
> This addresses these tools/ build warnings:
> 
>   Warning: Kernel ABI header differences:
>   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/mount.h include/uapi/linux/mount.h

Sorry, mount.h isn't touched, its  include/uapi/linux/fscrypt.h instead,
I fixed it yup locally.

- Arnaldo

>   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@...el.com>
> Cc: Andrei Vagin <avagin@...il.com>
> Cc: Andrew Morton <akpm@...ux-foundation.org>
> Cc: Andrii Nakryiko <andrii@...nel.org>
> Cc: Darrick J. Wong <djwong@...nel.org>
> Cc: Eric Biggers <ebiggers@...gle.com>
> Cc: Ian Rogers <irogers@...gle.com>
> Cc: James Clark <james.clark@...aro.org>
> Cc: Jiri Olsa <jolsa@...nel.org>
> Cc: John Garry <john.g.garry@...cle.com>
> Cc: Kan Liang <kan.liang@...ux.intel.com>
> Cc: Liam R. Howlett <liam.howlett@...cle.com>
> Cc: Namhyung Kim <namhyung@...nel.org>
> Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
> ---
>  tools/include/uapi/linux/fscrypt.h                | 6 ++++--
>  tools/include/uapi/linux/stat.h                   | 8 ++++++--
>  tools/perf/trace/beauty/include/uapi/linux/fs.h   | 1 +
>  tools/perf/trace/beauty/include/uapi/linux/stat.h | 8 ++++++--
>  4 files changed, 17 insertions(+), 6 deletions(-)
> 
> diff --git a/tools/include/uapi/linux/fscrypt.h b/tools/include/uapi/linux/fscrypt.h
> index 7a8f4c2901873f25..3aff99f2696a05cb 100644
> --- a/tools/include/uapi/linux/fscrypt.h
> +++ b/tools/include/uapi/linux/fscrypt.h
> @@ -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[];
>  };
>  
> diff --git a/tools/include/uapi/linux/stat.h b/tools/include/uapi/linux/stat.h
> index f78ee3670dd5d7c8..1686861aae20a6e4 100644
> --- a/tools/include/uapi/linux/stat.h
> +++ b/tools/include/uapi/linux/stat.h
> @@ -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 */
>  };
> diff --git a/tools/perf/trace/beauty/include/uapi/linux/fs.h b/tools/perf/trace/beauty/include/uapi/linux/fs.h
> index e762e1af650c4bf0..0098b0ce8ccb1f19 100644
> --- a/tools/perf/trace/beauty/include/uapi/linux/fs.h
> +++ b/tools/perf/trace/beauty/include/uapi/linux/fs.h
> @@ -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
> diff --git a/tools/perf/trace/beauty/include/uapi/linux/stat.h b/tools/perf/trace/beauty/include/uapi/linux/stat.h
> index f78ee3670dd5d7c8..1686861aae20a6e4 100644
> --- a/tools/perf/trace/beauty/include/uapi/linux/stat.h
> +++ b/tools/perf/trace/beauty/include/uapi/linux/stat.h
> @@ -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 */
>  };
> -- 
> 2.49.0
>