[PATCH 2/3] ARM: compressed: Bump MALLOC_SIZE to 128 KiB

Jonathan Neuschäfer posted 3 patches 2 years, 10 months ago
[PATCH 2/3] ARM: compressed: Bump MALLOC_SIZE to 128 KiB
Posted by Jonathan Neuschäfer 2 years, 10 months ago
The ZSTD compressor needs about 100 KiB.

Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
---
 arch/arm/boot/compressed/Makefile | 2 +-
 arch/arm/boot/compressed/head.S   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 2ef651a78fa2a..dec565a5b1f21 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -69,7 +69,7 @@ ZTEXTADDR	:= 0
 ZBSSADDR	:= ALIGN(8)
 endif

-MALLOC_SIZE	:= 65536
+MALLOC_SIZE	:= 131072

 AFLAGS_head.o += -DTEXT_OFFSET=$(TEXT_OFFSET) -DMALLOC_SIZE=$(MALLOC_SIZE)
 CPPFLAGS_vmlinux.lds := -DTEXT_START="$(ZTEXTADDR)" -DBSS_START="$(ZBSSADDR)"
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 9f406e9c0ea6f..23fbbe94da6e8 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -337,7 +337,7 @@ restart:	adr	r0, LC1
 		get_inflated_image_size	r9, r10, lr

 #ifndef CONFIG_ZBOOT_ROM
-		/* malloc space is above the relocated stack (64k max) */
+		/* malloc space is above the relocated stack (128k max) */
 		add	r10, sp, #MALLOC_SIZE
 #else
 		/*
@@ -629,7 +629,7 @@ not_relocated:	mov	r0, #0
  */
 		mov	r0, r4
 		mov	r1, sp			@ malloc space above stack
-		add	r2, sp, #MALLOC_SIZE	@ 64k max
+		add	r2, sp, #MALLOC_SIZE	@ 128k max
 		mov	r3, r7
 		bl	decompress_kernel

--
2.39.2
Re: [PATCH 2/3] ARM: compressed: Bump MALLOC_SIZE to 128 KiB
Posted by Russell King (Oracle) 2 years, 9 months ago
On Wed, Apr 12, 2023 at 11:21:25PM +0200, Jonathan Neuschäfer wrote:
> The ZSTD compressor needs about 100 KiB.
> 
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

Please check the kexec sources to see whether that also needs to be
updated. IIRC, kexec also needs to know how big this malloc space
is.

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 80Mbps down 10Mbps up. Decent connectivity at last!
Re: [PATCH 2/3] ARM: compressed: Bump MALLOC_SIZE to 128 KiB
Posted by Florian Fainelli 2 years, 10 months ago
On 4/12/23 14:21, Jonathan Neuschäfer wrote:
> The ZSTD compressor needs about 100 KiB.
> 
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [PATCH 2/3] ARM: compressed: Bump MALLOC_SIZE to 128 KiB
Posted by Linus Walleij 2 years, 10 months ago
On Wed, Apr 12, 2023 at 11:21 PM Jonathan Neuschäfer
<j.neuschaefer@gmx.net> wrote:

> The ZSTD compressor needs about 100 KiB.
>
> Signed-off-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>

Fair enough
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij