Skip to content

bootconfig: Add mixed subkeys and value under the same key

Masami Hiramatsu lkml 4 versions – In review

Get series with b4
b4 am 162262192121.264090.6540508908529705156.stgit@devnote2

Versions newest first · linked by author and title

  1. v4 Latest6 patches 10 repliesIn review
  2. v36 patches 1 replySuperseded
  3. v24 patches 2 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v14 patches3 repliesSuperseded

Changes in v4 from the cover letter

[1/6]:
- Added from separated thread. This is a fundamental fix.
[6/6]:
- New cleanup patch.

Patches in v4 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6tools/bootconfig: Fix a build error accroding to undefined fallthroughtools/bootconfig/include/linux/bootconfig.h+4 -00 replies
2/6bootconfig: Change array value to use child nodefs/proc/bootconfig.c include/linux/bootconfig.h lib/bootconfig.c +1 more+24 -90 replies
3/6bootconfig: Support mixing a value and subkeys under a keyinclude/linux/bootconfig.h lib/bootconfig.c tools/bootconfig/main.c+114 -280 replies
4/6tools/bootconfig: Support mixed value and subkey test casestools/bootconfig/samples/bad-mixed-kv1.bconf tools/bootconfig/samples/bad-mixed-kv2.bconf tools/bootconfig/samples/bad-override.bconf +6 more+20 -120 replies
5/6docs: bootconfig: Update for mixing value and subkeysDocumentation/admin-guide/bootconfig.rst+26 -40 replies
6/6bootconfig: Share the checksum function with toolsinclude/linux/bootconfig.h init/main.c tools/bootconfig/main.c+23 -240 replies

Reviews trailers per patch

None of the 6 patches has a Reviewed-by or Acked-by.

PatchDevin Moore
SeriesT-b
1/6
2/6
3/6
4/6
5/6
6/6

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v4 thread

Cover letter [PATCH v4 0/6] bootconfig: Add mixed subkeys and value under the same key

Hi,

Here is the 4th version of the series which updates bootconfig to support mixed subkeys and a value under the same key.
The 3rd version is completely wrong. I missed to picked up the older (v1) patches to v3. So please ignore v3.

Since the kernel cmdline accepts options like "aaa.bbb=val1 aaa.bbb.ccc=val2", it is better that the bootconfig also support it.

Here is the previous series (v2):
https://lore.kernel.org/lkml/162157886618.78209.11141970623539574861.stgit@devnote2/

In this version, I rebased on top of the latest linus tree and add the build error fix [1/6](*) and a cleanup patch [6/6].

(*) https://lore.kernel.org/lkml/162087519356.442660.11385099982318160180.stgit@devnote2/

Changes in v4
[1/6]:
- Added from separated thread. This is a fundamental fix.
[6/6]:
- New cleanup patch.

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 (6):
tools/bootconfig: Fix a build error accroding to undefined fallthrough
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
bootconfig: Share the checksum function with tools

 Documentation/admin-guide/bootconfig.rst           |   30 +++++++-
 fs/proc/bootconfig.c                               |    2 -
 include/linux/bootconfig.h                         |   58 ++++++++++++++-
 init/main.c                                        |   12 ---
 lib/bootconfig.c                                   |   76 +++++++++++++++-----
 tools/bootconfig/include/linux/bootconfig.h        |    4 +
 tools/bootconfig/main.c                            |   62 +++++++++++-----
 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 +
 16 files changed, 205 insertions(+), 71 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) <[email protected]>