From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37025C2D0C2 for ; Mon, 30 Dec 2019 16:23:47 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0905D20718 for ; Mon, 30 Dec 2019 16:23:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0905D20718 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id AE3FE88E40; Mon, 30 Dec 2019 16:23:46 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id 256A788E40 for ; Mon, 30 Dec 2019 16:23:45 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Dec 2019 08:23:44 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,375,1571727600"; d="scan'208";a="213366801" Received: from gaia.fi.intel.com ([10.237.72.192]) by orsmga008.jf.intel.com with ESMTP; 30 Dec 2019 08:23:43 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id 8B9315C1DD6; Mon, 30 Dec 2019 18:23:20 +0200 (EET) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20191230160112.3838434-6-chris@chris-wilson.co.uk> References: <20191230160112.3838434-1-chris@chris-wilson.co.uk> <20191230160112.3838434-6-chris@chris-wilson.co.uk> Date: Mon, 30 Dec 2019 18:23:20 +0200 Message-ID: <87a779rddz.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH 6/6] drm/i915/gt: Always poison the kernel_context image before unparking X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: matthew.auld@intel.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Chris Wilson writes: > Keep scrubbing the kernel_context image with poison before we reset it > in order to demonstrate that we will be resilient in the case where it > is accidentally overwritten on idle. > > Suggested-by: Imre Deak > Signed-off-by: Chris Wilson > Cc: Imre Deak > --- > drivers/gpu/drm/i915/gt/intel_context_types.h | 2 ++ > drivers/gpu/drm/i915/gt/intel_engine_pm.c | 18 +++++++++++++++++- > drivers/gpu/drm/i915/gt/intel_lrc.c | 4 ++-- > 3 files changed, 21 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_context_types.h b/drivers/gpu/drm/i915/gt/intel_context_types.h > index 9527a659546c..ca1420fb8b53 100644 > --- a/drivers/gpu/drm/i915/gt/intel_context_types.h > +++ b/drivers/gpu/drm/i915/gt/intel_context_types.h > @@ -17,6 +17,8 @@ > #include "intel_engine_types.h" > #include "intel_sseu.h" > > +#define CONTEXT_REDZONE POISON_INUSE > + > struct i915_gem_context; > struct i915_vma; > struct intel_context; > diff --git a/drivers/gpu/drm/i915/gt/intel_engine_pm.c b/drivers/gpu/drm/i915/gt/intel_engine_pm.c > index 1b9f73948f22..ea90ab3e396e 100644 > --- a/drivers/gpu/drm/i915/gt/intel_engine_pm.c > +++ b/drivers/gpu/drm/i915/gt/intel_engine_pm.c > @@ -37,8 +37,24 @@ static int __engine_unpark(struct intel_wakeref *wf) > > /* Discard stale context state from across idling */ > ce = engine->kernel_context; > - if (ce) > + if (ce) { > + GEM_BUG_ON(test_bit(CONTEXT_VALID_BIT, &ce->flags)); > + > + /* First poison the image to verify we never fully trust it */ > + if (IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM) && ce->state) { > + struct drm_i915_gem_object *obj = ce->state->obj; > + int type = i915_coherent_map_type(engine->i915); > + > + map = i915_gem_object_pin_map(obj, type); > + if (!IS_ERR(map)) { > + memset(map, CONTEXT_REDZONE, obj->base.size); Just pondering if the dword granularity would suffice. Reviewed-by: Mika Kuoppala > + i915_gem_object_flush_map(obj); > + i915_gem_object_unpin_map(obj); > + } > + } > + > ce->ops->reset(ce); > + } > > if (engine->unpark) > engine->unpark(engine); > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index 6d26d84812b6..f81e70cfd194 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -2409,7 +2409,7 @@ set_redzone(void *vaddr, const struct intel_engine_cs *engine) > > vaddr += engine->context_size; > > - memset(vaddr, POISON_INUSE, I915_GTT_PAGE_SIZE); > + memset(vaddr, CONTEXT_REDZONE, I915_GTT_PAGE_SIZE); > } > > static void > @@ -2420,7 +2420,7 @@ check_redzone(const void *vaddr, const struct intel_engine_cs *engine) > > vaddr += engine->context_size; > > - if (memchr_inv(vaddr, POISON_INUSE, I915_GTT_PAGE_SIZE)) > + if (memchr_inv(vaddr, CONTEXT_REDZONE, I915_GTT_PAGE_SIZE)) > dev_err_once(engine->i915->drm.dev, > "%s context redzone overwritten!\n", > engine->name); > -- > 2.25.0.rc0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx