From patchwork Fri Jan 22 23:10:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Gordon X-Patchwork-Id: 8093941 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7E7DC9F440 for ; Fri, 22 Jan 2016 23:10:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1794205B7 for ; Fri, 22 Jan 2016 23:10:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id DAF1A205B6 for ; Fri, 22 Jan 2016 23:10:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 56B0A6ECF7; Fri, 22 Jan 2016 15:10:30 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTP id 338896ECF6 for ; Fri, 22 Jan 2016 15:10:26 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP; 22 Jan 2016 15:10:26 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,333,1449561600"; d="scan'208";a="887283688" Received: from dsgordon-linux2.isw.intel.com ([10.102.226.88]) by fmsmga001.fm.intel.com with ESMTP; 22 Jan 2016 15:10:22 -0800 From: Dave Gordon To: intel-gfx@lists.freedesktop.org Date: Fri, 22 Jan 2016 23:10:10 +0000 Message-Id: <1453504211-7982-6-git-send-email-david.s.gordon@intel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1453504211-7982-1-git-send-email-david.s.gordon@intel.com> References: <1453504211-7982-1-git-send-email-david.s.gordon@intel.com> Organization: Intel Corporation (UK) Ltd. - Co. Reg. #1134945 - Pipers Way, Swindon SN3 1RJ Subject: [Intel-gfx] [PATCH v2 5/6] drm/i915: HWSP should be unmapped earlier in LRC teardown sequence 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-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 In LRC mode, the HWSP is part of the default context object, and therefore does not exist independently. Worse, it doesn't contribute to the refcount on the default context object either. Currently, the default context is deallocated in intel_lr_context_free(), but the HWSP kmapping is not torn down until the subsequent call to intel_logical_ring_cleanup(). Between these calls, ring->status_page.obj continues to point to the (now non-existent) default context object, and the kernel mapping likewise points to a page which is now free. The solution is to dispose of the HWSP kmapping and pointer before the object itself is freed, so this patch moves the kmap teardown code from intel_lr_context_free() to intel_logical_ring_cleanup(). This code was introduced in 48d8238 drm/i915/bdw: Generic logical ring init and cleanup i.e. it has been there ever since LRC mode was first implemented. v2: Split from "handle teardown of HWSP when context is freed". Signed-off-by: Dave Gordon Cc: Mika Kuoppala --- drivers/gpu/drm/i915/intel_lrc.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_lrc.c b/drivers/gpu/drm/i915/intel_lrc.c index a3ab2b4..c702fc2 100644 --- a/drivers/gpu/drm/i915/intel_lrc.c +++ b/drivers/gpu/drm/i915/intel_lrc.c @@ -1986,13 +1986,9 @@ void intel_logical_ring_cleanup(struct intel_engine_cs *ring) i915_cmd_parser_fini_ring(ring); i915_gem_batch_pool_fini(&ring->batch_pool); - if (ring->status_page.obj) { - struct page *page; - - page = i915_gem_object_get_page(ring->status_page.obj, LRC_PPHWSP_PN); - kunmap(page); - ring->status_page.obj = NULL; - } + /* Status page should have gone already */ + WARN_ON(ring->status_page.page_addr); + WARN_ON(ring->status_page.obj); ring->disable_lite_restore_wa = false; ring->ctx_desc_template = 0; @@ -2431,6 +2427,22 @@ void intel_lr_context_free(struct intel_context *ctx) continue; if (ctx == ctx->i915->kernel_context) { + struct intel_engine_cs *ring = ringbuf->ring; + + /* + * The HWSP is part of the kernel context + * object in LRC mode, so tear it down now. + */ + if (ring->status_page.obj) { + struct page *page; + + page = i915_gem_object_get_page( + ring->status_page.obj, + LRC_PPHWSP_PN); + kunmap(page); + ring->status_page.obj = NULL; + } + intel_unpin_ringbuffer_obj(ringbuf); i915_gem_object_ggtt_unpin(ctx_obj); }