fast-get: convert to syscalls

Convert fast_get() and fast_put() to syscalls.

Signed-off-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>

Author: lyakh

src/include/sof/lib/fast-get.h

@@ -11,7 +11,18 @@
 #include <stddef.h>
 
 struct k_heap;
-const void *fast_get(struct k_heap *heap, const void * const dram_ptr, size_t size);
-void fast_put(struct k_heap *heap, const void *sram_ptr);
+
+#if defined(__ZEPHYR__) && defined(CONFIG_SOF)
+#include <zephyr/toolchain.h>
+
+__syscall const void *fast_get(struct k_heap *heap, const void * const dram_ptr, size_t size);
+__syscall void fast_put(struct k_heap *heap, const void *sram_ptr);
+#include <zephyr/syscalls/fast-get.h>
+#else
+const void *z_impl_fast_get(struct k_heap *heap, const void * const dram_ptr, size_t size);
+void z_impl_fast_put(struct k_heap *heap, const void *sram_ptr);
+#define fast_get z_impl_fast_get
+#define fast_put z_impl_fast_put
+#endif /* __ZEPHYR__ */
 
 #endif /* __SOF_LIB_FAST_GET_H__ */

zephyr/CMakeLists.txt

@@ -529,6 +529,8 @@ zephyr_library_sources_ifdef(CONFIG_SHELL
        sof_shell.c
 )
 
+zephyr_syscall_header(${SOF_SRC_PATH}/include/sof/lib/fast-get.h)
+
 zephyr_library_link_libraries(SOF)
 target_link_libraries(SOF INTERFACE zephyr_interface)
 

zephyr/lib/fast-get.c

@@ -80,7 +80,7 @@ static struct sof_fast_get_entry *fast_get_find_entry(struct sof_fast_get_data *
 	return NULL;
 }
 
-const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
+const void *z_impl_fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 {
 	struct sof_fast_get_data *data = &fast_get_data;
 	struct sof_fast_get_entry *entry;
@@ -131,7 +131,7 @@ const void *fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
 
 	return ret;
 }
-EXPORT_SYMBOL(fast_get);
+EXPORT_SYMBOL(z_impl_fast_get);
 
 static struct sof_fast_get_entry *fast_put_find_entry(struct sof_fast_get_data *data,
 						      const void *sram_ptr)
@@ -146,7 +146,7 @@ static struct sof_fast_get_entry *fast_put_find_entry(struct sof_fast_get_data *
 	return NULL;
 }
 
-void fast_put(struct k_heap *heap, const void *sram_ptr)
+void z_impl_fast_put(struct k_heap *heap, const void *sram_ptr)
 {
 	struct sof_fast_get_data *data = &fast_get_data;
 	struct sof_fast_get_entry *entry;
@@ -168,4 +168,30 @@ void fast_put(struct k_heap *heap, const void *sram_ptr)
 	       entry ? entry->size : 0, entry ? entry->refcount : 0);
 	k_spin_unlock(&data->lock, key);
 }
-EXPORT_SYMBOL(fast_put);
+EXPORT_SYMBOL(z_impl_fast_put);
+
+#ifdef CONFIG_USERSPACE
+void z_vrfy_fast_put(struct k_heap *heap, const void *sram_ptr)
+{
+	K_OOPS(K_SYSCALL_MEMORY_WRITE(heap, sizeof(*heap)));
+	K_OOPS(K_SYSCALL_MEMORY_WRITE(heap->heap.heap, sizeof(*heap->heap.heap)));
+	/*
+	 * FIXME: we don't know how much SRAM has been allocated, so cannot
+	 * check. Should fast_put() be changed to pass a size argument?
+	 */
+
+	z_impl_fast_put(heap, sram_ptr);
+}
+#include <zephyr/syscalls/mod_fast_put_mrsh.c>
+
+const void *z_vrfy_fast_get(struct k_heap *heap, const void *dram_ptr, size_t size)
+{
+	K_OOPS(K_SYSCALL_MEMORY_WRITE(heap, sizeof(*heap)));
+	K_OOPS(K_SYSCALL_MEMORY_WRITE(heap->heap.heap, sizeof(*heap->heap.heap)));
+	/* We cannot (easily) verify the actual heapp memory */
+	K_OOPS(K_SYSCALL_MEMORY_READ(dram_ptr, size));
+
+	return z_impl_fast_get(heap, dram_ptr, size);
+}
+#include <zephyr/syscalls/mod_fast_get_mrsh.c>
+#endif