fit: dm-verity support
cover fit: dm-verity support
Hi,
This series adds dm-verity support to U-Boot's FIT image infrastructure. It is the first logical subset of the larger OpenWrt boot method series posted as an RFC in February 2026 [1], extracted here for independent review and merging.
OpenWrt's firmware model embeds a read-only squashfs or erofs root filesystem directly inside a uImage.FIT container as a FILESYSTEM-type loadable FIT image. At boot the kernel maps this sub-image directly from the underlying block device via the fitblk driver (/dev/fit0, /dev/fit1, ...), the goal is that the bootloader never even copies it to RAM.
dm-verity enables the kernel to verify the integrity of those mapped filesystems at read time, with a Merkle hash tree stored contiguously in the same sub-image just after the data. Two kernel command-line parameters are required:
dm-mod.create= -- the device-mapper target table for the verity device
dm-mod.waitfor= -- a comma-separated list of block devices to wait for
before dm-init sets up the targets (needed when fitblk probes late, e.g. because it depends on NVMEM calibration data)
The FIT dm-verity node schema was upstreamed into the flat-image-tree specification [2], which this implementation tries to follow exactly.
The runtime feature is guarded behind CONFIG_FIT_VERITY. If not enabled the resulting binary size remains unchanged. If enabled the binary size increases by about 3kB.
[1] RFC/v2: https://www.mail-archive.com/[email protected]/msg565945.html
[2] flat-image-tree dm-verity node spec:
https://github.com/open-source-firmware/flat-image-tree/commit/795fd5fd7f0121d0cb03efb1900aafc61c704771
Daniel Golle (4):
image: fit: add dm-verity property name constants
boot: fit: support generating DM verity cmdline parameters
tools: mkimage: add dm-verity Merkle-tree generation
doc: fit: add dm-verity boot parameter documentation
boot/Kconfig | 21 ++ boot/bootm.c | 7 + boot/image-board.c | 5 + boot/image-fit.c | 336 ++++++++++++++++++++++++++++++++ doc/usage/fit/dm-verity.rst | 279 +++++++++++++++++++++++++++ doc/usage/fit/index.rst | 1 + include/image.h | 97 +++++++++- tools/fit_image.c | 111 ++++++++++- tools/image-host.c | 369 +++++++++++++++++++++++++++++++++++- 9 files changed, 1215 insertions(+), 11 deletions(-) create mode 100644 doc/usage/fit/dm-verity.rst
Signature · 1 line
2.53.0
PATCH 1/4 image: fit: add dm-verity property name constants
Add FIT_VERITY_NODENAME and the complete set of FIT_VERITY_*_PROP constants for the dm-verity child node of filesystem-type images, plus the five optional boolean error-handling property names aligned with the flat-image-tree specification.
--- include/image.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
include/image.h +17 -0
@@ -1079,6 +1079,23 @@ int booti_setup(ulong image, ulong *relocated_addr, ulong *size,#define FIT_CIPHER_NODENAME "cipher"#define FIT_ALGO_PROP "algo" +/* dm-verity node */ +#define FIT_VERITY_NODENAME "dm-verity" +#define FIT_VERITY_ALGO_PROP "algo" +#define FIT_VERITY_DBS_PROP "data-block-size" +#define FIT_VERITY_HBS_PROP "hash-block-size" +#define FIT_VERITY_NBLK_PROP "num-data-blocks" +#define FIT_VERITY_HBLK_PROP "hash-start-block" +#define FIT_VERITY_DIGEST_PROP "digest" +#define FIT_VERITY_SALT_PROP "salt" + +/* dm-verity error-handling modes (optional boolean property names) */ +#define FIT_VERITY_OPT_RESTART "restart-on-corruption" +#define FIT_VERITY_OPT_PANIC "panic-on-corruption" +#define FIT_VERITY_OPT_RERR "restart-on-error" +#define FIT_VERITY_OPT_PERR "panic-on-error" +#define FIT_VERITY_OPT_ONCE "check-at-most-once" +/* image node */ #define FIT_DATA_PROP "data"#define FIT_DATA_POSITION_PROP "data-position"
Signature · 1 line
2.53.0
PATCH 2/4 boot: fit: support generating DM verity cmdline parameters
In reply to Daniel GolleAdd fit_verity_build_cmdline(): when a FILESYSTEM loadable carries a dm-verity subnode, construct the dm-mod.create= kernel cmdline parameter from the verity metadata (block-size, data-blocks, algo, root-hash, salt) and append it to bootargs.
Also add dm-mod.waitfor=/dev/fit0[,/dev/fitN] for each dm-verity device so the kernel waits for the underlying FIT block device to appear before setting up device-mapper targets. This is needed when the block driver probes late, e.g. because it depends on NVMEM calibration data.
The dm-verity target references /dev/fitN where N is the loadable's index in the configuration -- matching the order Linux's FIT block driver assigns block devices. hash-start-block is read directly from the FIT dm-verity node; mkimage ensures its value equals num-data-blocks by invoking veritysetup with --no-superblock.
--- boot/Kconfig | 21 +++ boot/bootm.c | 7 + boot/image-board.c | 5 + boot/image-fit.c | 336 +++++++++++++++++++++++++++++++++++++++++++++ include/image.h | 80 ++++++++++- 5 files changed, 448 insertions(+), 1 deletion(-)
boot/Kconfig +21 -0
@@ -142,6 +142,27 @@ config FIT_CIPHER Enable the feature of data ciphering/unciphering in the tool mkimage and in the u-boot support of the FIT image. +config FIT_VERITY + bool "dm-verity boot parameter generation from FIT metadata" + depends on FIT && OF_LIBFDT + help + When a FIT configuration contains loadable sub-images of type + IH_TYPE_FILESYSTEM with a dm-verity subnode, this option enables + building the dm-mod.create= and dm-mod.waitfor= kernel + command-line parameters from the verity metadata + (data-block-size, hash-block-size, num-data-blocks, + hash-start-block, algorithm, digest, salt) stored in the FIT. + + The generated parameters reference /dev/fitN block devices that + Linux's uImage.FIT block driver assigns to loadable sub-images. + + During FIT parsing (BOOTM_STATE_FINDOTHER), verity cmdline + fragments are stored in struct bootm_headers and automatically + appended to the bootargs environment variable during + BOOTM_STATE_OS_PREP. This works from both the bootm command + and BOOTSTD bootmeths. + + config FIT_VERBOSE bool "Show verbose messages when FIT images fail" help
boot/bootm.c +7 -0
@@ -242,6 +242,7 @@ static int boot_get_kernel(const char *addr_fit, struct bootm_headers *images,static int bootm_start (void ) { +fit_verity_free (&images);memset ((void *)&images,0 ,sizeof (images)); images.verify =env_get_yesno ("verify" );
@@ -1070,6 +1071,12 @@ int bootm_run_states(struct bootm_info *bmi, int states)/* For Linux OS do all substitutions at console processing */ if (images->os.os ==IH_OS_LINUX ) flags =BOOTM_CL_ALL ; + ret =fit_verity_apply_bootargs (images); +if (ret) { +printf ("dm-verity bootargs failed (err=%d)\n" , ret); + ret =CMD_RET_FAILURE ; + goto err; + } ret =bootm_process_cmdline_env (flags);if (ret) {printf ("Cmdline setup failed (err=%d)\n" , ret);
boot/image-board.c +5 -0
@@ -810,6 +810,11 @@ int boot_get_loadable(struct bootm_headers *images)fit_loadable_process (img_type, img_data, img_len); } + + fit_img_result =fit_verity_build_cmdline (buf, conf_noffset, + images); +if (fit_img_result <0 ) +return fit_img_result;break ;default :printf ("The given image format is not supported (corrupt?)\n" );
boot/image-fit.c +336 -0
358 lines not on this page · raw message
include/image.h +79 -1
92 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 3/4 tools: mkimage: add dm-verity Merkle-tree generation
In reply to Daniel GolleWhen mkimage encounters a dm-verity subnode inside a component image node it now automatically invokes veritysetup(8) with --no-superblock to generate the Merkle hash tree, screen-scrapes the Root hash and Salt from the tool output, and writes the computed properties back into the FIT blob.
The user only needs to specify algorithm, data-block-size, and hash-block-size in the ITS; mkimage fills in digest, salt, num-data-blocks, and hash-start-block. Because --no-superblock is used, hash-start-block equals num-data-blocks with no off-by-one.
The image data property is replaced with the expanded content (original data followed directly by the hash tree) so that subsequent hash and signature subnodes operate on the complete image.
fit_image_add_verification_data() is restructured into two passes:
dm-verity first (may grow data), then hashes and signatures.
--- tools/fit_image.c | 111 +++++++++++++- tools/image-host.c | 369 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 470 insertions(+), 10 deletions(-)
tools/fit_image.c +105 -6
@@ -40,10 +40,10 @@ static int fit_estimate_hash_sig_size(struct image_tool_params *params, const chreturn -EIO ;/* -* Walk the FIT image, looking for nodes named hash* and -* signature*. Since the interesting nodes are subnodes of an -* image or configuration node, we are only interested in -* those at depth exactly 3. +* Walk the FIT image, looking for nodes named hash*, +* signature*, and dm-verity. Since the interesting nodes are +* subnodes of an image or configuration node, we are only +* interested in those at depth exactly 3. * * The estimate for a hash node is based on a sha512 digest * being 64 bytes, with another 64 bytes added to account for
@@ -55,6 +55,10 @@ static int fit_estimate_hash_sig_size(struct image_tool_params *params, const ch* account for fdt overhead and the various other properties * (hashed-nodes etc.) that will also be filled in. * +* For a dm-verity node the small metadata properties (digest, +* salt, two u32s and a temp-file path) are written into the +* FDT by fit_image_process_verity(). +* * One could try to be more precise in the estimates by * looking at the "algo" property and, in the case of * configuration signatures, the sign-images property. Also,
@@ -76,6 +80,18 @@ static int fit_estimate_hash_sig_size(struct image_tool_params *params, const chif (signing && !strncmp (name,FIT_SIG_NODENAME ,strlen (FIT_SIG_NODENAME ))) estimate +=1024 ; + +if (!strcmp (name,FIT_VERITY_NODENAME )) { +if (!params->external_data) { +fprintf (stderr, +"%s: dm-verity requires external data (-E)\n" , + params->cmdname); +munmap (fdt, sbuf.st_size); +close (fd); +return -EINVAL ; + } + estimate +=256 ; + } }munmap (fdt, sbuf.st_size);
@@ -470,6 +486,62 @@ static int fit_write_images(struct image_tool_params *params, char *fdt)return 0 ; } +/** +* fit_copy_image_data() - copy image data, using verity temp file if present +* @fdt: FIT blob +* @node: image node offset +* @buf: destination buffer +* @buf_ptr: write offset within @buf +* @data: embedded image data (used when no verity temp file exists) +* @lenp: in/out: on entry, length of @data; on exit, bytes written +* +* When fit_image_process_verity() has run, a temp-file path is stored in +* the dm-verity subnode. Read that file (original data + hash tree) into +* @buf instead of copying the embedded data property. +* +* Return: 0 on success, -EIO on error +*/ +static int fit_copy_image_data (void *fdt,int node,void *buf, +int buf_ptr,const void *data,int *lenp) +{ +const char *vfile; +char vfile_buf[256 ]; +struct stat vst; +int vfd; +int vn; + + vn =fdt_subnode_offset (fdt, node,FIT_VERITY_NODENAME ); + vfile =NULL ; +if (vn >=0 ) + vfile =fdt_getprop (fdt, vn,"verity-data-file" ,NULL ); +if (!vfile) { +memcpy (buf + buf_ptr, data, *lenp); +return 0 ; + } + +/* Copy path -- FDT shifts after delprop */ +snprintf (vfile_buf,sizeof (vfile_buf),"%s" , vfile); +fdt_delprop (fdt, vn,"verity-data-file" ); + +if (stat (vfile_buf, &vst)) { +fprintf (stderr,"Can't stat verity data: %s\n" , +strerror (errno)); +return -EIO ; + } + vfd =open (vfile_buf,O_RDONLY ); +if (vfd <0 ||read (vfd, buf + buf_ptr, vst.st_size) != vst.st_size) { +fprintf (stderr,"Can't read verity data: %s\n" , +strerror (errno)); +if (vfd >=0 ) +close (vfd); +return -EIO ; + } +close (vfd); + *lenp = vst.st_size; +unlink (vfile_buf); +return 0 ; +} +/** * fit_write_configs() - Write out a list of configurations to the FIT *
@@ -653,6 +725,11 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname)int node;int align_size =0 ;int len =0 ; +int verity_extra =0 ; +int orig_len; +int vn; +const char *vf; +struct stat vst; fd =mmap_fdt (params->cmdname, fname,0 , &fdt, &sbuf, false, false);if (fd <0 )
@@ -686,11 +763,30 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) align_size +=4 ; } +/* +* When dm-verity is active the external data for an image is +* larger than the embedded data property (original + hash tree). +* Walk images once more to account for the difference. +*/ +fdt_for_each_subnode (node, fdt, images) { + vn =fdt_subnode_offset (fdt, node,FIT_VERITY_NODENAME ); + orig_len =0 ; + +if (vn <0 ) +continue ; + vf =fdt_getprop (fdt, vn,"verity-data-file" ,NULL ); +if (!vf) +continue ; +fdt_getprop (fdt, node,FIT_DATA_PROP , &orig_len); +if (!stat (vf, &vst) && vst.st_size > orig_len) + verity_extra += vst.st_size - orig_len; + } +/* * Allocate space to hold the image data we will extract, * extral space allocate for image alignment to prevent overflow. */ - buf =calloc (1 , fit_size + align_size); + buf =calloc (1 , fit_size + align_size + verity_extra);if (!buf) { ret = -ENOMEM ; goto err_munmap;
@@ -721,7 +817,10 @@ static int fit_extract_data(struct image_tool_params *params, const char *fname) data =fdt_getprop (fdt, node,FIT_DATA_PROP , &len);if (!data)continue ; -memcpy (buf + buf_ptr, data, len); + + ret =fit_copy_image_data (fdt, node, buf, buf_ptr, data, &len); +if (ret) + goto err_munmap;debug ("Extracting data size %x\n" , len); ret =fdt_delprop (fdt, node,FIT_DATA_PROP );
tools/image-host.c +364 -4
420 lines not on this page · raw message
Signature · 1 line
2.53.0
PATCH 4/4 doc: fit: add dm-verity boot parameter documentation
In reply to Daniel GolleAdd documentation for CONFIG_FIT_VERITY which allows U-Boot to construct dm-mod.create= and dm-mod.waitfor= kernel command-line parameters from dm-verity metadata embedded in FIT filesystem sub-images.
The new document covers the relationship between FIT loadable indices and the /dev/fitN block devices that the Linux uImage.FIT block driver creates, provides a complete .its example with a dm-verity-protected SquashFS root filesystem, describes all required and optional dm-verity subnode properties and explains how mkimage generates the verity metadata automatically.
dm-verity is only supported for external-data FIT images (mkimage -E); mkimage aborts with an error if the flag is omitted.
--- doc/usage/fit/dm-verity.rst | 279 ++++++++++++++++++++++++++++++++++++ doc/usage/fit/index.rst | 1 + 2 files changed, 280 insertions(+) create mode 100644 doc/usage/fit/dm-verity.rst
doc/usage/fit/dm-verity.rst new file +279 -0
@@ -0,0 +1,279 @@ +.. SPDX-License-Identifier: GPL-2.0+ + +FIT dm-verity Boot Parameters +============================= + +Introduction +------------ + +Linux's dm-verity device-mapper target provides transparent integrity +checking of block devices using a Merkle tree. It is commonly used to +protect read-only root filesystems such as SquashFS images. + +When a FIT image packages the root filesystem as a loadable sub-image of +type ``filesystem`` (``IH_TYPE_FILESYSTEM``), the verity metadata can be +stored alongside the image data in a ``dm-verity`` subnode. U-Boot reads +this metadata at boot time and generates the kernel command-line parameters +that Linux needs to activate the verity target, eliminating the need for +an initramfs or userspace helper to set up dm-verity. + +This feature is enabled by ``CONFIG_FIT_VERITY`` (see ``boot/Kconfig``). + +Prerequisites +------------- + +* **Linux uImage.FIT block driver** – the kernel must include the FIT block + driver that exposes loadable sub-images as ``/dev/fit0``, ``/dev/fit1``, + etc. The driver assigns device numbers in the order loadables appear in + the FIT configuration. + +* **dm-verity support in the kernel** – ``CONFIG_DM_VERITY`` must be + enabled so the kernel can process the ``dm-mod.create=`` parameter. + +* **CONFIG_FIT_VERITY** enabled in U-Boot. + +How it works +------------ + +The implementation is split into a **build** phase and an **apply** phase, +both of which run automatically within the ``bootm`` state machine. No +boot method needs to call verity functions explicitly. + +**Build phase** (``BOOTM_STATE_FINDOTHER`` → ``boot_get_loadable()``) + +1. After all loadable sub-images have been loaded, + ``fit_verity_build_cmdline()`` iterates the configuration's + ``loadables`` list. + +2. For each loadable that is an ``IH_TYPE_FILESYSTEM`` image **and** + contains a ``dm-verity`` child node, a dm-verity target specification is + built by the helper ``fit_verity_build_target()``. + +3. The dm-verity target references ``/dev/fitN``, where *N* is the + zero-based index of the loadable in the configuration. This matches the + numbering used by the Linux FIT block driver. + +4. The resulting fragments are stored in ``struct bootm_headers``: + + ``images->dm_mod_create`` + The full dm-verity target table. Multiple targets are separated by + ``;``. + + ``images->dm_mod_waitfor`` + Comma-separated list of ``/dev/fitN`` devices so the kernel waits for + the underlying FIT block devices to appear before activating + device-mapper. + +**Apply phase** (``BOOTM_STATE_OS_PREP``) + +5. Just before ``bootm_process_cmdline_env()`` processes the ``bootargs`` + environment variable, ``fit_verity_apply_bootargs()`` appends the + ``dm-mod.create=`` and ``dm-mod.waitfor=`` parameters. + +**Bootmeth integration** + + Because the fragments are stored in ``struct bootm_headers``, a boot + method can check ``fit_verity_active(images)`` between bootm state + invocations. A typical pattern splits ``bootm_run_states()`` into two + calls -- one for ``START|FINDOS|FINDOTHER|LOADOS`` and one for + ``OS_PREP|OS_GO`` -- and inspects ``fit_verity_active()`` in + between to decide whether to add a ``root=`` parameter pointing at the + dm-verity device. + +FIT image source (.its) example +------------------------------- + +Below is a minimal ``.its`` file showing a kernel and a dm-verity-protected +root filesystem packaged as a FIT. Only the three user-provided properties +(``algo``, ``data-block-size``, ``hash-block-size``) are included; ``mkimage`` +computes and fills in ``digest``, ``salt``, ``num-data-blocks``, and +``hash-start-block`` automatically (see `Generating verity metadata`_ below):: + + /dts-v1/; + + / { + description = "Kernel + dm-verity rootfs"; + #address-cells = <1>; + + images { + kernel { + description = "Linux kernel"; + data = /incbin/("./Image.gz"); + type = "kernel"; + arch = "arm64"; + os = "linux"; + compression = "gzip"; + load = <0x44000000>; + entry = <0x44000000>; + }; + + fdt { + description = "Device tree blob"; + data = /incbin/("./board.dtb"); + type = "flat_dt"; + arch = "arm64"; + compression = "none"; + }; + + rootfs { + description = "SquashFS root filesystem"; + data = /incbin/("./rootfs.squashfs"); + type = "filesystem"; + arch = "arm64"; + compression = "none"; + + dm-verity { + data-block-size = <4096>; + hash-block-size = <4096>; + num-data-blocks = <3762>; + hash-start-block = <3762>; + algo = "sha256"; + digest = [8e 67 91 63 7f 93 cb b8 1f c4 52 99 e2 03 cb e8 + 5c a2 e4 7a 38 f5 05 1b dd ee ce 92 d7 b1 c9 f9]; + salt = [aa 7b 11 f8 db 8f e2 e5 bf d4 ec a1 d1 8a 22 b5 + de 7e a3 9d 2e 1b 93 bb 72 72 ce 0c 6c a3 cc 8e]; + }; + }; + }; + + configurations { + default = "config-1"; + config-1 { + description = "Boot with dm-verity rootfs"; + kernel = "kernel"; + fdt = "fdt"; + loadables = "rootfs"; + }; + }; + }; + +With this configuration U-Boot produces a kernel command line similar to:: + + dm-mod.create="rootfs,,, ro,0 <data_sectors> verity 1 \ + /dev/fit0 /dev/fit0 4096 4096 3762 3762 sha256 \ + 8e6791637f93cbb81fc45299e203cbe85ca2e47a38f5051bddeece92d7b1c9f9 \ + aa7b11f8db8fe2e5bfd4eca1d18a22b5de7ea39d2e1b93bb7272ce0c6ca3cc8e" \ + dm-mod.waitfor=/dev/fit0 + +dm-verity subnode properties +---------------------------- + +User-provided properties (required in the ``.its``): + +.. list-table:: + :header-rows: 1 + :widths: 20 15 65 + + * - Property + - Type + - Description + * - ``algo`` + - string + - Hash algorithm name, e.g. ``"sha256"``. + * - ``data-block-size`` + - u32 + - Data block size in bytes (>= 512, typically 4096). + * - ``hash-block-size`` + - u32 + - Hash block size in bytes (>= 512, typically 4096). + +Computed properties (filled in by ``mkimage``): + +.. list-table:: + :header-rows: 1 + :widths: 20 15 65 + + * - Property + - Type + - Description + * - ``num-data-blocks`` + - u32 + - Number of data blocks in the filesystem image (computed from the + image size and ``data-block-size``). + * - ``hash-start-block`` + - u32 + - Offset in ``hash-block-size``-sized blocks from the start of the + sub-image to the root block of the hash tree. + * - ``digest`` + - byte array + - Root hash of the Merkle tree, stored as raw bytes. Length must match + the output size of ``algo``. + * - ``salt`` + - byte array + - Salt used when computing the Merkle tree, stored as raw bytes. + +Optional boolean properties (when present, they are collected and appended +as dm-verity optional parameters with hyphens converted to underscores): + +.. list-table:: + :header-rows: 1 + :widths: 30 70 + + * - Property + - Description + * - ``restart-on-corruption`` + - Restart the system on data corruption. + * - ``panic-on-corruption`` + - Panic the system on data corruption. + * - ``restart-on-error`` + - Restart the system on I/O error. + * - ``panic-on-error`` + - Panic the system on I/O error. + * - ``check-at-most-once`` + - Verify data blocks only on first read. + +These values are the same ones produced by ``veritysetup format`` and can +typically be obtained from its output or from the verity superblock. +The ``digest`` and ``salt`` byte arrays correspond to the hex-encoded +``Root hash`` and ``Salt`` printed by ``veritysetup format``. + +Generating verity metadata +-------------------------- + +``mkimage`` automates the entire process. When it encounters a +``dm-verity`` subnode, it: + +1. Writes the embedded image data to a temporary file. +2. Runs ``veritysetup format`` with the user-supplied algorithm and + block sizes. +3. Parses ``Root hash`` and ``Salt`` from ``veritysetup`` stdout. +4. Reads back the expanded file (original data + verity superblock + + Merkle hash tree) and replaces the image's ``data`` property. +5. Writes the computed ``digest``, ``salt``, ``num-data-blocks``, and + ``hash-start-block`` properties into the ``dm-verity`` subnode. + +Images with ``dm-verity`` subnodes **must** use external data layout +(``mkimage -E``). ``mkimage`` will abort with an error if ``-E`` is +not specified. + +Usage:: + + # Create the filesystem image + mksquashfs rootfs/ rootfs.squashfs -comp xz + + # Build the FIT (dm-verity is computed automatically) + mkimage -E -f image.its image.itb + +``veritysetup`` (from the cryptsetup_ package) must be installed on +the build host. + +.. _cryptsetup: https://gitlab.com/cryptsetup/cryptsetup + +.. note:: + + ``veritysetup format`` is invoked with ``--no-superblock``, so no + on-disk superblock is written between the data and hash regions. + The Merkle hash tree is appended directly to the image data within + the FIT external data section. Consequently ``hash-start-block`` + equals ``num-data-blocks``. + +Kconfig +------- + +``CONFIG_FIT_VERITY`` + Depends on ``CONFIG_FIT`` and ``CONFIG_OF_LIBFDT``. + When enabled, ``fit_verity_build_cmdline()`` and + ``fit_verity_apply_bootargs()`` are compiled into the boot path. + When disabled, the functions are static inlines returning 0, so there + is no code-size impact. Works with both the ``bootm`` command and + BOOTSTD boot methods.
doc/usage/fit/index.rst +1 -0
@@ -11,6 +11,7 @@ images that it reads and boots. Documentation about FIT is available in :maxdepth: 1 beaglebone_vboot + dm-verity howto kernel_fdt kernel_fdts_compressed
Signature · 1 line
2.53.0
Re: [1/4] image: fit: add dm-verity property name constants
In reply to Daniel GolleQuoted 8 lines · Daniel Golle
image: fit: add dm-verity property name constants
image: fit: add dm-verity property name constantsAdd
FIT_VERITY_NODENAMEand the complete set of FIT_VERITY_*_PROP constants for the dm-verity child node of filesystem-type images, plus the five optional boolean error-handling property names aligned with the flat-image-tree specification.
Quoted 4 lines
Signed-off-by Daniel Golle <[email protected]>
include/image.h| 17 +++++++++++++++++1 file changed, 17 insertions(+)
Re: [2/4] boot: fit: support generating DM verity cmdline parameters
In reply to Daniel GolleHi Daniel,
Quoted 23 lines · Daniel Golle
boot: fit: support generating DM verity cmdline parameters
boot: fit: support generating DM verity cmdline parametersAdd
fit_verity_build_cmdline(): when a FILESYSTEM loadable carries a dm-verity subnode, construct the dm-mod.create= kernel cmdline parameter from the verity metadata (block-size, data-blocks, algo, root-hash, salt) and append it to bootargs.Also add dm-mod.waitfor=/dev/fit0[,/dev/fitN] for each dm-verity device so the kernel waits for the underlying FIT block device to appear before setting up device-mapper targets. This is needed when the block driver probes late, e.g. because it depends on NVMEM calibration data.
The dm-verity target references
/dev/fitNwhere N is the loadable's index in the configuration -- matching the order Linux's FIT block driver assigns block devices. hash-start-block is read directly from the FIT dm-verity node; mkimage ensures its value equals num-data-blocks by invoking veritysetup with --no-superblock.Signed-off-by Daniel Golle <[email protected]>
boot/Kconfig config FIT_CIPHER · line 146
Quoted 5 lines
boot/Kconfig +5
-0@@ -142,6 +142,27 @@ config FIT_CIPHER +config FIT_VERITY + ... + and BOOTSTD bootmeths. + +
Drop extra blank line.
boot/image-fit.c out: · line 2685
Quoted 6 lines
boot/image-fit.c +4
-0@@ -2642,3 +2682,299 @@ out: +if (!data_block_size || data_block_size <512 || + !hash_block_size || hash_block_size <512 || + !num_data_blocks) +return -EINVAL ;
dm-verity requires block sizes to be a power of two (and divisible by 512). The first check !data_block_size is redundant given the < 512 check that follows. Please can you add a power-of-two validation using is_power_of_2() from <linux/log2.h>? Otherwise the kernel will likely reject the table at boot time with a confusing error.
Quoted 6 lines
boot/image-fit.c +4
-0@@ -2642,3 +2682,299 @@ out: +int fit_verity_build_cmdline (const void *fit,int conf_noffset, +struct bootm_headers *images) +{ + ...
boot/image-fit.c out: · line 2695
Quoted 10 lines
boot/image-fit.c +10
-0+if (found) { +/* Transfer ownership to the bootm_headers */ + images->dm_mod_create = dm_create; + images->dm_mod_waitfor = dm_waitfor; + }else { +free (dm_create); +free (dm_waitfor); + } + +return found;
When found > 0, this returns a positive value which could be confused with an error by callers that only check < 0. The call site in boot_get_loadable() does if (fit_img_result < 0) return fit_img_result; so it works, but I suspect returning 0 for success and keeping the count internal would be cleaner. What do you think?
boot/bootm.c static int boot_get_kernel(...) · line 245
Quoted 6 lines
boot/bootm.c +1
-0@@ -242,6 +242,7 @@ static int boot_get_kernel(...)static int bootm_start (void ) { +fit_verity_free (&images);memset ((void *)&images,0 ,sizeof (images));
Just to check: fit_verity_free() is called here before memset(), which means the pointers must already be valid (or NULL) from a prior boot attempt. This works because fit_verity_free() checks for NULL internally, and .bss is zeroed. How about a comment explaining the ordering?
Regards,
Simon