Skip to content

libc/common: malloc fixes #58450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 31, 2023
Merged

libc/common: malloc fixes #58450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bac8a2a
libc/common: Require at least double alignment for common malloc arena
keith-packard May 30, 2023
050c082
libc/common: Increase USERSPACE + POT MPU default arena to 2048 bytes
keith-packard May 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/libc/common/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ config COMMON_LIBC_MALLOC_ARENA_SIZE
depends on COMMON_LIBC_MALLOC
default 0 if MINIMAL_LIBC
default 16384 if MMU
default 1024 if USERSPACE && MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT
default 2048 if USERSPACE && MPU_REQUIRES_POWER_OF_TWO_ALIGNMENT
default -1
help
Indicate the size in bytes of the memory arena used for
Expand Down
6 changes: 3 additions & 3 deletions lib/libc/common/source/stdlib/malloc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ K_APPMEM_PARTITION_DEFINE(z_malloc_partition);
# endif
# define HEAP_ALIGN CONFIG_COMMON_LIBC_MALLOC_ARENA_SIZE
# elif defined(CONFIG_ARM) || defined(CONFIG_ARM64)
# define HEAP_ALIGN CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE
# define HEAP_ALIGN MAX(sizeof(double), CONFIG_ARM_MPU_REGION_MIN_ALIGN_AND_SIZE)
# elif defined(CONFIG_ARC)
# define HEAP_ALIGN Z_ARC_MPU_ALIGN
# define HEAP_ALIGN MAX(sizeof(double), Z_ARC_MPU_ALIGN)
# elif defined(CONFIG_RISCV)
# define HEAP_ALIGN Z_POW2_CEIL(Z_RISCV_STACK_GUARD_SIZE)
# define HEAP_ALIGN Z_POW2_CEIL(MAX(sizeof(double), Z_RISCV_STACK_GUARD_SIZE))
# else
/* Default to 64-bytes; we'll get a run-time error if this doesn't work. */
# define HEAP_ALIGN 64
Expand Down