From: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> To: Al Viro <viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org>, Linus Torvalds <torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org> Cc: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org>, "Rafael J. Wysocki" <rafael-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Subject: [PATCH 12/24] init: add an init_mount helper Date: Tue, 21 Jul 2020 18:28:06 +0200 [thread overview] Message-ID: <20200721162818.197315-13-hch@lst.de> (raw) In-Reply-To: <20200721162818.197315-1-hch-jcswGhMUV9g@public.gmane.org> Like do_mount, but takes a kernel pointer for the destination path. Switch over the mounts in the init code and devtmpfs to it, which just happen to work due to the implicit set_fs(KERNEL_DS) during early init right now. Signed-off-by: Christoph Hellwig <hch-jcswGhMUV9g@public.gmane.org> --- init/Makefile | 2 +- init/do_mounts.c | 8 ++++---- init/do_mounts.h | 3 +++ init/do_mounts_initrd.c | 6 +++--- init/fs.c | 20 ++++++++++++++++++++ 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 init/fs.c diff --git a/init/Makefile b/init/Makefile index 6bc37f64b3617c..7d4b57d3cf7eac 100644 --- a/init/Makefile +++ b/init/Makefile @@ -5,7 +5,7 @@ ccflags-y := -fno-function-sections -fno-data-sections -obj-y := main.o version.o mounts.o +obj-y := main.o version.o fs.o mounts.o ifneq ($(CONFIG_BLK_DEV_INITRD),y) obj-y += noinitramfs.o else diff --git a/init/do_mounts.c b/init/do_mounts.c index 4f4ceb35805503..4812e21d149cab 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -395,16 +395,16 @@ static int __init do_mount_root(const char *name, const char *fs, int ret; if (data) { - /* do_mount() requires a full page as fifth argument */ + /* init_mount() requires a full page as fifth argument */ p = alloc_page(GFP_KERNEL); if (!p) return -ENOMEM; data_page = page_address(p); - /* zero-pad. do_mount() will make sure it's terminated */ + /* zero-pad. init_mount() will make sure it's terminated */ strncpy(data_page, data, PAGE_SIZE); } - ret = do_mount(name, "/root", fs, flags, data_page); + ret = init_mount(name, "/root", fs, flags, data_page); if (ret) goto out; @@ -628,7 +628,7 @@ void __init prepare_namespace(void) mount_root(); out: devtmpfs_mount(); - do_mount(".", "/", NULL, MS_MOVE, NULL); + init_mount(".", "/", NULL, MS_MOVE, NULL); ksys_chroot("."); } diff --git a/init/do_mounts.h b/init/do_mounts.h index 15d256658a3093..ce4f95fff6bc16 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -9,6 +9,9 @@ #include <linux/major.h> #include <linux/root_dev.h> +int __init init_mount(const char *dev_name, const char *dir_name, + const char *type_page, unsigned long flags, void *data_page); + void mount_block_root(char *name, int flags); void mount_root(void); void prepare_namespace(void); diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 3fabbc82513506..63a3eebd36e76b 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -63,7 +63,7 @@ static int __init init_linuxrc(struct subprocess_info *info, struct cred *new) console_on_rootfs(); /* move initrd over / and chdir/chroot in initrd root */ ksys_chdir("/root"); - do_mount(".", "/", NULL, MS_MOVE, NULL); + init_mount(".", "/", NULL, MS_MOVE, NULL); ksys_chroot("."); ksys_setsid(); return 0; @@ -100,7 +100,7 @@ static void __init handle_initrd(void) current->flags &= ~PF_FREEZER_SKIP; /* move initrd to rootfs' /old */ - do_mount("..", ".", NULL, MS_MOVE, NULL); + init_mount("..", ".", NULL, MS_MOVE, NULL); /* switch root and cwd back to / of rootfs */ ksys_chroot(".."); @@ -114,7 +114,7 @@ static void __init handle_initrd(void) mount_root(); printk(KERN_NOTICE "Trying to move old root to /initrd ... "); - error = do_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL); + error = init_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL); if (!error) printk("okay\n"); else { diff --git a/init/fs.c b/init/fs.c new file mode 100644 index 00000000000000..73423f5461f934 --- /dev/null +++ b/init/fs.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/init.h> +#include <linux/mount.h> +#include <linux/namei.h> +#include <linux/fs.h> +#include "do_mounts.h" + +int __init init_mount(const char *dev_name, const char *dir_name, + const char *type_page, unsigned long flags, void *data_page) +{ + struct path path; + int ret; + + ret = kern_path(dir_name, LOOKUP_FOLLOW, &path); + if (ret) + return ret; + ret = path_mount(dev_name, &path, type_page, flags, data_page); + path_put(&path); + return ret; +} -- 2.27.0
WARNING: multiple messages have this Message-ID (diff)
From: Christoph Hellwig <hch@lst.de> To: Al Viro <viro@zeniv.linux.org.uk>, Linus Torvalds <torvalds@linux-foundation.org> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, "Rafael J. Wysocki" <rafael@kernel.org>, linux-kernel@vger.kernel.org, linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-api@vger.kernel.org Subject: [PATCH 12/24] init: add an init_mount helper Date: Tue, 21 Jul 2020 18:28:06 +0200 [thread overview] Message-ID: <20200721162818.197315-13-hch@lst.de> (raw) In-Reply-To: <20200721162818.197315-1-hch@lst.de> Like do_mount, but takes a kernel pointer for the destination path. Switch over the mounts in the init code and devtmpfs to it, which just happen to work due to the implicit set_fs(KERNEL_DS) during early init right now. Signed-off-by: Christoph Hellwig <hch@lst.de> --- init/Makefile | 2 +- init/do_mounts.c | 8 ++++---- init/do_mounts.h | 3 +++ init/do_mounts_initrd.c | 6 +++--- init/fs.c | 20 ++++++++++++++++++++ 5 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 init/fs.c diff --git a/init/Makefile b/init/Makefile index 6bc37f64b3617c..7d4b57d3cf7eac 100644 --- a/init/Makefile +++ b/init/Makefile @@ -5,7 +5,7 @@ ccflags-y := -fno-function-sections -fno-data-sections -obj-y := main.o version.o mounts.o +obj-y := main.o version.o fs.o mounts.o ifneq ($(CONFIG_BLK_DEV_INITRD),y) obj-y += noinitramfs.o else diff --git a/init/do_mounts.c b/init/do_mounts.c index 4f4ceb35805503..4812e21d149cab 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -395,16 +395,16 @@ static int __init do_mount_root(const char *name, const char *fs, int ret; if (data) { - /* do_mount() requires a full page as fifth argument */ + /* init_mount() requires a full page as fifth argument */ p = alloc_page(GFP_KERNEL); if (!p) return -ENOMEM; data_page = page_address(p); - /* zero-pad. do_mount() will make sure it's terminated */ + /* zero-pad. init_mount() will make sure it's terminated */ strncpy(data_page, data, PAGE_SIZE); } - ret = do_mount(name, "/root", fs, flags, data_page); + ret = init_mount(name, "/root", fs, flags, data_page); if (ret) goto out; @@ -628,7 +628,7 @@ void __init prepare_namespace(void) mount_root(); out: devtmpfs_mount(); - do_mount(".", "/", NULL, MS_MOVE, NULL); + init_mount(".", "/", NULL, MS_MOVE, NULL); ksys_chroot("."); } diff --git a/init/do_mounts.h b/init/do_mounts.h index 15d256658a3093..ce4f95fff6bc16 100644 --- a/init/do_mounts.h +++ b/init/do_mounts.h @@ -9,6 +9,9 @@ #include <linux/major.h> #include <linux/root_dev.h> +int __init init_mount(const char *dev_name, const char *dir_name, + const char *type_page, unsigned long flags, void *data_page); + void mount_block_root(char *name, int flags); void mount_root(void); void prepare_namespace(void); diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c index 3fabbc82513506..63a3eebd36e76b 100644 --- a/init/do_mounts_initrd.c +++ b/init/do_mounts_initrd.c @@ -63,7 +63,7 @@ static int __init init_linuxrc(struct subprocess_info *info, struct cred *new) console_on_rootfs(); /* move initrd over / and chdir/chroot in initrd root */ ksys_chdir("/root"); - do_mount(".", "/", NULL, MS_MOVE, NULL); + init_mount(".", "/", NULL, MS_MOVE, NULL); ksys_chroot("."); ksys_setsid(); return 0; @@ -100,7 +100,7 @@ static void __init handle_initrd(void) current->flags &= ~PF_FREEZER_SKIP; /* move initrd to rootfs' /old */ - do_mount("..", ".", NULL, MS_MOVE, NULL); + init_mount("..", ".", NULL, MS_MOVE, NULL); /* switch root and cwd back to / of rootfs */ ksys_chroot(".."); @@ -114,7 +114,7 @@ static void __init handle_initrd(void) mount_root(); printk(KERN_NOTICE "Trying to move old root to /initrd ... "); - error = do_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL); + error = init_mount("/old", "/root/initrd", NULL, MS_MOVE, NULL); if (!error) printk("okay\n"); else { diff --git a/init/fs.c b/init/fs.c new file mode 100644 index 00000000000000..73423f5461f934 --- /dev/null +++ b/init/fs.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +#include <linux/init.h> +#include <linux/mount.h> +#include <linux/namei.h> +#include <linux/fs.h> +#include "do_mounts.h" + +int __init init_mount(const char *dev_name, const char *dir_name, + const char *type_page, unsigned long flags, void *data_page) +{ + struct path path; + int ret; + + ret = kern_path(dir_name, LOOKUP_FOLLOW, &path); + if (ret) + return ret; + ret = path_mount(dev_name, &path, type_page, flags, data_page); + path_put(&path); + return ret; +} -- 2.27.0
next prev parent reply other threads:[~2020-07-21 16:28 UTC|newest] Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-21 16:27 add file system helpers that take kernel pointers for the init code v2 Christoph Hellwig 2020-07-21 16:27 ` [PATCH 01/24] fs: refactor do_mount Christoph Hellwig 2020-07-21 16:27 ` [PATCH 02/24] fs: refactor ksys_umount Christoph Hellwig 2020-07-21 16:27 ` [PATCH 03/24] fs: push the getname from do_rmdir into the callers Christoph Hellwig 2020-07-21 16:27 ` [PATCH 04/24] devtmpfs: open code do_mount Christoph Hellwig 2020-07-21 16:27 ` [PATCH 05/24] devtmpfs: open code ksys_chdir and ksys_chroot Christoph Hellwig [not found] ` <20200721162818.197315-6-hch-jcswGhMUV9g@public.gmane.org> 2020-07-21 16:49 ` Linus Torvalds 2020-07-21 16:49 ` Linus Torvalds [not found] ` <CAHk-=wi0GQqAq6VSY=O2iWnPuuS54TkyRBH5B9Ca0Kg5A9d2aA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2020-07-21 17:16 ` Al Viro 2020-07-21 17:16 ` Al Viro 2020-07-21 18:26 ` Christoph Hellwig 2020-07-21 16:28 ` [PATCH 06/24] md: open code vfs_stat in md_setup_drive Christoph Hellwig [not found] ` <20200721162818.197315-7-hch-jcswGhMUV9g@public.gmane.org> 2020-07-21 16:55 ` Al Viro 2020-07-21 16:55 ` Al Viro [not found] ` <20200721165539.GT2786714-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org> 2020-07-21 18:27 ` Christoph Hellwig 2020-07-21 18:27 ` Christoph Hellwig [not found] ` <20200721182701.GB14450-jcswGhMUV9g@public.gmane.org> 2020-07-22 7:44 ` Al Viro 2020-07-22 7:44 ` Al Viro [not found] ` <20200722074432.GD2786714-3bDd1+5oDREiFSDQTTA3OLVCufUGDwFn@public.gmane.org> 2020-07-22 14:05 ` Christoph Hellwig 2020-07-22 14:05 ` Christoph Hellwig 2020-07-21 16:28 ` [PATCH 07/24] init: initialize ramdisk_execute_command at compile time Christoph Hellwig 2020-07-21 16:28 ` [PATCH 08/24] init: move the prepare_namespace prototype to init/do_mounts.h Christoph Hellwig 2020-07-21 16:28 ` [PATCH 09/24] init: mark create_dev as __init Christoph Hellwig 2020-07-21 16:28 ` [PATCH 10/24] init: open code ksys_umount in handle_initrd Christoph Hellwig 2020-07-21 16:28 ` [PATCH 11/24] init: open code do_utimes in do_utime Christoph Hellwig [not found] ` <20200721162818.197315-1-hch-jcswGhMUV9g@public.gmane.org> 2020-07-21 16:28 ` Christoph Hellwig [this message] 2020-07-21 16:28 ` [PATCH 12/24] init: add an init_mount helper Christoph Hellwig 2020-07-21 16:58 ` Al Viro 2020-07-21 16:28 ` [PATCH 17/24] init: add an init_chown helper Christoph Hellwig 2020-07-21 16:28 ` Christoph Hellwig 2020-07-21 16:28 ` [PATCH 18/24] init: add an init_chmod helper Christoph Hellwig 2020-07-21 16:28 ` Christoph Hellwig 2020-07-21 16:28 ` [PATCH 20/24] init: add an init_link helper Christoph Hellwig 2020-07-21 16:28 ` Christoph Hellwig 2020-07-21 16:28 ` [PATCH 13/24] init: add an init_unlink helper Christoph Hellwig [not found] ` <20200721162818.197315-14-hch-jcswGhMUV9g@public.gmane.org> 2020-07-21 17:12 ` Al Viro 2020-07-21 17:12 ` Al Viro 2020-07-21 16:28 ` [PATCH 14/24] init: add an init_rmdir helper Christoph Hellwig 2020-07-21 16:28 ` [PATCH 15/24] init: add an init_chdir helper Christoph Hellwig 2020-07-21 16:28 ` [PATCH 16/24] init: add an init_chroot helper Christoph Hellwig 2020-07-21 17:10 ` Al Viro 2020-08-01 18:43 ` kernel test robot 2020-07-21 16:28 ` [PATCH 19/24] init: add an init_eaccess helper Christoph Hellwig 2020-07-21 16:28 ` [PATCH 21/24] init: add an init_symlink helper Christoph Hellwig 2020-07-21 17:00 ` Al Viro 2020-07-21 16:28 ` [PATCH 22/24] init: add an init_mkdir helper Christoph Hellwig 2020-07-21 16:28 ` [PATCH 23/24] init: add an init_mknod helper Christoph Hellwig 2020-07-21 17:02 ` Al Viro 2020-07-21 16:28 ` [PATCH 24/24] init: add an init_lstat helper Christoph Hellwig
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200721162818.197315-13-hch@lst.de \ --to=hch-jcswghmuv9g@public.gmane.org \ --cc=gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org \ --cc=linux-api-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-fsdevel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=linux-raid-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=rafael-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org \ --cc=torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \ --cc=viro-RmSDqhL/yNMiFSDQTTA3OLVCufUGDwFn@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.