Provide support for the handling of an overrun in a watch queue. In the
event that an overrun occurs, the watcher needs to be able to find out what
it was that they missed. To this end, previous patches added event
counters to struct mount.
To make them accessible, they can be retrieved using fsinfo() and the
FSINFO_ATTR_MOUNT_INFO attribute.
struct fsinfo_mount_info {
__u64 mnt_unique_id;
__u64 mnt_attr_changes;
__u64 mnt_topology_changes;
__u64 mnt_subtree_notifications;
...
};
There's a uniquifier and some event counters:
(1) mnt_unique_id - This is an effectively non-repeating ID given to each
mount object on creation. This allows the caller to check that the
mount ID didn't get reused (the 32-bit mount ID is more efficient to
look up).
(2) mnt_attr_changes - Count of attribute changes on a mount object.
(3) mnt_topology_changes - Count of alterations to the mount tree that
affected this node.
(4) mnt_subtree_notifications - Count of mount object event notifications
that were generated in the subtree rooted at this node. This excludes
events generated on this node itself and does not include superblock
events.
The counters are also accessible through the FSINFO_ATTR_MOUNT_CHILDREN
attribute, where a list of all the children of a mount can be scanned. The
record returned for each child includes the sum of the counters for that
child. An additional record is added at the end for the queried object and
that also includes the sum of its counters
The mnt_topology_changes counter is also included in
FSINFO_ATTR_MOUNT_TOPOLOGY.
Signed-off-by: David Howells <dhowells@xxxxxxxxxx>
---
fs/mount_notify.c | 2 ++
fs/namespace.c | 21 +++++++++++++++++++++
include/uapi/linux/fsinfo.h | 7 +++++++
samples/vfs/test-fsinfo.c | 10 ++++++++--
4 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/fs/mount_notify.c b/fs/mount_notify.c
index 57eebae51cb1..57995c27ca88 100644
--- a/fs/mount_notify.c
+++ b/fs/mount_notify.c
@@ -93,6 +93,8 @@ void notify_mount(struct mount *trigger,
n.watch.info = info_flags | watch_sizeof(n);
n.triggered_on = trigger->mnt_unique_id;
+ smp_wmb(); /* See fsinfo_generic_mount_info(). */
+
switch (subtype) {
case NOTIFY_MOUNT_EXPIRY:
case NOTIFY_MOUNT_READONLY:
diff --git a/fs/namespace.c b/fs/namespace.c
index b5c2a3b4f96d..122c12f9512b 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -4282,6 +4282,17 @@ int fsinfo_generic_mount_info(struct path *path, struct fsinfo_context *ctx)
p->mnt_unique_id = m->mnt_unique_id;
p->mnt_id = m->mnt_id;
+#ifdef CONFIG_MOUNT_NOTIFICATIONS
+ p->mnt_subtree_notifications = atomic_long_read(&m->mnt_subtree_notifications);
+ p->mnt_topology_changes = atomic_long_read(&m->mnt_topology_changes);
+ p->mnt_attr_changes = atomic_long_read(&m->mnt_attr_changes);
+#endif
+
+ /* Record the counters before reading the attributes as we're not
+ * holding a lock. Paired with a write barrier in notify_mount().
+ */
+ smp_rmb();
+
flags = READ_ONCE(m->mnt.mnt_flags);
if (flags & MNT_READONLY)
p->attr |= MOUNT_ATTR_RDONLY;
@@ -4319,6 +4330,9 @@ int fsinfo_generic_mount_topology(struct path *path, struct fsinfo_context *ctx)
m = real_mount(path->mnt);
+#ifdef CONFIG_MOUNT_NOTIFICATIONS
+ p->mnt_topology_changes = atomic_long_read(&m->mnt_topology_changes);
+#endif
p->parent_id = m->mnt_parent->mnt_id;
if (path->mnt == root.mnt) {
@@ -4445,6 +4459,13 @@ static void fsinfo_store_mount(struct fsinfo_context *ctx, const struct mount *p
record.mnt_unique_id = p->mnt_unique_id;
record.mnt_id = p->mnt_id;
record.parent_id = is_root ? p->mnt_id : p->mnt_parent->mnt_id;
+
+#ifdef CONFIG_MOUNT_NOTIFICATIONS
+ record.mnt_notify_sum = (atomic_long_read(&p->mnt_attr_changes) +
+ atomic_long_read(&p->mnt_topology_changes) +
+ atomic_long_read(&p->mnt_subtree_notifications));
+#endif
+
memcpy(ctx->buffer + usage, &record, sizeof(record));
}
diff --git a/include/uapi/linux/fsinfo.h b/include/uapi/linux/fsinfo.h
index f0a352b7028e..b021466dee0f 100644
--- a/include/uapi/linux/fsinfo.h
+++ b/include/uapi/linux/fsinfo.h
@@ -100,6 +100,9 @@ struct fsinfo_mount_info {
__u64 mnt_unique_id; /* Kernel-lifetime unique mount ID */
__u32 mnt_id; /* Mount identifier (use with AT_FSINFO_MOUNTID_PATH) */
__u32 attr; /* MOUNT_ATTR_* flags */
+ __u64 mnt_attr_changes; /* Number of attribute changes to this mount. */
+ __u64 mnt_topology_changes; /* Number of topology changes to this mount. */
+ __u64 mnt_subtree_notifications; /* Number of notifications in mount subtree */
};
#define FSINFO_ATTR_MOUNT_INFO__STRUCT struct fsinfo_mount_info
@@ -113,6 +116,7 @@ struct fsinfo_mount_topology {
__u32 dependent_source_id; /* Dependent: source mount group ID */
__u32 dependent_clone_of_id; /* Dependent: ID of mount this was cloned from */
__u32 propagation_type; /* MOUNT_PROPAGATION_* type */
+ __u64 mnt_topology_changes; /* Number of topology changes to this mount. */
};
#define FSINFO_ATTR_MOUNT_TOPOLOGY__STRUCT struct fsinfo_mount_topology
@@ -125,6 +129,9 @@ struct fsinfo_mount_child {
__u64 mnt_unique_id; /* Kernel-lifetime unique mount ID */
__u32 mnt_id; /* Mount identifier (use with AT_FSINFO_MOUNTID_PATH) */
__u32 parent_id; /* Parent mount identifier */
+ __u64 mnt_notify_sum; /* Sum of mnt_attr_changes, mnt_topology_changes and
+ * mnt_subtree_notifications.
+ */
};
#define FSINFO_ATTR_MOUNT_CHILDREN__STRUCT struct fsinfo_mount_child
diff --git a/samples/vfs/test-fsinfo.c b/samples/vfs/test-fsinfo.c
index b7290ea8eb55..620a02477aa8 100644
--- a/samples/vfs/test-fsinfo.c
+++ b/samples/vfs/test-fsinfo.c
@@ -304,6 +304,10 @@ static void dump_fsinfo_generic_mount_info(void *reply, unsigned int size)
printf("\tmnt_uniq: %llx\n", (unsigned long long)r->mnt_unique_id);
printf("\tmnt_id : %x\n", r->mnt_id);
printf("\tattr : %x\n", r->attr);
+ printf("\tevents : attr=%llu topology=%llu subtree=%llu\n",
+ (unsigned long long)r->mnt_attr_changes,
+ (unsigned long long)r->mnt_topology_changes,
+ (unsigned long long)r->mnt_subtree_notifications);
}
static void dump_fsinfo_generic_mount_topology(void *reply, unsigned int size)
@@ -332,6 +336,7 @@ static void dump_fsinfo_generic_mount_topology(void *reply, unsigned int size)
break;
}
+ printf("\tevents : topology=%llu\n", (unsigned long long)r->mnt_topology_changes);
}
static void dump_fsinfo_generic_mount_children(void *reply, unsigned int size)
@@ -354,8 +359,9 @@ static void dump_fsinfo_generic_mount_children(void *reply, unsigned int size)
mp = "<this>";
}
- printf("%8x %16llx %s\n",
- r->mnt_id, (unsigned long long)r->mnt_unique_id, mp);
+ printf("%8x %16llx %10llu %s\n",
+ r->mnt_id, (unsigned long long)r->mnt_unique_id,
+ (unsigned long long)r->mnt_notify_sum, mp);
}
static void dump_string(void *reply, unsigned int size)
