test-runner: Add support for audio daemons
v3 cover test-runner: Add support for audio daemons
Those patches add DBus session and an audio card so it should be possible to start an audio daemon like PipeWire in the VM.
Frédéric Danis (4):
test-runner: Add DBus session support
doc/test-runner: Add audio config options
test-runner: Add audio card support
test-runner: Add udevd and trigger events
doc/test-runner.txt | 5 ++ tools/test-runner.c | 197 +++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 189 insertions(+), 13 deletions(-)
Since v2:
- move doc/test-runner changes to its own patch
- replace AUDIO_SUPPORT by TESTAUDIO to be consistent with the other parameters
Since v1:
- Fix checkpatch errors
Signature · 1 line
2.25.1
PATCH v3 1/4 test-runner: Add DBus session support
Audio daemons requests access to DBus session to start
--- tools/test-runner.c | 97 +++++++++++++++++++++++++++++++++++++++------ 1 file changed, 85 insertions(+), 12 deletions(-)
tools/test-runner.c +85 -12
@@ -47,6 +47,7 @@ static int test_argc;static bool run_auto = false;static bool start_dbus = false; +static bool start_dbus_session;static bool start_daemon = false;static bool start_emulator = false;static bool start_monitor = false;
@@ -251,9 +252,11 @@ static void start_qemu(void)"acpi=off pci=noacpi noapic quiet ro init=%s " "bluetooth.enable_ecred=1" "TESTHOME=%s TESTDBUS=%u TESTDAEMON=%u " +"TESTDBUSSESSION=%u XDG_RUNTIME_DIR=/run/user/0 " "TESTMONITOR=%u TESTEMULATOR=%u TESTDEVS=%d " "TESTAUTO=%u TESTARGS=\'%s\'" , initcmd, cwd, start_dbus, start_daemon, + start_dbus_session, start_monitor, start_emulator, num_devs, run_auto, testargs);
@@ -420,19 +423,63 @@ static void create_dbus_system_conf(void)mkdir ("/run/dbus" ,0755 ); } -static pid_t start_dbus_daemon (void ) +static void create_dbus_session_conf (void ) +{ +FILE *fp; + + fp =fopen ("/etc/dbus-1/session.conf" ,"we" ); +if (!fp) +return ; + +fputs ("<!DOCTYPE busconfig PUBLIC " +"\"-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN\" " +"\"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd\">\n" , fp); +fputs ("<busconfig>\n" , fp); +fputs ("<type>session</type>\n" , fp); +fputs ("<listen>unix:path=/run/user/0/bus</listen>\n" , fp); +fputs ("<policy context=\"default\">\n" , fp); +fputs ("<allow user=\"*\"/>\n" , fp); +fputs ("<allow own=\"*\"/>\n" , fp); +fputs ("<allow send_type=\"method_call\"/>\n" , fp); +fputs ("<allow send_type=\"signal\"/>\n" , fp); +fputs ("<allow send_type=\"method_return\"/>\n" , fp); +fputs ("<allow send_type=\"error\"/>\n" , fp); +fputs ("<allow receive_type=\"method_call\"/>\n" , fp); +fputs ("<allow receive_type=\"signal\"/>\n" , fp); +fputs ("<allow receive_type=\"method_return\"/>\n" , fp); +fputs ("<allow receive_type=\"error\"/>\n" , fp); +fputs ("</policy>\n" , fp); +fputs ("</busconfig>\n" , fp); + +fclose (fp); + +if (symlink ("/etc/dbus-1/session.conf" , +"/usr/share/dbus-1/session.conf" ) <0 ) +perror ("Failed to create session.conf symlink" ); + +mkdir ("/run/user" ,0755 ); +mkdir ("/run/user/0" ,0755 ); +} + +static pid_t start_dbus_daemon (bool session) {char *argv[3 ], *envp[1 ];pid_t pid;int i; +char *bus_type = session ?"session" :"system" ; +char *socket_path = session ? +"/run/user/0/bus" :"/run/dbus/system_bus_socket" ; argv[0 ] ="/usr/bin/dbus-daemon" ; - argv[1 ] ="--system" ; +if (session) + argv[1 ] ="--session" ; +else + argv[1 ] ="--system" ; argv[2 ] =NULL ; envp[0 ] =NULL ; -printf ("Starting D-Bus daemon\n" ); +printf ("Starting D-Bus %s daemon\n" , bus_type); pid =fork ();if (pid <0 ) {
@@ -445,13 +492,13 @@ static pid_t start_dbus_daemon(void)exit (EXIT_SUCCESS ); } -printf ("D-Bus daemon process %d created\n" , pid); +printf ("D-Bus %s daemon process %d created\n" , bus_type, pid);for (i =0 ; i <20 ; i++) {struct stat st; -if (!stat ("/run/dbus/system_bus_socket" , &st)) { -printf ("Found D-Bus daemon socket\n" ); +if (!stat (socket_path, &st)) { +printf ("Found D-Bus %s daemon socket\n" , bus_type);return pid; }
@@ -666,7 +713,8 @@ static void run_command(char *cmdname, char *home)char *argv[9 ], *envp[3 ];int pos =0 , idx =0 ;int serial_fd; -pid_t pid, dbus_pid, daemon_pid, monitor_pid, emulator_pid; +pid_t pid, dbus_pid, daemon_pid, monitor_pid, emulator_pid, + dbus_session_pid;if (num_devs) {const char *node ="/dev/ttyS1" ;
@@ -684,10 +732,16 @@ static void run_command(char *cmdname, char *home)if (start_dbus) {create_dbus_system_conf (); - dbus_pid =start_dbus_daemon (); + dbus_pid =start_dbus_daemon (false); }else dbus_pid =-1 ; +if (start_dbus_session) { +create_dbus_session_conf (); + dbus_session_pid =start_dbus_daemon (true); + }else + dbus_session_pid =-1 ; +if (start_daemon) daemon_pid =start_bluetooth_daemon (home);else
@@ -780,7 +834,12 @@ start_next:printf ("Process %d continued\n" , corpse);if (corpse == dbus_pid) { -printf ("D-Bus daemon terminated\n" ); +printf ("D-Bus system daemon terminated\n" ); + dbus_pid =-1 ; + } + +if (corpse == dbus_session_pid) { +printf ("D-Bus session daemon terminated\n" ); dbus_pid =-1 ; }
@@ -814,6 +873,9 @@ start_next:if (dbus_pid >0 )kill (dbus_pid,SIGTERM ); +if (dbus_session_pid >0 ) +kill (dbus_session_pid,SIGTERM ); +if (emulator_pid >0 )kill (dbus_pid,SIGTERM );
@@ -874,10 +936,16 @@ static void run_tests(void) ptr =strstr (cmdline,"TESTDBUS=1" );if (ptr) { -printf ("D-Bus daemon requested\n" ); +printf ("D-Bus system daemon requested\n" ); start_dbus = true; } + ptr =strstr (cmdline,"TESTDBUSSESSION=1" ); +if (ptr) { +printf ("D-Bus session daemon requested\n" ); + start_dbus_session = true; + } + ptr =strstr (cmdline,"TESTDAEMON=1" );if (ptr) {printf ("bluetoothd requested\n" );
@@ -914,7 +982,8 @@ static void usage(void)printf ("\ttest-runner [options] [--] <command> [args]\n" );printf ("Options:\n" "\t-a, --auto Find tests and run them\n" -"\t-b, --dbus Start D-Bus daemon\n" +"\t-b, --dbus Start D-Bus system daemon\n" +"\t-s, --dbus-session Start D-Bus session daemon\n" "\t-d, --daemon Start bluetoothd\n" "\t-m, --monitor Start btmon\n" "\t-l, --emulator Start btvirt\n"
@@ -928,6 +997,7 @@ static const struct option main_options[] = { { "all", no_argument, NULL, 'a' }, { "auto", no_argument, NULL, 'a' }, { "dbus", no_argument, NULL, 'b' }, + { "dbus-session", no_argument, NULL, 's' }, { "unix", no_argument, NULL, 'u' }, { "daemon", no_argument, NULL, 'd' }, { "emulator", no_argument, NULL, 'l' },
@@ -953,7 +1023,7 @@ int main(int argc, char *argv[])for (;;) {int opt; - opt =getopt_long (argc, argv,"aubdlmq:k:vh" , main_options, + opt =getopt_long (argc, argv,"aubdslmq:k:vh" , main_options,NULL );if (opt <0 )break ;
@@ -968,6 +1038,9 @@ int main(int argc, char *argv[])case 'b' : start_dbus = true;break ; +case 's' : + start_dbus_session = true; +break ;case 'd' : start_dbus = true; start_daemon = true;
Signature · 1 line
2.25.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list. This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=649349
---Test result---
Test Summary:
CheckPatch PASS 4.57 seconds GitLint PASS 2.95 seconds Prep - Setup ELL PASS 54.51 seconds Build - Prep PASS 0.75 seconds Build - Configure PASS 10.73 seconds Build - Make PASS 1894.15 seconds Make Check PASS 13.11 seconds Make Check w/Valgrind PASS 570.37 seconds Make Distcheck PASS 301.02 seconds Build w/ext ELL - Configure PASS 10.96 seconds Build w/ext ELL - Make PASS 1856.12 seconds Incremental Build with patchesPASS 7611.82 seconds
---
Regards,
Linux Bluetooth
PATCH v3 2/4 doc/test-runner: Add audio config options
In reply to Frédéric DanisList the build options for an AC97 audio card necessary for test with audio daemon.
--- doc/test-runner.txt | 5 +++++ 1 file changed, 5 insertions(+)
doc/test-runner.txt +5 -0
@@ -54,6 +54,11 @@ For Bluetooth functionality: CONFIG_UHID=y +For Audio functionality: + CONFIG_SYSVIPC=y + CONFIG_SOUND=y + CONFIG_SND=y + CONFIG_SND_INTEL8X0=y These options should be installed as .config in the kernel source directory followed by this command.
Signature · 1 line
2.25.1
PATCH v3 3/4 test-runner: Add audio card support
In reply to Frédéric DanisWith this commit audio daemons can detect an audio card with output and input, allowing to test interaction between BlueZ and the audio daemon.
--- tools/test-runner.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
tools/test-runner.c +22 -1
@@ -54,6 +54,7 @@ static bool start_monitor = false;static int num_devs =0 ;static const char *qemu_binary =NULL ;static const char *kernel_image =NULL ; +static bool audio_support;static const char *qemu_table[] = {"qemu-system-x86_64" ,
@@ -261,6 +262,7 @@ static void start_qemu(void) run_auto, testargs); argv =alloca (sizeof (qemu_argv) + + (audio_support ?4 :0 ) + (sizeof (char *) * (4 + (num_devs *4 ))));memcpy (argv, qemu_argv,sizeof (qemu_argv));
@@ -268,6 +270,20 @@ static void start_qemu(void) argv[0 ] = (char *) qemu_binary; +if (audio_support) { +char *xdg_runtime_dir, *audiodev; + + xdg_runtime_dir =getenv ("XDG_RUNTIME_DIR" ); + audiodev =alloca (40 +strlen (xdg_runtime_dir)); +sprintf (audiodev,"id=audio,driver=pa,server=%s/pulse/native" , + xdg_runtime_dir); + + argv[pos++] ="-audiodev" ; + argv[pos++] = audiodev; + argv[pos++] ="-device" ; + argv[pos++] ="AC97,audiodev=audio" ; + } + argv[pos++] ="-kernel" ; argv[pos++] = (char *) kernel_image; argv[pos++] ="-append" ;
@@ -990,6 +1006,7 @@ static void usage(void)"\t-u, --unix [path] Provide serial device\n" "\t-q, --qemu <path> QEMU binary\n" "\t-k, --kernel <image> Kernel image (bzImage)\n" +"\t-A, --audio Add audio support\n" "\t-h, --help Show help options\n"); }
@@ -1004,6 +1021,7 @@ static const struct option main_options[] = { { "monitor", no_argument, NULL, 'm' }, { "qemu", required_argument, NULL, 'q' }, { "kernel", required_argument, NULL, 'k' }, + { "audio", no_argument, NULL, 'A' }, { "version", no_argument, NULL, 'v' }, { "help", no_argument, NULL, 'h' }, { }
@@ -1023,7 +1041,7 @@ int main(int argc, char *argv[])for (;;) {int opt; - opt =getopt_long (argc, argv,"aubdslmq:k:vh" , main_options, + opt =getopt_long (argc, argv,"aubdslmq:k:Avh" , main_options,NULL );if (opt <0 )break ;
@@ -1057,6 +1075,9 @@ int main(int argc, char *argv[])case 'k' : kernel_image = optarg;break ; +case 'A' : + audio_support = true; +break ;case 'v' :printf ("%s\n" ,VERSION );return EXIT_SUCCESS ;
Signature · 1 line
2.25.1
PATCH v3 4/4 test-runner: Add udevd and trigger events
In reply to Frédéric DanisKernel events should have been managed so the audio card is accessible from PipeWire
--- tools/test-runner.c | 83 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 80 insertions(+), 3 deletions(-)
tools/test-runner.c +80 -3
@@ -251,13 +251,14 @@ static void start_qemu(void)"rootfstype=9p " "rootflags=trans=virtio,version=9p2000.L " "acpi=off pci=noacpi noapic quiet ro init=%s " -"bluetooth.enable_ecred=1" +"bluetooth.enable_ecred=1 " "TESTHOME=%s TESTDBUS=%u TESTDAEMON=%u " "TESTDBUSSESSION=%u XDG_RUNTIME_DIR=/run/user/0 " +"TESTAUDIO=%u " "TESTMONITOR=%u TESTEMULATOR=%u TESTDEVS=%d " "TESTAUTO=%u TESTARGS=\'%s\'" , initcmd, cwd, start_dbus, start_daemon, - start_dbus_session, + start_dbus_session, audio_support, start_monitor, start_emulator, num_devs, run_auto, testargs);
@@ -724,13 +725,70 @@ static pid_t start_btvirt(const char *home)return pid; } +static void trigger_udev (void ) +{ +char *argv[3 ], *envp[1 ]; +pid_t pid; + + argv[0 ] ="/bin/udevadm" ; + argv[1 ] ="trigger" ; + argv[2 ] =NULL ; + + envp[0 ] =NULL ; + +printf ("Triggering udev events\n" ); + + pid =fork (); +if (pid <0 ) { +perror ("Failed to fork new process" ); +return ; + } + +if (pid ==0 ) { +execve (argv[0 ], argv, envp); +exit (EXIT_SUCCESS ); + } + +printf ("udev trigger process %d created\n" , pid); +} + +static pid_t start_udevd (void ) +{ +char *argv[2 ], *envp[1 ]; +pid_t pid; + + argv[0 ] ="/lib/systemd/systemd-udevd" ; + argv[1 ] =NULL ; + + envp[0 ] =NULL ; + +printf ("Starting udevd daemon\n" ); + + pid =fork (); +if (pid <0 ) { +perror ("Failed to fork new process" ); +return -1 ; + } + +if (pid ==0 ) { +execve (argv[0 ], argv, envp); +exit (EXIT_SUCCESS ); + } + +printf ("udevd daemon process %d created\n" , pid); + +trigger_udev (); + +return pid; +} +static void run_command (char *cmdname,char *home) {char *argv[9 ], *envp[3 ];int pos =0 , idx =0 ;int serial_fd;pid_t pid, dbus_pid, daemon_pid, monitor_pid, emulator_pid, - dbus_session_pid; + dbus_session_pid, udevd_pid;if (num_devs) {const char *node ="/dev/ttyS1" ;
@@ -746,6 +804,11 @@ static void run_command(char *cmdname, char *home) }else serial_fd =-1 ; +if (audio_support) + udevd_pid =start_udevd (); +else + udevd_pid =-1 ; +if (start_dbus) {create_dbus_system_conf (); dbus_pid =start_dbus_daemon (false);
@@ -874,6 +937,11 @@ start_next: monitor_pid =-1 ; } +if (corpse == udevd_pid) { +printf ("udevd terminated\n" ); + udevd_pid =-1 ; + } +if (corpse == pid)break ; }
@@ -898,6 +966,9 @@ start_next:if (monitor_pid >0 )kill (monitor_pid,SIGTERM ); +if (udevd_pid >0 ) +kill (udevd_pid,SIGTERM ); +if (serial_fd >=0 ) {close (serial_fd); serial_fd =-1 ;
@@ -980,6 +1051,12 @@ static void run_tests(void) start_emulator = true; } + ptr =strstr (cmdline,"TESTAUDIO=1" ); +if (ptr) { +printf ("Audio support requested\n" ); + audio_support = true; + } + ptr =strstr (cmdline,"TESTHOME=" );if (ptr) { home = ptr +4 ;
Signature · 1 line
2.25.1
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Hello:
This series was applied to bluetooth/bluez.git (master) by Luiz Augusto von Dentz <[email protected]>:
Quoted 10 lines · On Fri, 10 Jun 2022 18:38:16 +0200 you wrote:
Those patches add DBus session and an audio card so it should be possible to start an audio daemon like PipeWire in the VM.
Frédéric Danis (4):
test-runner: Add DBus session support
doc/test-runner: Add audio config options
test-runner: Add audio card support
test-runner: Add udevd and trigger events[...]
Here is the summary with links:
- [BlueZ,v3,1/4] test-runner: Add DBus session support
https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=a7e2f05e029b - [BlueZ,v3,2/4] doc/test-runner: Add audio config options https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=096599c1ae85 - [BlueZ,v3,3/4] test-runner: Add audio card support https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=e20e7e0b05c7 - [BlueZ,v3,4/4] test-runner: Add udevd and trigger events https://git.kernel.org/pub/scm/bluetooth/bluez.git/?id=91a48af52efb
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html