audio: buffers: ring_buffer: Allocate memory from shared heap for userspace

Allocates audio data buffer from shared memory heap.

The security reqirements assume that the non-privileged modules data
and code should be protected from other non-privileged modules access.
The audio data could be accessible.

This change is effective only when CONFIG_USERSPACE=y.

Signed-off-by: Adrian Warecki <adrian.warecki@intel.com>

Author: softwarecki

src/audio/buffers/ring_buffer.c

@@ -8,6 +8,7 @@
 #include <sof/lib/uuid.h>
 
 #include <sof/audio/ring_buffer.h>
+#include <sof/audio/component.h>
 
 #include <rtos/alloc.h>
 #include <ipc/topology.h>
@@ -273,17 +274,16 @@ static const struct audio_buffer_ops audio_buffer_ops = {
 	.reset = ring_buffer_reset
 };
 
-struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_space, bool is_shared,
+struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_available,
+				       size_t min_free_space, bool is_shared,
 				       uint32_t id)
 {
 	struct ring_buffer *ring_buffer;
+	int memory_flags = (is_shared ? SOF_MEM_FLAG_COHERENT : 0) |
+			   (dev->drv->drv_heap ? SOF_MEM_FLAG_USER_SHARED : SOF_MEM_FLAG_USER);
 
 	/* allocate ring_buffer structure */
-	if (is_shared)
-		ring_buffer = rzalloc(SOF_MEM_FLAG_USER | SOF_MEM_FLAG_COHERENT,
-				      sizeof(*ring_buffer));
-	else
-		ring_buffer = rzalloc(SOF_MEM_FLAG_USER, sizeof(*ring_buffer));
+	ring_buffer = rzalloc(memory_flags, sizeof(*ring_buffer));
 	if (!ring_buffer)
 		return NULL;
 
@@ -353,7 +353,8 @@ struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_spa
 	ring_buffer->data_buffer_size =
 			ALIGN_UP(ring_buffer->data_buffer_size, PLATFORM_DCACHE_ALIGN);
 	ring_buffer->_data_buffer = (__sparse_force __sparse_cache void *)
-			rballoc_align(SOF_MEM_FLAG_USER, ring_buffer->data_buffer_size, PLATFORM_DCACHE_ALIGN);
+			rballoc_align(memory_flags, ring_buffer->data_buffer_size,
+				      PLATFORM_DCACHE_ALIGN);
 	if (!ring_buffer->_data_buffer)
 		goto err;
 

src/include/sof/audio/ring_buffer.h

@@ -97,6 +97,7 @@
  *		always means "buffer full"
  */
 
+struct comp_dev;
 struct ring_buffer;
 struct sof_audio_stream_params;
 
@@ -114,6 +115,7 @@ struct ring_buffer {
 
 /**
  *
+ * @param dev pointer to the DP module device structure
  * @param min_available  minimum data available in queue required by the module using
  *			 ring_buffer's source api
  * @param min_free_space minimum buffer space in queue required by the module using
@@ -122,7 +124,8 @@ struct ring_buffer {
  * @param id a stream ID, accessible later by sink_get_id/source_get_id
  *
  */
-struct ring_buffer *ring_buffer_create(size_t min_available, size_t min_free_space, bool is_shared,
+struct ring_buffer *ring_buffer_create(struct comp_dev *dev, size_t min_available,
+				       size_t min_free_space, bool is_shared,
 				       uint32_t id);
 
 #endif /* __SOF_RING_BUFFER_H__ */

src/ipc/ipc4/helper.c

@@ -603,25 +603,23 @@ __cold int ipc_comp_connect(struct ipc *ipc, ipc_pipe_comp_connect *_connect)
 
 	if (sink->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP ||
 	    source->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP) {
-		struct sof_source *source = audio_buffer_get_source(&buffer->audio_buffer);
-		struct sof_sink *sink = audio_buffer_get_sink(&buffer->audio_buffer);
+		bool dp_on_source = source->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP;
+		struct sof_source *src = audio_buffer_get_source(&buffer->audio_buffer);
+		struct sof_sink *snk = audio_buffer_get_sink(&buffer->audio_buffer);
 
-		ring_buffer = ring_buffer_create(source_get_min_available(source),
-						 sink_get_min_free_space(sink),
+		ring_buffer = ring_buffer_create(dp_on_source ? source : sink,
+						 source_get_min_available(src),
+						 sink_get_min_free_space(snk),
 						 audio_buffer_is_shared(&buffer->audio_buffer),
 						 buf_get_id(buffer));
 		if (!ring_buffer)
 			goto free;
-	}
 
-	if (sink->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP)
 		/* data destination module needs to use ring_buffer */
-		audio_buffer_attach_secondary_buffer(&buffer->audio_buffer, false, /* at_input */
-						     &ring_buffer->audio_buffer);
-	else if (source->ipc_config.proc_domain == COMP_PROCESSING_DOMAIN_DP)
-		/* data source module needs to use ring_buffer */
-		audio_buffer_attach_secondary_buffer(&buffer->audio_buffer, true, /* at_input */
+		audio_buffer_attach_secondary_buffer(&buffer->audio_buffer, dp_on_source,
 						     &ring_buffer->audio_buffer);
+	}
+
 #endif /* CONFIG_ZEPHYR_DP_SCHEDULER */
 	/*
 	 * Connect and bind the buffer to both source and sink components with LL processing been