From patchwork Mon Nov 21 15:29:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Foss X-Patchwork-Id: 9439601 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 325E460235 for ; Mon, 21 Nov 2016 15:31:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3677228B64 for ; Mon, 21 Nov 2016 15:31:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3516D28B6F; Mon, 21 Nov 2016 15:31:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 24A6328B63 for ; Mon, 21 Nov 2016 15:31:06 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 47CBE6E525; Mon, 21 Nov 2016 15:30:59 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by gabe.freedesktop.org (Postfix) with ESMTPS id 008D66E515 for ; Mon, 21 Nov 2016 15:30:44 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: robertfoss) with ESMTPSA id 5EA2A267855 From: robert.foss@collabora.com To: intel-gfx@lists.freedesktop.org, Gustavo Padovan , Daniel Stone , Daniel Vetter , Marius Vlad , Eric Engestrom , Chris Wilson , Tomeu Vizoso Date: Mon, 21 Nov 2016 10:29:22 -0500 Message-Id: <20161121152922.5595-22-robert.foss@collabora.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161121152922.5595-1-robert.foss@collabora.com> References: <20161121152922.5595-1-robert.foss@collabora.com> Subject: [Intel-gfx] [PATCH i-g-t v8 21/21] tests/sw_sync: Add subtest test_sync_busy_unixsocket X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Robert Foss 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 --- 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 #include #include +#include +#include #include #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();