[Devel] [PATCH RHEL9 COMMIT] ms/tools include UAPI: Update linux/mount.h copy

[Konstantin Khorenko]

The commit is pushed to "branch-rh9-5.14.0-162.18.1.vz9.19.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git
after rh9-5.14.0-162.18.1.vz9.19.7
------>
commit 7fce8dbc6fe57eb53fcd3797ed36ef358ddd3261
Author: Arnaldo Carvalho de Melo <acme at redhat.com>
Date:   Fri Apr 7 14:36:50 2023 +0800

    ms/tools include UAPI: Update linux/mount.h copy
    
    To pick the changes from:
    
      9ffb14ef61bab83f ("move_mount: allow to add a mount into an existing group")
    
    That ends up adding support for the new MOVE_MOUNT_SET_GROUP move_mount
    flag.
    
      $ tools/perf/trace/beauty/move_mount_flags.sh > before
      $ cp include/uapi/linux/mount.h tools/include/uapi/linux/mount.h
      $ tools/perf/trace/beauty/move_mount_flags.sh > after
      $ diff -u before after
      --- before    2021-09-10 12:28:43.865279808 -0300
      +++ after     2021-09-10 12:28:50.183429184 -0300
      @@ -5,4 +5,5 @@
            [ilog2(0x00000010) + 1] = "T_SYMLINKS",
            [ilog2(0x00000020) + 1] = "T_AUTOMOUNTS",
            [ilog2(0x00000040) + 1] = "T_EMPTY_PATH",
      +     [ilog2(0x00000100) + 1] = "SET_GROUP",
       };
      $
    
    So now one can use it in --filter expressions for tracepoints.
    
    This silences this perf build warnings:
    
      Warning: Kernel ABI header at 'tools/include/uapi/linux/mount.h' differs from latest version at 'include/uapi/linux/mount.h'
      diff -u tools/include/uapi/linux/mount.h include/uapi/linux/mount.h
    
    Cc: Christian Brauner <christian.brauner at ubuntu.com>
    Cc: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
    
    https://jira.sw.ru/browse/PSBM-144416
    (cherry picked from commit ms 37ce9e4fc596cf10a4d32ced741679bd1b4fa7a5)
    Signed-off-by: Pavel Tikhomirov <ptikhomirov at virtuozzo.com>
    
    ======
    Patchset description:
    mount: Port move_mount_set_group related patches
    
    We need this as in Virtuozzo criu after rebase to mainstream criu in u20
    we will switch to this new API for sharing group setting accross mounts.
    
    https://jira.sw.ru/browse/PSBM-144416
    
    Feature: mount: port move_mount_set_group related patches
---
 tools/include/uapi/linux/mount.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/include/uapi/linux/mount.h b/tools/include/uapi/linux/mount.h
index dd7a166fdf9c..4d93967f8aea 100644
--- a/tools/include/uapi/linux/mount.h
+++ b/tools/include/uapi/linux/mount.h
@@ -73,7 +73,8 @@
 #define MOVE_MOUNT_T_SYMLINKS		0x00000010 /* Follow symlinks on to path */
 #define MOVE_MOUNT_T_AUTOMOUNTS		0x00000020 /* Follow automounts on to path */
 #define MOVE_MOUNT_T_EMPTY_PATH		0x00000040 /* Empty to path permitted */
-#define MOVE_MOUNT__MASK		0x00000077
+#define MOVE_MOUNT_SET_GROUP		0x00000100 /* Set sharing group instead */
+#define MOVE_MOUNT__MASK		0x00000177
 
 /*
  * fsopen() flags.