From: robert.foss@collabora.com
To: intel-gfx@lists.freedesktop.org,
Gustavo Padovan <gustavo.padovan@collabora.com>,
Daniel Stone <daniels@collabora.com>,
Daniel Vetter <daniel@ffwll.ch>,
Marius Vlad <marius.c.vlad@intel.com>,
Eric Engestrom <eric@engestrom.ch>,
Chris Wilson <chris@chris-wilson.co.uk>,
Tomeu Vizoso <tomeu@tomeuvizoso.net>
Subject: [PATCH i-g-t v6 21/21] tests/sw_sync: Add subtest test_sync_busy_unixsocket
Date: Fri, 18 Nov 2016 10:00:15 -0500 [thread overview]
Message-ID: <20161118150015.10745-22-robert.foss@collabora.com> (raw)
In-Reply-To: <20161118150015.10745-1-robert.foss@collabora.com>
From: Robert Foss <robert.foss@collabora.com>
Add subtest test_sync_busy_fork which increments the timeline in a forked child
process, where the timeline fd has been sent through a UNIX socket.
Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
tests/sw_sync.c | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 103 insertions(+)
diff --git a/tests/sw_sync.c b/tests/sw_sync.c
index e0bf6c3..bcf5731 100644
--- a/tests/sw_sync.c
+++ b/tests/sw_sync.c
@@ -30,6 +30,8 @@
#include <pthread.h>
#include <semaphore.h>
#include <stdint.h>
+#include <sys/socket.h>
+#include <sys/types.h>
#include <unistd.h>
#include "igt.h"
@@ -171,6 +173,104 @@ static void test_sync_busy(void)
close(timeline);
}
+static void test_sync_busy_fork_unixsocket(void)
+{
+ int fence, ret;
+ int timeline;
+ int skip = 0;
+ int sv[2];
+
+
+ timeline = sw_sync_timeline_create();
+ fence = sw_sync_fence_create(timeline, 1);
+
+ if (socketpair(AF_UNIX, SOCK_DGRAM, 0, sv) != 0) {
+ skip = 1;
+ goto out;
+ }
+
+ switch (fork()) {
+ case 0:
+ {
+ /* Child process */
+ int socket = sv[1];
+ int socket_timeline;
+ struct msghdr msg = {0};
+ struct cmsghdr *cmsg;
+ unsigned char *data;
+ char m_buffer[256];
+ char c_buffer[256];
+ struct iovec io = { .iov_base = m_buffer, .iov_len = sizeof(m_buffer) };
+ close(sv[0]);
+
+ msg.msg_iov = &io;
+ msg.msg_iovlen = 1;
+ msg.msg_control = c_buffer;
+ msg.msg_controllen = sizeof(c_buffer);
+
+ if (recvmsg(socket, &msg, 0) < 0)
+ _Exit(1);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ data = CMSG_DATA(cmsg);
+ socket_timeline = *((int *) data);
+
+ /* Advance timeline from 0 -> 1 */
+ sw_sync_timeline_inc(socket_timeline, 1);
+
+ _Exit(0);
+ break;
+ }
+ case -1:
+ {
+ /* Failed fork */
+ skip = 1;
+ break;
+ }
+ default:
+ {
+ /* Parent process */
+ int socket = sv[0];
+ struct cmsghdr *cmsg;
+ struct iovec io = { .iov_base = (char *)"ABC", .iov_len = 3 };
+ struct msghdr msg = { 0 };
+ char buf[CMSG_SPACE(sizeof(timeline))];
+ memset(buf, '\0', sizeof(buf));
+ close(sv[1]);
+
+ msg.msg_iov = &io;
+ msg.msg_iovlen = 1;
+ msg.msg_control = buf;
+ msg.msg_controllen = sizeof(buf);
+
+ cmsg = CMSG_FIRSTHDR(&msg);
+ cmsg->cmsg_level = SOL_SOCKET;
+ cmsg->cmsg_type = SCM_RIGHTS;
+ cmsg->cmsg_len = CMSG_LEN(sizeof(timeline));
+
+ *((int *) CMSG_DATA(cmsg)) = timeline;
+ msg.msg_controllen = cmsg->cmsg_len;
+
+ ret = sync_wait(fence, 0);
+ igt_assert_f(ret == -1 && errno == ETIME, "Fence signaled (it should not have been signalled yet)\n");
+
+ if (sendmsg(socket, &msg, 0) < 0) {
+ skip = 1;
+ goto out;
+ }
+
+ ret = sync_wait(fence, 2*1000);
+ igt_assert_f(ret == 0, "Fence not signaled (timeline value 1 fence seqno 1)\n");
+ break;
+ }
+ }
+
+out:
+ close(fence);
+ close(timeline);
+ igt_require(!skip);
+}
+
static void test_sync_busy_fork(void)
{
int fence, ret;
@@ -828,6 +928,9 @@ igt_main
igt_subtest("sync_busy_fork")
test_sync_busy_fork();
+ igt_subtest("sync_busy_fork_unixsocket")
+ test_sync_busy_fork_unixsocket();
+
igt_subtest("sync_merge_invalid")
test_sync_merge_invalid();
--
2.10.2
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-11-18 15:01 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-18 14:59 [PATCH i-g-t v6 00/21] Implement sw_sync test robert.foss
2016-11-18 14:59 ` [PATCH i-g-t v6 01/21] lib/sw_sync: Add helper functions for managing synchronization primitives robert.foss
2016-11-18 14:59 ` [PATCH i-g-t v6 02/21] tests/sw_sync: Add sw_sync test robert.foss
2016-11-18 14:59 ` [PATCH i-g-t v6 03/21] tests/sw_sync: Add subtest test_alloc_fence robert.foss
2016-11-18 14:59 ` [PATCH i-g-t v6 04/21] tests/sw_sync: Add subtest test_alloc_fence_invalid_timeline robert.foss
2016-11-18 14:59 ` [PATCH i-g-t v6 05/21] tests/sw_sync: Add subtest test_alloc_merge_fence robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 06/21] tests/sw_sync: Add subtest test_sync_busy robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 07/21] tests/sw_sync: Add subtest test_sync_merge robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 08/21] tests/sw_sync: Add subtest test_sync_merge_same robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 09/21] tests/sw_sync: Add subtest test_sync_multi_consumer robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 10/21] tests/sw_sync: Add subtest test_sync_multi_consumer_producer robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 11/21] tests/sw_sync: Add subtest test_sync_random_merge robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 12/21] tests/sw_sync: Add subtest test_sync_multi_timeline_wait robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 13/21] tests/sw_sync: Add subtest test_sync_multi_producer_single_consumer robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 14/21] tests/sw_sync: Add subtest test_sync_expired_merge robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 15/21] tests/sw_sync: Add subtest test_timeline_closed robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 16/21] tests/sw_sync: Add subtest test_timeline_closed_signaled robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 17/21] lib/sw_sync: Add igt_require_sw_sync to enable skipping on no sw_sync support robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 18/21] tests/sw_sync: Add igt_require check for sw_sync feature robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 19/21] tests/sw_sync: Add subtest test_sync_merge_invalid robert.foss
2016-11-18 15:00 ` [PATCH i-g-t v6 20/21] tests/sw_sync: Add subtest test_sync_busy_fork robert.foss
2016-11-18 15:00 ` robert.foss [this message]
2016-11-18 15:48 ` [PATCH i-g-t v6 00/21] Implement sw_sync test Robert Foss
-- strict thread matches above, loose matches on Subject: below --
2016-11-17 15:01 robert.foss
2016-11-17 15:02 ` [PATCH i-g-t v6 21/21] tests/sw_sync: Add subtest test_sync_busy_unixsocket robert.foss
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161118150015.10745-22-robert.foss@collabora.com \
--to=robert.foss@collabora.com \
--cc=chris@chris-wilson.co.uk \
--cc=daniel@ffwll.ch \
--cc=daniels@collabora.com \
--cc=eric@engestrom.ch \
--cc=gustavo.padovan@collabora.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=marius.c.vlad@intel.com \
--cc=tomeu@tomeuvizoso.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).