From patchwork Mon Nov 4 16:30:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3136521 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7B9799F3C4 for ; Mon, 4 Nov 2013 16:35:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 43DD5204E3 for ; Mon, 4 Nov 2013 16:35:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 29A4C204E2 for ; Mon, 4 Nov 2013 16:35:46 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 03464FA9B1; Mon, 4 Nov 2013 08:35:40 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id B6BFBFA9A9 for ; Mon, 4 Nov 2013 08:35:36 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 04 Nov 2013 08:35:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,633,1378882800"; d="scan'208";a="427711778" Received: from unknown (HELO omateolo-haswell.isw.intel.com) ([10.102.226.164]) by fmsmga002.fm.intel.com with ESMTP; 04 Nov 2013 08:35:35 -0800 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Nov 2013 16:30:48 +0000 Message-Id: <1383582649-2841-3-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1383582649-2841-1-git-send-email-oscar.mateo@intel.com> References: <1383582649-2841-1-git-send-email-oscar.mateo@intel.com> Cc: Ben Widawsky Subject: [Intel-gfx] [PATCH 3/4] prime_self_import: Assure no pending requests before object counting X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, 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: Oscar Mateo We don't want a previously used object to be freed in the middle of a before/after object counting operation (or we would get a "-1 objects leaked" message). We have seen this happening, e.g., when a context from a previous run dies, but its backing object is alive waiting for a retire_work to kick in. v2: Use igt_debugfs facilities for drop cache Signed-off-by: Oscar Mateo Cc: Ben Widawsky --- tests/prime_self_import.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/tests/prime_self_import.c b/tests/prime_self_import.c index 2edc1f8..fb007bc 100644 --- a/tests/prime_self_import.c +++ b/tests/prime_self_import.c @@ -46,6 +46,7 @@ #include "drm.h" #include "i915_drm.h" #include "drmtest.h" +#include "igt_debugfs.h" #define BO_SIZE (16*1024) @@ -252,10 +253,13 @@ static void test_reimport_close_race(void) pthread_t *threads; int r, i, num_threads; int fds[2]; - int obj_count = get_object_count(); + int obj_count; void *status; uint32_t handle; + igt_drop_caches_set(DROP_RETIRE); + obj_count = get_object_count(); + num_threads = sysconf(_SC_NPROCESSORS_ONLN); threads = calloc(num_threads, sizeof(pthread_t)); @@ -330,9 +334,12 @@ static void test_export_close_race(void) pthread_t *threads; int r, i, num_threads; int fd; - int obj_count = get_object_count(); + int obj_count; void *status; + igt_drop_caches_set(DROP_RETIRE); + obj_count = get_object_count(); + num_threads = sysconf(_SC_NPROCESSORS_ONLN); threads = calloc(num_threads, sizeof(pthread_t));