lkml.org 
[lkml]   [2018]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] [RFC] initrd/initramfs: extracted common code to init_rootfs.c file
Date
Extracted from initramfs to common place code that sits on top of
iniramfs and initrd and initializes one or another depending on
configuration.

Signed-off-by: Vasyl Vavrychuk <vvavrychuk@gmail.com>
---
init/Makefile | 5 +-
init/default_rootfs.c | 52 ++++++++++++++++
init/do_mounts_initrd.c | 2 -
init/init_rootfs.c | 162 ++++++++++++++++++++++++++++++++++++++++++++++++
init/initramfs.c | 156 +---------------------------------------------
init/initramfs.h | 4 ++
init/noinitramfs.c | 52 ----------------
7 files changed, 222 insertions(+), 211 deletions(-)
create mode 100644 init/default_rootfs.c
create mode 100644 init/init_rootfs.c
create mode 100644 init/initramfs.h
delete mode 100644 init/noinitramfs.c

diff --git a/init/Makefile b/init/Makefile
index a3e5ce2..d513411 100644
--- a/init/Makefile
+++ b/init/Makefile
@@ -7,10 +7,11 @@ ccflags-y := -fno-function-sections -fno-data-sections

obj-y := main.o version.o mounts.o
ifneq ($(CONFIG_BLK_DEV_INITRD),y)
-obj-y += noinitramfs.o
+obj-y += default_rootfs.o
else
-obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o
+obj-$(CONFIG_BLK_DEV_INITRD) += init_rootfs.o
endif
+obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o
obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o

obj-y += init_task.o
diff --git a/init/default_rootfs.c b/init/default_rootfs.c
new file mode 100644
index 0000000..f4bad84
--- /dev/null
+++ b/init/default_rootfs.c
@@ -0,0 +1,52 @@
+/*
+ * init/noinitramfs.c
+ *
+ * Copyright (C) 2006, NXP Semiconductors, All Rights Reserved
+ * Author: Jean-Paul Saman <jean-paul.saman@nxp.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+#include <linux/init.h>
+#include <linux/stat.h>
+#include <linux/kdev_t.h>
+#include <linux/syscalls.h>
+
+/*
+ * Create a simple rootfs that is similar to the default initramfs
+ */
+static int __init default_rootfs(void)
+{
+ int err;
+
+ err = ksys_mkdir((const char __user __force *) "/dev", 0755);
+ if (err < 0)
+ goto out;
+
+ err = ksys_mknod((const char __user __force *) "/dev/console",
+ S_IFCHR | S_IRUSR | S_IWUSR,
+ new_encode_dev(MKDEV(5, 1)));
+ if (err < 0)
+ goto out;
+
+ err = ksys_mkdir((const char __user __force *) "/root", 0700);
+ if (err < 0)
+ goto out;
+
+ return 0;
+
+out:
+ printk(KERN_WARNING "Failed to create a rootfs\n");
+ return err;
+}
+rootfs_initcall(default_rootfs);
diff --git a/init/do_mounts_initrd.c b/init/do_mounts_initrd.c
index 5a91aef..05b958f 100644
--- a/init/do_mounts_initrd.c
+++ b/init/do_mounts_initrd.c
@@ -21,8 +21,6 @@

#include "do_mounts.h"

-unsigned long initrd_start, initrd_end;
-int initrd_below_start_ok;
unsigned int real_root_dev; /* do_proc_dointvec cannot handle kdev_t */
static int __initdata mount_initrd = 1;

diff --git a/init/init_rootfs.c b/init/init_rootfs.c
new file mode 100644
index 0000000..bd70072
--- /dev/null
+++ b/init/init_rootfs.c
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/init.h>
+#include <linux/file.h>
+#include "initramfs.h"
+
+/* externally loaded initrd or initramfs location */
+unsigned long initrd_start, initrd_end;
+int initrd_below_start_ok;
+
+static int __initdata do_retain_initrd;
+
+static int __init retain_initrd_param(char *str)
+{
+ if (*str)
+ return 0;
+ do_retain_initrd = 1;
+ return 1;
+}
+__setup("retain_initrd", retain_initrd_param);
+
+extern char __initramfs_start[];
+extern unsigned long __initramfs_size;
+#include <linux/initrd.h>
+#include <linux/kexec.h>
+
+static void __init free_initrd(void)
+{
+#ifdef CONFIG_KEXEC_CORE
+ unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
+ unsigned long crashk_end = (unsigned long)__va(crashk_res.end);
+#endif
+ if (do_retain_initrd)
+ goto skip;
+
+#ifdef CONFIG_KEXEC_CORE
+ /*
+ * If the initrd region is overlapped with crashkernel reserved region,
+ * free only memory that is not part of crashkernel region.
+ */
+ if (initrd_start < crashk_end && initrd_end > crashk_start) {
+ /*
+ * Initialize initrd memory region since the kexec boot does
+ * not do.
+ */
+ memset((void *)initrd_start, 0, initrd_end - initrd_start);
+ if (initrd_start < crashk_start)
+ free_initrd_mem(initrd_start, crashk_start);
+ if (initrd_end > crashk_end)
+ free_initrd_mem(crashk_end, initrd_end);
+ } else
+#endif
+ free_initrd_mem(initrd_start, initrd_end);
+skip:
+ initrd_start = 0;
+ initrd_end = 0;
+}
+
+#ifdef CONFIG_BLK_DEV_RAM
+#define BUF_SIZE 1024
+static void __init clean_rootfs(void)
+{
+ int fd;
+ void *buf;
+ struct linux_dirent64 *dirp;
+ int num;
+
+ fd = ksys_open("/", O_RDONLY, 0);
+ WARN_ON(fd < 0);
+ if (fd < 0)
+ return;
+ buf = kzalloc(BUF_SIZE, GFP_KERNEL);
+ WARN_ON(!buf);
+ if (!buf) {
+ ksys_close(fd);
+ return;
+ }
+
+ dirp = buf;
+ num = ksys_getdents64(fd, dirp, BUF_SIZE);
+ while (num > 0) {
+ while (num > 0) {
+ struct kstat st;
+ int ret;
+
+ ret = vfs_lstat(dirp->d_name, &st);
+ WARN_ON_ONCE(ret);
+ if (!ret) {
+ if (S_ISDIR(st.mode))
+ ksys_rmdir(dirp->d_name);
+ else
+ ksys_unlink(dirp->d_name);
+ }
+
+ num -= dirp->d_reclen;
+ dirp = (void *)dirp + dirp->d_reclen;
+ }
+ dirp = buf;
+ memset(buf, 0, BUF_SIZE);
+ num = ksys_getdents64(fd, dirp, BUF_SIZE);
+ }
+
+ ksys_close(fd);
+ kfree(buf);
+}
+#endif
+
+static int __init populate_rootfs(void)
+{
+ /* Load the built in initramfs */
+ char *err = initramfs_unpack_to_rootfs(__initramfs_start, __initramfs_size);
+ if (err)
+ panic("%s", err); /* Failed to decompress INTERNAL initramfs */
+ /* If available load the bootloader supplied initrd */
+ if (initrd_start && !IS_ENABLED(CONFIG_INITRAMFS_FORCE)) {
+#ifdef CONFIG_BLK_DEV_RAM
+ int fd;
+ printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n");
+ err = initramfs_unpack_to_rootfs((char *)initrd_start,
+ initrd_end - initrd_start);
+ if (!err) {
+ free_initrd();
+ goto done;
+ } else {
+ clean_rootfs();
+ initramfs_unpack_to_rootfs(__initramfs_start, __initramfs_size);
+ }
+ printk(KERN_INFO "rootfs image is not initramfs (%s)"
+ "; looks like an initrd\n", err);
+ fd = ksys_open("/initrd.image",
+ O_WRONLY|O_CREAT, 0700);
+ if (fd >= 0) {
+ ssize_t written = xwrite(fd, (char *)initrd_start,
+ initrd_end - initrd_start);
+
+ if (written != initrd_end - initrd_start)
+ pr_err("/initrd.image: incomplete write (%zd != %ld)\n",
+ written, initrd_end - initrd_start);
+
+ ksys_close(fd);
+ free_initrd();
+ }
+ done:
+ /* empty statement */;
+#else
+ printk(KERN_INFO "Unpacking initramfs...\n");
+ err = initramfs_unpack_to_rootfs((char *)initrd_start,
+ initrd_end - initrd_start);
+ if (err)
+ printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
+ free_initrd();
+#endif
+ }
+ flush_delayed_fput();
+ /*
+ * Try loading default modules from initramfs. This gives
+ * us a chance to load before device_initcalls.
+ */
+ load_default_modules();
+
+ return 0;
+}
+rootfs_initcall(populate_rootfs);
diff --git a/init/initramfs.c b/init/initramfs.c
index 13643c4..eea6eb1 100644
--- a/init/initramfs.c
+++ b/init/initramfs.c
@@ -448,7 +448,7 @@ static unsigned long my_inptr; /* index of next byte to be processed in inbuf */

#include <linux/decompress/generic.h>

-static char * __init unpack_to_rootfs(char *buf, unsigned long len)
+char * __init initramfs_unpack_to_rootfs(char *buf, unsigned long len)
{
long written;
decompress_fn decompress;
@@ -509,157 +509,3 @@ static char * __init unpack_to_rootfs(char *buf, unsigned long len)
kfree(header_buf);
return message;
}
-
-static int __initdata do_retain_initrd;
-
-static int __init retain_initrd_param(char *str)
-{
- if (*str)
- return 0;
- do_retain_initrd = 1;
- return 1;
-}
-__setup("retain_initrd", retain_initrd_param);
-
-extern char __initramfs_start[];
-extern unsigned long __initramfs_size;
-#include <linux/initrd.h>
-#include <linux/kexec.h>
-
-static void __init free_initrd(void)
-{
-#ifdef CONFIG_KEXEC_CORE
- unsigned long crashk_start = (unsigned long)__va(crashk_res.start);
- unsigned long crashk_end = (unsigned long)__va(crashk_res.end);
-#endif
- if (do_retain_initrd)
- goto skip;
-
-#ifdef CONFIG_KEXEC_CORE
- /*
- * If the initrd region is overlapped with crashkernel reserved region,
- * free only memory that is not part of crashkernel region.
- */
- if (initrd_start < crashk_end && initrd_end > crashk_start) {
- /*
- * Initialize initrd memory region since the kexec boot does
- * not do.
- */
- memset((void *)initrd_start, 0, initrd_end - initrd_start);
- if (initrd_start < crashk_start)
- free_initrd_mem(initrd_start, crashk_start);
- if (initrd_end > crashk_end)
- free_initrd_mem(crashk_end, initrd_end);
- } else
-#endif
- free_initrd_mem(initrd_start, initrd_end);
-skip:
- initrd_start = 0;
- initrd_end = 0;
-}
-
-#ifdef CONFIG_BLK_DEV_RAM
-#define BUF_SIZE 1024
-static void __init clean_rootfs(void)
-{
- int fd;
- void *buf;
- struct linux_dirent64 *dirp;
- int num;
-
- fd = ksys_open("/", O_RDONLY, 0);
- WARN_ON(fd < 0);
- if (fd < 0)
- return;
- buf = kzalloc(BUF_SIZE, GFP_KERNEL);
- WARN_ON(!buf);
- if (!buf) {
- ksys_close(fd);
- return;
- }
-
- dirp = buf;
- num = ksys_getdents64(fd, dirp, BUF_SIZE);
- while (num > 0) {
- while (num > 0) {
- struct kstat st;
- int ret;
-
- ret = vfs_lstat(dirp->d_name, &st);
- WARN_ON_ONCE(ret);
- if (!ret) {
- if (S_ISDIR(st.mode))
- ksys_rmdir(dirp->d_name);
- else
- ksys_unlink(dirp->d_name);
- }
-
- num -= dirp->d_reclen;
- dirp = (void *)dirp + dirp->d_reclen;
- }
- dirp = buf;
- memset(buf, 0, BUF_SIZE);
- num = ksys_getdents64(fd, dirp, BUF_SIZE);
- }
-
- ksys_close(fd);
- kfree(buf);
-}
-#endif
-
-static int __init populate_rootfs(void)
-{
- /* Load the built in initramfs */
- char *err = unpack_to_rootfs(__initramfs_start, __initramfs_size);
- if (err)
- panic("%s", err); /* Failed to decompress INTERNAL initramfs */
- /* If available load the bootloader supplied initrd */
- if (initrd_start && !IS_ENABLED(CONFIG_INITRAMFS_FORCE)) {
-#ifdef CONFIG_BLK_DEV_RAM
- int fd;
- printk(KERN_INFO "Trying to unpack rootfs image as initramfs...\n");
- err = unpack_to_rootfs((char *)initrd_start,
- initrd_end - initrd_start);
- if (!err) {
- free_initrd();
- goto done;
- } else {
- clean_rootfs();
- unpack_to_rootfs(__initramfs_start, __initramfs_size);
- }
- printk(KERN_INFO "rootfs image is not initramfs (%s)"
- "; looks like an initrd\n", err);
- fd = ksys_open("/initrd.image",
- O_WRONLY|O_CREAT, 0700);
- if (fd >= 0) {
- ssize_t written = xwrite(fd, (char *)initrd_start,
- initrd_end - initrd_start);
-
- if (written != initrd_end - initrd_start)
- pr_err("/initrd.image: incomplete write (%zd != %ld)\n",
- written, initrd_end - initrd_start);
-
- ksys_close(fd);
- free_initrd();
- }
- done:
- /* empty statement */;
-#else
- printk(KERN_INFO "Unpacking initramfs...\n");
- err = unpack_to_rootfs((char *)initrd_start,
- initrd_end - initrd_start);
- if (err)
- printk(KERN_EMERG "Initramfs unpacking failed: %s\n", err);
- free_initrd();
-#endif
- }
- flush_delayed_fput();
- /*
- * Try loading default modules from initramfs. This gives
- * us a chance to load before device_initcalls.
- */
- load_default_modules();
-
- return 0;
-}
-rootfs_initcall(populate_rootfs);
diff --git a/init/initramfs.h b/init/initramfs.h
new file mode 100644
index 0000000..3ecad6f
--- /dev/null
+++ b/init/initramfs.h
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
+#include <linux/init.h>
+
+char * __init initramfs_unpack_to_rootfs(char *buf, unsigned long len);
diff --git a/init/noinitramfs.c b/init/noinitramfs.c
deleted file mode 100644
index f4bad84..0000000
--- a/init/noinitramfs.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * init/noinitramfs.c
- *
- * Copyright (C) 2006, NXP Semiconductors, All Rights Reserved
- * Author: Jean-Paul Saman <jean-paul.saman@nxp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-#include <linux/init.h>
-#include <linux/stat.h>
-#include <linux/kdev_t.h>
-#include <linux/syscalls.h>
-
-/*
- * Create a simple rootfs that is similar to the default initramfs
- */
-static int __init default_rootfs(void)
-{
- int err;
-
- err = ksys_mkdir((const char __user __force *) "/dev", 0755);
- if (err < 0)
- goto out;
-
- err = ksys_mknod((const char __user __force *) "/dev/console",
- S_IFCHR | S_IRUSR | S_IWUSR,
- new_encode_dev(MKDEV(5, 1)));
- if (err < 0)
- goto out;
-
- err = ksys_mkdir((const char __user __force *) "/root", 0700);
- if (err < 0)
- goto out;
-
- return 0;
-
-out:
- printk(KERN_WARNING "Failed to create a rootfs\n");
- return err;
-}
-rootfs_initcall(default_rootfs);
--
2.7.4
\
 
 \ /
  Last update: 2018-07-16 10:12    [W:0.053 / U:1.160 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site