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>,
	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: [RFC PATCH v3 02/19] skc: Add /proc/sup_cmdline to show SKC key-value list
Date: Mon, 26 Aug 2019 12:16:01 +0900	[thread overview]
Message-ID: <156678936178.21459.13301820262182543136.stgit@devnote2> (raw)
In-Reply-To: <156678933823.21459.4100380582025186209.stgit@devnote2>

Add /proc/sup_cmdline which shows the list of key-value pairs
in SKC data. Since after boot, all SKC data and tree are
removed, this interface just keep a copy of key-value
pairs in text.

Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 MAINTAINERS           |    1 
 fs/proc/Makefile      |    1 
 fs/proc/sup_cmdline.c |  106 +++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 108 insertions(+)
 create mode 100644 fs/proc/sup_cmdline.c

diff --git a/MAINTAINERS b/MAINTAINERS
index 67590c0e37c5..10dd38311d96 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15366,6 +15366,7 @@ SUPPLEMENTAL KERNEL CMDLINE
 M:	Masami Hiramatsu <mhiramat@kernel.org>
 S:	Maintained
 F:	lib/skc.c
+F:	fs/proc/sup_cmdline.c
 F:	include/linux/skc.h
 
 SUN3/3X
diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index ead487e80510..a5d018f9422c 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -33,3 +33,4 @@ proc-$(CONFIG_PROC_KCORE)	+= kcore.o
 proc-$(CONFIG_PROC_VMCORE)	+= vmcore.o
 proc-$(CONFIG_PRINTK)	+= kmsg.o
 proc-$(CONFIG_PROC_PAGE_MONITOR)	+= page.o
+proc-$(CONFIG_SKC)	+= sup_cmdline.o
diff --git a/fs/proc/sup_cmdline.c b/fs/proc/sup_cmdline.c
new file mode 100644
index 000000000000..97bc40f0c9dd
--- /dev/null
+++ b/fs/proc/sup_cmdline.c
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * /proc/sup_cmdline - Supplemental kernel command line
+ */
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/printk.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/skc.h>
+#include <linux/slab.h>
+
+static char *saved_sup_cmdline;
+
+static int skc_proc_show(struct seq_file *m, void *v)
+{
+	if (saved_sup_cmdline)
+		seq_puts(m, saved_sup_cmdline);
+	else
+		seq_putc(m, '\n');
+	return 0;
+}
+
+static int __init update_snprintf(char **dstp, size_t *sizep,
+				  const char *fmt, ...)
+{
+	va_list args;
+	int ret;
+
+	va_start(args, fmt);
+	ret = vsnprintf(*dstp, *sizep, fmt, args);
+	va_end(args);
+
+	if (*sizep && ret > 0) {
+		*sizep -= ret;
+		*dstp += ret;
+	}
+
+	return ret;
+}
+
+/* Return the needed total length if @size is 0 */
+static int __init copy_skc_key_value_list(char *dst, size_t size)
+{
+	struct skc_node *leaf, *vnode;
+	const char *val;
+	int len = 0, ret = 0;
+	char *key;
+
+	key = kzalloc(SKC_KEYLEN_MAX, GFP_KERNEL);
+
+	skc_for_each_key_value(leaf, val) {
+		ret = skc_node_compose_key(leaf, key, SKC_KEYLEN_MAX);
+		if (ret < 0)
+			break;
+		ret = update_snprintf(&dst, &size, "%s = ", key);
+		if (ret < 0)
+			break;
+		len += ret;
+		vnode = skc_node_get_child(leaf);
+		if (vnode && skc_node_is_array(vnode)) {
+			skc_array_for_each_value(vnode, val) {
+				ret = update_snprintf(&dst, &size, "\"%s\"%s",
+					val, vnode->next ? ", " : ";\n");
+				if (ret < 0)
+					goto out;
+				len += ret;
+			}
+		} else {
+			ret = update_snprintf(&dst, &size, "\"%s\";\n", val);
+			if (ret < 0)
+				break;
+			len += ret;
+		}
+	}
+out:
+	kfree(key);
+
+	return ret < 0 ? ret : len;
+}
+
+static int __init proc_skc_init(void)
+{
+	int len;
+
+	len = copy_skc_key_value_list(NULL, 0);
+	if (len < 0)
+		return len;
+
+	if (len > 0) {
+		saved_sup_cmdline = kzalloc(len + 1, GFP_KERNEL);
+		if (!saved_sup_cmdline)
+			return -ENOMEM;
+
+		len = copy_skc_key_value_list(saved_sup_cmdline, len + 1);
+		if (len < 0) {
+			kfree(saved_sup_cmdline);
+			return len;
+		}
+	}
+
+	proc_create_single("sup_cmdline", 0, NULL, skc_proc_show);
+
+	return 0;
+}
+fs_initcall(proc_skc_init);


  parent reply	other threads:[~2019-08-26  3:16 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-26  3:15 [RFC PATCH v3 00/19] tracing: skc: Boot-time tracing and Supplemental Kernel Cmdline Masami Hiramatsu
2019-08-26  3:15 ` [RFC PATCH v3 01/19] skc: Add supplemental kernel cmdline support Masami Hiramatsu
2019-08-26 13:27   ` Rob Herring
2019-08-27  2:37     ` Masami Hiramatsu
2019-08-26  3:16 ` Masami Hiramatsu [this message]
2019-08-26  3:16 ` [RFC PATCH v3 03/19] skc: Add a boot setup routine from cmdline Masami Hiramatsu
2019-08-26  3:16 ` [RFC PATCH v3 04/19] Documentation: skc: Add a doc for supplemental kernel cmdline Masami Hiramatsu
2019-08-26  3:16 ` [RFC PATCH v3 05/19] tracing: Apply soft-disabled and filter to tracepoints printk Masami Hiramatsu
2019-08-26  3:16 ` [RFC PATCH v3 06/19] tracing: kprobes: Output kprobe event to printk buffer Masami Hiramatsu
2019-08-26  3:17 ` [RFC PATCH v3 07/19] tracing: Expose EXPORT_SYMBOL_GPL symbol Masami Hiramatsu
2019-08-26  3:17 ` [RFC PATCH v3 08/19] tracing: kprobes: Register to dynevent earlier stage Masami Hiramatsu
2019-08-26  3:17 ` [RFC PATCH v3 09/19] tracing: Accept different type for synthetic event fields Masami Hiramatsu
2019-08-26  3:17 ` [RFC PATCH v3 10/19] tracing: Add NULL trace-array check in print_synth_event() Masami Hiramatsu
2019-08-26  3:17 ` [RFC PATCH v3 11/19] tracing/boot: Add boot-time tracing by supplemental kernel cmdline Masami Hiramatsu
2019-08-26  3:18 ` [RFC PATCH v3 12/19] tracing/boot: Add per-event settings Masami Hiramatsu
2019-08-26  3:18 ` [RFC PATCH v3 13/19] tracing/boot Add kprobe event support Masami Hiramatsu
2019-08-26  3:18 ` [RFC PATCH v3 14/19] tracing/boot: Add synthetic " Masami Hiramatsu
2019-08-26  3:18 ` [RFC PATCH v3 15/19] tracing/boot: Add instance node support Masami Hiramatsu
2019-08-26  3:18 ` [RFC PATCH v3 16/19] tracing/boot: Add cpu_mask option support Masami Hiramatsu
2019-08-26  3:18 ` [RFC PATCH v3 17/19] tracing/boot: Add function tracer filter options Masami Hiramatsu
2019-08-26  3:19 ` [RFC PATCH v3 18/19] tracing/boot: Add function-graph tracer options Masami Hiramatsu
2019-08-26  3:19 ` [RFC PATCH v3 19/19] Documentation: tracing: Add boot-time tracing document 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=156678936178.21459.13301820262182543136.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=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.