[Qemu-devel] [PULL 0/3] qtest: avoid pidfile and QEMU process leaks

[Qemu-devel] [PULL 0/3] qtest: avoid pidfile and QEMU process leaks

[Stefan Hajnoczi]

Reviewed by Paolo and Markus.  Here is the pull request.

v2:
 * Don't call qtest_end() from SIGABRT handler to avoid reentrancy [Paolo]
 * Use sigemptyset() to avoid assumption about signal mask [Markus]
 * if (fd != -1) close(fd) is no longer necessary [Markus]

This series prevents the following qtest issues:

1. Leaking the pidfile if QEMU startup fails, as discovered by Andreas Färber.
2. Leaking the QEMU process when a test case aborts.

Applying this series should make buildbots and manual "make check" users have a
more pleasant and less leaky experience :).

The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:

  Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)

are available in the git repository at:

  git://github.com/stefanha/qemu.git tags/qtest-monitor-process-pull-request

for you to fetch changes up to b15d422a23a3e4cf1b4195af209211eccdb88d51:

  qtest: kill QEMU process on g_assert() failure (2014-02-19 15:45:51 +0100)

----------------------------------------------------------------
qtest resource cleanup pull request

----------------------------------------------------------------
Stefan Hajnoczi (3):
      qtest: drop unused child_pid field
      qtest: make QEMU our direct child process
      qtest: kill QEMU process on g_assert() failure

 tests/libqtest.c | 59 +++++++++++++++++++++++++-------------------------------
 1 file changed, 26 insertions(+), 33 deletions(-)

-- 
1.8.5.3

[Qemu-devel] [PULL 1/3] qtest: drop unused child_pid field

[Stefan Hajnoczi]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 tests/libqtest.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/libqtest.c b/tests/libqtest.c
index c9a4f89..2876ce4 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -43,7 +43,6 @@ struct QTestState
     int qmp_fd;
     bool irq_level[MAX_IRQ];
     GString *rx;
-    int child_pid;   /* Child process created to execute QEMU */
     pid_t qemu_pid;  /* QEMU process spawned by our child */
 };
 
@@ -152,7 +151,6 @@ QTestState *qtest_init(const char *extra_args)
     g_free(qmp_socket_path);
 
     s->rx = g_string_new("");
-    s->child_pid = pid;
     for (i = 0; i < MAX_IRQ; i++) {
         s->irq_level[i] = false;
     }
-- 
1.8.5.3

[Qemu-devel] [PULL 2/3] qtest: make QEMU our direct child process

[Stefan Hajnoczi]

qtest_init() cannot use exec*p() to launch QEMU since the exec*p()
functions take an argument array while qtest_init() takes char
*extra_args.  Therefore we execute /bin/sh -c <command-line> and let the
shell parse the argument string.

This left /bin/sh as our child process and our child's child was QEMU.
We still want QEMU's pid so the -pidfile option was used to let QEMU
report its pid.

The pidfile needs to be unlinked when the test case exits or fails.  In
other words, the pidfile creates a new problem for us!

Simplify all this using the shell 'exec' command.  It allows us to
replace the /bin/sh process with QEMU.  Then we no longer need to use
-pidfile because we already know our fork child's pid.

Note: Yes, it seems silly to exec /bin/sh when we could just exec QEMU
directly.  But remember qtest_init() takes a single char *extra_args
command-line fragment instead of a real argv[] array, so we need
/bin/sh's argument parsing behavior.

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
---
 tests/libqtest.c | 34 +++++-----------------------------
 1 file changed, 5 insertions(+), 29 deletions(-)

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 2876ce4..8b2b2d7 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -43,7 +43,7 @@ struct QTestState
     int qmp_fd;
     bool irq_level[MAX_IRQ];
     GString *rx;
-    pid_t qemu_pid;  /* QEMU process spawned by our child */
+    pid_t qemu_pid;  /* our child QEMU process */
 };
 
 #define g_assert_no_errno(ret) do { \
@@ -88,32 +88,14 @@ static int socket_accept(int sock)
     return ret;
 }
 
-static pid_t read_pid_file(const char *pid_file)
-{
-    FILE *f;
-    char buffer[1024];
-    pid_t pid = -1;
-
-    f = fopen(pid_file, "r");
-    if (f) {
-        if (fgets(buffer, sizeof(buffer), f)) {
-            pid = atoi(buffer);
-        }
-        fclose(f);
-    }
-    return pid;
-}
-
 QTestState *qtest_init(const char *extra_args)
 {
     QTestState *s;
     int sock, qmpsock, i;
     gchar *socket_path;
     gchar *qmp_socket_path;
-    gchar *pid_file;
     gchar *command;
     const char *qemu_binary;
-    pid_t pid;
 
     qemu_binary = getenv("QTEST_QEMU_BINARY");
     g_assert(qemu_binary != NULL);
@@ -122,22 +104,20 @@ QTestState *qtest_init(const char *extra_args)
 
     socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
     qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
-    pid_file = g_strdup_printf("/tmp/qtest-%d.pid", getpid());
 
     sock = init_socket(socket_path);
     qmpsock = init_socket(qmp_socket_path);
 
-    pid = fork();
-    if (pid == 0) {
-        command = g_strdup_printf("%s "
+    s->qemu_pid = fork();
+    if (s->qemu_pid == 0) {
+        command = g_strdup_printf("exec %s "
                                   "-qtest unix:%s,nowait "
                                   "-qtest-log /dev/null "
                                   "-qmp unix:%s,nowait "
-                                  "-pidfile %s "
                                   "-machine accel=qtest "
                                   "-display none "
                                   "%s", qemu_binary, socket_path,
-                                  qmp_socket_path, pid_file,
+                                  qmp_socket_path,
                                   extra_args ?: "");
         execlp("/bin/sh", "sh", "-c", command, NULL);
         exit(1);
@@ -159,10 +139,6 @@ QTestState *qtest_init(const char *extra_args)
     qtest_qmp_discard_response(s, "");
     qtest_qmp_discard_response(s, "{ 'execute': 'qmp_capabilities' }");
 
-    s->qemu_pid = read_pid_file(pid_file);
-    unlink(pid_file);
-    g_free(pid_file);
-
     if (getenv("QTEST_STOP")) {
         kill(s->qemu_pid, SIGSTOP);
     }
-- 
1.8.5.3

[Qemu-devel] [PULL 3/3] qtest: kill QEMU process on g_assert() failure

[Stefan Hajnoczi]

The QEMU process stays running if the test case fails.  This patch fixes
the leak by installing a SIGABRT signal handler which invokes
qtest_end().

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
---
 tests/libqtest.c | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 8b2b2d7..f587d36 100644
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -44,6 +44,7 @@ struct QTestState
     bool irq_level[MAX_IRQ];
     GString *rx;
     pid_t qemu_pid;  /* our child QEMU process */
+    struct sigaction sigact_old; /* restored on exit */
 };
 
 #define g_assert_no_errno(ret) do { \
@@ -88,6 +89,19 @@ static int socket_accept(int sock)
     return ret;
 }
 
+static void kill_qemu(QTestState *s)
+{
+    if (s->qemu_pid != -1) {
+        kill(s->qemu_pid, SIGTERM);
+        waitpid(s->qemu_pid, NULL, 0);
+    }
+}
+
+static void sigabrt_handler(int signo)
+{
+    kill_qemu(global_qtest);
+}
+
 QTestState *qtest_init(const char *extra_args)
 {
     QTestState *s;
@@ -96,6 +110,7 @@ QTestState *qtest_init(const char *extra_args)
     gchar *qmp_socket_path;
     gchar *command;
     const char *qemu_binary;
+    struct sigaction sigact;
 
     qemu_binary = getenv("QTEST_QEMU_BINARY");
     g_assert(qemu_binary != NULL);
@@ -108,6 +123,14 @@ QTestState *qtest_init(const char *extra_args)
     sock = init_socket(socket_path);
     qmpsock = init_socket(qmp_socket_path);
 
+    /* Catch SIGABRT to clean up on g_assert() failure */
+    sigact = (struct sigaction){
+        .sa_handler = sigabrt_handler,
+        .sa_flags = SA_RESETHAND,
+    };
+    sigemptyset(&sigact.sa_mask);
+    sigaction(SIGABRT, &sigact, &s->sigact_old);
+
     s->qemu_pid = fork();
     if (s->qemu_pid == 0) {
         command = g_strdup_printf("exec %s "
@@ -148,13 +171,9 @@ QTestState *qtest_init(const char *extra_args)
 
 void qtest_quit(QTestState *s)
 {
-    int status;
-
-    if (s->qemu_pid != -1) {
-        kill(s->qemu_pid, SIGTERM);
-        waitpid(s->qemu_pid, &status, 0);
-    }
+    sigaction(SIGABRT, &s->sigact_old, NULL);
 
+    kill_qemu(s);
     close(s->fd);
     close(s->qmp_fd);
     g_string_free(s->rx, true);
-- 
1.8.5.3

Re: [Qemu-devel] [PULL 0/3] qtest: avoid pidfile and QEMU process leaks

[Andreas Färber]

Am 19.02.2014 15:50, schrieb Stefan Hajnoczi:
> Reviewed by Paolo and Markus.  Here is the pull request.
> 
> v2:
>  * Don't call qtest_end() from SIGABRT handler to avoid reentrancy [Paolo]
>  * Use sigemptyset() to avoid assumption about signal mask [Markus]
>  * if (fd != -1) close(fd) is no longer necessary [Markus]
> 
> This series prevents the following qtest issues:
> 
> 1. Leaking the pidfile if QEMU startup fails, as discovered by Andreas Färber.
> 2. Leaking the QEMU process when a test case aborts.
> 
> Applying this series should make buildbots and manual "make check" users have a
> more pleasant and less leaky experience :).
> 
> The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:
> 
>   Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
> 
> are available in the git repository at:
> 
>   git://github.com/stefanha/qemu.git tags/qtest-monitor-process-pull-request
> 
> for you to fetch changes up to b15d422a23a3e4cf1b4195af209211eccdb88d51:
> 
>   qtest: kill QEMU process on g_assert() failure (2014-02-19 15:45:51 +0100)
> 
> ----------------------------------------------------------------
> qtest resource cleanup pull request
> 
> ----------------------------------------------------------------
> Stefan Hajnoczi (3):
>       qtest: drop unused child_pid field
>       qtest: make QEMU our direct child process
>       qtest: kill QEMU process on g_assert() failure
> 
>  tests/libqtest.c | 59 +++++++++++++++++++++++++-------------------------------
>  1 file changed, 26 insertions(+), 33 deletions(-)

Ack, my pending pull touches qtest.c rather than libqtest.c (hope you
remembered to check!) and changes look OK, didn't test yet though.

Andreas

-- 
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg

Re: [Qemu-devel] [PULL 0/3] qtest: avoid pidfile and QEMU process leaks

[Stefan Hajnoczi]

On Wed, Feb 19, 2014 at 07:23:24PM +0100, Andreas Färber wrote:
> Am 19.02.2014 15:50, schrieb Stefan Hajnoczi:
> > Reviewed by Paolo and Markus.  Here is the pull request.
> > 
> > v2:
> >  * Don't call qtest_end() from SIGABRT handler to avoid reentrancy [Paolo]
> >  * Use sigemptyset() to avoid assumption about signal mask [Markus]
> >  * if (fd != -1) close(fd) is no longer necessary [Markus]
> > 
> > This series prevents the following qtest issues:
> > 
> > 1. Leaking the pidfile if QEMU startup fails, as discovered by Andreas Färber.
> > 2. Leaking the QEMU process when a test case aborts.
> > 
> > Applying this series should make buildbots and manual "make check" users have a
> > more pleasant and less leaky experience :).
> > 
> > The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:
> > 
> >   Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
> > 
> > are available in the git repository at:
> > 
> >   git://github.com/stefanha/qemu.git tags/qtest-monitor-process-pull-request
> > 
> > for you to fetch changes up to b15d422a23a3e4cf1b4195af209211eccdb88d51:
> > 
> >   qtest: kill QEMU process on g_assert() failure (2014-02-19 15:45:51 +0100)
> > 
> > ----------------------------------------------------------------
> > qtest resource cleanup pull request
> > 
> > ----------------------------------------------------------------
> > Stefan Hajnoczi (3):
> >       qtest: drop unused child_pid field
> >       qtest: make QEMU our direct child process
> >       qtest: kill QEMU process on g_assert() failure
> > 
> >  tests/libqtest.c | 59 +++++++++++++++++++++++++-------------------------------
> >  1 file changed, 26 insertions(+), 33 deletions(-)
> 
> Ack, my pending pull touches qtest.c rather than libqtest.c (hope you
> remembered to check!) and changes look OK, didn't test yet though.

I took a quick look and don't see any conflicts/issues.

Re: [Qemu-devel] [PULL 0/3] qtest: avoid pidfile and QEMU process leaks

[Peter Maydell]

On 19 February 2014 14:50, Stefan Hajnoczi <stefanha@redhat.com> wrote:
> Reviewed by Paolo and Markus.  Here is the pull request.
>
> v2:
>  * Don't call qtest_end() from SIGABRT handler to avoid reentrancy [Paolo]
>  * Use sigemptyset() to avoid assumption about signal mask [Markus]
>  * if (fd != -1) close(fd) is no longer necessary [Markus]
>
> This series prevents the following qtest issues:
>
> 1. Leaking the pidfile if QEMU startup fails, as discovered by Andreas Färber.
> 2. Leaking the QEMU process when a test case aborts.
>
> Applying this series should make buildbots and manual "make check" users have a
> more pleasant and less leaky experience :).
>
> The following changes since commit 46eef33b89e936ca793e13c4aeea1414e97e8dbb:
>
>   Fix QEMU build on OpenBSD on x86 archs (2014-02-17 11:44:00 +0000)
>
> are available in the git repository at:
>
>   git://github.com/stefanha/qemu.git tags/qtest-monitor-process-pull-request
>
> for you to fetch changes up to b15d422a23a3e4cf1b4195af209211eccdb88d51:
>
>   qtest: kill QEMU process on g_assert() failure (2014-02-19 15:45:51 +0100)

Applied, thanks.

-- PMM