All of lore.kernel.org
 help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>,
	Frank Rowand <frowand.list@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>,
	Randy Dunlap <rdunlap@infradead.org>,
	Namhyung Kim <namhyung@kernel.org>, Tim Bird <Tim.Bird@sony.com>,
	Jiri Olsa <jolsa@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Tom Zanussi <tom.zanussi@linux.intel.com>,
	Rob Herring <robh+dt@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Alexey Dobriyan <adobriyan@gmail.com>,
	Jonathan Corbet <corbet@lwn.net>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v5 02/22] bootconfig: Load boot config from the tail of initrd
Date: Thu, 26 Dec 2019 23:04:13 +0900	[thread overview]
Message-ID: <157736905283.11126.16391120901514076133.stgit@devnote2> (raw)
In-Reply-To: <157736902773.11126.2531161235817081873.stgit@devnote2>

Load the extended boot config data from the tail of initrd
image. If there is an SKC data there, it has
[(u32)size][(u32)checksum] header (in really, this is a
footer) at the end of initrd. If the checksum (simple sum
of bytes) is match, this starts parsing it from there.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 Changes in v4:
  - Rename skc to bootconfig.
---
 0 files changed

diff --git a/init/Kconfig b/init/Kconfig
index 63450d3bbf12..ffd240fb88c3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1217,6 +1217,7 @@ endif
 
 config BOOT_CONFIG
 	bool "Boot config support"
+	depends on BLK_DEV_INITRD
 	select LIBXBC
 	default y
 	help
diff --git a/init/main.c b/init/main.c
index 1ecfd43ed464..a47a95076405 100644
--- a/init/main.c
+++ b/init/main.c
@@ -28,6 +28,7 @@
 #include <linux/initrd.h>
 #include <linux/memblock.h>
 #include <linux/acpi.h>
+#include <linux/bootconfig.h>
 #include <linux/console.h>
 #include <linux/nmi.h>
 #include <linux/percpu.h>
@@ -246,6 +247,58 @@ static int __init loglevel(char *str)
 
 early_param("loglevel", loglevel);
 
+#ifdef CONFIG_BOOT_CONFIG
+u32 boot_config_checksum(unsigned char *p, u32 size)
+{
+	u32 ret = 0;
+
+	while (size--)
+		ret += *p++;
+
+	return ret;
+}
+
+static void __init setup_boot_config(void)
+{
+	u32 size, csum;
+	char *data, *copy;
+	u32 *hdr;
+
+	if (!initrd_end)
+		return;
+
+	hdr = (u32 *)(initrd_end - 8);
+	size = hdr[0];
+	csum = hdr[1];
+
+	if (size >= XBC_DATA_MAX)
+		return;
+
+	data = ((void *)hdr) - size;
+	if ((unsigned long)data < initrd_start)
+		return;
+
+	if (boot_config_checksum((unsigned char *)data, size) != csum)
+		return;
+
+	copy = memblock_alloc(size + 1, SMP_CACHE_BYTES);
+	if (!copy) {
+		pr_err("Failed to allocate memory for boot config\n");
+		return;
+	}
+
+	memcpy(copy, data, size);
+	copy[size] = '\0';
+
+	if (xbc_init(copy) < 0)
+		pr_err("Failed to parse boot config\n");
+	else
+		pr_info("Load boot config: %d bytes\n", size);
+}
+#else
+#define setup_boot_config()	do { } while (0)
+#endif
+
 /* Change NUL term back to "=", to make "param" the whole string. */
 static int __init repair_env_string(char *param, char *val,
 				    const char *unused, void *arg)
@@ -596,6 +649,7 @@ asmlinkage __visible void __init start_kernel(void)
 	pr_notice("%s", linux_banner);
 	early_security_init();
 	setup_arch(&command_line);
+	setup_boot_config();
 	setup_command_line(command_line);
 	setup_nr_cpu_ids();
 	setup_per_cpu_areas();


  parent reply	other threads:[~2019-12-26 14:04 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-26 14:03 [PATCH v5 00/22] tracing: bootconfig: Boot-time tracing and Extra boot config Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 01/22] bootconfig: Add Extra Boot Config support Masami Hiramatsu
2020-01-08  1:59   ` Steven Rostedt
2020-01-08  3:03     ` Steven Rostedt
2020-01-08  5:17     ` Masami Hiramatsu
2020-01-08 14:01       ` Steven Rostedt
2019-12-26 14:04 ` Masami Hiramatsu [this message]
2019-12-26 14:04 ` [PATCH v5 03/22] tools: bootconfig: Add bootconfig command Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 04/22] tools: bootconfig: Add bootconfig test script Masami Hiramatsu
2019-12-26 14:04 ` [PATCH v5 05/22] proc: bootconfig: Add /proc/bootconfig to show boot config list Masami Hiramatsu
2020-01-09 21:37   ` Steven Rostedt
2020-01-10  0:52     ` Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 06/22] init/main.c: Alloc initcall_command_line in do_initcall() and free it Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 07/22] bootconfig: init: Allow admin to use bootconfig for kernel command line Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 08/22] bootconfig: init: Allow admin to use bootconfig for init " Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 09/22] Documentation: bootconfig: Add a doc for extended boot config Masami Hiramatsu
2019-12-26 14:05 ` [PATCH v5 10/22] tracing: Apply soft-disabled and filter to tracepoints printk Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 11/22] tracing: kprobes: Output kprobe event to printk buffer Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 12/22] tracing: kprobes: Register to dynevent earlier stage Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 13/22] tracing: Accept different type for synthetic event fields Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 14/22] tracing: Add NULL trace-array check in print_synth_event() Masami Hiramatsu
2019-12-26 14:06 ` [PATCH v5 15/22] tracing/boot: Add boot-time tracing Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 16/22] tracing/boot: Add per-event settings Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 17/22] tracing/boot Add kprobe event support Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 18/22] tracing/boot: Add synthetic " Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 19/22] tracing/boot: Add instance node support Masami Hiramatsu
2019-12-26 14:07 ` [PATCH v5 20/22] tracing/boot: Add cpu_mask option support Masami Hiramatsu
2019-12-26 14:08 ` [PATCH v5 21/22] tracing/boot: Add function tracer filter options Masami Hiramatsu
2019-12-26 18:05   ` kbuild test robot
2019-12-26 18:05     ` kbuild test robot
2019-12-27  2:56     ` Masami Hiramatsu
2019-12-27  2:56       ` Masami Hiramatsu
2019-12-26 14:08 ` [PATCH v5 22/22] Documentation: tracing: Add boot-time tracing document Masami Hiramatsu
2020-01-09 23:10 ` [PATCH v5 00/22] tracing: bootconfig: Boot-time tracing and Extra boot config Steven Rostedt
2020-01-10 15:30   ` Masami Hiramatsu

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=157736905283.11126.16391120901514076133.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=Tim.Bird@sony.com \
    --cc=acme@kernel.org \
    --cc=adobriyan@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=corbet@lwn.net \
    --cc=frowand.list@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jolsa@redhat.com \
    --cc=linux-doc@vger.kernel.org \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@redhat.com \
    --cc=namhyung@kernel.org \
    --cc=rdunlap@infradead.org \
    --cc=robh+dt@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=tglx@linutronix.de \
    --cc=tom.zanussi@linux.intel.com \
    --cc=torvalds@linux-foundation.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: link
Be 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.