tools headers: Sync uapi/linux/mount.h with the kernel sources

To pick up the changes in this cset:

  aefff51e1c2986e1 statmount: retrieve security mount options
  2f4d4503e9e5ab76 statmount: add flag to retrieve unescaped options
  44010543fc8bedad fs: add the ability for statmount() to report the sb_source
  ed9d95f691c29748 fs: add the ability for statmount() to report the fs_subtype

This addresses these perf build warnings:

  Warning: Kernel ABI header differences:
    diff -u tools/perf/trace/beauty/include/uapi/linux/mount.h include/uapi/linux/mount.h

Please see tools/include/uapi/README for further details.

Reviewed-by: James Clark <james.clark@linaro.org>
Cc: Christian Brauner <brauner@kernel.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: linux-fsdevel@vger.kernel.org
Link: https://lore.kernel.org/r/20241203035349.1901262-10-namhyung@kernel.org
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/trace/beauty/include/uapi/linux/mount.h b/tools/perf/trace/beauty/include/uapi/linux/mount.h
index 225bc366ffcbf0319929e2f55f1fbea88e4d7b81..c07008816acae89cbea3087caf50d537d4e78298 100644 (file)
--- a/tools/perf/trace/beauty/include/uapi/linux/mount.h
+++ b/tools/perf/trace/beauty/include/uapi/linux/mount.h
@@ -154,7 +154,7 @@ struct mount_attr {
  */
 struct statmount {
        __u32 size;             /* Total size, including strings */
-       __u32 mnt_opts;         /* [str] Mount options of the mount */
+       __u32 mnt_opts;         /* [str] Options (comma separated, escaped) */
        __u64 mask;             /* What results were written */
        __u32 sb_dev_major;     /* Device ID */
        __u32 sb_dev_minor;
@@ -173,7 +173,13 @@ struct statmount {
        __u32 mnt_root;         /* [str] Root of mount relative to root of fs */
        __u32 mnt_point;        /* [str] Mountpoint relative to current root */
        __u64 mnt_ns_id;        /* ID of the mount namespace */
-       __u64 __spare2[49];
+       __u32 fs_subtype;       /* [str] Subtype of fs_type (if any) */
+       __u32 sb_source;        /* [str] Source string of the mount */
+       __u32 opt_num;          /* Number of fs options */
+       __u32 opt_array;        /* [str] Array of nul terminated fs options */
+       __u32 opt_sec_num;      /* Number of security options */
+       __u32 opt_sec_array;    /* [str] Array of nul terminated security options */
+       __u64 __spare2[46];
        char str[];             /* Variable size part containing strings */
 };
 
@@ -207,6 +213,10 @@ struct mnt_id_req {
 #define STATMOUNT_FS_TYPE              0x00000020U     /* Want/got fs_type */
 #define STATMOUNT_MNT_NS_ID            0x00000040U     /* Want/got mnt_ns_id */
 #define STATMOUNT_MNT_OPTS             0x00000080U     /* Want/got mnt_opts */
+#define STATMOUNT_FS_SUBTYPE           0x00000100U     /* Want/got fs_subtype */
+#define STATMOUNT_SB_SOURCE            0x00000200U     /* Want/got sb_source */
+#define STATMOUNT_OPT_ARRAY            0x00000400U     /* Want/got opt_... */
+#define STATMOUNT_OPT_SEC_ARRAY                0x00000800U     /* Want/got opt_sec... */
 
 /*
  * Special @mnt_id values that can be passed to listmount