syscalls/fanotify: FAN_REPORT_FID and Directory Modification Events

A newly defined test file to validate the fanotify FAN_REPORT_FID functionality. A new line entry for this test file has been added within runtest/syscalls.

Additionally, defined a helper function that can be used to obtain __kernel_fsid_t and file_handle objects. This helper will be used by test files related to verifying FAN_REPORT_FID. The name_to_handle_at() function is conditionally added to accommodate for builds on older distributions.

Signed-off-by Matthew Bobrowski <[email protected]>

Reviewed-by Amir Goldstein <[email protected]>

---

 configure.ac                                  |   1 +
 runtest/syscalls                              |   1 +
 testcases/kernel/syscalls/fanotify/.gitignore |   1 +
 testcases/kernel/syscalls/fanotify/fanotify.h |  56 +++-
 .../kernel/syscalls/fanotify/fanotify13.c     | 313 ++++++++++++++++++
 5 files changed, 369 insertions(+), 3 deletions(-)
 create mode 100644 testcases/kernel/syscalls/fanotify/fanotify13.c

configure.ac +1 -0

index 53ad784d7..ac4d85b0e 100644
@@ -68,6 +68,7 @@ AC_CHECK_FUNCS([ \
     kcmp \
     mkdirat \
     mknodat \
+    name_to_handle_at \
     openat \
     preadv \
     preadv2 \

runtest/syscalls +1 -0

index 2b8ca719b..dfdc6cbf9 100644
@@ -537,6 +537,7 @@ fanotify09 fanotify09
 fanotify10 fanotify10
 fanotify11 fanotify11
 fanotify12 fanotify12
+fanotify13 fanotify13
 
 ioperm01 ioperm01
 ioperm02 ioperm02

testcases/kernel/syscalls/fanotify/.gitignore +1 -0

index 4256b8cd3..16bdd99e5 100644
@@ -10,4 +10,5 @@
 /fanotify10
 /fanotify11
 /fanotify12
+/fanotify13
 /fanotify_child

testcases/kernel/syscalls/fanotify/fanotify.h +28 -3

index 14654b7c7..d6e259002 100644
@@ -29,6 +29,11 @@
 #define        __FANOTIFY_H__
 
 #include "config.h"
+#include <sys/statfs.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+#include <fcntl.h>
 
 #if defined(HAVE_SYS_FANOTIFY_H)
 

@@ -57,9 +62,6 @@ static long fanotify_mark(int fd, unsigned int flags, uint64_t mask,
 #ifndef FAN_REPORT_TID
 #define FAN_REPORT_TID         0x00000100
 #endif
-#ifndef FAN_REPORT_FID
-#define FAN_REPORT_FID         0x00000200
-#endif
 
 #ifndef FAN_MARK_INODE
 #define FAN_MARK_INODE         0

@@ -89,6 +91,54 @@ struct fanotify_mark_type {
        const char * name;
 };
 
+#ifndef FAN_REPORT_FID
+#define FAN_REPORT_FID         0x00000200
+
+struct fanotify_event_info_header {
+       uint8_t info_type;
+       uint8_t pad;
+       uint16_t len;
+};
+
+struct fanotify_event_info_fid {
+       struct fanotify_event_info_header hdr;
+       __kernel_fsid_t fsid;
+       unsigned char handle[0];
+};
+
+/*
+ * Helper function used to obtain __kernel_fsid_t and file_handle objects
+ * for a given path. Used by test files correlated to FAN_REPORT_FID
+ * functionality.
+ */
+static inline void fanotify_get_fid(const char *path, __kernel_fsid_t *fsid,
+                       struct file_handle *handle)
+{

testcases/kernel/syscalls/fanotify/fanotify.h +4 -0

+               if (errno == EOPNOTSUPP) {
+                       tst_brk(TCONF,
+                               "filesystem %s does not support file handles",
+                               tst_device->fs_type);

This patch series contains the changes needed to validate the new FAN_REPORT_FID flag and directory modification event functionality within the fanotify API.

Changes since version 2:
* Added an ifdef statement within fanotify_get_fid() to check for name_to_handle_at() support.

Matthew Bobrowski (3):
syscalls/fanotify13: new test to verify FAN_REPORT_FID functionality syscalls/fanotify14: new test to validate FAN_REPORT_FID interface values
syscalls/fanotify15: verify fid for dirent events

 configure.ac                                  |   1 +
 runtest/syscalls                              |   3 +
 testcases/kernel/syscalls/fanotify/.gitignore |   3 +
 testcases/kernel/syscalls/fanotify/fanotify.h |  81 ++++-
 .../kernel/syscalls/fanotify/fanotify13.c     | 313 ++++++++++++++++++
 .../kernel/syscalls/fanotify/fanotify14.c     | 171 ++++++++++
 .../kernel/syscalls/fanotify/fanotify15.c     | 245 ++++++++++++++
 7 files changed, 814 insertions(+), 3 deletions(-)
 create mode 100644 testcases/kernel/syscalls/fanotify/fanotify13.c
 create mode 100644 testcases/kernel/syscalls/fanotify/fanotify14.c
 create mode 100644 testcases/kernel/syscalls/fanotify/fanotify15.c

--