wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 10:47:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Generic Memory Pools

Browse Source 
1. Add generic function wolfSSL_StaticBufferSz_ex() where one specifies
   the memory bucket list sizes and distribution.
2. Rewrote wolfSSL_StaticBufferSz() in terms of the new function.
3. Changed the list pointers on wc_LoadStaticMemory_ex() and
   wc_init_memory_heap() to be pointers to const.
This commit is contained in:
John Safranek
2024-04-11 13:59:28 -07:00
parent 7481644842
commit 15a0ae4244
2 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
wolfcrypt/src/memory.c
View File

@ -633,7 +633,7 @@ static int wc_partition_static_memory(byte* buffer, word32 sz, int flag,
} }
static int wc_init_memory_heap(WOLFSSL_HEAP* heap, unsigned int listSz, static int wc_init_memory_heap(WOLFSSL_HEAP* heap, unsigned int listSz,
unsigned int* sizeList, unsigned int* distList) const unsigned int* sizeList, const unsigned int* distList)
{ {
if (heap == NULL || listSz > WOLFMEM_MAX_BUCKETS) { if (heap == NULL || listSz > WOLFMEM_MAX_BUCKETS) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -653,9 +653,9 @@ static int wc_init_memory_heap(WOLFSSL_HEAP* heap, unsigned int listSz,
} }
int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint, int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,
unsigned int listSz, unsigned int listSz, const unsigned int* memSzList,
unsigned int* memSzList, unsigned int* memDistList, const unsigned int* memDistList, unsigned char* buf,
unsigned char* buf, unsigned int sz, int flag, int maxSz) unsigned int sz, int flag, int maxSz)
{ {
WOLFSSL_HEAP* heap = NULL; WOLFSSL_HEAP* heap = NULL;
WOLFSSL_HEAP_HINT* hint = NULL; WOLFSSL_HEAP_HINT* hint = NULL;
@ -743,17 +743,16 @@ int wolfSSL_MemoryPaddingSz(void)
/* Used to calculate memory size for optimum use with buckets. /* Used to calculate memory size for optimum use with buckets.
returns the suggested size rounded down to the nearest bucket. */ returns the suggested size rounded down to the nearest bucket. */
int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag) int wolfSSL_StaticBufferSz_ex(unsigned int listSz,
const unsigned int *sizeList, const unsigned int *distList,
byte* buffer, word32 sz, int flag)
{ {
word32 bucketSz[WOLFMEM_MAX_BUCKETS] = {WOLFMEM_BUCKETS};
word32 distList[WOLFMEM_MAX_BUCKETS] = {WOLFMEM_DIST};
word32 ava = sz; word32 ava = sz;
byte* pt = buffer; byte* pt = buffer;
word32 memSz = (word32)sizeof(wc_Memory); word32 memSz = (word32)sizeof(wc_Memory);
word32 padSz = -(int)memSz & (WOLFSSL_STATIC_ALIGN - 1); word32 padSz = -(int)memSz & (WOLFSSL_STATIC_ALIGN - 1);
WOLFSSL_ENTER("wolfSSL_static_size"); WOLFSSL_ENTER("wolfSSL_StaticBufferSz_ex");
if (buffer == NULL) { if (buffer == NULL) {
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -776,26 +775,39 @@ int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag)
else { else {
int i, k; int i, k;
if (ava < (bucketSz[0] + padSz + memSz)) { if (ava < (sizeList[0] + padSz + memSz)) {
return 0; /* not enough room for even one bucket */ return 0; /* not enough room for even one bucket */
} }
while ((ava >= (bucketSz[0] + padSz + memSz)) && (ava > 0)) { while ((ava >= (sizeList[0] + padSz + memSz)) && (ava > 0)) {
/* start at largest and move to smaller buckets */ /* start at largest and move to smaller buckets */
for (i = (WOLFMEM_MAX_BUCKETS - 1); i >= 0; i--) { for (i = (listSz- 1); i >= 0; i--) {
for (k = distList[i]; k > 0; k--) { for (k = distList[i]; k > 0; k--) {
if ((bucketSz[i] + padSz + memSz) <= ava) { if ((sizeList[i] + padSz + memSz) <= ava) {
ava -= bucketSz[i] + padSz + memSz; ava -= sizeList[i] + padSz + memSz;
} }
} }
} }
} }
} }
WOLFSSL_LEAVE("wolfSSL_StaticBufferSz_ex", sz - ava);
return sz - ava; /* round down */ return sz - ava; /* round down */
} }
/* Calls wolfSSL_StaticBufferSz_ex with the static memory pool config
* used by wolfSSL by default. */
int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag)
{
word32 bucketSz[WOLFMEM_MAX_BUCKETS] = {WOLFMEM_BUCKETS};
word32 distList[WOLFMEM_MAX_BUCKETS] = {WOLFMEM_DIST};
return wolfSSL_StaticBufferSz_ex(WOLFMEM_MAX_BUCKETS, bucketSz, distList,
buffer, sz, flag);
}
int FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io) int FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io)
{ {
WOLFSSL_MSG("Freeing fixed IO buffer"); WOLFSSL_MSG("Freeing fixed IO buffer");

8
wolfssl/wolfcrypt/memory.h
View File

@ -217,8 +217,9 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf,
} WOLFSSL_HEAP_HINT; } WOLFSSL_HEAP_HINT;
WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint, WOLFSSL_API int wc_LoadStaticMemory_ex(WOLFSSL_HEAP_HINT** pHint,
unsigned int listSz, unsigned int *sizeList, unsigned int *distList, unsigned int listSz, const unsigned int *sizeList,
unsigned char* buf, unsigned int sz, int flag, int max); const unsigned int *distList, unsigned char* buf, unsigned int sz,
int flag, int max);
WOLFSSL_API int wc_LoadStaticMemory(WOLFSSL_HEAP_HINT** pHint, WOLFSSL_API int wc_LoadStaticMemory(WOLFSSL_HEAP_HINT** pHint,
unsigned char* buf, unsigned int sz, int flag, int max); unsigned char* buf, unsigned int sz, int flag, int max);
@ -227,6 +228,9 @@ WOLFSSL_API int wolfSSL_GetAllocators(wolfSSL_Malloc_cb* mf,
WOLFSSL_LOCAL int SetFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io); WOLFSSL_LOCAL int SetFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io);
WOLFSSL_LOCAL int FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io); WOLFSSL_LOCAL int FreeFixedIO(WOLFSSL_HEAP* heap, wc_Memory** io);
WOLFSSL_API int wolfSSL_StaticBufferSz_ex(unsigned int listSz,
const unsigned int *sizeList, const unsigned int *distList,
byte* buffer, word32 sz, int flag);
WOLFSSL_API int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag); WOLFSSL_API int wolfSSL_StaticBufferSz(byte* buffer, word32 sz, int flag);
WOLFSSL_API int wolfSSL_MemoryPaddingSz(void); WOLFSSL_API int wolfSSL_MemoryPaddingSz(void);
#endif /* WOLFSSL_STATIC_MEMORY */ #endif /* WOLFSSL_STATIC_MEMORY */