[PATCH v1 0/3] Support various block interfaces for avb and bcb

newer
[PATCH v2 1/1] efi_driver: don't...

older
[PATCH 0/2] rpi: Copy properties...

Andrii Chepurnyi

8 Apr 2022 8 Apr '22

2:43 p.m.

Hello.

Originally bcb and avb utilities implementation relay on mmc block devices. This patch series adds an optional interface parameter to those utilities, which gives the ability to use bcb and avb on various block devices. The patch set was tested using xenguest_arm64 based board and pvblock interface.

Andrii Chepurnyi (3): cmd: bcb: introduce optional interface parameter to bcb cmd: avb: introduce optional interface parameter to avb init cmd: avb: remove warning during avb build

-- 2.25.1

Show replies by date

Andrii Chepurnyi

8 Apr 8 Apr

2:43 p.m.

New subject: [PATCH v1 1/3] cmd: bcb: introduce optional interface parameter to bcb

From: Andrii Chepurnyi andrii.chepurnyi82@gmail.com

From: Andrii Chepurnyi andrii_chepurnyi@epam.com

Originally, bcb implementation relay on mmc block devices. The interface parameter will give the ability to use bcb with various block devices by choosing the exact interface type. By default (if no interface parameter is provided) mmc interface will be used.

Signed-off-by: Andrii Chepurnyi andrii_chepurnyi@epam.com --- cmd/bcb.c | 65 +++++++++++++++++++++++---------------------- doc/android/bcb.rst | 33 ++++++++++++----------- 2 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/cmd/bcb.c b/cmd/bcb.c index 92f4d27990..bfe395558e 100644 --- a/cmd/bcb.c +++ b/cmd/bcb.c @@ -26,6 +26,7 @@ enum bcb_cmd { static int bcb_dev = -1; static int bcb_part = -1; static struct bootloader_message bcb __aligned(ARCH_DMA_MINALIGN) = { { 0 } }; +static struct blk_desc *bcb_blk_desc;

static int bcb_cmd_get(char *cmd) { @@ -51,6 +52,9 @@ static int bcb_is_misused(int argc, char *const argv[])

switch (cmd) { case BCB_CMD_LOAD: + if (argc != 3 && argc != 4) + goto err; + break; case BCB_CMD_FIELD_SET: if (argc != 3) goto err; @@ -115,25 +119,23 @@ static int bcb_field_get(char *name, char **fieldp, int *sizep)

static int __bcb_load(int devnum, const char *partp) { - struct blk_desc *desc; struct disk_partition info; u64 cnt; char *endp; int part, ret;

- desc = blk_get_devnum_by_type(IF_TYPE_MMC, devnum); - if (!desc) { + if (!bcb_blk_desc) { ret = -ENODEV; goto err_read_fail; }

part = simple_strtoul(partp, &endp, 0); if (*endp == '\0') { - ret = part_get_info(desc, part, &info); + ret = part_get_info(bcb_blk_desc, part, &info); if (ret) goto err_read_fail; } else { - part = part_get_info_by_name(desc, partp, &info); + part = part_get_info_by_name(bcb_blk_desc, partp, &info); if (part < 0) { ret = part; goto err_read_fail; @@ -144,12 +146,12 @@ static int __bcb_load(int devnum, const char *partp) if (cnt > info.size) goto err_too_small;

- if (blk_dread(desc, info.start, cnt, &bcb) != cnt) { + if (blk_dread(bcb_blk_desc, info.start, cnt, &bcb) != cnt) { ret = -EIO; goto err_read_fail; }

- bcb_dev = desc->devnum; + bcb_dev = bcb_blk_desc->devnum; bcb_part = part; debug("%s: Loaded from mmc %d:%d\n", __func__, bcb_dev, bcb_part);

@@ -170,15 +172,15 @@ err: static int do_bcb_load(struct cmd_tbl *cmdtp, int flag, int argc, char * const argv[]) { - char *endp; - int devnum = simple_strtoul(argv[1], &endp, 0); + int ret = blk_get_device_by_str((argv[3]) ? argv[3] : "mmc", argv[1], &bcb_blk_desc);

- if (*endp != '\0') { - printf("Error: Device id '%s' not a number\n", argv[1]); + if (ret < 0) { + printf("Error: Device id '%s' or interface '%s' is not valid\n", argv[1], + (argv[3]) ? argv[3] : "mmc"); return CMD_RET_FAILURE; }

- return __bcb_load(devnum, argv[2]); + return __bcb_load(bcb_blk_desc->devnum, argv[2]); }

static int __bcb_set(char *fieldp, const char *valp) @@ -281,24 +283,22 @@ static int do_bcb_dump(struct cmd_tbl *cmdtp, int flag, int argc,

static int __bcb_store(void) { - struct blk_desc *desc; struct disk_partition info; u64 cnt; int ret;

- desc = blk_get_devnum_by_type(IF_TYPE_MMC, bcb_dev); - if (!desc) { + if (!bcb_blk_desc) { ret = -ENODEV; goto err; }

- ret = part_get_info(desc, bcb_part, &info); + ret = part_get_info(bcb_blk_desc, bcb_part, &info); if (ret) goto err;

cnt = DIV_ROUND_UP(sizeof(struct bootloader_message), info.blksz);

- if (blk_dwrite(desc, info.start, cnt, &bcb) != cnt) { + if (blk_dwrite(bcb_blk_desc, info.start, cnt, &bcb) != cnt) { ret = -EIO; goto err; } @@ -373,21 +373,22 @@ static int do_bcb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) U_BOOT_CMD( bcb, CONFIG_SYS_MAXARGS, 1, do_bcb, "Load/set/clear/test/dump/store Android BCB fields", - "load <dev> <part> - load BCB from mmc <dev>:<part>\n" - "bcb set <field> <val> - set BCB <field> to <val>\n" - "bcb clear [<field>] - clear BCB <field> or all fields\n" - "bcb test <field> <op> <val> - test BCB <field> against <val>\n" - "bcb dump <field> - dump BCB <field>\n" - "bcb store - store BCB back to mmc\n" + "load <dev> <part> [<interface>] - load BCB from <dev>:<part>[<interface>]\n" + "bcb set <field> <val> - set BCB <field> to <val>\n" + "bcb clear [<field>] - clear BCB <field> or all fields\n" + "bcb test <field> <op> <val> - test BCB <field> against <val>\n" + "bcb dump <field> - dump BCB <field>\n" + "bcb store - store BCB back to mmc\n" "\n" "Legend:\n" - "<dev> - MMC device index containing the BCB partition\n" - "<part> - MMC partition index or name containing the BCB\n" - "<field> - one of {command,status,recovery,stage,reserved}\n" - "<op> - the binary operator used in 'bcb test':\n" - " '=' returns true if <val> matches the string stored in <field>\n" - " '~' returns true if <val> matches a subset of <field>'s string\n" - "<val> - string/text provided as input to bcb {set,test}\n" - " NOTE: any ':' character in <val> will be replaced by line feed\n" - " during 'bcb set' and used as separator by upper layers\n" + "<dev> - device index containing the BCB partition\n" + "<part> - partition index or name containing the BCB\n" + "<interface> - interface name of the block device containing the BCB\n" + "<field> - one of {command,status,recovery,stage,reserved}\n" + "<op> - the binary operator used in 'bcb test':\n" + " '=' returns true if <val> matches the string stored in <field>\n" + " '~' returns true if <val> matches a subset of <field>'s string\n" + "<val> - string/text provided as input to bcb {set,test}\n" + " NOTE: any ':' character in <val> will be replaced by line feed\n" + " during 'bcb set' and used as separator by upper layers\n" ); diff --git a/doc/android/bcb.rst b/doc/android/bcb.rst index 8861608300..e6d201f439 100644 --- a/doc/android/bcb.rst +++ b/doc/android/bcb.rst @@ -41,23 +41,26 @@ requirements enumerated above. Below is the command's help message:: bcb - Load/set/clear/test/dump/store Android BCB fields

Usage: - bcb load <dev> <part> - load BCB from mmc <dev>:<part> - bcb set <field> <val> - set BCB <field> to <val> - bcb clear [<field>] - clear BCB <field> or all fields - bcb test <field> <op> <val> - test BCB <field> against <val> - bcb dump <field> - dump BCB <field> - bcb store - store BCB back to mmc + bcb load <dev> <part> [<iftype>] - load BCB from <dev>:<part>[<iftype>] + bcb set <field> <val> - set BCB <field> to <val> + bcb clear [<field>] - clear BCB <field> or all fields + bcb test <field> <op> <val> - test BCB <field> against <val> + bcb dump <field> - dump BCB <field> + bcb store - store BCB back to <iftype>

Legend: - <dev> - MMC device index containing the BCB partition - <part> - MMC partition index or name containing the BCB - <field> - one of {command,status,recovery,stage,reserved} - <op> - the binary operator used in 'bcb test': - '=' returns true if <val> matches the string stored in <field> - '~' returns true if <val> matches a subset of <field>'s string - <val> - string/text provided as input to bcb {set,test} - NOTE: any ':' character in <val> will be replaced by line feed - during 'bcb set' and used as separator by upper layers + <dev> - device index containing the BCB partition + <iftype> - Optional parameter of the interface type for the specified + block device like: mmc,sd,virtio see blk.h for details. + The default value is mmc. + <part> - partition index or name containing the BCB + <field> - one of {command,status,recovery,stage,reserved} + <op> - the binary operator used in 'bcb test': + '=' returns true if <val> matches the string stored in <field> + '~' returns true if <val> matches a subset of <field>'s string + <val> - string/text provided as input to bcb {set,test} + NOTE: any ':' character in <val> will be replaced by line feed + during 'bcb set' and used as separator by upper layers

'bcb'. Example of getting reboot reason

-- 2.25.1

Andrii Chepurnyi

2:43 p.m.

New subject: [PATCH v1 2/3] cmd: avb: introduce optional interface parameter to avb init

From: Andrii Chepurnyi andrii.chepurnyi82@gmail.com

From: Andrii Chepurnyi andrii_chepurnyi@epam.com

Originally, avb implementation relay on mmc block devices. The interface parameter will give the ability to use avb with various block devices by choosing the exact interface type. By default (if no interface parameter is provided) mmc interface will be used.

Signed-off-by: Andrii Chepurnyi andrii_chepurnyi@epam.com --- cmd/avb.c | 13 +++++-------- common/avb_verify.c | 28 ++++++++++------------------ doc/android/avb2.rst | 2 +- include/avb_verify.h | 11 ++++++++++- 4 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/cmd/avb.c b/cmd/avb.c index 783f51b816..6fdbdc708f 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -17,17 +17,14 @@ static struct AvbOps *avb_ops;

int do_avb_init(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) { - unsigned long mmc_dev; - - if (argc != 2) + if (argc != 2 && argc != 3) return CMD_RET_USAGE;

- mmc_dev = hextoul(argv[1], NULL); - if (avb_ops) avb_ops_free(avb_ops);

- avb_ops = avb_ops_alloc(mmc_dev); + avb_ops = avb_ops_alloc(argv[1], (argc == 3) ? argv[2] : "mmc"); + if (avb_ops) return CMD_RET_SUCCESS;

@@ -419,7 +416,7 @@ int do_avb_write_pvalue(struct cmd_tbl *cmdtp, int flag, int argc, }

static struct cmd_tbl cmd_avb[] = { - U_BOOT_CMD_MKENT(init, 2, 0, do_avb_init, "", ""), + U_BOOT_CMD_MKENT(init, 3, 0, do_avb_init, "", ""), U_BOOT_CMD_MKENT(read_rb, 2, 0, do_avb_read_rb, "", ""), U_BOOT_CMD_MKENT(write_rb, 3, 0, do_avb_write_rb, "", ""), U_BOOT_CMD_MKENT(is_unlocked, 1, 0, do_avb_is_unlocked, "", ""), @@ -455,7 +452,7 @@ static int do_avb(struct cmd_tbl *cmdtp, int flag, int argc, char *const argv[]) U_BOOT_CMD( avb, 29, 0, do_avb, "Provides commands for testing Android Verified Boot 2.0 functionality", - "init <dev> - initialize avb2 for <dev>\n" + "init <dev> [<interface>] - initialize avb2 for <dev> [<interface>]\n" "avb read_rb <num> - read rollback index at location <num>\n" "avb write_rb <num> <rb> - write rollback index <rb> to <num>\n" "avb is_unlocked - returns unlock status of the device\n" diff --git a/common/avb_verify.c b/common/avb_verify.c index 0520a71455..e086dc6760 100644 --- a/common/avb_verify.c +++ b/common/avb_verify.c @@ -338,7 +338,6 @@ static struct mmc_part *get_partition(AvbOps *ops, const char *partition) { int ret; u8 dev_num; - int part_num = 0; struct mmc_part *part; struct blk_desc *mmc_blk;

@@ -347,22 +346,8 @@ static struct mmc_part *get_partition(AvbOps *ops, const char *partition) return NULL;

dev_num = get_boot_device(ops); - part->mmc = find_mmc_device(dev_num); - if (!part->mmc) { - printf("No MMC device at slot %x\n", dev_num); - goto err; - } - - if (mmc_init(part->mmc)) { - printf("MMC initialization failed\n"); - goto err; - } + mmc_blk = get_blk(ops);

- ret = mmc_switch_part(part->mmc, part_num); - if (ret) - goto err; - - mmc_blk = mmc_get_blk_desc(part->mmc); if (!mmc_blk) { printf("Error - failed to obtain block descriptor\n"); goto err; @@ -976,7 +961,8 @@ free_name: * AVB2.0 AvbOps alloc/initialisation/free * ============================================================================ */ -AvbOps *avb_ops_alloc(int boot_device) + +AvbOps *avb_ops_alloc(const char *boot_device, const char *interface) { struct AvbOpsData *ops_data;

@@ -999,7 +985,13 @@ AvbOps *avb_ops_alloc(int boot_device) ops_data->ops.read_persistent_value = read_persistent_value; #endif ops_data->ops.get_size_of_partition = get_size_of_partition; - ops_data->mmc_dev = boot_device; + ops_data->mmc_dev = simple_strtoul(boot_device, NULL, 16); + ops_data->blk = NULL; + if (interface && (blk_get_device_by_str(interface, boot_device, &ops_data->blk) < 0)) { + printf("Error - failed to obtain block descriptor for devce=%s if=%s\n", + boot_device, interface); + return NULL; + }

return &ops_data->ops; } diff --git a/doc/android/avb2.rst b/doc/android/avb2.rst index a072119574..8fa54338fd 100644 --- a/doc/android/avb2.rst +++ b/doc/android/avb2.rst @@ -38,7 +38,7 @@ AVB 2.0 U-Boot shell commands Provides CLI interface to invoke AVB 2.0 verification + misc. commands for different testing purposes::

- avb init <dev> - initialize avb 2.0 for <dev> + avb init <dev> [<interface>] - initialize avb2 for <dev> [<interface>] avb verify - run verification process using hash data from vbmeta structure avb read_rb <num> - read rollback index at location <num> avb write_rb <num> <rb> - write rollback index <rb> to <num> diff --git a/include/avb_verify.h b/include/avb_verify.h index 1e787ba666..ff70cb26f8 100644 --- a/include/avb_verify.h +++ b/include/avb_verify.h @@ -32,6 +32,7 @@ struct AvbOpsData { struct udevice *tee; u32 session; #endif + struct blk_desc *blk; };

struct mmc_part { @@ -46,7 +47,7 @@ enum mmc_io_type { IO_WRITE };

-AvbOps *avb_ops_alloc(int boot_device); +AvbOps *avb_ops_alloc(const char *boot_device, const char *interface); void avb_ops_free(AvbOps *ops);

char *avb_set_state(AvbOps *ops, enum avb_boot_state boot_state); @@ -98,4 +99,12 @@ static inline int get_boot_device(AvbOps *ops) return -1; }

+static inline struct blk_desc *get_blk(AvbOps *ops) +{ + if (ops && ops->user_data) + return ((struct AvbOpsData *)ops->user_data)->blk; + + return NULL; +} + #endif /* _AVB_VERIFY_H */

-- 2.25.1

Andrii Chepurnyi

2:43 p.m.

New subject: [PATCH v1 3/3] cmd: avb: remove warning during avb build

From: Andrii Chepurnyi andrii.chepurnyi82@gmail.com

From: Andrii Chepurnyi andrii_chepurnyi@epam.com

Remove warning during avb build: cmd/avb.c:247:8: warning: unused variable ‘extra_args’ [-Wunused-variable] 247 | char *extra_args; | ^~~~~~~~~~ cmd/avb.c:246:8: warning: unused variable ‘cmdline’ [-Wunused-variable] 246 | char *cmdline; | ^~~~~~~

Signed-off-by: Andrii Chepurnyi andrii_chepurnyi@epam.com --- cmd/avb.c | 2 -- 1 file changed, 2 deletions(-)

diff --git a/cmd/avb.c b/cmd/avb.c index 6fdbdc708f..a5ac224b22 100644 --- a/cmd/avb.c +++ b/cmd/avb.c @@ -231,8 +231,6 @@ int do_avb_verify_part(struct cmd_tbl *cmdtp, int flag, const char * const requested_partitions[] = {"boot", NULL}; AvbSlotVerifyResult slot_result; AvbSlotVerifyData *out_data; - char *cmdline; - char *extra_args; char *slot_suffix = "";

bool unlocked = false;

-- 2.25.1

Andrii Chepurnyi

19 Apr 19 Apr

8:46 a.m.

New subject: [PATCH v2 0/2] Support various block interfaces for avb and bcb

Hello.

Changes for v2: - Removed patch #3 as not actual for mainline

Andrii Chepurnyi (2): cmd: bcb: introduce optional interface parameter to bcb cmd: avb: introduce optional interface parameter to avb init

-- 2.25.1

Andrii Chepurnyi

8:46 a.m.

New subject: [PATCH v2 1/2] cmd: bcb: introduce optional interface parameter to bcb