Skip to contentSkip to conversation

lib: reduce SPL size

PATCH New Heinrich Schuchardt 2 participants 24 messages Apr 15, 2020 – Apr 24, 2020 Library code

lore
Share & tools
lore
#0 lore raw

cover lib: reduce SPL size

Several configuration options inject code into SPL even if it is not needed.

Heinrich Schuchardt (5):
lib: do not build OID registry in SPL
lib: date functions in SPL
common: image_sign_info helper functions in SPL
lib: do not provide hexdump in SPL
dlmalloc: remove unit test support in SPL

 Kconfig           |  2 +-
 common/Kconfig    | 11 +++++++++++
 common/Makefile   |  2 +-
 common/dlmalloc.c |  2 +-
 lib/Makefile      |  6 +++---
 lib/hexdump.c     |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)

--
2.25.1

#1 lore raw

PATCH 1/5 lib: do not build OID registry in SPL

The OID registry is only used by crypto functions that are not built in SPL. So we should not build it in SPL.

Fixes a9b45e6e8382 ("lib: add oid registry utility")
---
 lib/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
lib/Makefile +1 -2
index 32bf3f3693..5d4bb3232c 100644
@@ -119,6 +119,7 @@ obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o
 else
 # Main U-Boot always uses the full printf support
 obj-y += vsprintf.o strto.o
+obj-$(CONFIG_OID_REGISTRY) += oid_registry.o
 endif
 
 obj-y += date.o
@@ -127,8 +128,6 @@ obj-$(CONFIG_LIB_ELF) += elf.o
 #
 # Build a fast OID lookup registry from include/linux/oid_registry.h
 #
-obj-$(CONFIG_OID_REGISTRY) += oid_registry.o
-
 $(obj)/oid_registry.o: $(obj)/oid_registry_data.c
 
 $(obj)/oid_registry_data.c: $(srctree)/include/linux/oid_registry.h \

--
2.25.1

#2 lore raw

PATCH 1/5 lib: do not build OID registry in SPL

Quoted 8 lines · Heinrich Schuchardt

The OID registry is only used by crypto functions that are not built in SPL. So we should not build it in SPL.

Fixes a9b45e6e8382 ("lib: add oid registry utility")
---
 lib/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

This problem shows up with the full secure boot patch series, yes? Thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200415/cfa8e174/attachment.sig>
#3 lore raw

PATCH 1/5 lib: do not build OID registry in SPL

Quoted 5 lines · Tom Rini
Quoted 3 lines · Heinrich Schuchardt

The OID registry is only used by crypto functions that are not built in SPL. So we should not build it in SPL.

Quoted 9 lines
Quoted 5 lines
Fixes a9b45e6e8382 ("lib: add oid registry utility")
---
 lib/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

This problem shows up with the full secure boot patch series, yes? Thanks.

Take origin/master:

pine64-lts_defconfig
+ CONFIG_RSA=y
+ CONFIG_ASYMMETRIC_KEY_TYPE=y
+ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+ CONFIG_RSA_PUBLIC_KEY_PARSER=y

and you will see spl/lib/oid_registry.o being built.

These settings will in future be needed for UEFI secure boot.

Best regards

Heinrich

#4 lore raw

PATCH 1/5 lib: do not build OID registry in SPL

Quoted 24 lines · Heinrich Schuchardt
Quoted 5 lines · Tom Rini
Quoted 3 lines · Heinrich Schuchardt

The OID registry is only used by crypto functions that are not built in SPL. So we should not build it in SPL.

Quoted 9 lines
Quoted 5 lines
Fixes a9b45e6e8382 ("lib: add oid registry utility")
---
 lib/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

This problem shows up with the full secure boot patch series, yes? Thanks.

Take origin/master:

pine64-lts_defconfig
+ CONFIG_RSA=y
+ CONFIG_ASYMMETRIC_KEY_TYPE=y
+ CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+ CONFIG_RSA_PUBLIC_KEY_PARSER=y

Quoted 3 lines

and you will see spl/lib/oid_registry.o being built.

These settings will in future be needed for UEFI secure boot.

Thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200416/2ad8bdcc/attachment.sig>
#5 lore raw

PATCH 1/5 lib: do not build OID registry in SPL

In reply to Heinrich Schuchardt
Quoted 6 lines · Heinrich Schuchardt

The OID registry is only used by crypto functions that are not built in SPL. So we should not build it in SPL.

Fixes a9b45e6e8382 ("lib: add oid registry utility")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/3e22d7aa/attachment.sig>
#6 lore raw

PATCH 2/5 lib: date functions in SPL

In reply to Heinrich Schuchardt

Date functions are only needed in SPL if SPL contains RTC drivers.

Fixes 05429b6cf5b3 ("rtc: move date.c from drivers/rtc/ to lib/")
---
 lib/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
lib/Makefile +2 -1
index 5d4bb3232c..dbea69f52c 100644
@@ -116,13 +116,14 @@ else
 obj-$(CONFIG_$(SPL_TPL_)SPRINTF) += vsprintf.o
 endif
 obj-$(CONFIG_$(SPL_TPL_)STRTO) += strto.o
+obj-$(CONFIG_$(SPL_TPL_)RTC_SUPPORT) += date.o
 else
 # Main U-Boot always uses the full printf support
 obj-y += vsprintf.o strto.o
 obj-$(CONFIG_OID_REGISTRY) += oid_registry.o
+obj-y += date.o
 endif
 
-obj-y += date.o
 obj-$(CONFIG_LIB_ELF) += elf.o
 
 #

--
2.25.1

#7 lore raw

PATCH 2/5 lib: date functions in SPL

Quoted 4 lines · Heinrich Schuchardt

Date functions are only needed in SPL if SPL contains RTC drivers.

Fixes 05429b6cf5b3 ("rtc: move date.c from drivers/rtc/ to lib/")

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200415/d910b6e4/attachment.sig>
#8 lore raw

PATCH 2/5 lib: date functions in SPL

Quoted 10 lines · Tom Rini
Quoted 4 lines · Heinrich Schuchardt

Date functions are only needed in SPL if SPL contains RTC drivers.

Fixes 05429b6cf5b3 ("rtc: move date.c from drivers/rtc/ to lib/")

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

We are compiling ./spl/lib/date.o for no good reason since said patch. It may be that the when creating u-boot-spl.bin from u-boot-spl this gets deleted again due to linker optimization.

Best regards

Heinrich

#9 lore raw

PATCH 2/5 lib: date functions in SPL

Quoted 8 lines · Heinrich Schuchardt
Quoted 7 lines · Tom Rini
Quoted 4 lines · Heinrich Schuchardt

Date functions are only needed in SPL if SPL contains RTC drivers.

Fixes 05429b6cf5b3 ("rtc: move date.c from drivers/rtc/ to lib/")
Quoted 7 lines
Quoted 3 lines

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

We are compiling ./spl/lib/date.o for no good reason since said patch. It may be that the when creating u-boot-spl.bin from u-boot-spl this gets deleted again due to linker optimization.

It is discarded at link time, yes. I'm generally dis-inclined to grab patches like this when it adds more to the Makefile without a size savings.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200416/952b4f4c/attachment.sig>
#10 lore raw

PATCH 3/5 common: image_sign_info helper functions in SPL

In reply to Heinrich Schuchardt

Do not build image_sign_info helper functions in SPL if not needed.

Fixes b983cc2da0ba ("lib: rsa: decouple rsa from FIT image verification")
---
 Kconfig         |  2 +-
 common/Kconfig  | 11 +++++++++++
 common/Makefile |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)
Kconfig +1 -1
index 1b0b6999d8..6038e93afb 100644
@@ -447,7 +447,7 @@ config SPL_FIT_SIGNATURE
 	select SPL_FIT
 	select SPL_RSA
 	select SPL_RSA_VERIFY
-	select IMAGE_SIGN_INFO
+	select SPL_IMAGE_SIGN_INFO
 
 config SPL_LOAD_FIT
 	bool "Enable SPL loading U-Boot as a FIT (basic fitImage features)"
common/Kconfig +11 -0
index 3072651082..75d9dfdc33 100644
@@ -1053,3 +1053,14 @@ config IMAGE_SIGN_INFO
 	select SHA256
 	help
 	  Enable image_sign_info helper functions.
+
+if IMAGE_SIGN_INFO
+
+config SPL_IMAGE_SIGN_INFO
+	bool
+	select SHA1
+	select SHA256
+	help
+	  Enable image_sign_info helper functions in SPL.
+
+endif
common/Makefile +1 -1
index 702f2396cf..ad030e05eb 100644
@@ -112,7 +112,7 @@ obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
 obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o
 obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o
 obj-$(CONFIG_$(SPL_)MULTI_DTB_FIT) += boot_fit.o common_fit.o
-obj-$(CONFIG_IMAGE_SIGN_INFO) += image-sig.o
+obj-$(CONFIG_$(SPL_TPL_)IMAGE_SIGN_INFO) += image-sig.o
 obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += image-fit-sig.o
 obj-$(CONFIG_$(SPL_TPL_)FIT_CIPHER) += image-cipher.o
 obj-$(CONFIG_IO_TRACE) += iotrace.o

--
2.25.1

#11 lore raw

PATCH 3/5 common: image_sign_info helper functions in SPL

Quoted 4 lines · Heinrich Schuchardt

Do not build image_sign_info helper functions in SPL if not needed.

Fixes b983cc2da0ba ("lib: rsa: decouple rsa from FIT image verification")
Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200415/99f9e104/attachment.sig>
#12 lore raw

PATCH 3/5 common: image_sign_info helper functions in SPL

In reply to Heinrich Schuchardt
Quoted 5 lines · Heinrich Schuchardt

Do not build image_sign_info helper functions in SPL if not needed.

Fixes b983cc2da0ba ("lib: rsa: decouple rsa from FIT image verification")

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/f1be360a/attachment.sig>
#13 lore raw

PATCH 4/5 lib: do not provide hexdump in SPL

In reply to Heinrich Schuchardt

SPL should not be enlarged by building with CONFIG_HEXDUMP=y.

---
 lib/hexdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/hexdump.c +1 -1
index bf14b5bdbd..a3f219a874 100644
@@ -18,7 +18,7 @@
 const char hex_asc[] = "0123456789abcdef";
 const char hex_asc_upper[] = "0123456789ABCDEF";
 
-#ifdef CONFIG_HEXDUMP
+#if CONFIG_IS_ENABLED(HEXDUMP)
 /**
  * hex_dump_to_buffer - convert a blob of data to "hex ASCII" in memory
  * @buf: data blob to dump

--
2.25.1

#14 lore raw

PATCH 4/5 lib: do not provide hexdump in SPL

Quoted 6 lines · Heinrich Schuchardt

SPL should not be enlarged by building with CONFIG_HEXDUMP=y.

---
 lib/hexdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200415/d4e59364/attachment.sig>
#15 lore raw

PATCH 4/5 lib: do not provide hexdump in SPL

Quoted 4 lines · Tom Rini
Quoted 2 lines · Heinrich Schuchardt

SPL should not be enlarged by building with CONFIG_HEXDUMP=y.

Quoted 8 lines
Quoted 4 lines
---
 lib/hexdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

I checked for origin/master pine64_defconfig

with HEXDUMP
1493728 spl/u-boot-spl

without HEXDUMP
1485712 spl/u-boot-spl

Currently no driver is actually calling the hexdump function is SPL. So the code seems to be removed in the final binary.

Best regards

Heinrich

#16 lore raw

PATCH 4/5 lib: do not provide hexdump in SPL

Quoted 16 lines · Heinrich Schuchardt
Quoted 4 lines · Tom Rini
Quoted 2 lines · Heinrich Schuchardt

SPL should not be enlarged by building with CONFIG_HEXDUMP=y.

Quoted 8 lines
Quoted 4 lines
---
 lib/hexdump.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

I checked for origin/master pine64_defconfig

Quoted 8 lines

with HEXDUMP
1493728 spl/u-boot-spl

without HEXDUMP
1485712 spl/u-boot-spl

Currently no driver is actually calling the hexdump function is SPL. So the code seems to be removed in the final binary.

OK, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200416/5e07babe/attachment.sig>
#17 lore raw

PATCH 4/5 lib: do not provide hexdump in SPL

In reply to Heinrich Schuchardt
Quoted 4 lines · Heinrich Schuchardt

SPL should not be enlarged by building with CONFIG_HEXDUMP=y.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/5a646dfb/attachment.sig>
#18 lore raw

PATCH 5/5 dlmalloc: remove unit test support in SPL

In reply to Heinrich Schuchardt

We cannot run unit tests in SPL. So remove the unit test support.

---
 common/dlmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
common/dlmalloc.c +1 -1
index dade68faf7..db5ab55ed3 100644
@@ -1,6 +1,6 @@
 #include <common.h>
 
-#if defined(CONFIG_UNIT_TEST)
+#if CONFIG_IS_ENABLED(UNIT_TEST)
 #define DEBUG
 #endif
 

--
2.25.1

#19 lore raw

PATCH 5/5 dlmalloc: remove unit test support in SPL

Quoted 6 lines · Heinrich Schuchardt

We cannot run unit tests in SPL. So remove the unit test support.

---
 common/dlmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200415/dd165c8e/attachment.sig>
#20 lore raw

PATCH 5/5 dlmalloc: remove unit test support in SPL

Quoted 4 lines · Tom Rini
Quoted 2 lines · Heinrich Schuchardt

We cannot run unit tests in SPL. So remove the unit test support.

Quoted 8 lines
Quoted 4 lines
---
 common/dlmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

pine64-lts_defconfig + CONFIG_UNIT_TEST=y:

without patch:
1487904 spl/u-boot-spl

with patch:
1485712 spl/u-boot-spl

The difference seems to be in the size of debug sections.

Best regards

Heinrich

#21 lore raw

PATCH 5/5 dlmalloc: remove unit test support in SPL

Quoted 16 lines · Heinrich Schuchardt
Quoted 4 lines · Tom Rini
Quoted 2 lines · Heinrich Schuchardt

We cannot run unit tests in SPL. So remove the unit test support.

Quoted 8 lines
Quoted 4 lines
---
 common/dlmalloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

pine64-lts_defconfig + CONFIG_UNIT_TEST=y:

Quoted 7 lines

without patch:
1487904 spl/u-boot-spl

with patch:
1485712 spl/u-boot-spl

The difference seems to be in the size of debug sections.

Interesting, what toolchain are you using? That doesn't show up here. Thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200416/77e46cd4/attachment.sig>
#22 lore raw

PATCH 5/5 dlmalloc: remove unit test support in SPL

Quoted 19 lines · Tom Rini
Quoted 17 lines · Heinrich Schuchardt
Quoted 6 lines · Tom Rini
Quoted 3 lines · Heinrich Schuchardt

We cannot run unit tests in SPL. So remove the unit test support.

Quoted 7 lines
Quoted 3 lines

common/dlmalloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

Does this show up as a problem somewhere? I don't see this resulting in size savings anywhere, thanks.

pine64-lts_defconfig + CONFIG_UNIT_TEST=y:

Quoted 9 lines
Quoted 5 lines

without patch: 1487904 spl/u-boot-spl

with patch: 1485712 spl/u-boot-spl

The difference seems to be in the size of debug sections.

Interesting, what toolchain are you using? That doesn't show up here. Thanks!

I am on Debian Bullseye gcc-9.2.

As you already remarked replying to another patch the linker is stripping the differences. My idea is that we should only compile the necessary.

Best regards

Heinrich

#23 lore raw

PATCH 5/5 dlmalloc: remove unit test support in SPL

In reply to Heinrich Schuchardt
Quoted 3 lines · Heinrich Schuchardt

We cannot run unit tests in SPL. So remove the unit test support.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20200424/e19571eb/attachment.sig>