From patchwork Mon Jul 14 10:03:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 4543771 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 522C9C0514 for ; Mon, 14 Jul 2014 10:03:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 799342013D for ; Mon, 14 Jul 2014 10:03:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5CDB920138 for ; Mon, 14 Jul 2014 10:03:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CCF8C6E412; Mon, 14 Jul 2014 03:03:45 -0700 (PDT) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 56C0E89FBC for ; Mon, 14 Jul 2014 03:03:44 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 14 Jul 2014 03:03:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,657,1400050800"; d="scan'208";a="569441848" Received: from tursulin-linux.iwi.intel.com ([172.28.253.62]) by fmsmga002.fm.intel.com with ESMTP; 14 Jul 2014 03:03:42 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Mon, 14 Jul 2014 11:03:26 +0100 Message-Id: <1405332206-6292-1-git-send-email-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 1.9.3 Subject: [Intel-gfx] [PATCH] tests/gem_userptr_blits: Race between object creation and multi-threaded mm ops X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 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-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Userptr v23 was not thread safe against memory map operations and object creation from separate threads. MMU notifier callback would get triggered on a partially constructed object causing a NULL pointer dereference. This test excercises that path a bit. In my testing it would trigger it every time and easily, but unfortunately a test pass here does not guarantee the absence of the race. Signed-off-by: Tvrtko Ursulin Cc: Chris Wilson --- tests/Makefile.am | 2 ++ tests/gem_userptr_blits.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 2878624..e207509 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -65,6 +65,8 @@ prime_self_import_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) prime_self_import_LDADD = $(LDADD) -lpthread gen7_forcewake_mt_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) gen7_forcewake_mt_LDADD = $(LDADD) -lpthread +gem_userptr_blits_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS) +gem_userptr_blits_LDADD = $(LDADD) -lpthread gem_wait_render_timeout_LDADD = $(LDADD) -lrt kms_flip_LDADD = $(LDADD) -lrt -lpthread diff --git a/tests/gem_userptr_blits.c b/tests/gem_userptr_blits.c index 2eb127f..0213868 100644 --- a/tests/gem_userptr_blits.c +++ b/tests/gem_userptr_blits.c @@ -47,6 +47,7 @@ #include #include #include +#include #include "drm.h" #include "i915_drm.h" @@ -1107,6 +1108,56 @@ static int test_unmap_cycles(int fd, int expected) return 0; } +static volatile int stop_mm_stress_thread; + +static void *mm_stress_thread(void *data) +{ + void *ptr; + int ret; + + while (!stop_mm_stress_thread) { + ptr = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + assert(ptr != MAP_FAILED); + ret = munmap(ptr, PAGE_SIZE); + assert(ret == 0); + } + + return NULL; +} + +static int test_stress_mm(int fd) +{ + int ret; + pthread_t t; + unsigned int loops = 100000; + uint32_t handle; + void *ptr; + + assert(posix_memalign(&ptr, PAGE_SIZE, PAGE_SIZE) == 0); + + ret = pthread_create(&t, NULL, mm_stress_thread, NULL); + assert(ret == 0); + + while (loops--) { + ret = gem_userptr(fd, ptr, PAGE_SIZE, 0, &handle); + assert(ret == 0); + + gem_close(fd, handle); + } + + stop_mm_stress_thread = 1; + + free(ptr); + + ret = pthread_cancel(t); + assert(ret == 0); + ret = pthread_join(t, NULL); + assert(ret == 0); + + return 0; +} + unsigned int total_ram; uint64_t aperture_size; int fd, count; @@ -1261,6 +1312,9 @@ int main(int argc, char **argv) igt_subtest("sync-unmap-after-close") test_unmap_after_close(fd); + igt_subtest("stress-mm") + test_stress_mm(fd); + igt_subtest("coherency-sync") test_coherency(fd, count);