cuttlefish: support bootconfig parameters
Support the bootconfig image from the boot image. Version 4 of the
vendor bootimage contains bootconfig parameters. These parameters are
placed at the end of the initramfs followed by bootconfig trailer.
Support adding run-time parameters to bootconfig. This is done with a
helper function in libxbc that adds the string of parameters followed by
the bootconfig trailer.
Test: boot cuttlefish with bootconfig parameters in the boot image and
parameters being added at run time. Check /proc/bootconfig to make sure
they all show up.
Bug: 173815685
Change-Id: I194449880dd0dcce98c5f2687dbcf777a27e0e0e
diff --git a/common/image-android.c b/common/image-android.c
index 47d7925..b9e0bf6 100644
--- a/common/image-android.c
+++ b/common/image-android.c
@@ -12,6 +12,7 @@
#include <mapmem.h>
#include <errno.h>
#include <asm/unaligned.h>
+#include <xbc.h>
#include <mapmem.h>
#include <part.h>
#include <log.h>
@@ -65,7 +66,8 @@
ulong *rd_data, ulong *rd_len)
{
*rd_data = (ulong)(boot_info->vendor_ramdisk_addr);
- *rd_len = boot_info->vendor_ramdisk_size + boot_info->boot_ramdisk_size;
+ *rd_len = boot_info->vendor_ramdisk_size + boot_info->boot_ramdisk_size
+ + boot_info->vendor_bootconfig_size;
return 0;
}
@@ -243,6 +245,68 @@
return true;
}
+static bool _read_in_bootconfig(struct blk_desc *dev_desc,
+ const struct disk_partition *vendor_boot_img,
+ struct andr_boot_info *boot_info) {
+ if (boot_info->vendor_header_version < 4) {
+ // no error, just nothing to do for versions less than 4
+ return true;
+ }
+ long bootconfig_size = 0;
+ if (boot_info->vendor_bootconfig_size > 0) {
+ u32 vhdr_size_page_aligned =
+ ALIGN(sizeof(struct vendor_boot_img_hdr_v4), boot_info->page_size);
+ u32 vramdisk_size_page_aligned =
+ ALIGN(boot_info->vendor_ramdisk_size, boot_info->page_size);
+ u32 vdtb_size_page_aligned =
+ ALIGN(boot_info->dtb_size, boot_info->page_size);
+ u32 vramdisk_table_size_page_aligned =
+ ALIGN(boot_info->vendor_ramdisk_table_size, boot_info->page_size);
+ lbaint_t bootconfig_lba = vendor_boot_img->start
+ + BLK_CNT(vhdr_size_page_aligned, vendor_boot_img->blksz)
+ + BLK_CNT(vramdisk_size_page_aligned, vendor_boot_img->blksz)
+ + BLK_CNT(vdtb_size_page_aligned, vendor_boot_img->blksz)
+ + BLK_CNT(vramdisk_table_size_page_aligned, vendor_boot_img->blksz);
+
+ long blk_cnt, blks_read;
+ blk_cnt =
+ BLK_CNT(boot_info->vendor_bootconfig_size, vendor_boot_img->blksz);
+
+ blks_read = blk_dread(dev_desc, bootconfig_lba, blk_cnt,
+ (void*)(boot_info->boot_ramdisk_addr + boot_info->boot_ramdisk_size));
+ if(blk_cnt != blks_read) {
+ debug("Reading out %lu blocks containing the vendor ramdisk."
+ "Expect to read out %lu blks.\n",
+ blks_read, blk_cnt);
+ return false;
+ }
+
+ bootconfig_size += boot_info->vendor_bootconfig_size;
+ }
+
+ // Add any additional boot config parameters from the boot loader here. The
+ // final size of the boot config section will need to be tracked.
+ int ret = addBootConfigParameters("androidboot.bootloader_example=1\n", 33, boot_info->boot_ramdisk_addr
+ + boot_info->boot_ramdisk_size, bootconfig_size);
+ if (ret <= 0) {
+ debug("Failed to apply boot config params\n");
+ } else {
+ bootconfig_size += ret;
+ }
+ ret = addBootConfigParameters("androidboot.bootloader_example_2=2\n", 35,
+ boot_info->boot_ramdisk_addr + boot_info->boot_ramdisk_size, bootconfig_size);
+ if (ret <= 0) {
+ debug("Failed to apply boot config params\n");
+ } else {
+ bootconfig_size += ret;
+ }
+
+ // Need to update the size after adding parameters
+ boot_info->vendor_bootconfig_size = bootconfig_size;
+
+ return true;
+}
+
static bool _read_in_boot_ramdisk(struct blk_desc *dev_desc,
const struct disk_partition *boot_img,
const struct andr_boot_info *boot_info) {
@@ -308,7 +372,8 @@
_populate_boot_info(boot_hdr, vboot_hdr, kernel_rd_addr, boot_info);
if(!_read_in_kernel(dev_desc, boot_img, boot_info)
|| !_read_in_vendor_ramdisk(dev_desc, vendor_boot_img, boot_info)
- || !_read_in_boot_ramdisk(dev_desc, boot_img, boot_info)) {
+ || !_read_in_boot_ramdisk(dev_desc, boot_img, boot_info)
+ || !_read_in_bootconfig(dev_desc, vendor_boot_img, boot_info)) {
goto image_load_exit;
}
diff --git a/cuttlefish.fragment b/cuttlefish.fragment
index d42418f..f571616 100644
--- a/cuttlefish.fragment
+++ b/cuttlefish.fragment
@@ -35,3 +35,6 @@
# Other OS support (EFI system partition)
CONFIG_CMD_BOOTEFI=y
# CONFIG_CMD_BOOTEFI_HELLO_COMPILE is not set
+
+# Support bootconfig with libxbc
+CONFIG_XBC=y
diff --git a/include/xbc.h b/include/xbc.h
new file mode 100644
index 0000000..725e65f
--- /dev/null
+++ b/include/xbc.h
@@ -0,0 +1 @@
+#include <../lib/libxbc/libxbc.h>
diff --git a/lib/Kconfig b/lib/Kconfig
index 7673d2e..7e6a5f1 100644
--- a/lib/Kconfig
+++ b/lib/Kconfig
@@ -344,6 +344,20 @@
endmenu
+menu "Boot Configuration"
+
+config XBC
+ bool "Boot Configuration support"
+ depends on ANDROID_BOOT_IMAGE
+ default n
+ help
+ This enables support of Boot Configuration which can be used
+ to pass boot configuration parameters to user space. These
+ parameters will show up in /proc/bootconfig similar to the kernel
+ parameters that show up in /proc/cmdline
+
+endmenu
+
menu "Hashing Support"
config SHA1
diff --git a/lib/Makefile b/lib/Makefile
index 851a80e..eff1b43 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -73,6 +73,8 @@
obj-$(CONFIG_LIBAVB) += libavb/
+obj-$(CONFIG_XBC) += libxbc/
+
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += libfdt/
ifneq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)OF_PLATDATA),yy)
obj-$(CONFIG_$(SPL_TPL_)OF_CONTROL) += fdtdec_common.o
diff --git a/lib/libxbc/COPYING b/lib/libxbc/COPYING
new file mode 100644
index 0000000..d645695
--- /dev/null
+++ b/lib/libxbc/COPYING
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/lib/libxbc/Makefile b/lib/libxbc/Makefile
new file mode 100644
index 0000000..0c2feee
--- /dev/null
+++ b/lib/libxbc/Makefile
@@ -0,0 +1,15 @@
+ # Copyright (C) 2021 The Android Open Source Project
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+obj-$(CONFIG_XBC) += libxbc.o
diff --git a/lib/libxbc/libxbc.c b/lib/libxbc/libxbc.c
new file mode 100644
index 0000000..6e47dee
--- /dev/null
+++ b/lib/libxbc/libxbc.c
@@ -0,0 +1,118 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "libxbc.h"
+
+#define BOOTCONFIG_MAGIC "#BOOTCONFIG\n"
+#define BOOTCONFIG_MAGIC_SIZE 12
+#define BOOTCONFIG_SIZE_SIZE 4
+#define BOOTCONFIG_CHECKSUM_SIZE 4
+#define BOOTCONFIG_TRAILER_SIZE BOOTCONFIG_MAGIC_SIZE + \
+ BOOTCONFIG_SIZE_SIZE + \
+ BOOTCONFIG_CHECKSUM_SIZE
+/*
+ * Simple checksum for a buffer.
+ *
+ * @param addr pointer to the start of the buffer.
+ * @param size size of the buffer in bytes.
+ * @return check sum result.
+ */
+static uint32_t checksum(const unsigned char* const buffer, uint32_t size) {
+ uint32_t sum = 0;
+ for (uint32_t i = 0; i < size; i++) {
+ sum += buffer[i];
+ }
+ return sum;
+}
+
+/*
+ * Check if the bootconfig trailer is present within the bootconfig section.
+ *
+ * @param bootconfig_end_addr address of the end of the bootconfig section. If
+ * the trailer is present, it will be directly preceding this address.
+ * @return true if the trailer is present, false if not.
+ */
+static bool isTrailerPresent(uint64_t bootconfig_end_addr) {
+ return !strncmp((char*)(bootconfig_end_addr - BOOTCONFIG_MAGIC_SIZE),
+ BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_SIZE);
+}
+
+/*
+ * Add a string of boot config parameters to memory appended by the trailer.
+ */
+int32_t addBootConfigParameters(char* params, uint32_t params_size,
+ uint64_t bootconfig_start_addr, uint32_t bootconfig_size) {
+ if (!params || !bootconfig_start_addr) {
+ return -1;
+ }
+ if (params_size == 0) {
+ return 0;
+ }
+ int32_t applied_bytes = 0;
+ int32_t new_size = 0;
+ uint64_t end = bootconfig_start_addr + bootconfig_size;
+
+ if (isTrailerPresent(end)) {
+ end -= BOOTCONFIG_TRAILER_SIZE;
+ applied_bytes -= BOOTCONFIG_TRAILER_SIZE;
+ memcpy(&new_size, (void *)end, BOOTCONFIG_SIZE_SIZE);
+ } else {
+ new_size = bootconfig_size;
+ }
+
+ // params
+ memcpy((void*)end, params, params_size);
+
+ applied_bytes += params_size;
+ applied_bytes += addBootConfigTrailer(bootconfig_start_addr,
+ bootconfig_size + applied_bytes);
+
+ return applied_bytes;
+}
+
+/*
+ * Add boot config trailer.
+ */
+int32_t addBootConfigTrailer(uint64_t bootconfig_start_addr,
+ uint32_t bootconfig_size) {
+ if (!bootconfig_start_addr) {
+ return -1;
+ }
+ if (bootconfig_size == 0) {
+ return 0;
+ }
+ uint64_t end = bootconfig_start_addr + bootconfig_size;
+
+ if (isTrailerPresent(end)) {
+ // no need to overwrite the current trailers
+ return 0;
+ }
+
+ // size
+ memcpy((void *)(end), &bootconfig_size, BOOTCONFIG_SIZE_SIZE);
+
+ // checksum
+ uint32_t sum =
+ checksum((unsigned char*)bootconfig_start_addr, bootconfig_size);
+ memcpy((void *)(end + BOOTCONFIG_SIZE_SIZE), &sum,
+ BOOTCONFIG_CHECKSUM_SIZE);
+
+ // magic
+ memcpy((void *)(end + BOOTCONFIG_SIZE_SIZE + BOOTCONFIG_CHECKSUM_SIZE),
+ BOOTCONFIG_MAGIC, BOOTCONFIG_MAGIC_SIZE);
+
+ return BOOTCONFIG_TRAILER_SIZE;
+}
diff --git a/lib/libxbc/libxbc.h b/lib/libxbc/libxbc.h
new file mode 100644
index 0000000..0bee548
--- /dev/null
+++ b/lib/libxbc/libxbc.h
@@ -0,0 +1,59 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef LIBXBC_H_
+#define LIBXBC_H_
+
+// memcpy and strncmp
+#include <common.h>
+
+/*
+ * Add a string of boot config parameters to memory appended by the trailer.
+ * This memory needs to be immediately following the end of the ramdisks.
+ * The new boot config trailer will be written to the end of the entire
+ * parameter section(previous + new). The trailer contains a 4 byte size of the
+ * parameters, followed by a 4 byte checksum of the parameters, followed by a 12
+ * byte magic string.
+ *
+ * @param params pointer to string of boot config parameters
+ * @param params_size size of params string in bytes
+ * @param bootconfig_start_addr address that the boot config section is starting
+ * at in memory.
+ * @param bootconfig_size size of the current bootconfig section in bytes.
+ * @return number of bytes added to the boot config section. -1 for error.
+ */
+int addBootConfigParameters(char *params, uint32_t params_size,
+ uint64_t bootconfig_start_addr,
+ uint32_t bootconfig_size);
+
+/*
+ * Add the boot config trailer to the end of the boot config parameter section.
+ * This can be used after the vendor bootconfig section has been placed into
+ * memory if there are no additional parameters that need to be added.
+ * The new boot config trailer will be written to the end of the entire
+ * parameter section at (bootconfig_start_addr + bootconfig_size).
+ * The trailer contains a 4 byte size of the parameters, followed by a 4 byte
+ * checksum of the parameters, followed by a 12 byte magic string.
+ *
+ * @param bootconfig_start_addr address that the boot config section is starting
+ * at in memory.
+ * @param bootconfig_size size of the current bootconfig section in bytes.
+ * @return number of bytes added to the boot config section. -1 for error.
+ */
+int addBootConfigTrailer(uint64_t bootconfig_start_addr,
+ uint32_t bootconfig_size);
+
+#endif /* LIBXBC_H_ */
