[LTP] [PATCH 2/3] fanotify24: print range info for pre-content events

[Amir Goldstein]

range info is expected only for pre-content events

Signed-off-by: Amir Goldstein <amir73il@gmail.com>
---
 configure.ac                                   |  3 ++-
 include/lapi/fanotify.h                        | 12 ++++++++++++
 .../kernel/syscalls/fanotify/fanotify24.c      | 18 ++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 344b2ae2c..9b9883eac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -179,7 +179,8 @@ AC_CHECK_TYPES([enum kcmp_type],,,[#include <linux/kcmp.h>])
 AC_CHECK_TYPES([struct acct_v3],,,[#include <sys/acct.h>])
 AC_CHECK_TYPES([struct af_alg_iv, struct sockaddr_alg],,,[# include <linux/if_alg.h>])
 AC_CHECK_TYPES([struct fanotify_event_info_fid, struct fanotify_event_info_error,
-		struct fanotify_event_info_header, struct fanotify_event_info_pidfd],,,[#include <sys/fanotify.h>])
+		struct fanotify_event_info_header, struct fanotify_event_info_pidfd,
+		struct fanotify_event_info_range],,,[#include <sys/fanotify.h>])
 AC_CHECK_TYPES([struct file_clone_range],,,[#include <linux/fs.h>])
 AC_CHECK_TYPES([struct file_dedupe_range],,,[#include <linux/fs.h>])
 
diff --git a/include/lapi/fanotify.h b/include/lapi/fanotify.h
index 9076685e8..76907ea5f 100644
--- a/include/lapi/fanotify.h
+++ b/include/lapi/fanotify.h
@@ -178,6 +178,9 @@ typedef struct {
 #ifndef FAN_EVENT_INFO_TYPE_ERROR
 #define FAN_EVENT_INFO_TYPE_ERROR	5
 #endif
+#ifndef FAN_EVENT_INFO_TYPE_RANGE
+#define FAN_EVENT_INFO_TYPE_RANGE	6
+#endif
 
 #ifndef FAN_EVENT_INFO_TYPE_OLD_DFID_NAME
 #define FAN_EVENT_INFO_TYPE_OLD_DFID_NAME	10
@@ -217,6 +220,15 @@ struct fanotify_event_info_error {
 };
 #endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_ERROR */
 
+#ifndef HAVE_STRUCT_FANOTIFY_EVENT_INFO_RANGE
+struct fanotify_event_info_range {
+	struct fanotify_event_info_header hdr;
+	__u32 pad;
+	__u64 offset;
+	__u64 count;
+};
+#endif /* HAVE_STRUCT_FANOTIFY_EVENT_INFO_RANGE */
+
 /* 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])
diff --git a/testcases/kernel/syscalls/fanotify/fanotify24.c b/testcases/kernel/syscalls/fanotify/fanotify24.c
index 539f74137..2d2479b39 100644
--- a/testcases/kernel/syscalls/fanotify/fanotify24.c
+++ b/testcases/kernel/syscalls/fanotify/fanotify24.c
@@ -339,6 +339,7 @@ static void test_fanotify(unsigned int n)
 	 */
 	while (test_num < EVENT_SET_MAX && fd_notify != -1) {
 		struct fanotify_event_metadata *event;
+		struct fanotify_event_info_range *range;
 
 		if (i == len) {
 			/* Get more events */
@@ -367,6 +368,7 @@ static void test_fanotify(unsigned int n)
 			test_num--;
 
 		event = (struct fanotify_event_metadata *)&event_buf[i];
+		range = (struct fanotify_event_info_range *)(event + 1);
 		/* Permission events cannot be merged, so the event mask
 		 * reported should exactly match the event mask within the
 		 * event set.
@@ -386,6 +388,22 @@ static void test_fanotify(unsigned int n)
 				(unsigned int)event->pid,
 				(unsigned int)child_pid,
 				event->fd);
+		} else if (event->mask & LTP_PRE_CONTENT_EVENTS) {
+			if (range->hdr.info_type != FAN_EVENT_INFO_TYPE_RANGE) {
+				tst_res(TFAIL,
+					"got event: mask=%llx pid=%u fd=%d "
+					"(expected range info)",
+					(unsigned long long)event->mask,
+					(unsigned int)event->pid,
+					event->fd);
+			} else {
+				tst_res(TPASS,
+					"got event: mask=%llx pid=%u fd=%d "
+					"offset=%llu count=%llu",
+					(unsigned long long)event->mask,
+					(unsigned int)event->pid, event->fd,
+					range->offset, range->count);
+			}
 		} else {
 			tst_res(TPASS,
 				"got event: mask=%llx pid=%u fd=%d",
-- 
2.34.1