[PATCH v2 00/10] Test the new fanotify FAN_FS_ERROR event

---
 testcases/kernel/syscalls/fanotify/fanotify.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index a2be183385e4..c67db3117e29 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h

@@ -373,4 +373,9 @@ static inline int fanotify_mark_supported_by_kernel(uint64_t flag)
        return rval;
 }

+#define REQUIRE_MARK_TYPE_SUPPORTED_ON_KERNEL(mark_type) do { \
+       fanotify_init_flags_err_msg(#mark_type, __FILE__, __LINE__, tst_brk_, \
+                                   fanotify_mark_supported_by_kernel(mark_type)); \
+} while (0)
+
 #endif /* __FANOTIFY_H__ */
--

2.33.0

Add a helper for tests to fail if an event is not available in the
kernel.  Since some events only work with REPORT_FID or a specific
class, update the verifier to allow those to be specified.

Signed-off-by: Gabriel Krisman Bertazi <redacted>
---
 testcases/kernel/syscalls/fanotify/fanotify.h | 28 +++++++++++++++++--
 .../kernel/syscalls/fanotify/fanotify03.c     |  4 +--
 .../kernel/syscalls/fanotify/fanotify10.c     |  3 +-
 .../kernel/syscalls/fanotify/fanotify12.c     |  3 +-
 4 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index c67db3117e29..b2b56466d028 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h

@@ -266,14 +266,26 @@ static inline void require_fanotify_access_permissions_supported_by_kernel(void)
        SAFE_CLOSE(fd);
 }

-static inline int fanotify_events_supported_by_kernel(uint64_t mask)
+static inline int fanotify_events_supported_by_kernel(uint64_t mask,
+                                                     unsigned int init_flags,
+                                                     unsigned int mark_flags)
 {
        int fd;
        int rval = 0;

-       fd = SAFE_FANOTIFY_INIT(FAN_CLASS_CONTENT, O_RDONLY);
+       fd = fanotify_init(init_flags, O_RDONLY);

-       if (fanotify_mark(fd, FAN_MARK_ADD, mask, AT_FDCWD, ".") < 0) {
+       if (fd < 0) {
+               if (errno == EINVAL) {
+                       rval = -1;
+               } else {
+                       tst_brk(TBROK | TERRNO,
+                               "fanotify_init (%d, FAN_CLASS_CONTENT, ..., 0_RDONLY", fd);

+               }
+               goto out;
+       }
+
+       if (fanotify_mark(fd, FAN_MARK_ADD | mark_flags, mask, AT_FDCWD, ".") < 0) {
                if (errno == EINVAL) {
                        rval = -1;
                } else {

@@ -284,6 +296,7 @@ static inline int fanotify_events_supported_by_kernel(uint64_t mask)

        SAFE_CLOSE(fd);

+out:
        return rval;
 }

@@ -378,4 +391,13 @@ static inline int fanotify_mark_supported_by_kernel(uint64_t flag)
                                    fanotify_mark_supported_by_kernel(mark_type)); \
 } while (0)

+#define REQUIRE_FANOTIFY_EVENTS_SUPPORTED_ON_FS(init_flags, mark_type, mask, fname) do { \
+       if (mark_type)                                                  \
+               REQUIRE_MARK_TYPE_SUPPORTED_ON_KERNEL(mark_type);       \
+       if (init_flags)                                                 \
+               REQUIRE_FANOTIFY_INIT_FLAGS_SUPPORTED_ON_FS(init_flags, fname); \
+       fanotify_init_flags_err_msg(#mask, __FILE__, __LINE__, tst_brk_, \
+               fanotify_events_supported_by_kernel(mask, init_flags, mark_type)); \
+} while (0)
+
 #endif /* __FANOTIFY_H__ */

diff --git a/testcases/kernel/syscalls/fanotify/fanotify03.c b/testcases/kernel/syscalls/fanotify/fanotify03.c
index 26d17e64d1f5..2081f0bd1b57 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify03.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify03.c

@@ -323,8 +323,8 @@ static void setup(void)
        require_fanotify_access_permissions_supported_by_kernel();

        filesystem_mark_unsupported = fanotify_mark_supported_by_kernel(FAN_MARK_FILESYSTEM);
-       exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC_PERM);
-
+       exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC_PERM,
+                                                                     FAN_CLASS_CONTENT, 0);
        sprintf(fname, MOUNT_PATH"/fname_%d", getpid());
        SAFE_FILE_PRINTF(fname, "1");

diff --git a/testcases/kernel/syscalls/fanotify/fanotify10.c b/testcases/kernel/syscalls/fanotify/fanotify10.c
index 92e4d3ff3054..0fa9d1f4f7e4 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify10.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify10.c

@@ -509,7 +509,8 @@ cleanup:

 static void setup(void)
 {
-       exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC);
+       exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC,
+                                                                     FAN_CLASS_CONTENT, 0);
        filesystem_mark_unsupported = fanotify_mark_supported_by_kernel(FAN_MARK_FILESYSTEM);
        fan_report_dfid_unsupported = fanotify_init_flags_supported_on_fs(FAN_REPORT_DFID_NAME,
                                                                          MOUNT_PATH);

diff --git a/testcases/kernel/syscalls/fanotify/fanotify12.c b/testcases/kernel/syscalls/fanotify/fanotify12.c
index 76f1aca77615..d863ae1a7d6d 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify12.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify12.c

@@ -222,7 +222,8 @@ cleanup:

 static void do_setup(void)
 {
-       exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC);
+       exec_events_unsupported = fanotify_events_supported_by_kernel(FAN_OPEN_EXEC,
+                                                                     FAN_CLASS_CONTENT, 0);

fanotify20 is a new test validating the FAN_FS_ERROR file system error
event.  This adds some basic structure for the next patches.

The strategy for error reporting testing in fanotify20 goes like this:

  - Generate a broken filesystem
  - Start FAN_FS_ERROR monitoring group
  - Make the file system  notice the error through ordinary operations
  - Observe the event generated

Signed-off-by: Gabriel Krisman Bertazi <redacted>

---
Changes since v1:
  - Move defines to header file.
---
 testcases/kernel/syscalls/fanotify/.gitignore |   1 +
 testcases/kernel/syscalls/fanotify/fanotify.h |   3 +
 .../kernel/syscalls/fanotify/fanotify20.c     | 128 ++++++++++++++++++
 3 files changed, 132 insertions(+)
 create mode 100644 testcases/kernel/syscalls/fanotify/fanotify20.c

diff --git a/testcases/kernel/syscalls/fanotify/.gitignore b/testcases/kernel/syscalls/fanotify/.gitignore
index 9554b16b196e..c99e6fff76d6 100644
--- a/testcases/kernel/syscalls/fanotify/.gitignore
+++ b/testcases/kernel/syscalls/fanotify/.gitignore

@@ -17,4 +17,5 @@
 /fanotify17
 /fanotify18
 /fanotify19
+/fanotify20
 /fanotify_child

diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index b2b56466d028..8828b53532a2 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h

@@ -124,6 +124,9 @@ static inline int safe_fanotify_mark(const char *file, const int lineno,
 #ifndef FAN_OPEN_EXEC_PERM
 #define FAN_OPEN_EXEC_PERM     0x00040000
 #endif
+#ifndef FAN_FS_ERROR
+#define FAN_FS_ERROR           0x00008000
+#endif

 /* Flags required for unprivileged user group */
 #define FANOTIFY_REQUIRED_USER_INIT_FLAGS    (FAN_REPORT_FID)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
new file mode 100644
index 000000000000..7a522aad4386
--- /dev/null
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2021 Collabora Ltd.
+ *
+ * Author: Gabriel Krisman Bertazi <gabriel@krisman.be>
+ * Based on previous work by Amir Goldstein <amir73il@gmail.com>
+ */
+
+/*\
+ * [Description]
+ * Check fanotify FAN_ERROR_FS events triggered by intentionally
+ * corrupted filesystems:
+ *
+ * - Generate a broken filesystem
+ * - Start FAN_FS_ERROR monitoring group
+ * - Make the file system notice the error through ordinary operations
+ * - Observe the event generated
+ */
+
+#define _GNU_SOURCE
+#include "config.h"
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/mount.h>
+#include <sys/syscall.h>
+#include "tst_test.h"
+#include <sys/fanotify.h>
+#include <sys/types.h>
+#include <fcntl.h>
+
+#ifdef HAVE_SYS_FANOTIFY_H
+#include "fanotify.h"
+
+#define BUF_SIZE 256
+static char event_buf[BUF_SIZE];
+int fd_notify;
+
+#define MOUNT_PATH "test_mnt"
+
+static struct test_case {
+       char *name;
+       void (*trigger_error)(void);
+} testcases[] = {
+};
+

---
Changes since v1:
  - Move defines to header file.
---
 testcases/kernel/syscalls/fanotify/fanotify.h | 32 +++++++++++++++++
 .../kernel/syscalls/fanotify/fanotify20.c     | 35 ++++++++++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index 8828b53532a2..58e30aaf00bc 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h

@@ -167,6 +167,9 @@ typedef struct {
 #ifndef FAN_EVENT_INFO_TYPE_DFID
 #define FAN_EVENT_INFO_TYPE_DFID       3
 #endif
+#ifndef FAN_EVENT_INFO_TYPE_ERROR
+#define FAN_EVENT_INFO_TYPE_ERROR      5
+#endif

 #ifndef HAVE_STRUCT_FANOTIFY_EVENT_INFO_HEADER
 struct fanotify_event_info_header {

@@ -184,6 +187,14 @@ struct fanotify_event_info_fid {
 };
 #endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID */

+#ifndef HAVE_STRUCT_FANOTIFY_EVENT_INFO_ERROR
+struct fanotify_event_info_error {
+       struct fanotify_event_info_header hdr;
+       __s32 error;
+       __u32 error_count;
+};
+#endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_ERROR */

+
 /* NOTE: only for struct fanotify_event_info_fid */
 #ifdef HAVE_STRUCT_FANOTIFY_EVENT_INFO_FID_FSID___VAL
 # define FSID_VAL_MEMBER(fsid, i) (fsid.__val[i])

@@ -403,4 +414,25 @@ static inline int fanotify_mark_supported_by_kernel(uint64_t flag)
                fanotify_events_supported_by_kernel(mask, init_flags, mark_type)); \
 } while (0)

+struct fanotify_event_info_header *get_event_info(
+                                       struct fanotify_event_metadata *event,
+                                       int info_type)
+{
+       struct fanotify_event_info_header *hdr = NULL;
+       char *start = (char *) event;
+       int off;
+
+       for (off = event->metadata_len; (off+sizeof(*hdr)) < event->event_len;
+            off += hdr->len) {
+               hdr = (struct fanotify_event_info_header *) &(start[off]);
+               if (hdr->info_type == info_type)
+                       return hdr;
+       }
+       return NULL;
+}
+
+#define get_event_info_error(event)                                    \
+       ((struct fanotify_event_info_error *)                           \
+        get_event_info((event), FAN_EVENT_INFO_TYPE_ERROR))
+
 #endif /* __FANOTIFY_H__ */

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 7a522aad4386..6074d449ae63 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -42,10 +42,32 @@ int fd_notify;

 static struct test_case {
        char *name;
+       int error;
+       unsigned int error_count;
        void (*trigger_error)(void);
 } testcases[] = {
 };

+int check_error_event_info_error(struct fanotify_event_info_error *info_error,
+                                const struct test_case *ex)
+{
+       int fail = 0;
+
+       if (info_error->error_count != ex->error_count) {
+               tst_res(TFAIL, "%s: Unexpected error_count (%d!=%d)",
+                       ex->name, info_error->error_count, ex->error_count);
+               fail++;
+       }
+
+       if (info_error->error != ex->error) {
+               tst_res(TFAIL, "%s: Unexpected error code value (%d!=%d)",
+                       ex->name, info_error->error, ex->error);
+               fail++;
+       }
+
+       return fail;
+}
+
 int check_error_event_metadata(struct fanotify_event_metadata *event)
 {
        int fail = 0;

@@ -68,6 +90,8 @@ void check_event(char *buf, size_t len, const struct test_case *ex)
 {
        struct fanotify_event_metadata *event =
                (struct fanotify_event_metadata *) buf;
+       struct fanotify_event_info_error *info_error;
+       int fail = 0;

        if (len < FAN_EVENT_METADATA_LEN) {
                tst_res(TFAIL, "No event metadata found");

@@ -77,7 +101,16 @@ void check_event(char *buf, size_t len, const struct test_case *ex)
        if (check_error_event_metadata(event))
                return;

-       tst_res(TPASS, "Successfully received: %s", ex->name);
+       info_error = get_event_info_error(event);
+       if (info_error)
+               fail += check_error_event_info_error(info_error, ex);
+       else {
+               tst_res(TFAIL, "Generic error record not found");
+               fail++;
+       }
+
+       if (!fail)
+               tst_res(TPASS, "Successfully received: %s", ex->name);
 }

 static void do_test(unsigned int i)
--

2.33.0

---
Changes since v1:
  - Move defines to header file.
  - Use 0-len FH for sb error
---
 testcases/kernel/syscalls/fanotify/fanotify.h |  4 ++
 .../kernel/syscalls/fanotify/fanotify20.c     | 63 +++++++++++++++++++
 2 files changed, 67 insertions(+)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify.h b/testcases/kernel/syscalls/fanotify/fanotify.h
index 58e30aaf00bc..9bff3cf1a3fe 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify.h
+++ b/testcases/kernel/syscalls/fanotify/fanotify.h

@@ -435,4 +435,8 @@ struct fanotify_event_info_header *get_event_info(
        ((struct fanotify_event_info_error *)                           \
         get_event_info((event), FAN_EVENT_INFO_TYPE_ERROR))

+#define get_event_info_fid(event)                                      \
+       ((struct fanotify_event_info_fid *)                             \
+        get_event_info((event), FAN_EVENT_INFO_TYPE_FID))
+
 #endif /* __FANOTIFY_H__ */

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 6074d449ae63..220cd51419e8 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -34,20 +34,61 @@
 #ifdef HAVE_SYS_FANOTIFY_H
 #include "fanotify.h"

+#ifndef FILEID_INVALID
+#define        FILEID_INVALID          0xff
+#endif
+
 #define BUF_SIZE 256
 static char event_buf[BUF_SIZE];
 int fd_notify;

 #define MOUNT_PATH "test_mnt"

+/* These expected FIDs are common to multiple tests */
+static struct fanotify_fid_t null_fid;
+
 static struct test_case {
        char *name;
        int error;
        unsigned int error_count;
+       struct fanotify_fid_t *fid;
        void (*trigger_error)(void);
 } testcases[] = {
 };

+int check_error_event_info_fid(struct fanotify_event_info_fid *fid,
+                                const struct test_case *ex)
+{
+       struct file_handle *fh = (struct file_handle *) &fid->handle;
+
+       if (memcmp(&fid->fsid, &ex->fid->fsid, sizeof(fid->fsid))) {
+               tst_res(TFAIL, "%s: Received bad FSID type (%x...!=%x...)",
+                       ex->name, FSID_VAL_MEMBER(fid->fsid, 0),
+                       FSID_VAL_MEMBER(ex->fid->fsid, 0));
+
+               return 1;
+       }
+       if (fh->handle_type != ex->fid->handle.handle_type) {
+               tst_res(TFAIL, "%s: Received bad file_handle type (%d!=%d)",
+                       ex->name, fh->handle_type, ex->fid->handle.handle_type);
+               return 1;
+       }
+
+       if (fh->handle_bytes != ex->fid->handle.handle_bytes) {
+               tst_res(TFAIL, "%s: Received bad file_handle len (%d!=%d)",
+                       ex->name, fh->handle_bytes, ex->fid->handle.handle_bytes);
+               return 1;
+       }
+
+       if (memcmp(fh->f_handle, ex->fid->handle.f_handle, fh->handle_bytes)) {
+               tst_res(TFAIL, "%s: Received wrong handle. "
+                       "Expected (%x...) got (%x...) ", ex->name,
+                       *(int*)ex->fid->handle.f_handle, *(int*)fh->f_handle);
+               return 1;
+       }
+       return 0;
+}
+
 int check_error_event_info_error(struct fanotify_event_info_error *info_error,
                                 const struct test_case *ex)
 {

@@ -91,6 +132,7 @@ void check_event(char *buf, size_t len, const struct test_case *ex)
        struct fanotify_event_metadata *event =
                (struct fanotify_event_metadata *) buf;
        struct fanotify_event_info_error *info_error;
+       struct fanotify_event_info_fid *info_fid;
        int fail = 0;

        if (len < FAN_EVENT_METADATA_LEN) {

@@ -109,6 +151,14 @@ void check_event(char *buf, size_t len, const struct test_case *ex)
                fail++;
        }

+       info_fid = get_event_info_fid(event);
+       if (info_fid)
+               fail += check_error_event_info_fid(info_fid, ex);
+       else {
+               tst_res(TFAIL, "FID record not found");
+               fail++;
+       }
+
        if (!fail)
                tst_res(TPASS, "Successfully received: %s", ex->name);
 }

@@ -125,12 +175,25 @@ static void do_test(unsigned int i)
        check_event(event_buf, read_len, tcase);
 }

+static void init_null_fid(void)
+{
+       /* Use fanotify_save_fid to fill the fsid and overwrite the
+        * file_handler to create a null_fid
+        */
+       fanotify_save_fid(MOUNT_PATH, &null_fid);
+
+       null_fid.handle.handle_type = FILEID_INVALID;
+       null_fid.handle.handle_bytes = 0;
+}
+
 static void setup(void)
 {
        REQUIRE_FANOTIFY_EVENTS_SUPPORTED_ON_FS(FAN_CLASS_NOTIF|FAN_REPORT_FID,
                                                FAN_MARK_FILESYSTEM,
                                                FAN_FS_ERROR, ".");

+       init_null_fid();
+
        fd_notify = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF|FAN_REPORT_FID,
                                       O_RDONLY);

--

2.33.0

---
changes since v1:
  - Add .needs_cmds to require debugfs
---
 testcases/kernel/syscalls/fanotify/fanotify20.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 220cd51419e8..7c4b01720654 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -47,6 +47,13 @@ int fd_notify;
 /* These expected FIDs are common to multiple tests */
 static struct fanotify_fid_t null_fid;

+static void do_debugfs_request(const char *dev, char *request)
+{
+       const char *cmd[] = {"debugfs", "-w", dev, "-R", request, NULL};
+
+       SAFE_CMD(cmd, NULL, NULL);
+}
+
 static struct test_case {
        char *name;
        int error;

@@ -216,7 +223,11 @@ static struct tst_test test = {
        .mntpoint = MOUNT_PATH,
        .all_filesystems = 0,
        .needs_root = 1,
-       .dev_fs_type = "ext4"
+       .dev_fs_type = "ext4",
+       .needs_cmds = (const char *[]) {
+               "debugfs",
+               NULL
+       }
 };

 #else
--

2.33.0

---
 testcases/kernel/syscalls/fanotify/fanotify20.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 7c4b01720654..298bb303a810 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -43,9 +43,12 @@ static char event_buf[BUF_SIZE];
 int fd_notify;

 #define MOUNT_PATH "test_mnt"
+#define BASE_DIR "internal_dir"
+#define BAD_DIR BASE_DIR"/bad_dir"

 /* These expected FIDs are common to multiple tests */
 static struct fanotify_fid_t null_fid;
+static struct fanotify_fid_t bad_file_fid;

 static void do_debugfs_request(const char *dev, char *request)
 {

@@ -182,6 +185,18 @@ static void do_test(unsigned int i)
        check_event(event_buf, read_len, tcase);
 }

+static void pre_corrupt_fs(void)
+{
+       SAFE_MKDIR(MOUNT_PATH"/"BASE_DIR, 0777);
+       SAFE_MKDIR(MOUNT_PATH"/"BAD_DIR, 0777);
+
+       fanotify_save_fid(MOUNT_PATH"/"BAD_DIR, &bad_file_fid);
+
+       SAFE_UMOUNT(MOUNT_PATH);
+       do_debugfs_request(tst_device->dev, "sif " BAD_DIR " mode 0xff");
+       SAFE_MOUNT(tst_device->dev, MOUNT_PATH, tst_device->fs_type, 0, NULL);
+}
+
 static void init_null_fid(void)
 {
        /* Use fanotify_save_fid to fill the fsid and overwrite the

@@ -201,6 +216,8 @@ static void setup(void)

        init_null_fid();

+       pre_corrupt_fs();
+
        fd_notify = SAFE_FANOTIFY_INIT(FAN_CLASS_NOTIF|FAN_REPORT_FID,
                                       O_RDONLY);

--

2.33.0

This test monitors the error triggered after a file system abort.  It
works by forcing a remount with the option "abort".  This is an error
not related to a file so it is reported against the superblock with a
zero size fh.

Signed-off-by: Gabriel Krisman Bertazi <redacted>
---
 testcases/kernel/syscalls/fanotify/fanotify20.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 298bb303a810..5c5ee3c6fb74 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -57,6 +57,12 @@ static void do_debugfs_request(const char *dev, char *request)
        SAFE_CMD(cmd, NULL, NULL);
 }

+static void trigger_fs_abort(void)
+{
+       SAFE_MOUNT(tst_device->dev, MOUNT_PATH, tst_device->fs_type,
+                  MS_REMOUNT|MS_RDONLY, "abort");
+}
+
 static struct test_case {
        char *name;
        int error;

@@ -64,6 +70,13 @@ static struct test_case {
        struct fanotify_fid_t *fid;
        void (*trigger_error)(void);
 } testcases[] = {
+       {
+               .name = "Trigger abort",
+               .trigger_error = &trigger_fs_abort,
+               .error_count = 1,
+               .error = ESHUTDOWN,
+               .fid = &null_fid,
+       },
 };

---
 .../kernel/syscalls/fanotify/fanotify20.c     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/testcases/kernel/syscalls/fanotify/fanotify20.c b/testcases/kernel/syscalls/fanotify/fanotify20.c
index 5c5ee3c6fb74..7bcddcaa98cb 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify20.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify20.c

@@ -38,6 +38,10 @@
 #define        FILEID_INVALID          0xff
 #endif

+#ifndef EFSCORRUPTED
+#define EFSCORRUPTED    EUCLEAN         /* Filesystem is corrupted */
+#endif
+
 #define BUF_SIZE 256
 static char event_buf[BUF_SIZE];
 int fd_notify;

@@ -63,6 +67,17 @@ static void trigger_fs_abort(void)
                   MS_REMOUNT|MS_RDONLY, "abort");
 }

+static void tcase2_trigger_lookup(void)
+{
+       int ret;
+
+       /* SAFE_OPEN cannot be used here because we expect it to fail. */
+       ret = open(MOUNT_PATH"/"BAD_DIR, O_RDONLY, 0);
+       if (ret != -1 && errno != EUCLEAN)
+               tst_res(TFAIL, "Unexpected lookup result(%d) of %s (%d!=%d)",
+                       ret, BAD_DIR, errno, EUCLEAN);
+}
+
 static struct test_case {
        char *name;
        int error;

@@ -77,6 +92,13 @@ static struct test_case {
                .error = ESHUTDOWN,
                .fid = &null_fid,
        },
+       {
+               .name = "Lookup of inode with invalid mode",
+               .trigger_error = &tcase2_trigger_lookup,
+               .error_count = 1,
+               .error = EFSCORRUPTED,
+               .fid = &bad_file_fid,
+       },
 };

 int check_error_event_info_fid(struct fanotify_event_info_fid *fid,
--

2.33.0