From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
Ingo Molnar <mingo@kernel.org>,
Devin Moore <devinmoore@google.com>
Subject: [PATCH v2 0/4] bootconfig: Add mixed subkeys and value under the same key
Date: Fri, 21 May 2021 15:34:26 +0900 [thread overview]
Message-ID: <162157886618.78209.11141970623539574861.stgit@devnote2> (raw)
Hi,
Here is the 2nd version of the series which updates bootconfig to
support mixed subkeys and a value under the same key.
Since the kernel cmdline accepts options like
"aaa.bbb=val1 aaa.bbb.ccc=val2", it is better that the bootconfig
also support it.
In this version, I fixed [1/4] to show /proc/bootconfig correctly
and update the description.
Changes in v2
[1/4]:
- Fix /proc/bootconfig accroding to Devin's report (Thanks!)
- Update patch description to explain why, not what.
- Use xbc_node_is_array() instead of checking field directly.
[4/4]:
- Update an exmaple code.
This series depends on the below bugfix.
https://lore.kernel.org/lkml/162087519356.442660.11385099982318160180.stgit@devnote2/
With this series, sub-keys and a value can co-exist under a parent key.
For example, following config is allowed.
foo = value1
foo.bar = value2
Note, since there is no syntax to put a raw value directly under a
structured key, you have to define it outside of the brace. For example,
foo {
bar = value1
bar {
baz = value2
qux = value3
}
}
Also, the order of the value node under a key is fixed. If there
are a value and subkeys, the value is always the first child node
of the key. Thus if user specifies subkeys first, e.g.
foo.bar = value1
foo = value2
In the program (and /proc/bootconfig), it will be shown as below
foo = value2
foo.bar = value1
Thank you,
---
Masami Hiramatsu (4):
bootconfig: Change array value to use child node
bootconfig: Support mixing a value and subkeys under a key
tools/bootconfig: Support mixed value and subkey test cases
docs: bootconfig: Update for mixing value and subkeys
Documentation/admin-guide/bootconfig.rst | 30 +++++++-
fs/proc/bootconfig.c | 2 -
include/linux/bootconfig.h | 38 +++++++++-
lib/bootconfig.c | 76 +++++++++++++++-----
tools/bootconfig/main.c | 47 ++++++++++--
tools/bootconfig/samples/bad-mixed-kv1.bconf | 3 -
tools/bootconfig/samples/bad-mixed-kv2.bconf | 3 -
tools/bootconfig/samples/bad-override.bconf | 3 -
tools/bootconfig/samples/bad-override2.bconf | 3 -
tools/bootconfig/samples/good-mixed-append.bconf | 4 +
tools/bootconfig/samples/good-mixed-kv1.bconf | 3 +
tools/bootconfig/samples/good-mixed-kv2.bconf | 3 +
tools/bootconfig/samples/good-mixed-kv3.bconf | 6 ++
tools/bootconfig/samples/good-mixed-override.bconf | 4 +
14 files changed, 178 insertions(+), 47 deletions(-)
delete mode 100644 tools/bootconfig/samples/bad-mixed-kv1.bconf
delete mode 100644 tools/bootconfig/samples/bad-mixed-kv2.bconf
delete mode 100644 tools/bootconfig/samples/bad-override.bconf
delete mode 100644 tools/bootconfig/samples/bad-override2.bconf
create mode 100644 tools/bootconfig/samples/good-mixed-append.bconf
create mode 100644 tools/bootconfig/samples/good-mixed-kv1.bconf
create mode 100644 tools/bootconfig/samples/good-mixed-kv2.bconf
create mode 100644 tools/bootconfig/samples/good-mixed-kv3.bconf
create mode 100644 tools/bootconfig/samples/good-mixed-override.bconf
--
Masami Hiramatsu (Linaro) <mhiramat@kernel.org>
next reply other threads:[~2021-05-21 6:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-21 6:34 Masami Hiramatsu [this message]
2021-05-21 6:34 ` [PATCH v2 1/4] bootconfig: Change array value to use child node Masami Hiramatsu
2021-05-21 6:34 ` [PATCH v2 2/4] bootconfig: Support mixing a value and subkeys under a key Masami Hiramatsu
2021-05-21 6:34 ` [PATCH v2 3/4] tools/bootconfig: Support mixed value and subkey test cases Masami Hiramatsu
2021-05-21 6:35 ` [PATCH v2 4/4] docs: bootconfig: Update for mixing value and subkeys Masami Hiramatsu
2021-05-21 22:06 ` [PATCH v2 0/4] bootconfig: Add mixed subkeys and value under the same key Devin Moore
2021-05-22 1:55 ` 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=162157886618.78209.11141970623539574861.stgit@devnote2 \
--to=mhiramat@kernel.org \
--cc=devinmoore@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox