From patchwork Mon Mar 27 08:45:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ander Conselvan de Oliveira X-Patchwork-Id: 9645603 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 646D6602D6 for ; Mon, 27 Mar 2017 08:45:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5936528307 for ; Mon, 27 Mar 2017 08:45:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A2B328334; Mon, 27 Mar 2017 08:45:14 +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 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 B70B828307 for ; Mon, 27 Mar 2017 08:45:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 653EC89A8B; Mon, 27 Mar 2017 08:45:12 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id A19CF89A8B for ; Mon, 27 Mar 2017 08:45:11 +0000 (UTC) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP; 27 Mar 2017 01:45:11 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,229,1486454400"; d="scan'208";a="240651341" Received: from linux.intel.com ([10.54.29.200]) by fmsmga004.fm.intel.com with ESMTP; 27 Mar 2017 01:45:10 -0700 Received: from localhost (aconselv-mobl3.fi.intel.com [10.237.66.54]) by linux.intel.com (Postfix) with ESMTP id 276A06A4080; Mon, 27 Mar 2017 01:45:03 -0700 (PDT) From: Ander Conselvan de Oliveira To: intel-gfx@lists.freedesktop.org Date: Mon, 27 Mar 2017 11:45:07 +0300 Message-Id: <20170327084507.26766-1-ander.conselvan.de.oliveira@intel.com> X-Mailer: git-send-email 2.9.3 Cc: Ander Conselvan de Oliveira Subject: [Intel-gfx] [PATCH i-g-t] lib/dummyload: Handle timeout in a new thread instead of signal handler 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 Currently, the main thread needs to wakeup to run the signal handler that ends a spin batch. When testing whether a function call succesfully waits for a batch to complete, this behavior is undesired. It actually invalidates the test. Fix this by spawning a new thread to handle the timeout. Cc: Chris Wilson Signed-off-by: Ander Conselvan de Oliveira --- lib/igt_dummyload.c | 55 +++++++++++++++++------------------------------------ lib/igt_dummyload.h | 3 ++- 2 files changed, 19 insertions(+), 39 deletions(-) diff --git a/lib/igt_dummyload.c b/lib/igt_dummyload.c index 019c1fb..38b1930 100644 --- a/lib/igt_dummyload.c +++ b/lib/igt_dummyload.c @@ -24,6 +24,7 @@ #include "igt.h" #include "igt_dummyload.h" +#include #include #include #include @@ -166,6 +167,8 @@ igt_spin_batch_new(int fd, int engine, unsigned int dep_handle) spin = calloc(1, sizeof(struct igt_spin)); igt_assert(spin); + pthread_mutex_init(&spin->mutex, NULL); + emit_recursive_batch(spin, fd, engine, dep_handle); igt_assert(gem_bo_busy(fd, spin->handle)); @@ -174,27 +177,11 @@ igt_spin_batch_new(int fd, int engine, unsigned int dep_handle) return spin; } -static void clear_sig_handler(int sig) -{ - struct sigaction act; - - memset(&act, 0, sizeof(act)); - act.sa_handler = SIG_DFL; - igt_assert(sigaction(sig, &act, NULL) == 0); -} - -static void sig_handler(int sig, siginfo_t *info, void *arg) +static void notify(union sigval arg) { - struct igt_spin *iter; + igt_spin_t *spin = arg.sival_ptr; - igt_list_for_each(iter, &spin_list, link) { - if (iter->signo == info->si_signo) { - igt_spin_batch_end(iter); - return; - } - } - - clear_sig_handler(sig); + igt_spin_batch_end(spin); } /** @@ -208,43 +195,33 @@ static void sig_handler(int sig, siginfo_t *info, void *arg) */ void igt_spin_batch_set_timeout(igt_spin_t *spin, int64_t ns) { - static int spin_signo = 48; /* Midpoint of SIGRTMIN, SIGRTMAX */ timer_t timer; struct sigevent sev; - struct sigaction act, oldact; struct itimerspec its; + pthread_mutex_lock(&spin->mutex); + igt_assert(ns > 0); if (!spin) return; igt_assert(!spin->timer); - /* SIGRTMAX is used by valgrind, SIGRTMAX - 1 by igt_fork_hang_detector */ - if (spin_signo >= SIGRTMAX - 2) - spin_signo = SIGRTMIN; - spin->signo = ++spin_signo; - memset(&sev, 0, sizeof(sev)); - sev.sigev_notify = SIGEV_SIGNAL | SIGEV_THREAD_ID; - sev.sigev_notify_thread_id = gettid(); - sev.sigev_signo = spin->signo; + sev.sigev_notify = SIGEV_THREAD; + sev.sigev_value.sival_ptr = spin; + sev.sigev_notify_function = notify; igt_assert(timer_create(CLOCK_MONOTONIC, &sev, &timer) == 0); igt_assert(timer); - memset(&oldact, 0, sizeof(oldact)); - memset(&act, 0, sizeof(act)); - act.sa_sigaction = sig_handler; - act.sa_flags = SA_SIGINFO; - igt_assert(sigaction(spin->signo, &act, &oldact) == 0); - igt_assert(oldact.sa_sigaction == NULL); - memset(&its, 0, sizeof(its)); its.it_value.tv_sec = ns / NSEC_PER_SEC; its.it_value.tv_nsec = ns % NSEC_PER_SEC; igt_assert(timer_settime(timer, 0, &its, NULL) == 0); spin->timer = timer; + + pthread_mutex_unlock(&spin->mutex); } /** @@ -258,11 +235,12 @@ void igt_spin_batch_end(igt_spin_t *spin) if (!spin) return; + pthread_mutex_lock(&spin->mutex); + *spin->batch = MI_BATCH_BUFFER_END; __sync_synchronize(); - if (spin->signo) - clear_sig_handler(spin->signo); + pthread_mutex_unlock(&spin->mutex); } /** @@ -287,6 +265,7 @@ void igt_spin_batch_free(int fd, igt_spin_t *spin) gem_munmap(spin->batch, BATCH_SIZE); gem_close(fd, spin->handle); + pthread_mutex_destroy(&spin->mutex); free(spin); } diff --git a/lib/igt_dummyload.h b/lib/igt_dummyload.h index 2adfadf..8fdc3fe 100644 --- a/lib/igt_dummyload.h +++ b/lib/igt_dummyload.h @@ -31,11 +31,12 @@ #include "igt_aux.h" typedef struct igt_spin { + pthread_mutex_t mutex; unsigned int handle; timer_t timer; - int signo; struct igt_list link; uint32_t *batch; + } igt_spin_t; igt_spin_t *igt_spin_batch_new(int fd, int engine, unsigned int dep_handle);