Functional/integration testing

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

Quoted 1 line

PDB runcall (IO-capturing turned off) >>>>>>>>>>>>>>>>>>>>>

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(19)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(21)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(22)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(23)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(24)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(25)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(26)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(21)test_btmgmt_info()

/home/pauli/prj/external/bluez/test/functional/test_btmgmt_vm.py(28)test_btmgmt_info()

Make --server to take optional path name where to create the various server sockets.
---
 emulator/main.c | 37 ++++++++++++++++++++++++-------------

 1 file changed, 24 insertions(+), 13 deletions(-)

emulator/main.c +1 -0

index 456fcd98e..09d6e9adb 100644
@@ -18,6 +18,7 @@
  #include <stdbool.h>
  #include <getopt.h>
  #include <sys/uio.h>
+#include <limits.h>

 #include "src/shared/mainloop.h"
 #include "src/shared/util.h"

emulator/main.c +0 -0

@@ -46,7 +47,7 @@ static void usage(void)

  printf("options:\n"
  "\t-d                    Enable debug\n" "\t-S                    Create local serial port\n"

emulator/main.c +0 -1

-		"\t-s                    Create local server

sockets\n"

emulator/main.c +1 -0

+		"\t-s[path=/tmp]         Create local server

sockets\n"
  "\t-t[port=45550]        Create a TCP server\n" "\t-l[num]               Number of local controllers\n"
  "\t-L                    Create LE only controller\n"

emulator/main.c +2 -1

@@ -60,7 +61,7 @@ static void usage(void)
  static const struct option main_options[] = {
  	{ "debug",   no_argument,       NULL, 'd' },
  	{ "serial",  no_argument,       NULL, 'S' },
-	{ "server",  no_argument,       NULL, 's' },
+	{ "server",  optional_argument, NULL, 's' },
  	{ "tcp",     optional_argument, NULL, 't' },
  	{ "local",   optional_argument, NULL, 'l' },
  	{ "le",      no_argument,       NULL, 'L' },

@@ -88,6 +89,7 @@ int main(int argc, char *argv[])
  	struct server *server5;
  	bool debug_enabled = false;
  	bool server_enabled = false;
+	const char *server_path = "/tmp";
  	uint16_t tcp_port = 0;
  	bool serial_enabled = false;
  	int letest_count = 0;

@@ -100,7 +102,7 @@ int main(int argc, char *argv[])
  	for (;;) {
  		int opt;

emulator/main.c +0 -1

-		opt = getopt_long(argc, argv,

"dSst::l::LBAU::T::vh",

emulator/main.c +1 -0

+		opt = getopt_long(argc, argv,

"dSs::t::l::LBAU::T::vh",
  main_options, NULL); if (opt < 0)
  break;

emulator/main.c +0 -0

@@ -114,6 +116,8 @@ int main(int argc, char *argv[])
  			break;

  case 's':
  server_enabled = true;

emulator/main.c +2 -0

+			if (optarg)
+				server_path = optarg;

  break;
  case 't':
  if (optarg)

emulator/main.c +0 -0

@@ -196,28 +200,35 @@ int main(int argc, char *argv[])
  	}

  if (server_enabled) {

emulator/main.c +0 -2

-		server1 = server_open_unix(SERVER_TYPE_BREDRLE,
-						"/tmp/bt-server-

bredrle");

emulator/main.c +4 -0

+		char path[PATH_MAX];
+
+		snprintf(path, sizeof(path), "%s/%s", server_path,
+							"bt-server-

bredrle");

emulator/main.c +1 -0

+		server1 = server_open_unix(SERVER_TYPE_BREDRLE,

path);

  if (!server1)
  fprintf(stderr, "Failed to open BR/EDR/LE server\n");

emulator/main.c +0 -2

-		server2 = server_open_unix(SERVER_TYPE_BREDR,
-						"/tmp/bt-server-

bredr");

emulator/main.c +2 -0

+		snprintf(path, sizeof(path), "%s/%s", server_path,
+							"bt-server-

bredr");

emulator/main.c +1 -0

+		server2 = server_open_unix(SERVER_TYPE_BREDR, path);

  if (!server2)
  fprintf(stderr, "Failed to open BR/EDR server\n");

emulator/main.c +0 -2

-		server3 = server_open_unix(SERVER_TYPE_AMP,
-						"/tmp/bt-server-

amp");

emulator/main.c +2 -0

+		snprintf(path, sizeof(path), "%s/%s", server_path,
+							"bt-server-

amp");

emulator/main.c +1 -0

+		server3 = server_open_unix(SERVER_TYPE_AMP, path);

  if (!server3)
  fprintf(stderr, "Failed to open AMP server\n");

emulator/main.c +0 -2

-		server4 = server_open_unix(SERVER_TYPE_LE,
-						"/tmp/bt-server-

le");

emulator/main.c +2 -0

+		snprintf(path, sizeof(path), "%s/%s", server_path,
+							"bt-server-

le");

emulator/main.c +1 -0

+		server4 = server_open_unix(SERVER_TYPE_LE, path);

  if (!server4)
  fprintf(stderr, "Failed to open LE server\n");

emulator/main.c +0 -2

-		server5 = server_open_unix(SERVER_TYPE_MONITOR,
-						"/tmp/bt-server-

mon");

emulator/main.c +2 -0

+		snprintf(path, sizeof(path), "%s/%s", server_path,
+							"bt-server-

mon");

emulator/main.c +1 -0

+		server5 = server_open_unix(SERVER_TYPE_MONITOR,

path);
  if (!server5)
  fprintf(stderr, "Failed to open monitor server\n");
  }

Quoted 81 lines · Pauli Virtanen

Make --server to take optional path name where to create the various server sockets.

---
 emulator/main.c | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

emulator/main.c +1 -1

index 456fcd98e..09d6e9adb 100644
@@ -18,6 +18,7 @@
 #include <stdbool.h>
 #include <getopt.h>
 #include <sys/uio.h>
+#include <limits.h>
 
 #include "src/shared/mainloop.h"
 #include "src/shared/util.h"

@@ -46,7 +47,7 @@ static void usage(void)
      printf("options:\n"
              "\t-d                    Enable debug\n"
              "\t-S                    Create local serial port\n"
-             "\t-s                    Create local server

sockets\n"
+ "\t-s[path=/tmp] Create local server
sockets\n"
"\t-t[port=45550] Create a TCP server\n"
"\t-l[num] Number of local
controllers\n"
"\t-L Create LE only
controller\n"

emulator/main.c +3 -2

@@ -60,7 +61,7 @@ static void usage(void)
 static const struct option main_options[] = {
      { "debug",   no_argument,       NULL, 'd' },
      { "serial",  no_argument,       NULL, 'S' },
-     { "server",  no_argument,       NULL, 's' },
+     { "server",  optional_argument, NULL, 's' },
      { "tcp",     optional_argument, NULL, 't' },
      { "local",   optional_argument, NULL, 'l' },
      { "le",      no_argument,       NULL, 'L' },

@@ -88,6 +89,7 @@ int main(int argc, char *argv[])
      struct server *server5;
      bool debug_enabled = false;
      bool server_enabled = false;
+     const char *server_path = "/tmp";
      uint16_t tcp_port = 0;
      bool serial_enabled = false;
      int letest_count = 0;

@@ -100,7 +102,7 @@ int main(int argc, char *argv[])
      for (;;) {
              int opt;
 
-             opt = getopt_long(argc, argv,
 "dSst::l::LBAU::T::vh",
+             opt = getopt_long(argc, argv,
 "dSs::t::l::LBAU::T::vh",
                                              main_options, NULL);

              if (opt < 0)
                      break;

emulator/main.c +7 -2

@@ -114,6 +116,8 @@ int main(int argc, char *argv[])
                      break;
              case 's':
                      server_enabled = true;
+                     if (optarg)
+                             server_path = optarg;
                      break;
              case 't':
                      if (optarg)

@@ -196,28 +200,35 @@ int main(int argc, char *argv[])
      }
 
      if (server_enabled) {
-             server1 = server_open_unix(SERVER_TYPE_BREDRLE,
-                                             "/tmp/bt-server-
 bredrle");
+             char path[PATH_MAX];
+
+             snprintf(path, sizeof(path), "%s/%s", server_path,
+                                                     "bt-server-
 bredrle");
+             server1 = server_open_unix(SERVER_TYPE_BREDRLE,

emulator/main.c int main(int argc, char *argv[]) · line 210

Quoted 1 line

emulator/main.c +0 -0

 path);

If we were allowed to use new glib calls, this hand-rolled code should probably use like g_build_filename():
https://docs.gtk.org/glib/func.build_filename.html
and g_auto:
https://docs.gtk.org/glib/auto-cleanup.html
to simplify the code.

Luiz, could we have have an update to maintainer-guidelines.rst to reflect the current guidelines for using or adding glib calls to the code?

Pauli, do you think we could have helpers for this sort of path manipulation in src/shared? Not saying it needs to be to the level of complexity of the g_build_filename() implementation, but snprintf()...:
https://github.com/GNOME/glib/blob/main/glib/gfileutils.c#L1926

Luiz, another question, could we start using __attribute__(cleanup()) in bluez?

Consider the following example, adapted from systemd:
#include <stddef.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>

static inline void freep(void *p) {
        free(*(void**) p);
}

#define _cleanup_(f) __attribute__((cleanup(f)))
#define _cleanup_free_ _cleanup_(freep)

int main(int argc, char **argv)

{
        _cleanup_free_ char *foo = NULL;

        foo = strdup("my string");

        printf ("%s\n", foo);

        return 0;
}

Is that something we could use? Happy to send a patchset to implement the basics of it, and cleanup a few places where that would make the code more readable.

As the systemd coding style says in
https://systemd.io/CODING_STYLE/#memory-allocation

"Make use of _cleanup_free_ and friends. It makes your code much nicer to read (and shorter)!"

Quoted 49 lines

emulator/main.c +6 -6

              if (!server1)
                      fprintf(stderr, "Failed to open BR/EDR/LE
 server\n");
 
-             server2 = server_open_unix(SERVER_TYPE_BREDR,
-                                             "/tmp/bt-server-
 bredr");
+             snprintf(path, sizeof(path), "%s/%s", server_path,
+                                                     "bt-server-
 bredr");
+             server2 = server_open_unix(SERVER_TYPE_BREDR, path);
              if (!server2)
                      fprintf(stderr, "Failed to open BR/EDR
 server\n");
 
-             server3 = server_open_unix(SERVER_TYPE_AMP,
-                                             "/tmp/bt-server-
 amp");
+             snprintf(path, sizeof(path), "%s/%s", server_path,
+                                                     "bt-server-
 amp");
+             server3 = server_open_unix(SERVER_TYPE_AMP, path);
              if (!server3)
                      fprintf(stderr, "Failed to open AMP
 server\n");
 
-             server4 = server_open_unix(SERVER_TYPE_LE,
-                                             "/tmp/bt-server-

le");

emulator/main.c +2 -0

+             snprintf(path, sizeof(path), "%s/%s", server_path,
+                                                     "bt-server-

le");
+ server4 = server_open_unix(SERVER_TYPE_LE, path);
if (!server4)
fprintf(stderr, "Failed to open LE
server\n");

emulator/main.c +0 -2

-             server5 = server_open_unix(SERVER_TYPE_MONITOR,
-                                             "/tmp/bt-server-

mon");

emulator/main.c +2 -0

+             snprintf(path, sizeof(path), "%s/%s", server_path,
+                                                     "bt-server-

mon");
+ server5 = server_open_unix(SERVER_TYPE_MONITOR,
path);
if (!server5)
fprintf(stderr, "Failed to open monitor

server\n");
      }

Quoted 7 lines

If we were allowed to use new glib calls, this hand-rolled code should
probably use like g_build_filename():
https://docs.gtk.org/glib/func.build_filename.html
and g_auto:
https://docs.gtk.org/glib/auto-cleanup.html
to simplify the code.

Don't really want to drag new dependecies.

Quoted 5 lines

Luiz, could we have have an update to maintainer-guidelines.rst to reflect the current guidelines for using or adding glib calls to the
code?

Using pci-serial to forward eg. btvirt sockets is unreliable, as qemu or kernel seems to be sometimes dropping part of the sent data or insert spurious \0 bytes, leading to sporadic errors like:

    kernel: Bluetooth: hci0: command 0x0c52 tx timeout
    kernel: Bluetooth: hci0: Opcode 0x0c52 failed: -110
    btvirt: packet error, unknown type: 0

This appears to occur most often when host system is under load, e.g. due to multiple test-runners running at the same time. The problem is not specific to btvirt, but seems to be in the qemu serial device layer vs. kernel interaction.

Change test-runner to use virtserialport to forward the btvirt connection inside the VM, as virtio-serial doesn't appear to have these problems.

Since it's not a TTY device, we have to do vport <-> tty-with-hci-ldisc forwarding of the data in test-runner, so this becomes a bit more involved.

---
 Makefile.tools      |   2 +
 configure.ac        |   9 ++
 tools/test-runner.c | 300 +++++++++++++++++++++++++++++++++-----------
 3 files changed, 241 insertions(+), 70 deletions(-)

Makefile.tools +2 -0

index f6de2e685..6e30a535f 100644
@@ -321,6 +321,8 @@ tools_btgatt_server_SOURCES = tools/btgatt-server.c src/uuid-helper.c
 tools_btgatt_server_LDADD = src/libshared-mainloop.la \
                                                lib/libbluetooth-internal.la
 
+tools_test_runner_LDADD = $(OPENPTY_LIBS)
+
 tools_rctest_LDADD = lib/libbluetooth-internal.la
 
 tools_l2test_LDADD = lib/libbluetooth-internal.la

configure.ac +9 -0

index 52de7d665..3bc1f5c44 100644
@@ -251,6 +251,15 @@ AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools],
                [disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
+openpty_libs=
+if (test "${enable_tools}" != "no"); then
+       AC_CHECK_FUNCS([openpty], [openpty_libs=],
+         [AC_CHECK_LIB([util], [openpty], [openpty_libs=-lutil],
+           [AC_CHECK_LIB([bsd], [openpty], [openpty_libs=-lbsd],
+                [AC_MSG_ERROR([openpty not found])])])])
+fi
+AC_SUBST(OPENPTY_LIBS, [${openpty_libs}])
+
 AC_ARG_ENABLE(monitor, AS_HELP_STRING([--disable-monitor],
                [disable Bluetooth monitor]), [enable_monitor=${enableval}])
 AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")

tools/test-runner.c +109 -58

index b3e0b0cfe..576313b79 100644
@@ -24,6 +24,9 @@
 #include <getopt.h>
 #include <poll.h>
 #include <limits.h>
+#include <dirent.h>
+#include <pty.h>
+#include <stdint.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>

@@ -306,7 +309,7 @@ static void start_qemu(void)
                                testargs);
 
        argv = alloca(sizeof(qemu_argv) +
-                       (sizeof(char *) * (6 + (num_devs * 4))) +
+                       (sizeof(char *) * (8 + (num_devs * 4))) +
                        (sizeof(char *) * (usb_dev ? 4 : 0)) +
                        (sizeof(char *) * num_extra_opts));
        memcpy(argv, qemu_argv, sizeof(qemu_argv));

@@ -330,14 +333,17 @@ static void start_qemu(void)
        argv[pos++] = "-append";
        argv[pos++] = (char *) cmdline;
 
+       argv[pos++] = "-device";
+       argv[pos++] = "virtio-serial";
+
        for (i = 0; i < num_devs; i++) {
                char *chrdev, *serdev;
 
                chrdev = alloca(48 + strlen(device_path));
                sprintf(chrdev, "socket,path=%s,id=bt%d", device_path, i);
 
-               serdev = alloca(48);
-               sprintf(serdev, "pci-serial,chardev=bt%d", i);
+               serdev = alloca(64);
+               sprintf(serdev, "virtserialport,chardev=bt%d,name=bt.%d", i, i);
 
                argv[pos++] = "-chardev";
                argv[pos++] = chrdev;

@@ -360,65 +366,12 @@ static void start_qemu(void)
        execve(argv[0], argv, qemu_envp);
 }
 
-static int open_serial(const char *path)
-{
-       struct termios ti;
-       int fd, saved_ldisc, ldisc = N_HCI;
-
-       fd = open(path, O_RDWR | O_NOCTTY);
-       if (fd < 0) {
-               perror("Failed to open serial port");
-               return -1;
-       }
-
-       if (tcflush(fd, TCIOFLUSH) < 0) {
-               perror("Failed to flush serial port");
-               close(fd);
-               return -1;
-       }
-
-       if (ioctl(fd, TIOCGETD, &saved_ldisc) < 0) {
-               perror("Failed get serial line discipline");
-               close(fd);
-               return -1;
-       }
-
-       /* Switch TTY to raw mode */
-       memset(&ti, 0, sizeof(ti));
-       cfmakeraw(&ti);
-
-       ti.c_cflag |= (B115200 | CLOCAL | CREAD);
-
-       /* Set flow control */
-       ti.c_cflag |= CRTSCTS;
-
-       if (tcsetattr(fd, TCSANOW, &ti) < 0) {
-               perror("Failed to set serial port settings");
-               close(fd);
-               return -1;
-       }
-
-       if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
-               perror("Failed set serial line discipline");
-               close(fd);
-               return -1;
-       }
-
-       printf("Switched line discipline from %d to %d\n", saved_ldisc, ldisc);
-
-       return fd;
-}
-
-static int attach_proto(const char *path, unsigned int proto,
+static int attach_proto(int fd, unsigned int proto,
                                        unsigned int mandatory_flags,
                                        unsigned int optional_flags)
 {
        unsigned int flags = mandatory_flags | optional_flags;
-       int fd, dev_id;
-
-       fd = open_serial(path);
-       if (fd < 0)
-               return -1;
+       int dev_id;
 
        if (ioctl(fd, HCIUARTSETFLAGS, flags) < 0) {
                if (errno == EINVAL) {

@@ -895,13 +848,222 @@ static int start_audio_server(pid_t pids[2])
        return 0;
 }
 
+static bool find_attach_dev(char path[PATH_MAX])
+{
+       const char *vport_path = "/sys/class/virtio-ports";
+       struct dirent *entry;
+       DIR *dir;
+
+       dir = opendir(vport_path);
+       if (!dir)
+               return false;
+
+       while ((entry = readdir(dir)) != NULL) {
+               FILE *f;
+               char buf[64];
+               size_t size;
+
+               snprintf(path, PATH_MAX, "%s/%s/name", vport_path,
+                                                               entry->d_name);
+               f = fopen(path, "r");
+               if (!f)
+                       continue;
+
+               size = fread(buf, 1, sizeof(buf) - 1, f);
+               buf[size] = 0;
+
+               fclose(f);
+
+               if (strncmp(buf, "bt.", 3) == 0) {
+                       snprintf(path, PATH_MAX, "/dev/%s", entry->d_name);
+                       closedir(dir);
+                       return true;
+               }
+       }
+
+       closedir(dir);
+       return false;
+}
+
+static void copy_fd_bidi(int src, int dst)
+{
+       fd_set rfds, wfds;
+       int fd[2] = { src, dst };
+       uint8_t buf[2][4096];
+       size_t size[2] = { 0, 0 };
+       size_t pos[2] = { 0, 0 };
+       int i, ret;
+
+       /* Simple copying of data src <-> dst to both directions */
+
+       for (i = 0; i < 2; ++i) {
+               int flags = fcntl(fd[i], F_GETFL);
+
+               if (fcntl(fd[i], F_SETFL, flags | O_NONBLOCK) < 0) {
+                       perror("fcntl");
+                       goto error;
+               }
+       }
+
+       while (1) {
+               FD_ZERO(&rfds);
+               FD_ZERO(&wfds);
+
+               for (i = 0; i < 2; ++i) {
+                       if (size[i])
+                               FD_SET(fd[i], &wfds);
+                       else
+                               FD_SET(fd[1 - i], &rfds);
+               }
+
+               ret = select(FD_SETSIZE, &rfds, &wfds, NULL, NULL);
+               if (ret < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       perror("select");
+                       goto error;
+               }
+
+               for (i = 0; i < 2; ++i) {
+                       ssize_t s;
+
+                       if (!size[i] && FD_ISSET(fd[1 - i], &rfds)) {
+                               s = read(fd[1 - i], buf[i], sizeof(buf[i]));
+                               if (s >= 0) {
+                                       size[i] = s;
+                                       pos[i] = 0;
+                               } else if (errno == EINTR) {
+                                       /* ok */
+                               } else {
+                                       perror("read");
+                                       goto error;
+                               }
+
+                       }
+
+                       if (size[i]) {
+                               s = write(fd[i], buf[i] + pos[i], size[i]);
+                               if (s >= 0) {
+                                       size[i] -= s;
+                                       pos[i] += s;

tools/test-runner.c +111 -13

+       return;
+
+error:
+       fprintf(stderr, "Bluetooth controller forward terminated with error\n");
+       exit(1);
+}
+
+static int start_controller_forward(const char *path, pid_t *controller_pid)
+{
+       struct termios ti;
+       pid_t pid;
+       int src = -1, dst = -1, fd = -1;
+       int ret, saved_ldisc, ldisc = N_HCI;
+
+       /* virtio-serial ports cannot be used for HCI line disciple, so
+        * openpty() serial device and forward data to/from it.
+        */
+
+       src = open(path, O_RDWR);
+       if (src < 0)
+               goto error;
+
+       /* Raw mode TTY */
+       memset(&ti, 0, sizeof(ti));
+       cfmakeraw(&ti);
+       ti.c_cflag |= B115200 | CLOCAL | CREAD;
+
+       /* With flow control */
+       ti.c_cflag |= CRTSCTS;
+
+       ret = openpty(&dst, &fd, NULL, &ti, NULL);
+       if (ret < 0)
+               goto error;
+
+       if (ioctl(fd, TIOCGETD, &saved_ldisc) < 0) {
+               perror("Failed get serial line discipline");
+               goto error;
+       }
+
+       if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
+               perror("Failed set serial line discipline");
+               goto error;
+       }
+
+       printf("Switched line discipline from %d to %d\n", saved_ldisc, ldisc);
+
+       pid = fork();
+       if (pid < 0) {
+               perror("Failed to fork new process");
+               goto error;
+       } else if (pid == 0) {
+               close(fd);
+               copy_fd_bidi(src, dst);
+               exit(0);
+       }
+
+       *controller_pid = pid;
+
+       close(src);
+       close(dst);
+       return fd;
+
+error:
+       if (src >= 0)
+               close(src);
+       if (dst >= 0)
+               close(dst);
+       if (fd >= 0)
+               close(fd);
+       return -1;
+}
+
+static int attach_controller(pid_t *controller_pid)
+{
+       unsigned int basic_flags, extra_flags;
+       char path[PATH_MAX];
+       int fd;
+
+       *controller_pid = -1;
+
+       if (!find_attach_dev(path)) {
+               printf("Failed to find Bluetooth controller virtio\n");
+               return -1;
+       }
+
+       printf("Forwarding Bluetooth controller from %s\n", path);
+
+       fd = start_controller_forward(path, controller_pid);
+       if (fd < 0) {
+               printf("Failed to forward Bluetooth controller\n");
+               return -1;
+       }
+
+       basic_flags = (1 << HCI_UART_RESET_ON_INIT);
+       extra_flags = (1 << HCI_UART_VND_DETECT);
+
+       printf("Attaching Bluetooth controller\n");
+
+       return attach_proto(fd, HCI_UART_H4, basic_flags, extra_flags);
+}
+
 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, audio_pid[2];
+               dbus_session_pid, audio_pid[2], controller_pid;
        int i;
 
        if (!home) {

@@ -910,18 +1072,11 @@ static void run_command(char *cmdname, char *home)
        }
 
        if (num_devs) {
-               const char *node = "/dev/ttyS1";
-               unsigned int basic_flags, extra_flags;
-
-               printf("Attaching BR/EDR controller to %s\n", node);
-
-               basic_flags = (1 << HCI_UART_RESET_ON_INIT);
-               extra_flags = (1 << HCI_UART_VND_DETECT);
-
-               serial_fd = attach_proto(node, HCI_UART_H4, basic_flags,
-                                                               extra_flags);
-       } else
+               serial_fd = attach_controller(&controller_pid);
+       } else {
                serial_fd = -1;
+               controller_pid = -1;
+       }
 
        if (start_dbus) {
                create_dbus_system_conf();

@@ -1063,6 +1218,11 @@ start_next:
                        monitor_pid = -1;
                }
 
+               if (corpse == controller_pid) {
+                       printf("Controller terminated\n");
+                       controller_pid = -1;
+               }
+
                for (i = 0; i < 2; ++i) {
                        if (corpse == audio_pid[i]) {
                                printf("Audio server %d terminated\n", i);
--

2.53.0

Hi Pauli,

Quoted 18 lines · Pauli Virtanen

Using pci-serial to forward eg. btvirt sockets is unreliable, as qemu or kernel seems to be sometimes dropping part of the sent data or insert spurious \0 bytes, leading to sporadic errors like:

    kernel: Bluetooth: hci0: command 0x0c52 tx timeout
    kernel: Bluetooth: hci0: Opcode 0x0c52 failed: -110
    btvirt: packet error, unknown type: 0

This appears to occur most often when host system is under load, e.g. due to multiple test-runners running at the same time. The problem is not specific to btvirt, but seems to be in the qemu serial device layer vs. kernel interaction.

Change test-runner to use virtserialport to forward the btvirt connection inside the VM, as virtio-serial doesn't appear to have these problems.

Quoted 3 lines

Since it's not a TTY device, we have to do vport <-> tty-with-hci-ldisc forwarding of the data in test-runner, so this becomes a bit more involved.

Lets try to sort this out first before we go into the functional framework. Does the vport not working as tty perhaps require a kernel driver or something to enable direct operation?

Quoted 253 lines

---
 Makefile.tools      |   2 +
 configure.ac        |   9 ++
 tools/test-runner.c | 300 +++++++++++++++++++++++++++++++++-----------
 3 files changed, 241 insertions(+), 70 deletions(-)

Makefile.tools +2 -0

index f6de2e685..6e30a535f 100644
@@ -321,6 +321,8 @@ tools_btgatt_server_SOURCES = tools/btgatt-server.c src/uuid-helper.c
 tools_btgatt_server_LDADD = src/libshared-mainloop.la \
                                                lib/libbluetooth-internal.la
 
+tools_test_runner_LDADD = $(OPENPTY_LIBS)
+
 tools_rctest_LDADD = lib/libbluetooth-internal.la
 
 tools_l2test_LDADD = lib/libbluetooth-internal.la

configure.ac +9 -0

index 52de7d665..3bc1f5c44 100644
@@ -251,6 +251,15 @@ AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-tools],
                [disable Bluetooth tools]), [enable_tools=${enableval}])
 AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")
 
+openpty_libs=
+if (test "${enable_tools}" != "no"); then
+       AC_CHECK_FUNCS([openpty], [openpty_libs=],
+         [AC_CHECK_LIB([util], [openpty], [openpty_libs=-lutil],
+           [AC_CHECK_LIB([bsd], [openpty], [openpty_libs=-lbsd],
+                [AC_MSG_ERROR([openpty not found])])])])
+fi
+AC_SUBST(OPENPTY_LIBS, [${openpty_libs}])
+
 AC_ARG_ENABLE(monitor, AS_HELP_STRING([--disable-monitor],
                [disable Bluetooth monitor]), [enable_monitor=${enableval}])
 AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")

tools/test-runner.c +109 -58

index b3e0b0cfe..576313b79 100644
@@ -24,6 +24,9 @@
 #include <getopt.h>
 #include <poll.h>
 #include <limits.h>
+#include <dirent.h>
+#include <pty.h>
+#include <stdint.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>

@@ -306,7 +309,7 @@ static void start_qemu(void)
                                testargs);
 
        argv = alloca(sizeof(qemu_argv) +
-                       (sizeof(char *) * (6 + (num_devs * 4))) +
+                       (sizeof(char *) * (8 + (num_devs * 4))) +
                        (sizeof(char *) * (usb_dev ? 4 : 0)) +
                        (sizeof(char *) * num_extra_opts));
        memcpy(argv, qemu_argv, sizeof(qemu_argv));

@@ -330,14 +333,17 @@ static void start_qemu(void)
        argv[pos++] = "-append";
        argv[pos++] = (char *) cmdline;
 
+       argv[pos++] = "-device";
+       argv[pos++] = "virtio-serial";
+
        for (i = 0; i < num_devs; i++) {
                char *chrdev, *serdev;
 
                chrdev = alloca(48 + strlen(device_path));
                sprintf(chrdev, "socket,path=%s,id=bt%d", device_path, i);
 
-               serdev = alloca(48);
-               sprintf(serdev, "pci-serial,chardev=bt%d", i);
+               serdev = alloca(64);
+               sprintf(serdev, "virtserialport,chardev=bt%d,name=bt.%d", i, i);
 
                argv[pos++] = "-chardev";
                argv[pos++] = chrdev;

@@ -360,65 +366,12 @@ static void start_qemu(void)
        execve(argv[0], argv, qemu_envp);
 }
 
-static int open_serial(const char *path)
-{
-       struct termios ti;
-       int fd, saved_ldisc, ldisc = N_HCI;
-
-       fd = open(path, O_RDWR | O_NOCTTY);
-       if (fd < 0) {
-               perror("Failed to open serial port");
-               return -1;
-       }
-
-       if (tcflush(fd, TCIOFLUSH) < 0) {
-               perror("Failed to flush serial port");
-               close(fd);
-               return -1;
-       }
-
-       if (ioctl(fd, TIOCGETD, &saved_ldisc) < 0) {
-               perror("Failed get serial line discipline");
-               close(fd);
-               return -1;
-       }
-
-       /* Switch TTY to raw mode */
-       memset(&ti, 0, sizeof(ti));
-       cfmakeraw(&ti);
-
-       ti.c_cflag |= (B115200 | CLOCAL | CREAD);
-
-       /* Set flow control */
-       ti.c_cflag |= CRTSCTS;
-
-       if (tcsetattr(fd, TCSANOW, &ti) < 0) {
-               perror("Failed to set serial port settings");
-               close(fd);
-               return -1;
-       }
-
-       if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
-               perror("Failed set serial line discipline");
-               close(fd);
-               return -1;
-       }
-
-       printf("Switched line discipline from %d to %d\n", saved_ldisc, ldisc);
-
-       return fd;
-}
-
-static int attach_proto(const char *path, unsigned int proto,
+static int attach_proto(int fd, unsigned int proto,
                                        unsigned int mandatory_flags,
                                        unsigned int optional_flags)
 {
        unsigned int flags = mandatory_flags | optional_flags;
-       int fd, dev_id;
-
-       fd = open_serial(path);
-       if (fd < 0)
-               return -1;
+       int dev_id;
 
        if (ioctl(fd, HCIUARTSETFLAGS, flags) < 0) {
                if (errno == EINVAL) {

@@ -895,13 +848,222 @@ static int start_audio_server(pid_t pids[2])
        return 0;
 }
 
+static bool find_attach_dev(char path[PATH_MAX])
+{
+       const char *vport_path = "/sys/class/virtio-ports";
+       struct dirent *entry;
+       DIR *dir;
+
+       dir = opendir(vport_path);
+       if (!dir)
+               return false;
+
+       while ((entry = readdir(dir)) != NULL) {
+               FILE *f;
+               char buf[64];
+               size_t size;
+
+               snprintf(path, PATH_MAX, "%s/%s/name", vport_path,
+                                                               entry->d_name);
+               f = fopen(path, "r");
+               if (!f)
+                       continue;
+
+               size = fread(buf, 1, sizeof(buf) - 1, f);
+               buf[size] = 0;
+
+               fclose(f);
+
+               if (strncmp(buf, "bt.", 3) == 0) {
+                       snprintf(path, PATH_MAX, "/dev/%s", entry->d_name);
+                       closedir(dir);
+                       return true;
+               }
+       }
+
+       closedir(dir);
+       return false;
+}
+
+static void copy_fd_bidi(int src, int dst)
+{
+       fd_set rfds, wfds;
+       int fd[2] = { src, dst };
+       uint8_t buf[2][4096];
+       size_t size[2] = { 0, 0 };
+       size_t pos[2] = { 0, 0 };
+       int i, ret;
+
+       /* Simple copying of data src <-> dst to both directions */
+
+       for (i = 0; i < 2; ++i) {
+               int flags = fcntl(fd[i], F_GETFL);
+
+               if (fcntl(fd[i], F_SETFL, flags | O_NONBLOCK) < 0) {
+                       perror("fcntl");
+                       goto error;
+               }
+       }
+
+       while (1) {
+               FD_ZERO(&rfds);
+               FD_ZERO(&wfds);
+
+               for (i = 0; i < 2; ++i) {
+                       if (size[i])
+                               FD_SET(fd[i], &wfds);
+                       else
+                               FD_SET(fd[1 - i], &rfds);
+               }
+
+               ret = select(FD_SETSIZE, &rfds, &wfds, NULL, NULL);
+               if (ret < 0) {
+                       if (errno == EINTR)
+                               continue;
+                       perror("select");
+                       goto error;
+               }
+
+               for (i = 0; i < 2; ++i) {
+                       ssize_t s;
+
+                       if (!size[i] && FD_ISSET(fd[1 - i], &rfds)) {
+                               s = read(fd[1 - i], buf[i], sizeof(buf[i]));
+                               if (s >= 0) {
+                                       size[i] = s;
+                                       pos[i] = 0;
+                               } else if (errno == EINTR) {
+                                       /* ok */
+                               } else {
+                                       perror("read");
+                                       goto error;
+                               }
+
+                       }
+
+                       if (size[i]) {
+                               s = write(fd[i], buf[i] + pos[i], size[i]);
+                               if (s >= 0) {
+                                       size[i] -= s;
+                                       pos[i] += s;

tools/test-runner.c static int start_audio_server(pid_t pids[2]) · line 958

Quoted 10 lines

tools/test-runner.c +10 -0

+                               } else if (errno == EINTR || errno == EAGAIN
+                                               || errno == EWOULDBLOCK) {
+                                       /* ok */
+                               } else {
+                                       perror("write");
+                                       goto error;
+                               }
+                       }
+               }
+       }

It doesn't look that great if you ask me. I think this requires us to copy significantly more data than before, likely resulting in worse performance, which could be detrimental in resource-limited environments like GitHub CI/CD.

Quoted 151 lines

tools/test-runner.c +111 -13

+       return;
+
+error:
+       fprintf(stderr, "Bluetooth controller forward terminated with error\n");
+       exit(1);
+}
+
+static int start_controller_forward(const char *path, pid_t *controller_pid)
+{
+       struct termios ti;
+       pid_t pid;
+       int src = -1, dst = -1, fd = -1;
+       int ret, saved_ldisc, ldisc = N_HCI;
+
+       /* virtio-serial ports cannot be used for HCI line disciple, so
+        * openpty() serial device and forward data to/from it.
+        */
+
+       src = open(path, O_RDWR);
+       if (src < 0)
+               goto error;
+
+       /* Raw mode TTY */
+       memset(&ti, 0, sizeof(ti));
+       cfmakeraw(&ti);
+       ti.c_cflag |= B115200 | CLOCAL | CREAD;
+
+       /* With flow control */
+       ti.c_cflag |= CRTSCTS;
+
+       ret = openpty(&dst, &fd, NULL, &ti, NULL);
+       if (ret < 0)
+               goto error;
+
+       if (ioctl(fd, TIOCGETD, &saved_ldisc) < 0) {
+               perror("Failed get serial line discipline");
+               goto error;
+       }
+
+       if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
+               perror("Failed set serial line discipline");
+               goto error;
+       }
+
+       printf("Switched line discipline from %d to %d\n", saved_ldisc, ldisc);
+
+       pid = fork();
+       if (pid < 0) {
+               perror("Failed to fork new process");
+               goto error;
+       } else if (pid == 0) {
+               close(fd);
+               copy_fd_bidi(src, dst);
+               exit(0);
+       }
+
+       *controller_pid = pid;
+
+       close(src);
+       close(dst);
+       return fd;
+
+error:
+       if (src >= 0)
+               close(src);
+       if (dst >= 0)
+               close(dst);
+       if (fd >= 0)
+               close(fd);
+       return -1;
+}
+
+static int attach_controller(pid_t *controller_pid)
+{
+       unsigned int basic_flags, extra_flags;
+       char path[PATH_MAX];
+       int fd;
+
+       *controller_pid = -1;
+
+       if (!find_attach_dev(path)) {
+               printf("Failed to find Bluetooth controller virtio\n");
+               return -1;
+       }
+
+       printf("Forwarding Bluetooth controller from %s\n", path);
+
+       fd = start_controller_forward(path, controller_pid);
+       if (fd < 0) {
+               printf("Failed to forward Bluetooth controller\n");
+               return -1;
+       }
+
+       basic_flags = (1 << HCI_UART_RESET_ON_INIT);
+       extra_flags = (1 << HCI_UART_VND_DETECT);
+
+       printf("Attaching Bluetooth controller\n");
+
+       return attach_proto(fd, HCI_UART_H4, basic_flags, extra_flags);
+}
+
 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, audio_pid[2];
+               dbus_session_pid, audio_pid[2], controller_pid;
        int i;
 
        if (!home) {

@@ -910,18 +1072,11 @@ static void run_command(char *cmdname, char *home)
        }
 
        if (num_devs) {
-               const char *node = "/dev/ttyS1";
-               unsigned int basic_flags, extra_flags;
-
-               printf("Attaching BR/EDR controller to %s\n", node);
-
-               basic_flags = (1 << HCI_UART_RESET_ON_INIT);
-               extra_flags = (1 << HCI_UART_VND_DETECT);
-
-               serial_fd = attach_proto(node, HCI_UART_H4, basic_flags,
-                                                               extra_flags);
-       } else
+               serial_fd = attach_controller(&controller_pid);
+       } else {
                serial_fd = -1;
+               controller_pid = -1;
+       }
 
        if (start_dbus) {
                create_dbus_system_conf();

@@ -1063,6 +1218,11 @@ start_next:
                        monitor_pid = -1;
                }
 
+               if (corpse == controller_pid) {
+                       printf("Controller terminated\n");
+                       controller_pid = -1;
+               }
+
                for (i = 0; i < 2; ++i) {
                        if (corpse == audio_pid[i]) {
                                printf("Audio server %d terminated\n", i);
--

2.53.0

Using pci-serial to forward eg. btvirt sockets is unreliable, as qemu or
kernel seems to be sometimes dropping part of the sent data or insert spurious \0 bytes, leading to sporadic errors like:

    kernel: Bluetooth: hci0: command 0x0c52 tx timeout
    kernel: Bluetooth: hci0: Opcode 0x0c52 failed: -110
    btvirt: packet error, unknown type: 0

This appears to occur most often when host system is under load, e.g. due to multiple test-runners running at the same time.  The problem is
not specific to btvirt, but seems to be in the qemu serial device layer
vs. kernel interaction.

Change test-runner to use virtserialport to forward the btvirt connection inside the VM, as virtio-serial doesn't appear to have these
problems.

Since it's not a TTY device, we have to do vport <-> tty-with-hci- ldisc
forwarding of the data in test-runner, so this becomes a bit more involved.
---
 Makefile.tools      |   2 +
 configure.ac        |   9 ++
 tools/test-runner.c | 300 +++++++++++++++++++++++++++++++++--------- --

 3 files changed, 241 insertions(+), 70 deletions(-)

Makefile.tools +0 -0

index f6de2e685..6e30a535f 100644
@@ -321,6 +321,8 @@ tools_btgatt_server_SOURCES = tools/btgatt-

server.c src/uuid-helper.c
 tools_btgatt_server_LDADD = src/libshared-mainloop.la \
  lib/libbluetooth- internal.la

Makefile.tools +2 -0

+tools_test_runner_LDADD = $(OPENPTY_LIBS)
+

 tools_rctest_LDADD = lib/libbluetooth-internal.la
 tools_l2test_LDADD = lib/libbluetooth-internal.la

configure.ac +0 -0

index 52de7d665..3bc1f5c44 100644
@@ -251,6 +251,15 @@ AC_ARG_ENABLE(tools, AS_HELP_STRING([--disable-
 tools],
  		[disable Bluetooth tools]),
 [enable_tools=${enableval}])
  AM_CONDITIONAL(TOOLS, test "${enable_tools}" != "no")

configure.ac +3 -0

+fi
+AC_SUBST(OPENPTY_LIBS, [${openpty_libs}])
+

 AC_ARG_ENABLE(monitor, AS_HELP_STRING([--disable-monitor], [disable Bluetooth monitor]), [enable_monitor=${enableval}]) AM_CONDITIONAL(MONITOR, test "${enable_monitor}" != "no")

tools/test-runner.c +3 -0

index b3e0b0cfe..576313b79 100644
@@ -24,6 +24,9 @@
  #include <getopt.h>
  #include <poll.h>
  #include <limits.h>
+#include <dirent.h>
+#include <pty.h>
+#include <stdint.h>
  #include <sys/wait.h>
  #include <sys/stat.h>
  #include <sys/types.h>

@@ -306,7 +309,7 @@ static void start_qemu(void)
  				testargs);

  argv = alloca(sizeof(qemu_argv) +

tools/test-runner.c +1 -1

-			(sizeof(char *) * (6 + (num_devs * 4))) +
+			(sizeof(char *) * (8 + (num_devs * 4))) +

  (sizeof(char *) * (usb_dev ? 4 : 0)) + (sizeof(char *) * num_extra_opts)); memcpy(argv, qemu_argv, sizeof(qemu_argv));

tools/test-runner.c +0 -0

@@ -330,14 +333,17 @@ static void start_qemu(void)
  	argv[pos++] = "-append";
  	argv[pos++] = (char *) cmdline;

tools/test-runner.c +3 -0

+	argv[pos++] = "-device";
+	argv[pos++] = "virtio-serial";
+

  for (i = 0; i < num_devs; i++) {
  char *chrdev, *serdev;

  chrdev = alloca(48 + strlen(device_path)); sprintf(chrdev, "socket,path=%s,id=bt%d", device_path, i);

tools/test-runner.c +2 -2

-		serdev = alloca(48);
-		sprintf(serdev, "pci-serial,chardev=bt%d", i);
+		serdev = alloca(64);
+		sprintf(serdev,

"virtserialport,chardev=bt%d,name=bt.%d", i, i);

  argv[pos++] = "-chardev";
  argv[pos++] = chrdev;

tools/test-runner.c +0 -0

@@ -360,65 +366,12 @@ static void start_qemu(void)
  	execve(argv[0], argv, qemu_envp);
  }

tools/test-runner.c +0 -45

-static int open_serial(const char *path)
-{
-	struct termios ti;
-	int fd, saved_ldisc, ldisc = N_HCI;
-
-	fd = open(path, O_RDWR | O_NOCTTY);
-	if (fd < 0) {
-		perror("Failed to open serial port");
-		return -1;
-	}
-
-	if (tcflush(fd, TCIOFLUSH) < 0) {
-		perror("Failed to flush serial port");
-		close(fd);
-		return -1;
-	}
-
-	if (ioctl(fd, TIOCGETD, &saved_ldisc) < 0) {
-		perror("Failed get serial line discipline");
-		close(fd);
-		return -1;
-	}
-
-	/* Switch TTY to raw mode */
-	memset(&ti, 0, sizeof(ti));
-	cfmakeraw(&ti);
-
-	ti.c_cflag |= (B115200 | CLOCAL | CREAD);
-
-	/* Set flow control */
-	ti.c_cflag |= CRTSCTS;
-
-	if (tcsetattr(fd, TCSANOW, &ti) < 0) {
-		perror("Failed to set serial port settings");
-		close(fd);
-		return -1;
-	}
-
-	if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
-		perror("Failed set serial line discipline");
-		close(fd);
-		return -1;
-	}
-
-	printf("Switched line discipline from %d to %d\n",

saved_ldisc, ldisc);

tools/test-runner.c +1 -5

-
-	return fd;
-}
-
-static int attach_proto(const char *path, unsigned int proto,
+static int attach_proto(int fd, unsigned int proto,

  unsigned int mandatory_flags,
  unsigned int optional_flags) {
  unsigned int flags = mandatory_flags | optional_flags;

tools/test-runner.c +1 -5

-	int fd, dev_id;
-
-	fd = open_serial(path);
-	if (fd < 0)
-		return -1;
+	int dev_id;

  if (ioctl(fd, HCIUARTSETFLAGS, flags) < 0) { if (errno == EINVAL) {

tools/test-runner.c +0 -0

@@ -895,13 +848,222 @@ static int start_audio_server(pid_t pids[2])
  	return 0;
  }

tools/test-runner.c +17 -0

+static bool find_attach_dev(char path[PATH_MAX])
+{
+	const char *vport_path = "/sys/class/virtio-ports";
+	struct dirent *entry;
+	DIR *dir;
+
+	dir = opendir(vport_path);
+	if (!dir)
+		return false;
+
+	while ((entry = readdir(dir)) != NULL) {
+		FILE *f;
+		char buf[64];
+		size_t size;
+
+		snprintf(path, PATH_MAX, "%s/%s/name", vport_path,
+								entr

y->d_name);

tools/test-runner.c +11 -0

+		f = fopen(path, "r");
+		if (!f)
+			continue;
+
+		size = fread(buf, 1, sizeof(buf) - 1, f);
+		buf[size] = 0;
+
+		fclose(f);
+
+		if (strncmp(buf, "bt.", 3) == 0) {
+			snprintf(path, PATH_MAX, "/dev/%s", entry-

Quoted 1 line

d_name);

tools/test-runner.c +52 -0

+			closedir(dir);
+			return true;
+		}
+	}
+
+	closedir(dir);
+	return false;
+}
+
+static void copy_fd_bidi(int src, int dst)
+{
+	fd_set rfds, wfds;
+	int fd[2] = { src, dst };
+	uint8_t buf[2][4096];
+	size_t size[2] = { 0, 0 };
+	size_t pos[2] = { 0, 0 };
+	int i, ret;
+
+	/* Simple copying of data src <-> dst to both directions */
+
+	for (i = 0; i < 2; ++i) {
+		int flags = fcntl(fd[i], F_GETFL);
+
+		if (fcntl(fd[i], F_SETFL, flags | O_NONBLOCK) < 0) {
+			perror("fcntl");
+			goto error;
+		}
+	}
+
+	while (1) {
+		FD_ZERO(&rfds);
+		FD_ZERO(&wfds);
+
+		for (i = 0; i < 2; ++i) {
+			if (size[i])
+				FD_SET(fd[i], &wfds);
+			else
+				FD_SET(fd[1 - i], &rfds);
+		}
+
+		ret = select(FD_SETSIZE, &rfds, &wfds, NULL, NULL);
+		if (ret < 0) {
+			if (errno == EINTR)
+				continue;
+			perror("select");
+			goto error;
+		}
+
+		for (i = 0; i < 2; ++i) {
+			ssize_t s;
+
+			if (!size[i] && FD_ISSET(fd[1 - i], &rfds))

{

tools/test-runner.c +1 -0

+				s = read(fd[1 - i], buf[i],

sizeof(buf[i]));

tools/test-runner.c +14 -0

+				if (s >= 0) {
+					size[i] = s;
+					pos[i] = 0;
+				} else if (errno == EINTR) {
+					/* ok */
+				} else {
+					perror("read");
+					goto error;
+				}
+
+			}
+
+			if (size[i]) {
+				s = write(fd[i], buf[i] + pos[i],

size[i]);

tools/test-runner.c +4 -0

+				if (s >= 0) {
+					size[i] -= s;
+					pos[i] += s;
+				} else if (errno == EINTR || errno

== EAGAIN

tools/test-runner.c +1 -0

+						|| errno ==

EWOULDBLOCK) {

tools/test-runner.c +12 -0

+					/* ok */
+				} else {
+					perror("write");
+					goto error;
+				}
+			}
+		}
+	}
+	return;
+
+error:
+	fprintf(stderr, "Bluetooth controller forward terminated

with error\n");

tools/test-runner.c +4 -0

+	exit(1);
+}
+
+static int start_controller_forward(const char *path, pid_t

*controller_pid)

tools/test-runner.c +7 -0

+{
+	struct termios ti;
+	pid_t pid;
+	int src = -1, dst = -1, fd = -1;
+	int ret, saved_ldisc, ldisc = N_HCI;
+
+	/* virtio-serial ports cannot be used for HCI line disciple,

so

tools/test-runner.c +30 -0

+	 * openpty() serial device and forward data to/from it.
+	 */
+
+	src = open(path, O_RDWR);
+	if (src < 0)
+		goto error;
+
+	/* Raw mode TTY */
+	memset(&ti, 0, sizeof(ti));
+	cfmakeraw(&ti);
+	ti.c_cflag |= B115200 | CLOCAL | CREAD;
+
+	/* With flow control */
+	ti.c_cflag |= CRTSCTS;
+
+	ret = openpty(&dst, &fd, NULL, &ti, NULL);
+	if (ret < 0)
+		goto error;
+
+	if (ioctl(fd, TIOCGETD, &saved_ldisc) < 0) {
+		perror("Failed get serial line discipline");
+		goto error;
+	}
+
+	if (ioctl(fd, TIOCSETD, &ldisc) < 0) {
+		perror("Failed set serial line discipline");
+		goto error;
+	}
+
+	printf("Switched line discipline from %d to %d\n",

saved_ldisc, ldisc);

tools/test-runner.c +37 -0

+
+	pid = fork();
+	if (pid < 0) {
+		perror("Failed to fork new process");
+		goto error;
+	} else if (pid == 0) {
+		close(fd);
+		copy_fd_bidi(src, dst);
+		exit(0);
+	}
+
+	*controller_pid = pid;
+
+	close(src);
+	close(dst);
+	return fd;
+
+error:
+	if (src >= 0)
+		close(src);
+	if (dst >= 0)
+		close(dst);
+	if (fd >= 0)
+		close(fd);
+	return -1;
+}
+
+static int attach_controller(pid_t *controller_pid)
+{
+	unsigned int basic_flags, extra_flags;
+	char path[PATH_MAX];
+	int fd;
+
+	*controller_pid = -1;
+
+	if (!find_attach_dev(path)) {
+		printf("Failed to find Bluetooth controller

virtio\n");

tools/test-runner.c +17 -0

+		return -1;
+	}
+
+	printf("Forwarding Bluetooth controller from %s\n", path);
+
+	fd = start_controller_forward(path, controller_pid);
+	if (fd < 0) {
+		printf("Failed to forward Bluetooth controller\n");
+		return -1;
+	}
+
+	basic_flags = (1 << HCI_UART_RESET_ON_INIT);
+	extra_flags = (1 << HCI_UART_VND_DETECT);
+
+	printf("Attaching Bluetooth controller\n");
+
+	return attach_proto(fd, HCI_UART_H4, basic_flags,

extra_flags);

tools/test-runner.c +2 -0

+}
+

 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,

tools/test-runner.c +1 -1

-	      dbus_session_pid, audio_pid[2];
+		dbus_session_pid, audio_pid[2], controller_pid;

  int i;

  if (!home) {

tools/test-runner.c +0 -0

@@ -910,18 +1072,11 @@ static void run_command(char *cmdname, char
 *home)
  	}

  if (num_devs) {

tools/test-runner.c +0 -9

-		const char *node = "/dev/ttyS1";
-		unsigned int basic_flags, extra_flags;
-
-		printf("Attaching BR/EDR controller to %s\n", node);
-
-		basic_flags = (1 << HCI_UART_RESET_ON_INIT);
-		extra_flags = (1 << HCI_UART_VND_DETECT);
-
-		serial_fd = attach_proto(node, HCI_UART_H4,

basic_flags,
-

								extra_flags);

tools/test-runner.c +2 -1

-	} else
+		serial_fd = attach_controller(&controller_pid);
+	} else {

  serial_fd = -1;

tools/test-runner.c +2 -0

+		controller_pid = -1;
+	}

  if (start_dbus) {
  create_dbus_system_conf();

tools/test-runner.c +0 -0

@@ -1063,6 +1218,11 @@ start_next:
  			monitor_pid = -1;
  		}

tools/test-runner.c +5 -0

+		if (corpse == controller_pid) {
+			printf("Controller terminated\n");
+			controller_pid = -1;
+		}
+

  for (i = 0; i < 2; ++i) {
  if (corpse == audio_pid[i]) { printf("Audio server %d terminated\n", i);