Fix the test suite on s390x

This commit is contained in:
Cole Robinson
2019-06-20 16:45:14 -04:00
parent 823c0cc7e3
commit f92cc4a3a0
4 changed files with 482 additions and 0 deletions
@@ -0,0 +1,203 @@
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 1 May 2018 11:34:51 +0100
Subject: [PATCH] tests: merge code for UNIX and TCP socket testing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The test code for UNIX and TCP sockets will need to be rewritten and
extended later, and will benefit from code sharing.
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 9e2fad87b429060842a536de26d6af61ea3d96ea)
---
tests/virnetsockettest.c | 120 +++++++++++++++++----------------------
1 file changed, 51 insertions(+), 69 deletions(-)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index 9f9a243484..e463d432ff 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -116,38 +116,67 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6,
}
-struct testTCPData {
+struct testSocketData {
const char *lnode;
int port;
const char *cnode;
};
-static int testSocketTCPAccept(const void *opaque)
+static int testSocketAccept(const void *opaque)
{
virNetSocketPtr *lsock = NULL; /* Listen socket */
size_t nlsock = 0, i;
virNetSocketPtr ssock = NULL; /* Server socket */
virNetSocketPtr csock = NULL; /* Client socket */
- const struct testTCPData *data = opaque;
+ const struct testSocketData *data = opaque;
int ret = -1;
char portstr[100];
+ char *tmpdir = NULL;
+ char *path = NULL;
+ char template[] = "/tmp/libvirt_XXXXXX";
- snprintf(portstr, sizeof(portstr), "%d", data->port);
+ if (!data) {
+ virNetSocketPtr usock;
+ tmpdir = mkdtemp(template);
+ if (tmpdir == NULL) {
+ VIR_WARN("Failed to create temporary directory");
+ goto cleanup;
+ }
+ if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0)
+ goto cleanup;
- if (virNetSocketNewListenTCP(data->lnode, portstr,
- AF_UNSPEC,
- &lsock, &nlsock) < 0)
- goto cleanup;
+ if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &usock) < 0)
+ goto cleanup;
+
+ if (VIR_ALLOC_N(lsock, 1) < 0) {
+ virObjectUnref(usock);
+ goto cleanup;
+ }
+
+ lsock[0] = usock;
+ nlsock = 1;
+ } else {
+ snprintf(portstr, sizeof(portstr), "%d", data->port);
+ if (virNetSocketNewListenTCP(data->lnode, portstr,
+ AF_UNSPEC,
+ &lsock, &nlsock) < 0)
+ goto cleanup;
+ }
for (i = 0; i < nlsock; i++) {
if (virNetSocketListen(lsock[i], 0) < 0)
goto cleanup;
}
- if (virNetSocketNewConnectTCP(data->cnode, portstr,
- AF_UNSPEC,
- &csock) < 0)
- goto cleanup;
+ if (!data) {
+ if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
+ goto cleanup;
+ } else {
+ if (virNetSocketNewConnectTCP(data->cnode, portstr,
+ AF_UNSPEC,
+ &csock) < 0)
+ goto cleanup;
+ }
virObjectUnref(csock);
@@ -171,62 +200,15 @@ static int testSocketTCPAccept(const void *opaque)
for (i = 0; i < nlsock; i++)
virObjectUnref(lsock[i]);
VIR_FREE(lsock);
- return ret;
-}
-#endif
-
-
-#ifndef WIN32
-static int testSocketUNIXAccept(const void *data ATTRIBUTE_UNUSED)
-{
- virNetSocketPtr lsock = NULL; /* Listen socket */
- virNetSocketPtr ssock = NULL; /* Server socket */
- virNetSocketPtr csock = NULL; /* Client socket */
- int ret = -1;
-
- char *path = NULL;
- char *tmpdir;
- char template[] = "/tmp/libvirt_XXXXXX";
-
- tmpdir = mkdtemp(template);
- if (tmpdir == NULL) {
- VIR_WARN("Failed to create temporary directory");
- goto cleanup;
- }
- if (virAsprintf(&path, "%s/test.sock", tmpdir) < 0)
- goto cleanup;
-
- if (virNetSocketNewListenUNIX(path, 0700, -1, getegid(), &lsock) < 0)
- goto cleanup;
-
- if (virNetSocketListen(lsock, 0) < 0)
- goto cleanup;
-
- if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
- goto cleanup;
-
- virObjectUnref(csock);
-
- if (virNetSocketAccept(lsock, &ssock) != -1) {
- char c = 'a';
- if (virNetSocketWrite(ssock, &c, 1) != -1) {
- VIR_DEBUG("Unexpected client socket present");
- goto cleanup;
- }
- }
-
- ret = 0;
-
- cleanup:
VIR_FREE(path);
- virObjectUnref(lsock);
- virObjectUnref(ssock);
if (tmpdir)
rmdir(tmpdir);
return ret;
}
+#endif
+#ifndef WIN32
static int testSocketUNIXAddrs(const void *data ATTRIBUTE_UNUSED)
{
virNetSocketPtr lsock = NULL; /* Listen socket */
@@ -456,28 +438,28 @@ mymain(void)
}
if (hasIPv4) {
- struct testTCPData tcpData = { "127.0.0.1", freePort, "127.0.0.1" };
- if (virTestRun("Socket TCP/IPv4 Accept", testSocketTCPAccept, &tcpData) < 0)
+ struct testSocketData tcpData = { "127.0.0.1", freePort, "127.0.0.1" };
+ if (virTestRun("Socket TCP/IPv4 Accept", testSocketAccept, &tcpData) < 0)
ret = -1;
}
if (hasIPv6) {
- struct testTCPData tcpData = { "::1", freePort, "::1" };
- if (virTestRun("Socket TCP/IPv6 Accept", testSocketTCPAccept, &tcpData) < 0)
+ struct testSocketData tcpData = { "::1", freePort, "::1" };
+ if (virTestRun("Socket TCP/IPv6 Accept", testSocketAccept, &tcpData) < 0)
ret = -1;
}
if (hasIPv6 && hasIPv4) {
- struct testTCPData tcpData = { NULL, freePort, "127.0.0.1" };
- if (virTestRun("Socket TCP/IPv4+IPv6 Accept", testSocketTCPAccept, &tcpData) < 0)
+ struct testSocketData tcpData = { NULL, freePort, "127.0.0.1" };
+ if (virTestRun("Socket TCP/IPv4+IPv6 Accept", testSocketAccept, &tcpData) < 0)
ret = -1;
tcpData.cnode = "::1";
- if (virTestRun("Socket TCP/IPv4+IPv6 Accept", testSocketTCPAccept, &tcpData) < 0)
+ if (virTestRun("Socket TCP/IPv4+IPv6 Accept", testSocketAccept, &tcpData) < 0)
ret = -1;
}
#endif
#ifndef WIN32
- if (virTestRun("Socket UNIX Accept", testSocketUNIXAccept, NULL) < 0)
+ if (virTestRun("Socket UNIX Accept", testSocketAccept, NULL) < 0)
ret = -1;
if (virTestRun("Socket UNIX Addrs", testSocketUNIXAddrs, NULL) < 0)
@@ -0,0 +1,241 @@
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Tue, 1 May 2018 11:55:02 +0100
Subject: [PATCH] tests: rewrite socket to do something sensible and reliable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The current socket test is rather crazy in that it sets up a server
listening for sockets and then runs a client connect call, relying on
the fact that the kernel will accept this despite the application
not having called accept() yet. It then closes the client socket and
calls accept() on the server. On Linux accept() will always see that
the client has gone and so skip the rest of the code. On FreeBSD,
however, the accept sometimes succeeds, causing us to then go into
code that attempts to read and write to the client which will fail
aborting the test. The accept() never succeeds on FreeBSD guests
with a single CPU, but as you add more CPUs, accept() becomes more and
more likely to succeed, giving a 100% failure rate for the test when
using 8 CPUs.
This completely rewrites the test so that it is avoids this designed in
race condition. We simply spawn a background thread to act as the
client, which will read a byte from the server and write it back again.
The main thread can now properly listen and accept the client in a
synchronous manner avoiding any races.
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
(cherry picked from commit 39015a6f3a0d4f9ca2041b9227094f0bcc2217e9)
---
tests/virnetsockettest.c | 141 +++++++++++++++++++++++++++++++++------
1 file changed, 120 insertions(+), 21 deletions(-)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index e463d432ff..cccb90d0be 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -115,6 +115,56 @@ checkProtocols(bool *hasIPv4, bool *hasIPv6,
return ret;
}
+struct testClientData {
+ const char *path;
+ const char *cnode;
+ const char *portstr;
+};
+
+static void
+testSocketClient(void *opaque)
+{
+ struct testClientData *data = opaque;
+ char c;
+ virNetSocketPtr csock = NULL;
+
+ if (data->path) {
+ if (virNetSocketNewConnectUNIX(data->path, false,
+ NULL, &csock) < 0)
+ return;
+ } else {
+ if (virNetSocketNewConnectTCP(data->cnode, data->portstr,
+ AF_UNSPEC,
+ &csock) < 0)
+ return;
+ }
+
+ virNetSocketSetBlocking(csock, true);
+
+ if (virNetSocketRead(csock, &c, 1) != 1) {
+ VIR_DEBUG("Cannot read from server");
+ goto done;
+ }
+ if (virNetSocketWrite(csock, &c, 1) != 1) {
+ VIR_DEBUG("Cannot write to server");
+ goto done;
+ }
+
+ done:
+ virObjectUnref(csock);
+}
+
+
+static void
+testSocketIncoming(virNetSocketPtr sock,
+ int events ATTRIBUTE_UNUSED,
+ void *opaque)
+{
+ virNetSocketPtr *retsock = opaque;
+ VIR_DEBUG("Incoming sock=%p events=%d\n", sock, events);
+ *retsock = sock;
+}
+
struct testSocketData {
const char *lnode;
@@ -122,18 +172,25 @@ struct testSocketData {
const char *cnode;
};
-static int testSocketAccept(const void *opaque)
+
+static int
+testSocketAccept(const void *opaque)
{
virNetSocketPtr *lsock = NULL; /* Listen socket */
size_t nlsock = 0, i;
virNetSocketPtr ssock = NULL; /* Server socket */
- virNetSocketPtr csock = NULL; /* Client socket */
+ virNetSocketPtr rsock = NULL; /* Incoming client socket */
const struct testSocketData *data = opaque;
int ret = -1;
char portstr[100];
char *tmpdir = NULL;
char *path = NULL;
char template[] = "/tmp/libvirt_XXXXXX";
+ virThread th;
+ struct testClientData cdata = { 0 };
+ bool goodsock = false;
+ char a = 'a';
+ char b = '\0';
if (!data) {
virNetSocketPtr usock;
@@ -155,50 +212,90 @@ static int testSocketAccept(const void *opaque)
lsock[0] = usock;
nlsock = 1;
+
+ cdata.path = path;
} else {
snprintf(portstr, sizeof(portstr), "%d", data->port);
if (virNetSocketNewListenTCP(data->lnode, portstr,
AF_UNSPEC,
&lsock, &nlsock) < 0)
goto cleanup;
+
+ cdata.cnode = data->cnode;
+ cdata.portstr = portstr;
}
for (i = 0; i < nlsock; i++) {
if (virNetSocketListen(lsock[i], 0) < 0)
goto cleanup;
- }
- if (!data) {
- if (virNetSocketNewConnectUNIX(path, false, NULL, &csock) < 0)
- goto cleanup;
- } else {
- if (virNetSocketNewConnectTCP(data->cnode, portstr,
- AF_UNSPEC,
- &csock) < 0)
+ if (virNetSocketAddIOCallback(lsock[i],
+ VIR_EVENT_HANDLE_READABLE,
+ testSocketIncoming,
+ &rsock,
+ NULL) < 0) {
goto cleanup;
+ }
}
- virObjectUnref(csock);
+ if (virThreadCreate(&th, true,
+ testSocketClient,
+ &cdata) < 0)
+ goto cleanup;
+
+ while (rsock == NULL)
+ virEventRunDefaultImpl();
for (i = 0; i < nlsock; i++) {
- if (virNetSocketAccept(lsock[i], &ssock) != -1 && ssock) {
- char c = 'a';
- if (virNetSocketWrite(ssock, &c, 1) != -1 &&
- virNetSocketRead(ssock, &c, 1) != -1) {
- VIR_DEBUG("Unexpected client socket present");
- goto cleanup;
- }
+ if (lsock[i] == rsock) {
+ goodsock = true;
+ break;
}
- virObjectUnref(ssock);
- ssock = NULL;
}
+ if (!goodsock) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ "Unexpected server socket seen");
+ goto join;
+ }
+
+ if (virNetSocketAccept(rsock, &ssock) < 0)
+ goto join;
+
+ if (!ssock) {
+ virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
+ "Client went away unexpectedly");
+ goto join;
+ }
+
+ virNetSocketSetBlocking(ssock, true);
+
+ if (virNetSocketWrite(ssock, &a, 1) < 0 ||
+ virNetSocketRead(ssock, &b, 1) < 0) {
+ goto join;
+ }
+
+ if (a != b) {
+ virReportError(VIR_ERR_INTERNAL_ERROR,
+ "Bad data received '%x' != '%x'", a, b);
+ goto join;
+ }
+
+ virObjectUnref(ssock);
+ ssock = NULL;
+
ret = 0;
+ join:
+ virThreadJoin(&th);
+
cleanup:
virObjectUnref(ssock);
- for (i = 0; i < nlsock; i++)
+ for (i = 0; i < nlsock; i++) {
+ virNetSocketRemoveIOCallback(lsock[i]);
+ virNetSocketClose(lsock[i]);
virObjectUnref(lsock[i]);
+ }
VIR_FREE(lsock);
VIR_FREE(path);
if (tmpdir)
@@ -431,6 +528,8 @@ mymain(void)
signal(SIGPIPE, SIG_IGN);
+ virEventRegisterDefaultImpl();
+
#ifdef HAVE_IFADDRS_H
if (checkProtocols(&hasIPv4, &hasIPv6, &freePort) < 0) {
fprintf(stderr, "Cannot identify IPv4/6 availability\n");
@@ -0,0 +1,34 @@
From: John Ferlan <jferlan@redhat.com>
Date: Fri, 7 Sep 2018 08:20:15 -0400
Subject: [PATCH] test: Remove possible infinite loop in virnetsockettest
Commit 39015a6f3 modified the test to be more reliable/realistic,
but without checking the return status of virEventRunDefaultImpl
it's possible that the test could run infinitely.
Found by Coverity
Signed-off-by: John Ferlan <jferlan@redhat.com>
ACKed-by: Michal Privoznik <mprivozn@redhat.com>
(cherry picked from commit a0ba31c0069e89f178f064e724ddbc8540b64d32)
---
tests/virnetsockettest.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/virnetsockettest.c b/tests/virnetsockettest.c
index cccb90d0be..5927be1f80 100644
--- a/tests/virnetsockettest.c
+++ b/tests/virnetsockettest.c
@@ -243,8 +243,10 @@ testSocketAccept(const void *opaque)
&cdata) < 0)
goto cleanup;
- while (rsock == NULL)
- virEventRunDefaultImpl();
+ while (rsock == NULL) {
+ if (virEventRunDefaultImpl() < 0)
+ break;
+ }
for (i = 0; i < nlsock; i++) {
if (lsock[i] == rsock) {
+4
View File
@@ -270,6 +270,10 @@ Patch0016: 0016-remote-enforce-ACL-write-permission-for-getting-gues.patch
Patch0017: 0017-Revert-qemu-hotplug-Prepare-disk-source-in-qemuDomai.patch
# PCI hostdev interface segfault (bz #1692053)
Patch0018: 0018-util-Fixing-invalid-error-checking-from-virPCIGetNet.patch
# Fix the test suite
Patch0019: 0019-tests-merge-code-for-UNIX-and-TCP-socket-testing.patch
Patch0020: 0020-tests-rewrite-socket-to-do-something-sensible-and-re.patch
Patch0021: 0021-test-Remove-possible-infinite-loop-in-virnetsockette.patch
Requires: libvirt-daemon = %{version}-%{release}