[Xen-devel] [PATCH 8 of 9 RFC v2] blktap3/libblktapctl: Introduce tapdisk spawn functionality

[Thanos Makatos <thanos.makatos@xxxxxxxxxx>]

This patch imports file control/tap-ctl-spawn.c from the existing blktap2
implementation, with most changes coming from blktap2 living in github.
Function tap-ctl-spawn is used for spawning a new tapdisk process in order to
serve a new virtual block device.

diff --git a/tools/blktap2/control/tap-ctl-spawn.c 
b/tools/blktap3/control/tap-ctl-spawn.c
copy from tools/blktap2/control/tap-ctl-spawn.c
copy to tools/blktap3/control/tap-ctl-spawn.c
--- a/tools/blktap2/control/tap-ctl-spawn.c
+++ b/tools/blktap3/control/tap-ctl-spawn.c
@@ -31,15 +31,17 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <signal.h>
 #include <sys/wait.h>
 
 #include "tap-ctl.h"
-#include "blktap2.h"
+#include "blktap3.h"
+#include "_paths.h"
 
 static pid_t
 __tap_ctl_spawn(int *readfd)
 {
-       int err, child, channel[2];
+       int child, channel[2];
        char *tapdisk;
 
        if (pipe(channel)) {
@@ -71,14 +73,21 @@ static pid_t
        close(channel[0]);
        close(channel[1]);
 
-       tapdisk = getenv("TAPDISK2");
+       tapdisk = getenv("TAPDISK");
        if (!tapdisk)
-               tapdisk = "tapdisk2";
+               tapdisk = getenv("TAPDISK2");
 
-       execlp(tapdisk, tapdisk, NULL);
+       if (tapdisk) {
+               execlp(tapdisk, tapdisk, NULL);
+               exit(errno);
+       }
 
-       EPRINTF("exec failed\n");
-       exit(1);
+       execl(TAPDISK_EXECDIR "/" TAPDISK_EXEC, TAPDISK_EXEC, NULL);
+
+       if (errno == ENOENT)
+               execl(TAPDISK_BUILDDIR "/" TAPDISK_EXEC, TAPDISK_EXEC, NULL);
+
+       exit(errno);
 }
 
 pid_t
@@ -90,7 +99,7 @@ tap_ctl_get_pid(const int id)
        memset(&message, 0, sizeof(message));
        message.type = TAPDISK_MESSAGE_PID;
 
-       err = tap_ctl_connect_send_and_receive(id, &message, 2);
+       err = tap_ctl_connect_send_and_receive(id, &message, NULL);
        if (err)
                return err;
 
@@ -119,6 +128,12 @@ tap_ctl_wait(pid_t child)
        if (WIFSIGNALED(status)) {
                int signo = WTERMSIG(status);
                EPRINTF("tapdisk2[%d] killed by signal %d\n", child, signo);
+               if (signo == SIGUSR1)
+                       /* NB. there's a race between tapdisk's
+                        * sigaction init and xen-bugtool shooting
+                        * debug signals. If killed by something as
+                        * innocuous as USR1, then retry. */
+                       return -EAGAIN;
                return -EINTR;
        }
 
@@ -139,8 +154,8 @@ tap_ctl_get_child_id(int readfd)
        }
 
        errno = 0;
-       if (fscanf(f, BLKTAP2_CONTROL_DIR"/"
-                  BLKTAP2_CONTROL_SOCKET"%d", &id) != 1) {
+       if (fscanf(f, BLKTAP3_CONTROL_DIR "/"
+                          BLKTAP3_CONTROL_SOCKET "%d", &id) != 1) {
                errno = (errno ? : EINVAL);
                EPRINTF("parsing id failed: %d\n", errno);
                id = -1;
@@ -158,13 +173,17 @@ tap_ctl_spawn(void)
 
        readfd = -1;
 
+  again:
        child = __tap_ctl_spawn(&readfd);
        if (child < 0)
                return child;
 
        err = tap_ctl_wait(child);
-       if (err)
+       if (err) {
+               if (err == -EAGAIN)
+                       goto again;
                return err;
+       }
 
        id = tap_ctl_get_child_id(readfd);
        if (id < 0)

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel