sys_mem_pool: use sys_mutex

Permission management no longer necessary, the former
parameter for the mutex is now simply ignored.

Signed-off-by: Andrew Boie <[email protected]>

Author: Andrew Boie

include/misc/mempool.h

@@ -9,10 +9,11 @@
 
 #include <kernel.h>
 #include <misc/mempool_base.h>
+#include <misc/mutex.h>
 
 struct sys_mem_pool {
 	struct sys_mem_pool_base base;
-	struct k_mutex *mutex;
+	struct sys_mutex mutex;
 };
 
 struct sys_mem_pool_block {
@@ -38,16 +39,15 @@ struct sys_mem_pool_block {
  * run sys_mem_pool_init() on it before using any other APIs.
  *
  * @param name Name of the memory pool.
- * @param kmutex Pointer to an initialized k_mutex object, used for
- *		 synchronization, declared with K_MUTEX_DEFINE().
+ * @param ignored ignored, any value
  * @param minsz Size of the smallest blocks in the pool (in bytes).
  * @param maxsz Size of the largest blocks in the pool (in bytes).
  * @param nmax Number of maximum sized blocks in the pool.
  * @param align Alignment of the pool's buffer (power of 2).
  * @param section Destination binary section for pool data
  */
-#define SYS_MEM_POOL_DEFINE(name, kmutex, minsz, maxsz, nmax, align, section) \
-	char __aligned(align) Z_GENERIC_SECTION(section)			\
+#define SYS_MEM_POOL_DEFINE(name, ignored, minsz, maxsz, nmax, align, section) \
+	char __aligned(align) Z_GENERIC_SECTION(section)		\
 		_mpool_buf_##name[_ALIGN4(maxsz * nmax)			\
 				  + _MPOOL_BITS_SIZE(maxsz, minsz, nmax)]; \
 	struct sys_mem_pool_lvl Z_GENERIC_SECTION(section)		\
@@ -60,8 +60,7 @@ struct sys_mem_pool_block {
 			.n_levels = Z_MPOOL_LVLS(maxsz, minsz),		\
 			.levels = _mpool_lvls_##name,			\
 			.flags = SYS_MEM_POOL_USER			\
-		},							\
-		.mutex = kmutex,					\
+		}							\
 	}
 
 /**

lib/gui/lvgl/lvgl_mem_user.c

@@ -9,8 +9,7 @@
 #include <init.h>
 #include <misc/mempool.h>
 
-K_MUTEX_DEFINE(lvgl_mem_pool_mutex);
-SYS_MEM_POOL_DEFINE(lvgl_mem_pool, &lvgl_mem_pool_mutex,
+SYS_MEM_POOL_DEFINE(lvgl_mem_pool, NULL,
 		CONFIG_LVGL_MEM_POOL_MIN_SIZE,
 		CONFIG_LVGL_MEM_POOL_MAX_SIZE,
 		CONFIG_LVGL_MEM_POOL_NUMBER_BLOCKS, 4, .data);
@@ -27,9 +26,6 @@ void lvgl_free(void *ptr)
 
 static int lvgl_mem_pool_init(struct device *unused)
 {
-#ifdef CONFIG_USERSPACE
-	k_object_access_all_grant(&lvgl_mem_pool_mutex);
-#endif
 	sys_mem_pool_init(&lvgl_mem_pool);
 	return 0;
 }

lib/libc/minimal/source/stdlib/malloc.c

@@ -24,8 +24,7 @@ K_APPMEM_PARTITION_DEFINE(z_malloc_partition);
 #define POOL_SECTION .data
 #endif /* CONFIG_USERSPACE */
 
-K_MUTEX_DEFINE(malloc_mutex);
-SYS_MEM_POOL_DEFINE(z_malloc_mem_pool, &malloc_mutex, 16,
+SYS_MEM_POOL_DEFINE(z_malloc_mem_pool, NULL, 16,
 		    CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE, 1, 4, POOL_SECTION);
 
 void *malloc(size_t size)
@@ -44,9 +43,6 @@ static int malloc_prepare(struct device *unused)
 {
 	ARG_UNUSED(unused);
 
-#ifdef CONFIG_USERSPACE
-	k_object_access_all_grant(&malloc_mutex);
-#endif
 	sys_mem_pool_init(&z_malloc_mem_pool);
 
 	return 0;

lib/os/mempool.c

@@ -333,7 +333,7 @@ void *sys_mem_pool_alloc(struct sys_mem_pool *p, size_t size)
 	u32_t level, block;
 	char *ret;
 
-	k_mutex_lock(p->mutex, K_FOREVER);
+	sys_mutex_lock(&p->mutex, K_FOREVER);
 
 	size += sizeof(struct sys_mem_pool_block);
 	if (z_sys_mem_pool_block_alloc(&p->base, size, &level, &block,
@@ -348,7 +348,7 @@ void *sys_mem_pool_alloc(struct sys_mem_pool *p, size_t size)
 	blk->pool = p;
 	ret += sizeof(*blk);
 out:
-	k_mutex_unlock(p->mutex);
+	sys_mutex_unlock(&p->mutex);
 	return ret;
 }
 
@@ -364,8 +364,8 @@ void sys_mem_pool_free(void *ptr)
 	blk = (struct sys_mem_pool_block *)((char *)ptr - sizeof(*blk));
 	p = blk->pool;
 
-	k_mutex_lock(p->mutex, K_FOREVER);
+	sys_mutex_lock(&p->mutex, K_FOREVER);
 	z_sys_mem_pool_block_free(&p->base, blk->level, blk->block);
-	k_mutex_unlock(p->mutex);
+	sys_mutex_unlock(&p->mutex);
 }
 

tests/kernel/mem_pool/sys_mem_pool/src/main.c

@@ -19,9 +19,7 @@
 #define BLK_SIZE_EXCLUDE_DESC (BLK_SIZE_MIN - 16)
 #define BLK_ALIGN BLK_SIZE_MIN
 
-K_MUTEX_DEFINE(pool_mutex);
-
-SYS_MEM_POOL_DEFINE(pool, &pool_mutex, BLK_SIZE_MIN, BLK_SIZE_MAX,
+SYS_MEM_POOL_DEFINE(pool, NULL, BLK_SIZE_MIN, BLK_SIZE_MAX,
 		    BLK_NUM_MAX, BLK_ALIGN, ZTEST_SECTION);
 
 /**
@@ -126,7 +124,6 @@ void test_sys_mem_pool_min_block_size(void)
 /*test case main entry*/
 void test_main(void)
 {
-	k_thread_access_grant(k_current_get(), &pool_mutex);
 	sys_mem_pool_init(&pool);
 
 	ztest_test_suite(test_sys_mem_pool_api,