Skip to content

Commit f874f04

Browse files
ranj063lgirdwood
ranj063
authored and
lgirdwood
committed
tools: plugin: Replace mqueue with unix domain socket
Replace the mqueues with unix domain ocket for IPC communication between the plugin and sof-pipe. Since socket are full-duplex, a single socket is sufficient to handle the IPC communication. They are also faster and require no queue management unlike with mqueues. Also, unix domain sockets aloow sending larger data sizes. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
1 parent 5c8058c commit f874f04

14 files changed

Lines changed: 333 additions & 366 deletions

File tree

‎tools/plugin/alsaplug/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ target_include_directories(asound_module_pcm_sof PRIVATE
1717
${sof_source_directory}/src/audio)
1818

1919
target_compile_options(asound_module_pcm_sof PRIVATE -DPIC -g -O3 -Wmissing-prototypes
20-
-Wimplicit-fallthrough -DCONFIG_LIBRARY -imacros${config_h})
20+
-Wno-stringop-truncation -Wimplicit-fallthrough -DCONFIG_LIBRARY -imacros${config_h})
2121

2222
install(TARGETS asound_module_pcm_sof DESTINATION /usr/lib/x86_64-linux-gnu/alsa-lib)
2323

@@ -49,7 +49,7 @@ target_include_directories(asound_module_ctl_sof PRIVATE
4949
${sof_source_directory}/src/audio)
5050

5151
target_compile_options(asound_module_ctl_sof PRIVATE -DPIC -g -O3 -Wmissing-prototypes
52-
-Wimplicit-fallthrough -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h})
52+
-Wimplicit-fallthrough -Wno-stringop-truncation -Wall -Werror -DCONFIG_LIBRARY -imacros${config_h})
5353

5454
install(TARGETS asound_module_ctl_sof DESTINATION /usr/lib/x86_64-linux-gnu/alsa-lib)
5555

‎tools/plugin/alsaplug/ctl.c‎

Lines changed: 15 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,7 @@
3131
typedef struct snd_sof_ctl {
3232
struct plug_shm_glb_state *glb;
3333
snd_ctl_ext_t ext;
34-
struct plug_mq_desc ipc_tx;
35-
struct plug_mq_desc ipc_rx;
34+
struct plug_socket_desc ipc;
3635
struct plug_shm_desc shm_ctx;
3736
int subscribed;
3837
int updated[MAX_CTLS];
@@ -232,8 +231,7 @@ static int plug_ctl_read_integer(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, long
232231

233232
/* send the IPC message */
234233
memcpy(msg, &config, sizeof(config));
235-
err = plug_mq_cmd_tx_rx(&ctl->ipc_tx, &ctl->ipc_rx,
236-
msg, size, reply_data, reply_data_size);
234+
err = plug_ipc_cmd_tx_rx(&ctl->ipc, msg, size, reply_data, reply_data_size);
237235
free(msg);
238236
if (err < 0) {
239237
SNDERR("failed to set volume for control %s\n", mixer_ctl->hdr.name);
@@ -325,8 +323,7 @@ static int plug_ctl_write_integer(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, lon
325323
memcpy(msg + sizeof(config), &volume, sizeof(volume));
326324

327325
/* send the message and check status */
328-
err = plug_mq_cmd_tx_rx(&ctl->ipc_tx, &ctl->ipc_rx,
329-
msg, size, &reply, sizeof(reply));
326+
err = plug_ipc_cmd_tx_rx(&ctl->ipc, msg, size, &reply, sizeof(reply));
330327
free(msg);
331328
if (err < 0) {
332329
SNDERR("failed to set volume control %s\n", mixer_ctl->hdr.name);
@@ -426,8 +423,7 @@ static int plug_ctl_read_enumerated(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
426423

427424
/* send the IPC message */
428425
memcpy(msg, &config, sizeof(config));
429-
err = plug_mq_cmd_tx_rx(&ctl->ipc_tx, &ctl->ipc_rx,
430-
msg, size, reply_data, reply_data_size);
426+
err = plug_ipc_cmd_tx_rx(&ctl->ipc, msg, size, reply_data, reply_data_size);
431427
free(msg);
432428
if (err < 0) {
433429
SNDERR("failed to get enum items for control %s\n", enum_ctl->hdr.name);
@@ -516,7 +512,7 @@ static int plug_ctl_write_enumerated(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
516512
free(data);
517513

518514
/* send the message and check status */
519-
err = plug_mq_cmd_tx_rx(&ctl->ipc_tx, &ctl->ipc_rx, msg, msg_size, &reply, sizeof(reply));
515+
err = plug_ipc_cmd_tx_rx(&ctl->ipc, msg, msg_size, &reply, sizeof(reply));
520516
free(msg);
521517
if (err < 0) {
522518
SNDERR("failed to set enum control %s\n", enum_ctl->hdr.name);
@@ -573,8 +569,7 @@ static int plug_ctl_get_bytes_data(snd_sof_ctl_t *ctl, snd_ctl_ext_key_t key,
573569

574570
/* send the IPC message */
575571
memcpy(msg, &config, sizeof(config));
576-
err = plug_mq_cmd_tx_rx(&ctl->ipc_tx, &ctl->ipc_rx,
577-
msg, size, reply_data, reply_data_size);
572+
err = plug_ipc_cmd_tx_rx(&ctl->ipc, msg, size, reply_data, reply_data_size);
578573
free(msg);
579574
if (err < 0) {
580575
SNDERR("failed to get bytes data for control %s\n", bytes_ctl->hdr.name);
@@ -633,9 +628,8 @@ static int plug_ctl_write_bytes(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key,
633628
int err;
634629

635630
/* send IPC with kcontrol data */
636-
err = plug_send_bytes_data(&ctl->ipc_tx, &ctl->ipc_rx,
637-
ctl->glb->ctl[key].module_id, ctl->glb->ctl[key].instance_id,
638-
abi);
631+
err = plug_send_bytes_data(&ctl->ipc, ctl->glb->ctl[key].module_id,
632+
ctl->glb->ctl[key].instance_id, abi);
639633
if (err < 0) {
640634
SNDERR("failed to set bytes data for control %s\n", bytes_ctl->hdr.name);
641635
return err;
@@ -673,8 +667,7 @@ static int plug_tlv_rw(snd_ctl_ext_t *ext, snd_ctl_ext_key_t key, int op_flag,
673667
if (op_flag) {
674668
int err;
675669

676-
err = plug_send_bytes_data(&ctl->ipc_tx, &ctl->ipc_rx,
677-
ctl->glb->ctl[key].module_id,
670+
err = plug_send_bytes_data(&ctl->ipc, ctl->glb->ctl[key].module_id,
678671
ctl->glb->ctl[key].instance_id, abi);
679672
if (err < 0) {
680673
SNDERR("failed to set bytes data for control %s\n", bytes_ctl->hdr.name);
@@ -747,6 +740,7 @@ static void plug_ctl_close(snd_ctl_ext_t *ext)
747740
snd_sof_ctl_t *ctl = ext->private_data;
748741

749742
/* TODO: munmap */
743+
close(ctl->ipc.socket_fd);
750744
free(ctl);
751745
}
752746

@@ -793,34 +787,17 @@ SND_CTL_PLUGIN_DEFINE_FUNC(sof)
793787
goto error;
794788
}
795789

796-
/* init IPC tx message queue name */
797-
err = plug_mq_init(&ctl->ipc_tx, "sof", "ipc-tx", 0);
790+
/* init IPC socket name */
791+
err = plug_socket_path_init(&ctl->ipc, "sof", "ipc", 0);
798792
if (err < 0) {
799793
SNDERR("error: invalid name for IPC tx mq %s\n", plug->tplg_file);
800794
goto error;
801795
}
802796

803-
/* open the sof-pipe IPC tx message queue */
804-
err = plug_mq_open(&ctl->ipc_tx);
797+
err = plug_create_client_socket(&ctl->ipc);
805798
if (err < 0) {
806-
SNDERR("error: failed to open sof-pipe IPC mq %s: %s",
807-
ctl->ipc_tx.queue_name, strerror(err));
808-
goto error;
809-
}
810-
811-
/* init IPC rx message queue name */
812-
err = plug_mq_init(&ctl->ipc_rx, "sof", "ipc-rx", 0);
813-
if (err < 0) {
814-
SNDERR("error: invalid name for IPC rx mq %s\n", plug->tplg_file);
815-
goto error;
816-
}
817-
818-
/* open the sof-pipe IPC rx message queue */
819-
err = plug_mq_open(&ctl->ipc_rx);
820-
if (err < 0) {
821-
SNDERR("error: failed to open sof-pipe IPC mq %s: %s",
822-
ctl->ipc_rx.queue_name, strerror(err));
823-
goto error;
799+
SNDERR("failed to connect to SOF pipe IPC socket : %s", strerror(err));
800+
return -errno;
824801
}
825802

826803
/* create a SHM mapping for low latency stream position */
@@ -847,9 +824,6 @@ SND_CTL_PLUGIN_DEFINE_FUNC(sof)
847824
strncpy(ctl->ext.mixername, "SOF",
848825
sizeof(ctl->ext.mixername) - 1);
849826

850-
/* polling on message queue - supported on Linux but not portable */
851-
ctl->ext.poll_fd = ctl->ipc_tx.mq;
852-
853827
ctl->ext.callback = &sof_ext_callback;
854828
ctl->ext.private_data = ctl;
855829
ctl->ext.tlv.c = plug_tlv_rw;

‎tools/plugin/alsaplug/pcm.c‎

Lines changed: 12 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
#include <sys/poll.h>
99
#include <string.h>
1010
#include <sys/types.h>
11+
#include <sys/socket.h>
12+
#include <sys/un.h>
1113
#include <unistd.h>
1214
#include <stdlib.h>
1315
#include <sys/wait.h>
1416
#include <sys/stat.h>
15-
#include <mqueue.h>
1617
#include <fcntl.h>
1718
#include <sys/mman.h>
1819
#include <semaphore.h>
@@ -42,10 +43,6 @@ typedef struct snd_sof_pcm {
4243
/* PCM flow control */
4344
struct plug_sem_desc ready[TPLG_MAX_PCM_PIPELINES];
4445
struct plug_sem_desc done[TPLG_MAX_PCM_PIPELINES];
45-
/* pipeline IPC tx queues */
46-
struct plug_mq_desc pipeline_ipc_tx[TPLG_MAX_PCM_PIPELINES];
47-
/* pipeline IPC response queues */
48-
struct plug_mq_desc pipeline_ipc_rx[TPLG_MAX_PCM_PIPELINES];
4946

5047
struct plug_shm_desc shm_pcm;
5148

@@ -55,15 +52,15 @@ typedef struct snd_sof_pcm {
5552
static int plug_pipeline_set_state(snd_sof_plug_t *plug, int state,
5653
struct ipc4_pipeline_set_state *pipe_state,
5754
struct tplg_pipeline_info *pipe_info,
58-
struct plug_mq_desc *ipc_tx, struct plug_mq_desc *ipc_rx)
55+
struct plug_socket_desc *ipc)
5956
{
6057
struct ipc4_message_reply reply = {{ 0 }};
6158
int ret;
6259

6360
pipe_state->primary.r.ppl_id = pipe_info->instance_id;
6461

65-
ret = plug_mq_cmd_tx_rx(ipc_tx, ipc_rx, pipe_state, sizeof(*pipe_state),
66-
&reply, sizeof(reply));
62+
ret = plug_ipc_cmd_tx_rx(ipc, pipe_state, sizeof(*pipe_state),
63+
&reply, sizeof(reply));
6764
if (ret < 0)
6865
SNDERR("failed pipeline %d set state %d\n", pipe_info->instance_id, state);
6966

@@ -97,8 +94,7 @@ static int plug_pipelines_set_state(snd_sof_plug_t *plug, int state)
9794
int ret;
9895

9996
ret = plug_pipeline_set_state(plug, state, &pipe_state, pipe_info,
100-
&pcm->pipeline_ipc_tx[i],
101-
&pcm->pipeline_ipc_rx[i]);
97+
&plug->ipc);
10298
if (ret < 0)
10399
return ret;
104100
}
@@ -111,7 +107,7 @@ static int plug_pipelines_set_state(snd_sof_plug_t *plug, int state)
111107
int ret;
112108

113109
ret = plug_pipeline_set_state(plug, state, &pipe_state, pipe_info,
114-
&pcm->pipeline_ipc_tx[i], &pcm->pipeline_ipc_rx[i]);
110+
&plug->ipc);
115111
if (ret < 0)
116112
return ret;
117113
}
@@ -482,38 +478,6 @@ static int plug_pcm_hw_params(snd_pcm_ioplug_t *io, snd_pcm_hw_params_t *params)
482478
for (i = 0; i < pipeline_list->count; i++) {
483479
struct tplg_pipeline_info *pipe_info = pipeline_list->pipelines[i];
484480

485-
/* init IPC message queue name */
486-
err = plug_mq_init(&pcm->pipeline_ipc_tx[i], plug->tplg_file, "pcm-tx",
487-
pipe_info->instance_id);
488-
if (err < 0) {
489-
SNDERR("error: invalid name for pipeline IPC mq %s\n", plug->tplg_file);
490-
return err;
491-
}
492-
493-
/* open the sof-pipe IPC message queue */
494-
err = plug_mq_open(&pcm->pipeline_ipc_tx[i]);
495-
if (err < 0) {
496-
SNDERR("error: failed to open sof-pipe IPC mq %s: %s",
497-
pcm->pipeline_ipc_tx[i].queue_name, strerror(err));
498-
return -errno;
499-
}
500-
501-
/* init IPC message queue name */
502-
err = plug_mq_init(&pcm->pipeline_ipc_rx[i], plug->tplg_file, "pcm-rx",
503-
pipe_info->instance_id);
504-
if (err < 0) {
505-
SNDERR("error: invalid name for pipeline IPC mq %s\n", plug->tplg_file);
506-
return err;
507-
}
508-
509-
/* open the sof-pipe IPC message queue */
510-
err = plug_mq_open(&pcm->pipeline_ipc_rx[i]);
511-
if (err < 0) {
512-
SNDERR("error: failed to open sof-pipe IPC mq %s: %s",
513-
pcm->pipeline_ipc_tx[i].queue_name, strerror(err));
514-
return -errno;
515-
}
516-
517481
/* init name for pipeline ready lock */
518482
err = plug_lock_init(&pcm->ready[i], plug->tplg_file, "ready",
519483
pipe_info->instance_id);
@@ -671,20 +635,17 @@ static int plug_pcm_hw_free(snd_pcm_ioplug_t *io)
671635
pipeline_list = &plug->pcm_info->playback_pipeline_list;
672636

673637
ret = plug_free_pipelines(plug, pipeline_list, pcm->capture);
674-
if (ret < 0)
675-
return ret;
676638

677639
close(pcm->shm_pcm.fd);
678640
close(plug->glb_ctx.fd);
679641

680642
for (i = 0; i < pipeline_list->count; i++) {
681643
struct tplg_pipeline_info *pipe_info = pipeline_list->pipelines[i];
682644

683-
mq_close(pcm->pipeline_ipc_tx[pipe_info->instance_id].mq);
684-
mq_close(pcm->pipeline_ipc_rx[pipe_info->instance_id].mq);
685645
sem_close(pcm->ready[pipe_info->instance_id].sem);
686646
sem_close(pcm->done[pipe_info->instance_id].sem);
687647
}
648+
close(plug->ipc.socket_fd);
688649

689650
return 0;
690651
}
@@ -957,31 +918,15 @@ static int plug_init_sof_pipe(snd_sof_plug_t *plug, snd_pcm_t **pcmp,
957918
fprintf(stdout, "topology parsing complete\n");
958919

959920
/* init IPC message queue name */
960-
err = plug_mq_init(&plug->ipc_tx, "sof", "ipc-tx", 0);
961-
if (err < 0) {
962-
SNDERR("error: invalid name for IPC mq %s\n", plug->tplg_file);
963-
return err;
964-
}
965-
966-
/* open the sof-pipe IPC message queue */
967-
err = plug_mq_open(&plug->ipc_tx);
968-
if (err < 0) {
969-
SNDERR("error: failed to open sof-pipe IPC mq %s: %s",
970-
plug->ipc_tx.queue_name, strerror(err));
971-
return -errno;
972-
}
973-
974-
err = plug_mq_init(&plug->ipc_rx, "sof", "ipc-rx", 0);
921+
err = plug_socket_path_init(&plug->ipc, "sof", "ipc", 0);
975922
if (err < 0) {
976-
SNDERR("error: invalid name for IPC mq %s\n", plug->tplg_file);
923+
SNDERR("error: invalid name for IPC socket %s\n", plug->tplg_file);
977924
return err;
978925
}
979926

980-
/* open the sof-pipe IPC message queue */
981-
err = plug_mq_open(&plug->ipc_rx);
927+
err = plug_create_client_socket(&plug->ipc);
982928
if (err < 0) {
983-
SNDERR("error: failed to open sof-pipe IPC mq %s: %s",
984-
plug->ipc_rx.queue_name, strerror(err));
929+
SNDERR("failed to connect to SOF pipe IPC socket : %s", strerror(err));
985930
return -errno;
986931
}
987932

‎tools/plugin/alsaplug/plugin.c‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
#include <stdlib.h>
3030
#include <sys/wait.h>
3131
#include <sys/stat.h>
32-
#include <mqueue.h>
3332
#include <fcntl.h>
3433
#include <sys/mman.h>
3534
#include <semaphore.h>
@@ -41,27 +40,6 @@
4140
#include "plugin.h"
4241
#include "common.h"
4342

44-
int plug_mq_cmd(struct plug_mq_desc *ipc, void *msg, size_t len, void *reply, size_t rlen)
45-
{
46-
return plug_mq_cmd_tx_rx(ipc, ipc, msg, len, reply, rlen);
47-
}
48-
49-
/*
50-
* Open an existing message queue using IPC object.
51-
*/
52-
int plug_mq_open(struct plug_mq_desc *ipc)
53-
{
54-
/* now open new queue for Tx and Rx */
55-
ipc->mq = mq_open(ipc->queue_name, O_RDWR);
56-
if (ipc->mq < 0) {
57-
// SNDERR("failed to open IPC queue %s: %s\n",
58-
// ipc->queue_name, strerror(errno));
59-
return -errno;
60-
}
61-
62-
return 0;
63-
}
64-
6543
/*
6644
* Open an existing semaphore using lock object.
6745
*/

‎tools/plugin/alsaplug/plugin.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,7 @@ typedef struct snd_sof_plug {
3939
struct list_item pcm_list;
4040
struct list_item pipeline_list;
4141
int instance_ids[SND_SOC_TPLG_DAPM_LAST];
42-
struct plug_mq_desc ipc_tx;
43-
struct plug_mq_desc ipc_rx;
42+
struct plug_socket_desc ipc;
4443

4544
struct plug_shm_desc glb_ctx;
4645

0 commit comments

Comments
 (0)