| Message ID | 163935794678.22433.16837658353666486857@noble.neil.brown.name (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [-,regression] devtmpfs: reconfigure on each mount | expand |
On Mon, Dec 13, 2021 at 12:12:26PM +1100, NeilBrown wrote: > > Prior to Linux v5.4 devtmpfs used mount_single() which treats the given > mount options as "remount" options, updating the configuration of the > single super_block on each mount. > Since that was changed, the mount options used for devtmpfs are ignored. > This is a regression which affects systemd - which mounts devtmpfs > with "-o mode=755,size=4m,nr_inodes=1m". > > This patch restores the "remount" effect by calling reconfigure_single() > > Fixes: d401727ea0d7 ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()") > Signed-off-by: NeilBrown <neilb@suse.de> > --- Hey Neil, So far this hasn't been an issue for us in systemd upstream. Is there a specific use-case where this is causing issues? I'm mostly asking because this change is fairly old. What I actually find more odd is that there's no .reconfigure for devtmpfs for non-vfs generic mount options it supports. So it's possible to change vfs generic stuff like mount -o remount,ro,nosuid /dev but none of the other mount options it supports and there's no word lost anywhere about whether or not that's on purpose. It feels odd because it uses the fs parameters from shmem/ramfs const struct fs_parameter_spec shmem_fs_parameters[] = { fsparam_u32 ("gid", Opt_gid), fsparam_enum ("huge", Opt_huge, shmem_param_enums_huge), fsparam_u32oct("mode", Opt_mode), fsparam_string("mpol", Opt_mpol), fsparam_string("nr_blocks", Opt_nr_blocks), fsparam_string("nr_inodes", Opt_nr_inodes), fsparam_string("size", Opt_size), fsparam_u32 ("uid", Opt_uid), fsparam_flag ("inode32", Opt_inode32), fsparam_flag ("inode64", Opt_inode64), {} } but doesn't allow to actually change them neither with your fix or with the old way of doing things. But afaict, all of them could be set via the "devtmpfs.mount" kernel command line option. So I could set gid=, uid=, and mpol= for devtmpfs via devtmpfs.mount but wouldn't be able to change it through remount or - in your case - with a mount with new parameters? Just wondering whether that's on purpose or an oversight. > drivers/base/devtmpfs.c | 7 +++++++ > fs/super.c | 4 ++-- > include/linux/fs_context.h | 2 ++ > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c > index 8be352ab4ddb..fa13ad49d211 100644 > --- a/drivers/base/devtmpfs.c > +++ b/drivers/base/devtmpfs.c > @@ -59,8 +59,15 @@ static struct dentry *public_dev_mount(struct file_system_type *fs_type, int fla > const char *dev_name, void *data) > { > struct super_block *s = mnt->mnt_sb; > + int err; > + > atomic_inc(&s->s_active); > down_write(&s->s_umount); > + err = reconfigure_single(s, flags, data); > + if (err < 0) { > + deactivate_locked_super(s); > + return ERR_PTR(err); > + } > return dget(s->s_root); > } > > diff --git a/fs/super.c b/fs/super.c > index 3bfc0f8fbd5b..a6405d44d4ca 100644 > --- a/fs/super.c > +++ b/fs/super.c > @@ -1423,8 +1423,8 @@ struct dentry *mount_nodev(struct file_system_type *fs_type, > } > EXPORT_SYMBOL(mount_nodev); > > -static int reconfigure_single(struct super_block *s, > - int flags, void *data) > +int reconfigure_single(struct super_block *s, > + int flags, void *data) > { > struct fs_context *fc; > int ret; > diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h > index 6b54982fc5f3..13fa6f3df8e4 100644 > --- a/include/linux/fs_context.h > +++ b/include/linux/fs_context.h > @@ -142,6 +142,8 @@ extern void put_fs_context(struct fs_context *fc); > extern int vfs_parse_fs_param_source(struct fs_context *fc, > struct fs_parameter *param); > extern void fc_drop_locked(struct fs_context *fc); > +int reconfigure_single(struct super_block *s, > + int flags, void *data); > > /* > * sget() wrappers to be called from the ->get_tree() op. > -- > 2.34.1 >
On Mon, Dec 13, 2021 at 01:59:06PM +0100, Christian Brauner wrote: > On Mon, Dec 13, 2021 at 12:12:26PM +1100, NeilBrown wrote: > > > > Prior to Linux v5.4 devtmpfs used mount_single() which treats the given > > mount options as "remount" options, updating the configuration of the > > single super_block on each mount. > > Since that was changed, the mount options used for devtmpfs are ignored. > > This is a regression which affects systemd - which mounts devtmpfs > > with "-o mode=755,size=4m,nr_inodes=1m". > > > > This patch restores the "remount" effect by calling reconfigure_single() > > > > Fixes: d401727ea0d7 ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()") > > Signed-off-by: NeilBrown <neilb@suse.de> > > --- > > Hey Neil, > > So far this hasn't been an issue for us in systemd upstream. Is there a > specific use-case where this is causing issues? I'm mostly asking > because this change is fairly old. This is standard init with systemd for SLE, where the systemd-provided mount params for devtmpfs are being effectively ignored due to this regression, so nr_inodes and size params are falling back to kernel defaults. It is also not specific to systemd, and can be easily reproduced by e.g. booting with devtmpfs.mount=0 and doing mount -t devtmpfs none /dev -o nr_inodes=1024. > What I actually find more odd is that there's no .reconfigure for > devtmpfs for non-vfs generic mount options it supports. There is a .reconfigure for devtmpfs, e.g. shmem_init_fs_context sets fc->ops to shmem_fs_context_ops, so everything goes through shmem_reconfigure. > So it's possible to change vfs generic stuff like > > mount -o remount,ro,nosuid /dev > > but none of the other mount options it supports and there's no word lost > anywhere about whether or not that's on purpose. That's not the case: even after d401727ea0d7 a remount can change any shmem-specific mount params. > It feels odd because it uses the fs parameters from shmem/ramfs > > const struct fs_parameter_spec shmem_fs_parameters[] = { > fsparam_u32 ("gid", Opt_gid), > fsparam_enum ("huge", Opt_huge, shmem_param_enums_huge), > fsparam_u32oct("mode", Opt_mode), > fsparam_string("mpol", Opt_mpol), > fsparam_string("nr_blocks", Opt_nr_blocks), > fsparam_string("nr_inodes", Opt_nr_inodes), > fsparam_string("size", Opt_size), > fsparam_u32 ("uid", Opt_uid), > fsparam_flag ("inode32", Opt_inode32), > fsparam_flag ("inode64", Opt_inode64), > {} > } > > but doesn't allow to actually change them neither with your fix or with > the old way of doing things. But afaict, all of them could be set via As per above, all those mount params are changeable via remount irrespective of the regression. What d401727ea0d7 regressed is that all those params are being ignored on new mounts only (and thus any init that mounts devtmpfs with params would be affected). > the "devtmpfs.mount" kernel command line option. So I could set gid=, > uid=, and mpol= for devtmpfs via devtmpfs.mount but wouldn't be able to > change it through remount or - in your case - with a mount with new > parameters? The devtmpfs.mount kernel boot param only controls if devtmpfs will be automatically mounted by the kernel during boot, and has nothing to do with the actual tmpfs mount params. Regards, Anthony
On Mon, Dec 13, 2021 at 09:46:53PM +0100, Anthony Iliopoulos wrote: > On Mon, Dec 13, 2021 at 01:59:06PM +0100, Christian Brauner wrote: > > On Mon, Dec 13, 2021 at 12:12:26PM +1100, NeilBrown wrote: > > > > > > Prior to Linux v5.4 devtmpfs used mount_single() which treats the given > > > mount options as "remount" options, updating the configuration of the > > > single super_block on each mount. > > > Since that was changed, the mount options used for devtmpfs are ignored. > > > This is a regression which affects systemd - which mounts devtmpfs > > > with "-o mode=755,size=4m,nr_inodes=1m". > > > > > > This patch restores the "remount" effect by calling reconfigure_single() > > > > > > Fixes: d401727ea0d7 ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()") > > > Signed-off-by: NeilBrown <neilb@suse.de> > > > --- > > > > Hey Neil, > > > > So far this hasn't been an issue for us in systemd upstream. Is there a > > specific use-case where this is causing issues? I'm mostly asking > > because this change is fairly old. > > This is standard init with systemd for SLE, where the systemd-provided > mount params for devtmpfs are being effectively ignored due to this > regression, so nr_inodes and size params are falling back to kernel > defaults. It is also not specific to systemd, and can be easily > reproduced by e.g. booting with devtmpfs.mount=0 and doing mount -t > devtmpfs none /dev -o nr_inodes=1024. > > > What I actually find more odd is that there's no .reconfigure for > > devtmpfs for non-vfs generic mount options it supports. > > There is a .reconfigure for devtmpfs, e.g. shmem_init_fs_context sets > fc->ops to shmem_fs_context_ops, so everything goes through > shmem_reconfigure. > > > So it's possible to change vfs generic stuff like > > > > mount -o remount,ro,nosuid /dev > > > > but none of the other mount options it supports and there's no word lost > > anywhere about whether or not that's on purpose. > > That's not the case: even after d401727ea0d7 a remount can change any > shmem-specific mount params. > > > It feels odd because it uses the fs parameters from shmem/ramfs > > > > const struct fs_parameter_spec shmem_fs_parameters[] = { > > fsparam_u32 ("gid", Opt_gid), > > fsparam_enum ("huge", Opt_huge, shmem_param_enums_huge), > > fsparam_u32oct("mode", Opt_mode), > > fsparam_string("mpol", Opt_mpol), > > fsparam_string("nr_blocks", Opt_nr_blocks), > > fsparam_string("nr_inodes", Opt_nr_inodes), > > fsparam_string("size", Opt_size), > > fsparam_u32 ("uid", Opt_uid), > > fsparam_flag ("inode32", Opt_inode32), > > fsparam_flag ("inode64", Opt_inode64), > > {} > > } > > > > but doesn't allow to actually change them neither with your fix or with > > the old way of doing things. But afaict, all of them could be set via > > As per above, all those mount params are changeable via remount > irrespective of the regression. What d401727ea0d7 regressed is that all Ah, I missed that. So shmem_reconfigure simple ignores some options for remount instead of returning an error. That's annoying: root@f2-vm:~# findmnt | grep devtmpfs ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 root@f2-vm:~# mount -o remount,gid=1000 /dev/ root@f2-vm:~# findmnt | grep devtmpfs ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 root@f2-vm:~# mount -o remount,mode=600 /dev root@f2-vm:~# findmnt | grep devtmpfs ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 > those params are being ignored on new mounts only (and thus any init > that mounts devtmpfs with params would be affected). > > > the "devtmpfs.mount" kernel command line option. So I could set gid=, > > uid=, and mpol= for devtmpfs via devtmpfs.mount but wouldn't be able to > > change it through remount or - in your case - with a mount with new > > parameters? > > The devtmpfs.mount kernel boot param only controls if devtmpfs will be > automatically mounted by the kernel during boot, and has nothing to do > with the actual tmpfs mount params. Thanks! I'm not a fan of a proper mount changing mount options tbh but if it is a regression for users then we should fix it. Though I'm surprised it took that such a long time to even realize that there was a regression.
On Tue, Dec 14, 2021 at 11:12:07AM +0100, Christian Brauner wrote: > On Mon, Dec 13, 2021 at 09:46:53PM +0100, Anthony Iliopoulos wrote: > > On Mon, Dec 13, 2021 at 01:59:06PM +0100, Christian Brauner wrote: > > > On Mon, Dec 13, 2021 at 12:12:26PM +1100, NeilBrown wrote: > > > > > > > > Prior to Linux v5.4 devtmpfs used mount_single() which treats the given > > > > mount options as "remount" options, updating the configuration of the > > > > single super_block on each mount. > > > > Since that was changed, the mount options used for devtmpfs are ignored. > > > > This is a regression which affects systemd - which mounts devtmpfs > > > > with "-o mode=755,size=4m,nr_inodes=1m". > > > > > > > > This patch restores the "remount" effect by calling reconfigure_single() > > > > > > > > Fixes: d401727ea0d7 ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()") > > > > Signed-off-by: NeilBrown <neilb@suse.de> > > > > --- > > > > > > Hey Neil, > > > > > > So far this hasn't been an issue for us in systemd upstream. Is there a > > > specific use-case where this is causing issues? I'm mostly asking > > > because this change is fairly old. > > > > This is standard init with systemd for SLE, where the systemd-provided > > mount params for devtmpfs are being effectively ignored due to this > > regression, so nr_inodes and size params are falling back to kernel > > defaults. It is also not specific to systemd, and can be easily > > reproduced by e.g. booting with devtmpfs.mount=0 and doing mount -t > > devtmpfs none /dev -o nr_inodes=1024. > > > > > What I actually find more odd is that there's no .reconfigure for > > > devtmpfs for non-vfs generic mount options it supports. > > > > There is a .reconfigure for devtmpfs, e.g. shmem_init_fs_context sets > > fc->ops to shmem_fs_context_ops, so everything goes through > > shmem_reconfigure. > > > > > So it's possible to change vfs generic stuff like > > > > > > mount -o remount,ro,nosuid /dev > > > > > > but none of the other mount options it supports and there's no word lost > > > anywhere about whether or not that's on purpose. > > > > That's not the case: even after d401727ea0d7 a remount can change any > > shmem-specific mount params. > > > > > It feels odd because it uses the fs parameters from shmem/ramfs > > > > > > const struct fs_parameter_spec shmem_fs_parameters[] = { > > > fsparam_u32 ("gid", Opt_gid), > > > fsparam_enum ("huge", Opt_huge, shmem_param_enums_huge), > > > fsparam_u32oct("mode", Opt_mode), > > > fsparam_string("mpol", Opt_mpol), > > > fsparam_string("nr_blocks", Opt_nr_blocks), > > > fsparam_string("nr_inodes", Opt_nr_inodes), > > > fsparam_string("size", Opt_size), > > > fsparam_u32 ("uid", Opt_uid), > > > fsparam_flag ("inode32", Opt_inode32), > > > fsparam_flag ("inode64", Opt_inode64), > > > {} > > > } > > > > > > but doesn't allow to actually change them neither with your fix or with > > > the old way of doing things. But afaict, all of them could be set via > > > > As per above, all those mount params are changeable via remount > > irrespective of the regression. What d401727ea0d7 regressed is that all > > Ah, I missed that. So shmem_reconfigure simple ignores some options for > remount instead of returning an error. That's annoying: > > root@f2-vm:~# findmnt | grep devtmpfs > ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 > > root@f2-vm:~# mount -o remount,gid=1000 /dev/ > root@f2-vm:~# findmnt | grep devtmpfs > ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 > > root@f2-vm:~# mount -o remount,mode=600 /dev > root@f2-vm:~# findmnt | grep devtmpfs > ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 This is a slightly different issue: shmem_reconfigure intentionally and specifically does not reconfigure any of the uid/gid/mode options that you picked in the above examples, and those can only be set on initial mounts (and only on tmpfs, not devtmpfs). This was the case since devtmps inception given that there was always an internal kernel mount with hardcoded mount options (mode=0755), and any subsequent public mounts from userspace are simply remounts (thus for devtmpfs specifying uid/gid/mode was never possible). But any other shmem-specific mount option that can be reconfigured via remounts is working irrespective of this regression. What has really regressed is the ability to set the rest of the shmem_fs_parameters on devtmpfs on initial mounts (remounts work just fine). > > those params are being ignored on new mounts only (and thus any init > > that mounts devtmpfs with params would be affected). > > > > > the "devtmpfs.mount" kernel command line option. So I could set gid=, > > > uid=, and mpol= for devtmpfs via devtmpfs.mount but wouldn't be able to > > > change it through remount or - in your case - with a mount with new > > > parameters? > > > > The devtmpfs.mount kernel boot param only controls if devtmpfs will be > > automatically mounted by the kernel during boot, and has nothing to do > > with the actual tmpfs mount params. > > Thanks! > I'm not a fan of a proper mount changing mount options tbh but if it is > a regression for users then we should fix it. > Though I'm surprised it took that such a long time to even realize that > there was a regression. I think this is due to the devtmpfs shmem options falling back to kernel defaults, which are apparently good enough for most use-cases. The only reason we observed the regression is due to a customer case where the avail inodes in /dev where exhausted and thus userspace was getting -ENOSPC. Subsequent attempts to raise the nr_inodes during boot were failing due to the regression. Regards, Anthony
On Tue, Dec 14, 2021 at 03:06:29PM +0100, Anthony Iliopoulos wrote: > On Tue, Dec 14, 2021 at 11:12:07AM +0100, Christian Brauner wrote: > > On Mon, Dec 13, 2021 at 09:46:53PM +0100, Anthony Iliopoulos wrote: > > > On Mon, Dec 13, 2021 at 01:59:06PM +0100, Christian Brauner wrote: > > > > On Mon, Dec 13, 2021 at 12:12:26PM +1100, NeilBrown wrote: > > > > > > > > > > Prior to Linux v5.4 devtmpfs used mount_single() which treats the given > > > > > mount options as "remount" options, updating the configuration of the > > > > > single super_block on each mount. > > > > > Since that was changed, the mount options used for devtmpfs are ignored. > > > > > This is a regression which affects systemd - which mounts devtmpfs > > > > > with "-o mode=755,size=4m,nr_inodes=1m". > > > > > > > > > > This patch restores the "remount" effect by calling reconfigure_single() > > > > > > > > > > Fixes: d401727ea0d7 ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()") > > > > > Signed-off-by: NeilBrown <neilb@suse.de> > > > > > --- > > > > > > > > Hey Neil, > > > > > > > > So far this hasn't been an issue for us in systemd upstream. Is there a > > > > specific use-case where this is causing issues? I'm mostly asking > > > > because this change is fairly old. > > > > > > This is standard init with systemd for SLE, where the systemd-provided > > > mount params for devtmpfs are being effectively ignored due to this > > > regression, so nr_inodes and size params are falling back to kernel > > > defaults. It is also not specific to systemd, and can be easily > > > reproduced by e.g. booting with devtmpfs.mount=0 and doing mount -t > > > devtmpfs none /dev -o nr_inodes=1024. > > > > > > > What I actually find more odd is that there's no .reconfigure for > > > > devtmpfs for non-vfs generic mount options it supports. > > > > > > There is a .reconfigure for devtmpfs, e.g. shmem_init_fs_context sets > > > fc->ops to shmem_fs_context_ops, so everything goes through > > > shmem_reconfigure. > > > > > > > So it's possible to change vfs generic stuff like > > > > > > > > mount -o remount,ro,nosuid /dev > > > > > > > > but none of the other mount options it supports and there's no word lost > > > > anywhere about whether or not that's on purpose. > > > > > > That's not the case: even after d401727ea0d7 a remount can change any > > > shmem-specific mount params. > > > > > > > It feels odd because it uses the fs parameters from shmem/ramfs > > > > > > > > const struct fs_parameter_spec shmem_fs_parameters[] = { > > > > fsparam_u32 ("gid", Opt_gid), > > > > fsparam_enum ("huge", Opt_huge, shmem_param_enums_huge), > > > > fsparam_u32oct("mode", Opt_mode), > > > > fsparam_string("mpol", Opt_mpol), > > > > fsparam_string("nr_blocks", Opt_nr_blocks), > > > > fsparam_string("nr_inodes", Opt_nr_inodes), > > > > fsparam_string("size", Opt_size), > > > > fsparam_u32 ("uid", Opt_uid), > > > > fsparam_flag ("inode32", Opt_inode32), > > > > fsparam_flag ("inode64", Opt_inode64), > > > > {} > > > > } > > > > > > > > but doesn't allow to actually change them neither with your fix or with > > > > the old way of doing things. But afaict, all of them could be set via > > > > > > As per above, all those mount params are changeable via remount > > > irrespective of the regression. What d401727ea0d7 regressed is that all > > > > Ah, I missed that. So shmem_reconfigure simple ignores some options for > > remount instead of returning an error. That's annoying: > > > > root@f2-vm:~# findmnt | grep devtmpfs > > ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 > > > > root@f2-vm:~# mount -o remount,gid=1000 /dev/ > > root@f2-vm:~# findmnt | grep devtmpfs > > ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 > > > > root@f2-vm:~# mount -o remount,mode=600 /dev > > root@f2-vm:~# findmnt | grep devtmpfs > > ├─/dev udev devtmpfs rw,nosuid,noexec,relatime,size=1842984k,nr_inodes=460746,mode=755,inode64 > > This is a slightly different issue: shmem_reconfigure intentionally and > specifically does not reconfigure any of the uid/gid/mode options that > you picked in the above examples, and those can only be set on initial > mounts (and only on tmpfs, not devtmpfs). > > This was the case since devtmps inception given that there was always an > internal kernel mount with hardcoded mount options (mode=0755), and any > subsequent public mounts from userspace are simply remounts (thus for > devtmpfs specifying uid/gid/mode was never possible). > > But any other shmem-specific mount option that can be reconfigured via > remounts is working irrespective of this regression. What has really Right, I understood all that. Just confusing from todays perspective that mount options that can't be changed on (superblock) remount are silently skipped instead of causing an error. But for historical reasons it obviously makes sense. > regressed is the ability to set the rest of the shmem_fs_parameters on > devtmpfs on initial mounts (remounts work just fine). > > > > those params are being ignored on new mounts only (and thus any init > > > that mounts devtmpfs with params would be affected). > > > > > > > the "devtmpfs.mount" kernel command line option. So I could set gid=, > > > > uid=, and mpol= for devtmpfs via devtmpfs.mount but wouldn't be able to > > > > change it through remount or - in your case - with a mount with new > > > > parameters? > > > > > > The devtmpfs.mount kernel boot param only controls if devtmpfs will be > > > automatically mounted by the kernel during boot, and has nothing to do > > > with the actual tmpfs mount params. > > > > Thanks! > > I'm not a fan of a proper mount changing mount options tbh but if it is > > a regression for users then we should fix it. > > Though I'm surprised it took that such a long time to even realize that > > there was a regression. > > I think this is due to the devtmpfs shmem options falling back to kernel > defaults, which are apparently good enough for most use-cases. The only > reason we observed the regression is due to a customer case where the > avail inodes in /dev where exhausted and thus userspace was getting > -ENOSPC. Subsequent attempts to raise the nr_inodes during boot were > failing due to the regression. Ah, that sucks. Acked-by: Christian Brauner <christian.brauner@ubuntu.com>
diff --git a/drivers/base/devtmpfs.c b/drivers/base/devtmpfs.c index 8be352ab4ddb..fa13ad49d211 100644 --- a/drivers/base/devtmpfs.c +++ b/drivers/base/devtmpfs.c @@ -59,8 +59,15 @@ static struct dentry *public_dev_mount(struct file_system_type *fs_type, int fla const char *dev_name, void *data) { struct super_block *s = mnt->mnt_sb; + int err; + atomic_inc(&s->s_active); down_write(&s->s_umount); + err = reconfigure_single(s, flags, data); + if (err < 0) { + deactivate_locked_super(s); + return ERR_PTR(err); + } return dget(s->s_root); } diff --git a/fs/super.c b/fs/super.c index 3bfc0f8fbd5b..a6405d44d4ca 100644 --- a/fs/super.c +++ b/fs/super.c @@ -1423,8 +1423,8 @@ struct dentry *mount_nodev(struct file_system_type *fs_type, } EXPORT_SYMBOL(mount_nodev); -static int reconfigure_single(struct super_block *s, - int flags, void *data) +int reconfigure_single(struct super_block *s, + int flags, void *data) { struct fs_context *fc; int ret; diff --git a/include/linux/fs_context.h b/include/linux/fs_context.h index 6b54982fc5f3..13fa6f3df8e4 100644 --- a/include/linux/fs_context.h +++ b/include/linux/fs_context.h @@ -142,6 +142,8 @@ extern void put_fs_context(struct fs_context *fc); extern int vfs_parse_fs_param_source(struct fs_context *fc, struct fs_parameter *param); extern void fc_drop_locked(struct fs_context *fc); +int reconfigure_single(struct super_block *s, + int flags, void *data); /* * sget() wrappers to be called from the ->get_tree() op.
Prior to Linux v5.4 devtmpfs used mount_single() which treats the given mount options as "remount" options, updating the configuration of the single super_block on each mount. Since that was changed, the mount options used for devtmpfs are ignored. This is a regression which affects systemd - which mounts devtmpfs with "-o mode=755,size=4m,nr_inodes=1m". This patch restores the "remount" effect by calling reconfigure_single() Fixes: d401727ea0d7 ("devtmpfs: don't mix {ramfs,shmem}_fill_super() with mount_single()") Signed-off-by: NeilBrown <neilb@suse.de> --- drivers/base/devtmpfs.c | 7 +++++++ fs/super.c | 4 ++-- include/linux/fs_context.h | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-)