| Message ID | 20201208003117.342047-5-krisman@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Superblock Notifications | expand |
On Mon, Dec 07, 2020 at 09:31:13PM -0300, Gabriel Krisman Bertazi wrote: > From: David Howells <dhowells@redhat.com> > > Add a superblock event notification facility whereby notifications about > superblock events, such as I/O errors (EIO), quota limits being hit > (EDQUOT) and running out of space (ENOSPC) can be reported to a monitoring > process asynchronously. Note that this does not cover vfsmount topology > changes. watch_mount() is used for that. <being a lazy reviewer and skipping straight to the data format> > diff --git a/include/uapi/linux/watch_queue.h b/include/uapi/linux/watch_queue.h > index c3d8320b5d3a..937363d9f7b3 100644 > --- a/include/uapi/linux/watch_queue.h > +++ b/include/uapi/linux/watch_queue.h > @@ -14,7 +14,8 @@ > enum watch_notification_type { > WATCH_TYPE_META = 0, /* Special record */ > WATCH_TYPE_KEY_NOTIFY = 1, /* Key change event notification */ > - WATCH_TYPE__NR = 2 > + WATCH_TYPE_SB_NOTIFY = 2, > + WATCH_TYPE__NR = 3 > }; > > enum watch_meta_notification_subtype { > @@ -101,4 +102,35 @@ struct key_notification { > __u32 aux; /* Per-type auxiliary data */ > }; > > +/* > + * Type of superblock notification. > + */ > +enum superblock_notification_type { > + NOTIFY_SUPERBLOCK_READONLY = 0, /* Filesystem toggled between R/O and R/W */ > + NOTIFY_SUPERBLOCK_ERROR = 1, /* Error in filesystem or blockdev */ > + NOTIFY_SUPERBLOCK_EDQUOT = 2, /* EDQUOT notification */ > + NOTIFY_SUPERBLOCK_NETWORK = 3, /* Network status change */ > +}; > + > +#define NOTIFY_SUPERBLOCK_IS_NOW_RO WATCH_INFO_FLAG_0 /* Superblock changed to R/O */ > + > +/* > + * Superblock notification record. > + * - watch.type = WATCH_TYPE_MOUNT_NOTIFY > + * - watch.subtype = enum superblock_notification_subtype > + */ > +struct superblock_notification { > + struct watch_notification watch; /* WATCH_TYPE_SB_NOTIFY */ > + __u64 sb_id; /* 64-bit superblock ID [fsinfo_ids::f_sb_id] */ > +}; > + > +struct superblock_error_notification { > + struct superblock_notification s; /* subtype = notify_superblock_error */ > + __u32 error_number; > + __u32 error_cookie; > + __u64 inode; > + __u64 block; Is this a file offset? In ... i_blocksize() units? What about filesystems that have multiple file offset mapping structures, like xfs? IOWs can we make a structure that covers enough of the "common"ly desired features that we don't just end up with the per-fs but then duplicated everywhere mess that is GETFLAGS/FSGETXATTR? > + char desc[0]; If the end of this is a VLA then I guess we can't add new fields by bumping the size and hoping userspace notices. I guess that implies the need for some padding and a flags field that we can set bits in when we start using that padding... --D > +}; > + > #endif /* _UAPI_LINUX_WATCH_QUEUE_H */ > diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c > index f27ac94d5fa7..3e97984bc4c8 100644 > --- a/kernel/sys_ni.c > +++ b/kernel/sys_ni.c > @@ -51,6 +51,9 @@ COND_SYSCALL_COMPAT(io_pgetevents); > COND_SYSCALL(io_uring_setup); > COND_SYSCALL(io_uring_enter); > COND_SYSCALL(io_uring_register); > +COND_SYSCALL(fsinfo); > +COND_SYSCALL(watch_mount); > +COND_SYSCALL(watch_sb); > > /* fs/xattr.c */ > > -- > 2.29.2 >
On Mon, Dec 07, 2020 at 09:31:13PM -0300, Gabriel Krisman Bertazi wrote: > From: David Howells <dhowells@redhat.com> > > Add a superblock event notification facility whereby notifications about > superblock events, such as I/O errors (EIO), quota limits being hit > (EDQUOT) and running out of space (ENOSPC) can be reported to a monitoring > process asynchronously. Note that this does not cover vfsmount topology > changes. watch_mount() is used for that. watch_mount() is not in the upstream tree, nor is it defined in this patch set. > Records are of the following format: > > struct superblock_notification { > struct watch_notification watch; > __u64 sb_id; > } *n; > > Where: > > n->watch.type will be WATCH_TYPE_SB_NOTIFY. > > n->watch.subtype will indicate the type of event, such as > NOTIFY_SUPERBLOCK_READONLY. > > n->watch.info & WATCH_INFO_LENGTH will indicate the length of the > record. > > n->watch.info & WATCH_INFO_ID will be the fifth argument to > watch_sb(), shifted. > > n->watch.info & NOTIFY_SUPERBLOCK_IS_NOW_RO will be used for > NOTIFY_SUPERBLOCK_READONLY, being set if the superblock becomes > R/O, and being cleared otherwise. > > n->sb_id will be the ID of the superblock, as can be retrieved with > the fsinfo() syscall, as part of the fsinfo_sb_notifications > attribute in the watch_id field. > > Note that it is permissible for event records to be of variable length - > or, at least, the length may be dependent on the subtype. Note also that > the queue can be shared between multiple notifications of various types. /me puts on his "We really, really, REALLY suck at APIs" hat. This adds a new syscall that has a complex structure associated with in. This needs a full man page specification written for it describing the parameters, the protocol structures, behaviour, etc before we can really review this. It really also needs full test infrastructure for every aspect of the syscall written from the man page (not the implementation) for fstests so that we end up with a consistent implementation for every filesystem that implements these watches. Other things: - Scoping: inode/block related information is not "superblock" information. What about errors in non-inode related objects? - offets into files/devices/objects need to be in bytes, not blocks - errors can span multiple contiguous blocks, so the notification needs to report the -byte range- the error corresponds to. - superblocks can have multiple block devices under them with individual address ranges. Hence we need {object,dev,offset,len} to uniquely identify where an error occurred in a filesystem. - userspace face structures need padding and flags/version/size information so we can tell what shape the structure being passed is. It is guaranteed that we will want to expand the structure definitions in future, maybe even deprecate some... - syscall has no flags field. - syscall is of "at" type (relative path via dfd) so probably shoudl be called "watch..._at()" Fundamentally, though, I'm struggling to understand what the difference between watch_mount() and watch_sb() is going to be. "superblock" watches seem like the wrong abstraction for a path based watch interface. Superblocks can be shared across multiple disjoint paths, subvolumes and even filesystems. The path based user API is really asking to watch a mount, not a superblock. We don't otherwise expose superblocks to userspace at all, so this seems like the API is somewhat exposing internal kernel implementation behind mounts. However, there -is- a watch_mount() syscall floating around somewhere, so it makes me wonder exactly why we need a second syscall and interface protocol to expose essentially the same path-based watch information to userspace. Without having that syscall the same patchset, or a reference to that patchset (and man page documenting the interface), I have no idea what it does or why it is different or why it can't be used for these error notifications.... /me wonders what applications are suppose to do if they have a watch on a path that then gets over-mounted by a different filesystem and so their watch for that path is effectively now stale because operations on that path now redirect to a different mount and superblock.... > diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c > index f27ac94d5fa7..3e97984bc4c8 100644 > --- a/kernel/sys_ni.c > +++ b/kernel/sys_ni.c > @@ -51,6 +51,9 @@ COND_SYSCALL_COMPAT(io_pgetevents); > COND_SYSCALL(io_uring_setup); > COND_SYSCALL(io_uring_enter); > COND_SYSCALL(io_uring_register); > +COND_SYSCALL(fsinfo); > +COND_SYSCALL(watch_mount); > +COND_SYSCALL(watch_sb); I think these need to be in the patches that introduce these syscalls, not this one. Cheers, Dave.
Dave, Thanks a lot for the very detailed review. > On Mon, Dec 07, 2020 at 09:31:13PM -0300, Gabriel Krisman Bertazi wrote: >> From: David Howells <dhowells@redhat.com> >> >> Add a superblock event notification facility whereby notifications about >> superblock events, such as I/O errors (EIO), quota limits being hit >> (EDQUOT) and running out of space (ENOSPC) can be reported to a monitoring >> process asynchronously. Note that this does not cover vfsmount topology >> changes. watch_mount() is used for that. > > watch_mount() is not in the upstream tree, nor is it defined in this > patch set. That is my mistake, not the author's. I picked this from a longer series that has a watch_mount implementation, but didn't include it. Only the commit message is bad, not the patch absence. >> Records are of the following format: >> >> struct superblock_notification { >> struct watch_notification watch; >> __u64 sb_id; >> } *n; >> >> Where: >> >> n->watch.type will be WATCH_TYPE_SB_NOTIFY. >> >> n->watch.subtype will indicate the type of event, such as >> NOTIFY_SUPERBLOCK_READONLY. >> >> n->watch.info & WATCH_INFO_LENGTH will indicate the length of the >> record. >> >> n->watch.info & WATCH_INFO_ID will be the fifth argument to >> watch_sb(), shifted. >> >> n->watch.info & NOTIFY_SUPERBLOCK_IS_NOW_RO will be used for >> NOTIFY_SUPERBLOCK_READONLY, being set if the superblock becomes >> R/O, and being cleared otherwise. >> >> n->sb_id will be the ID of the superblock, as can be retrieved with >> the fsinfo() syscall, as part of the fsinfo_sb_notifications >> attribute in the watch_id field. >> >> Note that it is permissible for event records to be of variable length - >> or, at least, the length may be dependent on the subtype. Note also that >> the queue can be shared between multiple notifications of various types. > > /me puts on his "We really, really, REALLY suck at APIs" hat. > > This adds a new syscall that has a complex structure associated with > in. This needs a full man page specification written for it > describing the parameters, the protocol structures, behaviour, etc > before we can really review this. It really also needs full test > infrastructure for every aspect of the syscall written from the man > page (not the implementation) for fstests so that we end up with a > consistent implementation for every filesystem that implements these > watches. I see. I was thinking the other way around, getting a design accepted by you all before writing down documentation, but that makes a lot of sense. In fact, I'm taking a step back and writing a text proposal, without patches, such that we can agree on the main points before I start coding. > Other things: > > - Scoping: inode/block related information is not "superblock" > information. What about errors in non-inode related objects? The previous RFC separated inode error notifications from other types, but my idea was to have different notifications types for each object. > - offets into files/devices/objects need to be in bytes, not blocks > - errors can span multiple contiguous blocks, so the notification > needs to report the -byte range- the error corresponds to. > - superblocks can have multiple block devices under them with > individual address ranges. Hence we need {object,dev,offset,len} > to uniquely identify where an error occurred in a filesystem. > - userspace face structures need padding and flags/version/size > information so we can tell what shape the structure being passed > is. It is guaranteed that we will want to expand the structure > definitions in future, maybe even deprecate some... > - syscall has no flags field. > - syscall is of "at" type (relative path via dfd) so probably shoudl > be called "watch..._at()" will do all the above. > > Fundamentally, though, I'm struggling to understand what the > difference between watch_mount() and watch_sb() is going to be. > "superblock" watches seem like the wrong abstraction for a path > based watch interface. Superblocks can be shared across multiple > disjoint paths, subvolumes and even filesystems. As far as I understand the original patchset, watch_mount was designed to monitor mountpoint operations (mount, umount,.. ) in a sub-tree, while watch_sb monitors filesystem operations and errors. I'm not working with watch_mount, my current interest is in having a notifications mechanism for filesystem errors, which seemed to fit nicely with the watch_sb patchset for watch_queue. > The path based user API is really asking to watch a mount, not a > superblock. We don't otherwise expose superblocks to userspace at > all, so this seems like the API is somewhat exposing internal kernel > implementation behind mounts. However, there -is- a watch_mount() > syscall floating around somewhere, so it makes me wonder exactly why > we need a second syscall and interface protocol to expose > essentially the same path-based watch information to userspace. I think these are indeed different syscalls, but maybe a bit misnamed. If not by path, how could we uniquely identify an entire filesystem? Maybe pointing to a block device that has a valid filesystem and in the case of fs spawning through multiple devices, consider all of them? But that would not work for some misc filesystems, like tmpfs. > Without having that syscall the same patchset, or a reference to > that patchset (and man page documenting the interface), I have no > idea what it does or why it is different or why it can't be used for > these error notifications.... As a short summary, My goal is an error reporting mechanism for ext4 (preferably that can also be used by other filesystems) that allows a userspace application to monitor errors on the filesystem without losing information and without having to parse a convoluted dmesg. The watch_queue API seem to expose exactly the infrastructure for this kind of thing. As I said, I'm gonna send a proposal with more details because, I'd really like to have something that can be used by several filesystems.
On Fri, Dec 11, 2020 at 05:55:32PM -0300, Gabriel Krisman Bertazi wrote: > > > Dave, > > Thanks a lot for the very detailed review. > > > On Mon, Dec 07, 2020 at 09:31:13PM -0300, Gabriel Krisman Bertazi wrote: > >> From: David Howells <dhowells@redhat.com> > >> > >> Add a superblock event notification facility whereby notifications about > >> superblock events, such as I/O errors (EIO), quota limits being hit > >> (EDQUOT) and running out of space (ENOSPC) can be reported to a monitoring > >> process asynchronously. Note that this does not cover vfsmount topology > >> changes. watch_mount() is used for that. > > > > watch_mount() is not in the upstream tree, nor is it defined in this > > patch set. > > > That is my mistake, not the author's. I picked this from a longer series that has > a watch_mount implementation, but didn't include it. Only the commit message > is bad, not the patch absence. > > >> Records are of the following format: > >> > >> struct superblock_notification { > >> struct watch_notification watch; > >> __u64 sb_id; > >> } *n; > >> > >> Where: > >> > >> n->watch.type will be WATCH_TYPE_SB_NOTIFY. > >> > >> n->watch.subtype will indicate the type of event, such as > >> NOTIFY_SUPERBLOCK_READONLY. > >> > >> n->watch.info & WATCH_INFO_LENGTH will indicate the length of the > >> record. > >> > >> n->watch.info & WATCH_INFO_ID will be the fifth argument to > >> watch_sb(), shifted. > >> > >> n->watch.info & NOTIFY_SUPERBLOCK_IS_NOW_RO will be used for > >> NOTIFY_SUPERBLOCK_READONLY, being set if the superblock becomes > >> R/O, and being cleared otherwise. > >> > >> n->sb_id will be the ID of the superblock, as can be retrieved with > >> the fsinfo() syscall, as part of the fsinfo_sb_notifications > >> attribute in the watch_id field. > >> > >> Note that it is permissible for event records to be of variable length - > >> or, at least, the length may be dependent on the subtype. Note also that > >> the queue can be shared between multiple notifications of various types. > > > > /me puts on his "We really, really, REALLY suck at APIs" hat. > > > > This adds a new syscall that has a complex structure associated with > > in. This needs a full man page specification written for it > > describing the parameters, the protocol structures, behaviour, etc > > before we can really review this. It really also needs full test > > infrastructure for every aspect of the syscall written from the man > > page (not the implementation) for fstests so that we end up with a > > consistent implementation for every filesystem that implements these > > watches. > > I see. I was thinking the other way around, getting a design accepted > by you all before writing down documentation, but that makes a lot of > sense. In fact, I'm taking a step back and writing a text proposal, > without patches, such that we can agree on the main points before I > start coding. > > > Other things: > > > > - Scoping: inode/block related information is not "superblock" > > information. What about errors in non-inode related objects? > > The previous RFC separated inode error notifications from other types, > but my idea was to have different notifications types for each object. > > > > - offets into files/devices/objects need to be in bytes, not blocks > > - errors can span multiple contiguous blocks, so the notification > > needs to report the -byte range- the error corresponds to. > > - superblocks can have multiple block devices under them with > > individual address ranges. Hence we need {object,dev,offset,len} > > to uniquely identify where an error occurred in a filesystem. > > - userspace face structures need padding and flags/version/size > > information so we can tell what shape the structure being passed > > is. It is guaranteed that we will want to expand the structure > > definitions in future, maybe even deprecate some... > > - syscall has no flags field. > > - syscall is of "at" type (relative path via dfd) so probably shoudl > > be called "watch..._at()" > > will do all the above. > > > > > Fundamentally, though, I'm struggling to understand what the > > difference between watch_mount() and watch_sb() is going to be. > > "superblock" watches seem like the wrong abstraction for a path > > based watch interface. Superblocks can be shared across multiple > > disjoint paths, subvolumes and even filesystems. > > As far as I understand the original patchset, watch_mount was designed > to monitor mountpoint operations (mount, umount,.. ) in a sub-tree, > while watch_sb monitors filesystem operations and errors. I'm not > working with watch_mount, my current interest is in having a > notifications mechanism for filesystem errors, which seemed to fit > nicely with the watch_sb patchset for watch_queue. <shrug> The previous patches are not part of your proposal, and if they are not likely to be merged, then we don't really care what they are or what they did. The only thing that matters here is what your patchset is trying to implement and whether that is appropriate or not... > > The path based user API is really asking to watch a mount, not a > > superblock. We don't otherwise expose superblocks to userspace at > > all, so this seems like the API is somewhat exposing internal kernel > > implementation behind mounts. However, there -is- a watch_mount() > > syscall floating around somewhere, so it makes me wonder exactly why > > we need a second syscall and interface protocol to expose > > essentially the same path-based watch information to userspace. > > I think these are indeed different syscalls, but maybe a bit misnamed. > > If not by path, how could we uniquely identify an entire filesystem? Exactly why do we need to uniquely identify a filesystem based on it's superblock? Surely it's already been identified by path by the application that registered the watch? > Maybe pointing to a block device that has a valid filesystem and in the > case of fs spawning through multiple devices, consider all of them? But > that would not work for some misc filesystems, like tmpfs. It can't be block device based at all - think NFS, CIFS, etc. We can't use UUIDs, because not all filesystem have them, and snapshots often have identical UUIDs. Really, I think "superblock" notifications are extremely problematic because the same superblock can be shared across different security contexts. I'm not sure what the solution might be, but I really don't like the idea of a mechanism that can report errors in objects outside the visibility of a namespaced container to that container just because it has access to some path inside a much bigger filesystem that is mostly out of bounds to that container. > > Without having that syscall the same patchset, or a reference to > > that patchset (and man page documenting the interface), I have no > > idea what it does or why it is different or why it can't be used for > > these error notifications.... > > As a short summary, My goal is an error reporting mechanism for ext4 > (preferably that can also be used by other filesystems) There's no "preferably" here. Either it is generic and usable by all other filesystems, or it's not functionality that should be merged into the VFS or exposed by a syscall. > that allows a > userspace application to monitor errors on the filesystem without losing > information and without having to parse a convoluted dmesg. The > watch_queue API seem to expose exactly the infrastructure for this kind > of thing. As I said, I'm gonna send a proposal with more details > because, I'd really like to have something that can be used by several > filesystems. Yes, I know what the desired functionality is, it's just that it's not as simple as "redirect global error messages to global pipe" such as what we do with printk and dmesg... Cheers, Dave.
Dave, thanks for the feedback. Dave Chinner <david@fromorbit.com> writes: > On Fri, Dec 11, 2020 at 05:55:32PM -0300, Gabriel Krisman Bertazi wrote: >> > Fundamentally, though, I'm struggling to understand what the >> > difference between watch_mount() and watch_sb() is going to be. >> > "superblock" watches seem like the wrong abstraction for a path >> > based watch interface. Superblocks can be shared across multiple >> > disjoint paths, subvolumes and even filesystems. >> >> As far as I understand the original patchset, watch_mount was designed >> to monitor mountpoint operations (mount, umount,.. ) in a sub-tree, >> while watch_sb monitors filesystem operations and errors. I'm not >> working with watch_mount, my current interest is in having a >> notifications mechanism for filesystem errors, which seemed to fit >> nicely with the watch_sb patchset for watch_queue. > > <shrug> > > The previous patches are not part of your proposal, and if they are > not likely to be merged, then we don't really care what they are > or what they did. The only thing that matters here is what your > patchset is trying to implement and whether that is appropriate or > not... I think the mistake was only mentioning them in the commit message, in the first place. >> > The path based user API is really asking to watch a mount, not a >> > superblock. We don't otherwise expose superblocks to userspace at >> > all, so this seems like the API is somewhat exposing internal kernel >> > implementation behind mounts. However, there -is- a watch_mount() >> > syscall floating around somewhere, so it makes me wonder exactly why >> > we need a second syscall and interface protocol to expose >> > essentially the same path-based watch information to userspace. >> >> I think these are indeed different syscalls, but maybe a bit misnamed. >> >> If not by path, how could we uniquely identify an entire filesystem? > > Exactly why do we need to uniquely identify a filesystem based on > it's superblock? Surely it's already been identified by path by the > application that registered the watch? I see. In fact, we don't, as that is an internal concept. The patch abuses the term superblock to refer to the entire filesystem. I should to operate in terms of mounts. >> Maybe pointing to a block device that has a valid filesystem and in the >> case of fs spawning through multiple devices, consider all of them? But >> that would not work for some misc filesystems, like tmpfs. > > It can't be block device based at all - think NFS, CIFS, etc. We > can't use UUIDs, because not all filesystem have them, and snapshots > often have identical UUIDs. > > Really, I think "superblock" notifications are extremely problematic > because the same superblock can be shared across different security > contexts. I'm not sure what the solution might be, but I really > don't like the idea of a mechanism that can report errors in objects > outside the visibility of a namespaced container to that container > just because it has access to some path inside a much bigger > filesystem that is mostly out of bounds to that container. I see. To solve the container visibility problem, would it suffice to forbid watching partial mounts of a filesystem? For instance, either the watched path is the root_sb or the API returns EINVAL. This limits the usability of the API to whoever controls the root of the filesystem, which seems to cover the use case of the host monitoring an entire filesystem. Would this limitation be acceptable? Alternatively, we want something similar to fanotify FAN_MARK_FILESYSTEM semantics? I suppose global errors (like an ext4 fs abort) should be reported individually for every mountpoint, while inode errors are only reported for each mountpoint for which the object is accessible.
diff --git a/arch/x86/entry/syscalls/syscall_32.tbl b/arch/x86/entry/syscalls/syscall_32.tbl index 0d0667a9fbd7..c481ab8c4454 100644 --- a/arch/x86/entry/syscalls/syscall_32.tbl +++ b/arch/x86/entry/syscalls/syscall_32.tbl @@ -445,3 +445,4 @@ 438 i386 pidfd_getfd sys_pidfd_getfd 439 i386 faccessat2 sys_faccessat2 440 i386 process_madvise sys_process_madvise +441 i386 watch_sb sys_watch_sb diff --git a/arch/x86/entry/syscalls/syscall_64.tbl b/arch/x86/entry/syscalls/syscall_64.tbl index 379819244b91..87efe2577169 100644 --- a/arch/x86/entry/syscalls/syscall_64.tbl +++ b/arch/x86/entry/syscalls/syscall_64.tbl @@ -362,6 +362,7 @@ 438 common pidfd_getfd sys_pidfd_getfd 439 common faccessat2 sys_faccessat2 440 common process_madvise sys_process_madvise +441 common watch_sb sys_watch_sb # # Due to a historical design error, certain syscalls are numbered differently diff --git a/fs/Kconfig b/fs/Kconfig index aa4c12282301..4e96521c37a1 100644 --- a/fs/Kconfig +++ b/fs/Kconfig @@ -117,6 +117,18 @@ source "fs/verity/Kconfig" source "fs/notify/Kconfig" +config SB_NOTIFICATIONS + bool "Superblock event notifications" + select WATCH_QUEUE + help + This option provides support for receiving superblock event + notifications. This makes use of the watch_queue API to + handle the notification buffer and provides the sb_notify() + system call to enable/disable watches. + + Events can include things like changing between R/W and R/O, EIO + generation, ENOSPC generation and EDQUOT generation. + source "fs/quota/Kconfig" source "fs/autofs/Kconfig" diff --git a/fs/super.c b/fs/super.c index 98bb0629ee10..93cf037f9b41 100644 --- a/fs/super.c +++ b/fs/super.c @@ -37,6 +37,8 @@ #include <linux/lockdep.h> #include <linux/user_namespace.h> #include <linux/fs_context.h> +#include <linux/syscalls.h> +#include <linux/namei.h> #include <uapi/linux/mount.h> #include "internal.h" @@ -330,6 +332,10 @@ void deactivate_locked_super(struct super_block *s) { struct file_system_type *fs = s->s_type; if (atomic_dec_and_test(&s->s_active)) { +#ifdef CONFIG_SB_NOTIFICATIONS + if (s->s_watchers) + remove_watch_list(s->s_watchers, s->s_unique_id); +#endif cleancache_invalidate_fs(s); unregister_shrinker(&s->s_shrink); fs->kill_sb(s); @@ -969,6 +975,8 @@ int reconfigure_super(struct fs_context *fc) /* Needs to be ordered wrt mnt_is_readonly() */ smp_wmb(); sb->s_readonly_remount = 0; + notify_sb(sb, NOTIFY_SUPERBLOCK_READONLY, + remount_ro ? NOTIFY_SUPERBLOCK_IS_NOW_RO : 0); /* * Some filesystems modify their metadata via some other path than the @@ -1818,3 +1826,122 @@ int thaw_super(struct super_block *sb) return thaw_super_locked(sb); } EXPORT_SYMBOL(thaw_super); + +#ifdef CONFIG_SB_NOTIFICATIONS +/* + * Post superblock notifications. + */ + +void post_sb_notification(struct super_block *s, struct superblock_notification *n, + const char *fmt, va_list *args) +{ + post_watch_notification_string(s->s_watchers, &n->watch, current_cred(), + s->s_unique_id, fmt, args); +} + +/** + * sys_watch_sb - Watch for superblock events. + * @dfd: Base directory to pathwalk from or fd referring to superblock. + * @filename: Path to superblock to place the watch upon + * @at_flags: Pathwalk control flags + * @watch_fd: The watch queue to send notifications to. + * @watch_id: The watch ID to be placed in the notification (-1 to remove watch) + */ +SYSCALL_DEFINE5(watch_sb, + int, dfd, + const char __user *, filename, + unsigned int, at_flags, + int, watch_fd, + int, watch_id) +{ + struct watch_queue *wqueue; + struct super_block *s; + struct watch_list *wlist = NULL; + struct watch *watch = NULL; + struct path path; + unsigned int lookup_flags = + LOOKUP_DIRECTORY | LOOKUP_FOLLOW | LOOKUP_AUTOMOUNT; + int ret; + + if (watch_id < -1 || watch_id > 0xff) + return -EINVAL; + if ((at_flags & ~(AT_NO_AUTOMOUNT | AT_EMPTY_PATH)) != 0) + return -EINVAL; + if (at_flags & AT_NO_AUTOMOUNT) + lookup_flags &= ~LOOKUP_AUTOMOUNT; + if (at_flags & AT_EMPTY_PATH) + lookup_flags |= LOOKUP_EMPTY; + + ret = user_path_at(dfd, filename, at_flags, &path); + if (ret) + return ret; + + ret = inode_permission(path.dentry->d_inode, MAY_EXEC); + if (ret) + goto err_path; + + wqueue = get_watch_queue(watch_fd); + if (IS_ERR(wqueue)) + goto err_path; + + s = path.dentry->d_sb; + if (watch_id >= 0) { + ret = -ENOMEM; + if (!s->s_watchers) { + wlist = kzalloc(sizeof(*wlist), GFP_KERNEL); + if (!wlist) + goto err_wqueue; + init_watch_list(wlist, NULL); + } + + watch = kzalloc(sizeof(*watch), GFP_KERNEL); + if (!watch) + goto err_wlist; + + init_watch(watch, wqueue); + watch->id = s->s_unique_id; + watch->private = s; + watch->info_id = (u32)watch_id << 24; + + ret = security_watch_sb(s); + if (ret < 0) + goto err_watch; + + down_write(&s->s_umount); + ret = -EIO; + if (atomic_read(&s->s_active)) { + if (!s->s_watchers) { + s->s_watchers = wlist; + wlist = NULL; + } + + ret = add_watch_to_object(watch, s->s_watchers); + if (ret == 0) { + spin_lock(&sb_lock); + s->s_count++; + spin_unlock(&sb_lock); + watch = NULL; + } + } + up_write(&s->s_umount); + } else { + ret = -EBADSLT; + if (READ_ONCE(s->s_watchers)) { + down_write(&s->s_umount); + ret = remove_watch_from_object(s->s_watchers, wqueue, + s->s_unique_id, false); + up_write(&s->s_umount); + } + } + +err_watch: + kfree(watch); +err_wlist: + kfree(wlist); +err_wqueue: + put_watch_queue(wqueue); +err_path: + path_put(&path); + return ret; +} +#endif diff --git a/include/linux/fs.h b/include/linux/fs.h index 8667d0cdc71e..df588edc0a34 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -39,6 +39,7 @@ #include <linux/fs_types.h> #include <linux/build_bug.h> #include <linux/stddef.h> +#include <linux/watch_queue.h> #include <asm/byteorder.h> #include <uapi/linux/fs.h> @@ -1547,6 +1548,13 @@ struct super_block { spinlock_t s_inode_wblist_lock; struct list_head s_inodes_wb; /* writeback inodes */ + + /* Superblock event notifications */ + u64 s_unique_id; + +#ifdef CONFIG_SB_NOTIFICATIONS + struct watch_list *s_watchers; +#endif } __randomize_layout; /* Helper functions so that in most cases filesystems will @@ -3476,4 +3484,83 @@ static inline int inode_drain_writes(struct inode *inode) return filemap_write_and_wait(inode->i_mapping); } +extern void post_sb_notification(struct super_block *, struct superblock_notification *, + const char *fmt, va_list *args); +/** + * notify_sb: Post simple superblock notification. + * @s: The superblock the notification is about. + * @subtype: The type of notification. + * @info: WATCH_INFO_FLAG_* flags to be set in the record. + */ +static inline void notify_sb(struct super_block *s, + enum superblock_notification_type subtype, + u32 info) +{ +#ifdef CONFIG_SB_NOTIFICATIONS + if (unlikely(s->s_watchers)) { + struct superblock_notification n = { + .watch.type = WATCH_TYPE_SB_NOTIFY, + .watch.subtype = subtype, + .watch.info = watch_sizeof(n) | info, + .sb_id = s->s_unique_id, + }; + + post_sb_notification(s, &n, NULL, NULL); + } + +#endif +} + +/** + * notify_sb_error: Post superblock error notification. + * @s: The superblock the notification is about. + * @error: The error number to be recorded. + * @inode: The inode the error refers to (if available, 0 otherwise) + * @block: The block the error refers to (if available, 0 otherwise) + * @fmt: Formating string for extra information appended to the notification + * @args: arguments for extra information string appended to the notification + */ +static inline int notify_sb_error(struct super_block *s, int error, u64 inode, + u64 block, const char *fmt, va_list *args) +{ +#ifdef CONFIG_SB_NOTIFICATIONS + if (unlikely(s->s_watchers)) { + struct superblock_error_notification n = { + .s.watch.type = WATCH_TYPE_SB_NOTIFY, + .s.watch.subtype = NOTIFY_SUPERBLOCK_ERROR, + .s.watch.info = watch_sizeof(n), + .s.sb_id = s->s_unique_id, + .error_number = error, + .error_cookie = 0, + .inode = inode, + .block = block, + }; + + post_sb_notification(s, &n.s, fmt, args); + } +#endif + return error; +} + +/** + * notify_sb_EDQUOT: Post superblock quota overrun notification. + * @s: The superblock the notification is about. + */ +static inline int notify_sb_EQDUOT(struct super_block *s) +{ +#ifdef CONFIG_SB_NOTIFICATIONS + if (unlikely(s->s_watchers)) { + struct superblock_notification n = { + .watch.type = WATCH_TYPE_SB_NOTIFY, + .watch.subtype = NOTIFY_SUPERBLOCK_EDQUOT, + .watch.info = watch_sizeof(n), + .sb_id = s->s_unique_id, + }; + + post_sb_notification(s, &n, NULL, NULL); + } +#endif + return -EDQUOT; +} + #endif /* _LINUX_FS_H */ diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h index 37bea07c12f2..5f7b282d331d 100644 --- a/include/linux/syscalls.h +++ b/include/linux/syscalls.h @@ -1008,6 +1008,8 @@ asmlinkage long sys_pidfd_send_signal(int pidfd, int sig, siginfo_t __user *info, unsigned int flags); asmlinkage long sys_pidfd_getfd(int pidfd, int fd, unsigned int flags); +asmlinkage long sys_watch_sb(int dfd, const char __user *path, + unsigned int at_flags, int watch_fd, int watch_id); /* * Architecture-specific system calls diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 2056318988f7..5eec69e2b312 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -859,9 +859,11 @@ __SYSCALL(__NR_pidfd_getfd, sys_pidfd_getfd) __SYSCALL(__NR_faccessat2, sys_faccessat2) #define __NR_process_madvise 440 __SYSCALL(__NR_process_madvise, sys_process_madvise) +#define __NR_watch_sb 441 +__SYSCALL(__NR_watch_sb, sys_watch_sb) #undef __NR_syscalls -#define __NR_syscalls 441 +#define __NR_syscalls 442 /* * 32 bit systems traditionally used different diff --git a/include/uapi/linux/watch_queue.h b/include/uapi/linux/watch_queue.h index c3d8320b5d3a..937363d9f7b3 100644 --- a/include/uapi/linux/watch_queue.h +++ b/include/uapi/linux/watch_queue.h @@ -14,7 +14,8 @@ enum watch_notification_type { WATCH_TYPE_META = 0, /* Special record */ WATCH_TYPE_KEY_NOTIFY = 1, /* Key change event notification */ - WATCH_TYPE__NR = 2 + WATCH_TYPE_SB_NOTIFY = 2, + WATCH_TYPE__NR = 3 }; enum watch_meta_notification_subtype { @@ -101,4 +102,35 @@ struct key_notification { __u32 aux; /* Per-type auxiliary data */ }; +/* + * Type of superblock notification. + */ +enum superblock_notification_type { + NOTIFY_SUPERBLOCK_READONLY = 0, /* Filesystem toggled between R/O and R/W */ + NOTIFY_SUPERBLOCK_ERROR = 1, /* Error in filesystem or blockdev */ + NOTIFY_SUPERBLOCK_EDQUOT = 2, /* EDQUOT notification */ + NOTIFY_SUPERBLOCK_NETWORK = 3, /* Network status change */ +}; + +#define NOTIFY_SUPERBLOCK_IS_NOW_RO WATCH_INFO_FLAG_0 /* Superblock changed to R/O */ + +/* + * Superblock notification record. + * - watch.type = WATCH_TYPE_MOUNT_NOTIFY + * - watch.subtype = enum superblock_notification_subtype + */ +struct superblock_notification { + struct watch_notification watch; /* WATCH_TYPE_SB_NOTIFY */ + __u64 sb_id; /* 64-bit superblock ID [fsinfo_ids::f_sb_id] */ +}; + +struct superblock_error_notification { + struct superblock_notification s; /* subtype = notify_superblock_error */ + __u32 error_number; + __u32 error_cookie; + __u64 inode; + __u64 block; + char desc[0]; +}; + #endif /* _UAPI_LINUX_WATCH_QUEUE_H */ diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index f27ac94d5fa7..3e97984bc4c8 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c @@ -51,6 +51,9 @@ COND_SYSCALL_COMPAT(io_pgetevents); COND_SYSCALL(io_uring_setup); COND_SYSCALL(io_uring_enter); COND_SYSCALL(io_uring_register); +COND_SYSCALL(fsinfo); +COND_SYSCALL(watch_mount); +COND_SYSCALL(watch_sb); /* fs/xattr.c */