Skip to content
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

mm: Unified memory management alignment length #15383

Closed
wants to merge 3 commits into from
Closed

mm: Unified memory management alignment length #15383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b513c29
boards/xtensa/esp32s3: increase stack size of buttons defconfig
fdcavalcanti Dec 20, 2024
c650bb6
Merge branch 'apache:master' into master
W-M-R Dec 30, 2024
e3a69cb
mm: Unified memory management alignment length
W-M-R Dec 30, 2024
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
8 changes: 1 addition & 7 deletions include/nuttx/mm/mempool.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,10 @@
* Pre-processor Definitions
****************************************************************************/

#if CONFIG_MM_DEFAULT_ALIGNMENT == 0
# define MEMPOOL_ALIGN (2 * sizeof(uintptr_t))
#else
# define MEMPOOL_ALIGN CONFIG_MM_DEFAULT_ALIGNMENT
#endif

#if CONFIG_MM_BACKTRACE >= 0
# define MEMPOOL_REALBLOCKSIZE(pool) (ALIGN_UP((pool)->blocksize + \
sizeof(struct mempool_backtrace_s), \
MEMPOOL_ALIGN))
MM_ALIGN))
#else
# define MEMPOOL_REALBLOCKSIZE(pool) ((pool)->blocksize)
#endif
Expand Down
6 changes: 6 additions & 0 deletions include/nuttx/mm/mm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,12 @@
# define MM_DUMP_LEAK(dump,pid) (false)
#endif

#if CONFIG_MM_DEFAULT_ALIGNMENT == 0
# define MM_ALIGN (2 * sizeof(uintptr_t))
#else
# define MM_ALIGN CONFIG_MM_DEFAULT_ALIGNMENT
#endif

#define MM_INIT_MAGIC 0xcc
#define MM_ALLOC_MAGIC 0xaa
#define MM_FREE_MAGIC 0x55
Expand Down
6 changes: 1 addition & 5 deletions mm/mm_heap/mm.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <nuttx/fs/procfs.h>
#include <nuttx/lib/math32.h>
#include <nuttx/mm/mempool.h>
#include <nuttx/mm/mm.h>

#include <assert.h>
#include <sys/types.h>
Expand Down Expand Up @@ -114,11 +115,6 @@
#define MM_MAX_CHUNK (1 << MM_MAX_SHIFT)
#define MM_NNODES (MM_MAX_SHIFT - MM_MIN_SHIFT + 1)

#if CONFIG_MM_DEFAULT_ALIGNMENT == 0
# define MM_ALIGN (2 * sizeof(uintptr_t))
#else
# define MM_ALIGN CONFIG_MM_DEFAULT_ALIGNMENT
#endif
#define MM_GRAN_MASK (MM_ALIGN - 1)
#define MM_ALIGN_UP(a) (((a) + MM_GRAN_MASK) & ~MM_GRAN_MASK)
#define MM_ALIGN_DOWN(a) ((a) & ~MM_GRAN_MASK)
Expand Down
Loading