fsnotify: introduce mark type iterator

fsnotify_foreach_iter_mark_type() is used to reduce boilerplate code
of iterating all marks of a specific group interested in an event
by consulting the iterator report_mask.

Use an open coded version of that iterator in fsnotify_iter_next()
that collects all marks of the current iteration group without
consulting the iterator report_mask.

At the moment, the two iterator variants are the same, but this
decoupling will allow us to exclude some of the group's marks from
reporting the event, for example for event on child and inode marks
on parent did not request to watch events on children.

Fixes: 2f02fd3fa13e ("fanotify: fix ignore mask logic for events on child and on dir")
Reported-by: Jan Kara <jack@suse.com>
Signed-off-by: Amir Goldstein <amir73il@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20220511190213.831646-2-amir73il@gmail.com

diff --git a/fs/notify/fanotify/fanotify.c b/fs/notify/fanotify/fanotify.c
index 985e995d2a3984f2d1808e64e23628b5937ecb12..263d303d8f8f1747eebf7639cea84fa5e89bc53c 100644 (file)
--- a/fs/notify/fanotify/fanotify.c
+++ b/fs/notify/fanotify/fanotify.c
@@ -319,11 +319,7 @@ static u32 fanotify_group_event_mask(struct fsnotify_group *group,
                        return 0;
        }
 
-       fsnotify_foreach_iter_type(type) {
-               if (!fsnotify_iter_should_report_type(iter_info, type))
-                       continue;
-               mark = iter_info->marks[type];
-
+       fsnotify_foreach_iter_mark_type(iter_info, mark, type) {
                /* Apply ignore mask regardless of ISDIR and ON_CHILD flags */
                marks_ignored_mask |= mark->ignored_mask;
 
@@ -849,16 +845,14 @@ out:
  */
 static __kernel_fsid_t fanotify_get_fsid(struct fsnotify_iter_info *iter_info)
 {
+       struct fsnotify_mark *mark;
        int type;
        __kernel_fsid_t fsid = {};
 
-       fsnotify_foreach_iter_type(type) {
+       fsnotify_foreach_iter_mark_type(iter_info, mark, type) {
                struct fsnotify_mark_connector *conn;
 
-               if (!fsnotify_iter_should_report_type(iter_info, type))
-                       continue;
-
-               conn = READ_ONCE(iter_info->marks[type]->connector);
+               conn = READ_ONCE(mark->connector);
                /* Mark is just getting destroyed or created? */
                if (!conn)
                        continue;

diff --git a/fs/notify/fsnotify.c b/fs/notify/fsnotify.c
index 6eee19d15e8cdd222a7c9324572da01cd8dc5c4f..35740a64ee4534f22b00e801b83d0854bc45278f 100644 (file)
--- a/fs/notify/fsnotify.c
+++ b/fs/notify/fsnotify.c
@@ -335,31 +335,23 @@ static int send_to_group(__u32 mask, const void *data, int data_type,
        struct fsnotify_mark *mark;
        int type;
 
-       if (WARN_ON(!iter_info->report_mask))
+       if (!iter_info->report_mask)
                return 0;
 
        /* clear ignored on inode modification */
        if (mask & FS_MODIFY) {
-               fsnotify_foreach_iter_type(type) {
-                       if (!fsnotify_iter_should_report_type(iter_info, type))
-                               continue;
-                       mark = iter_info->marks[type];
-                       if (mark &&
-                           !(mark->flags & FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY))
+               fsnotify_foreach_iter_mark_type(iter_info, mark, type) {
+                       if (!(mark->flags &
+                             FSNOTIFY_MARK_FLAG_IGNORED_SURV_MODIFY))
                                mark->ignored_mask = 0;
                }
        }
 
-       fsnotify_foreach_iter_type(type) {
-               if (!fsnotify_iter_should_report_type(iter_info, type))
-                       continue;
-               mark = iter_info->marks[type];
-               /* does the object mark tell us to do something? */
-               if (mark) {
-                       group = mark->group;
-                       marks_mask |= mark->mask;
-                       marks_ignored_mask |= mark->ignored_mask;
-               }
+       /* Are any of the group marks interested in this event? */
+       fsnotify_foreach_iter_mark_type(iter_info, mark, type) {
+               group = mark->group;
+               marks_mask |= mark->mask;
+               marks_ignored_mask |= mark->ignored_mask;
        }
 
        pr_debug("%s: group=%p mask=%x marks_mask=%x marks_ignored_mask=%x data=%p data_type=%d dir=%p cookie=%d\n",
@@ -403,11 +395,11 @@ static struct fsnotify_mark *fsnotify_next_mark(struct fsnotify_mark *mark)
 
 /*
  * iter_info is a multi head priority queue of marks.
- * Pick a subset of marks from queue heads, all with the
- * same group and set the report_mask for selected subset.
- * Returns the report_mask of the selected subset.
+ * Pick a subset of marks from queue heads, all with the same group
+ * and set the report_mask to a subset of the selected marks.
+ * Returns false if there are no more groups to iterate.
  */
-static unsigned int fsnotify_iter_select_report_types(
+static bool fsnotify_iter_select_report_types(
                struct fsnotify_iter_info *iter_info)
 {
        struct fsnotify_group *max_prio_group = NULL;
@@ -423,30 +415,37 @@ static unsigned int fsnotify_iter_select_report_types(
        }
 
        if (!max_prio_group)
-               return 0;
+               return false;
 
        /* Set the report mask for marks from same group as max prio group */
+       iter_info->current_group = max_prio_group;
        iter_info->report_mask = 0;
        fsnotify_foreach_iter_type(type) {
                mark = iter_info->marks[type];
-               if (mark &&
-                   fsnotify_compare_groups(max_prio_group, mark->group) == 0)
+               if (mark && mark->group == iter_info->current_group)
                        fsnotify_iter_set_report_type(iter_info, type);
        }
 
-       return iter_info->report_mask;
+       return true;
 }
 
 /*
- * Pop from iter_info multi head queue, the marks that were iterated in the
+ * Pop from iter_info multi head queue, the marks that belong to the group of
  * current iteration step.
  */
 static void fsnotify_iter_next(struct fsnotify_iter_info *iter_info)
 {
+       struct fsnotify_mark *mark;
        int type;
 
+       /*
+        * We cannot use fsnotify_foreach_iter_mark_type() here because we
+        * may need to advance a mark of type X that belongs to current_group
+        * but was not selected for reporting.
+        */
        fsnotify_foreach_iter_type(type) {
-               if (fsnotify_iter_should_report_type(iter_info, type))
+               mark = iter_info->marks[type];
+               if (mark && mark->group == iter_info->current_group)
                        iter_info->marks[type] =
                                fsnotify_next_mark(iter_info->marks[type]);
        }

diff --git a/include/linux/fsnotify_backend.h b/include/linux/fsnotify_backend.h
index 9a1a9e78f69f56544bea4f3668769249c66fc4ca..9560734759fa6bff7eef0e5c3db31f4f54f03e80 100644 (file)
--- a/include/linux/fsnotify_backend.h
+++ b/include/linux/fsnotify_backend.h
@@ -399,6 +399,7 @@ static inline bool fsnotify_valid_obj_type(unsigned int obj_type)
 
 struct fsnotify_iter_info {
        struct fsnotify_mark *marks[FSNOTIFY_ITER_TYPE_COUNT];
+       struct fsnotify_group *current_group;
        unsigned int report_mask;
        int srcu_idx;
 };
@@ -415,20 +416,31 @@ static inline void fsnotify_iter_set_report_type(
        iter_info->report_mask |= (1U << iter_type);
 }
 
-static inline void fsnotify_iter_set_report_type_mark(
-               struct fsnotify_iter_info *iter_info, int iter_type,
-               struct fsnotify_mark *mark)
+static inline struct fsnotify_mark *fsnotify_iter_mark(
+               struct fsnotify_iter_info *iter_info, int iter_type)
 {
-       iter_info->marks[iter_type] = mark;
-       iter_info->report_mask |= (1U << iter_type);
+       if (fsnotify_iter_should_report_type(iter_info, iter_type))
+               return iter_info->marks[iter_type];
+       return NULL;
+}
+
+static inline int fsnotify_iter_step(struct fsnotify_iter_info *iter, int type,
+                                    struct fsnotify_mark **markp)
+{
+       while (type < FSNOTIFY_ITER_TYPE_COUNT) {
+               *markp = fsnotify_iter_mark(iter, type);
+               if (*markp)
+                       break;
+               type++;
+       }
+       return type;
 }
 
 #define FSNOTIFY_ITER_FUNCS(name, NAME) \
 static inline struct fsnotify_mark *fsnotify_iter_##name##_mark( \
                struct fsnotify_iter_info *iter_info) \
 { \
-       return (iter_info->report_mask & (1U << FSNOTIFY_ITER_TYPE_##NAME)) ? \
-               iter_info->marks[FSNOTIFY_ITER_TYPE_##NAME] : NULL; \
+       return fsnotify_iter_mark(iter_info, FSNOTIFY_ITER_TYPE_##NAME); \
 }
 
 FSNOTIFY_ITER_FUNCS(inode, INODE)
@@ -438,6 +450,11 @@ FSNOTIFY_ITER_FUNCS(sb, SB)
 
 #define fsnotify_foreach_iter_type(type) \
        for (type = 0; type < FSNOTIFY_ITER_TYPE_COUNT; type++)
+#define fsnotify_foreach_iter_mark_type(iter, mark, type) \
+       for (type = 0; \
+            type = fsnotify_iter_step(iter, type, &mark), \
+            type < FSNOTIFY_ITER_TYPE_COUNT; \
+            type++)
 
 /*
  * fsnotify_connp_t is what we embed in objects which connector can be attached