Messages in this thread | | | From | Devin Moore <> | Date | Fri, 21 May 2021 15:06:22 -0700 | Subject | Re: [PATCH v2 0/4] bootconfig: Add mixed subkeys and value under the same key |
| |
On Thu, May 20, 2021 at 11:34 PM Masami Hiramatsu <mhiramat@kernel.org> wrote: > > 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>
Thanks a lot! I tested this on an Android virtual device(Cuttlefish) with a variety of parameters that included array values. I checked the output in /proc/bootconfig before and after the changes. I added a new parameter that failed before these changes and it worked great! Added 'androidboot.hardware=cutf_cvm ' which worked with 'androidboot.hardware.gralloc = "minigbm"' that was already present. So,
Tested-by: Devin Moore <devinmoore@google.com>
| |