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=-13.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 B2AECC433E0 for ; Fri, 29 Jan 2021 15:01:41 +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 2CEB064E03 for ; Fri, 29 Jan 2021 15:01:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2CEB064E03 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 A0C796EB51; Fri, 29 Jan 2021 15:01:40 +0000 (UTC) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id A97966EB51 for ; Fri, 29 Jan 2021 15:01:39 +0000 (UTC) IronPort-SDR: HlL7O6BNroiUE4REwuBIH1/Ei+gUlGv0hlp9EfQWclZ9aF3VtRLPOBTn0I/ozvVdM9PO/mGBad qONIn33SAcig== X-IronPort-AV: E=McAfee;i="6000,8403,9878"; a="180508569" X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="180508569" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Jan 2021 07:01:38 -0800 IronPort-SDR: oBfXnYsVgBXAOrrYKmddcYodoSar9ZLVtLP7p2fWsZzHAePSao4QD+9/XoaCcwz8e8PSRh+3zK gfBrdbdmOLOw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.79,385,1602572400"; d="scan'208";a="354654915" Received: from gaia.fi.intel.com ([10.237.72.192]) by orsmga003.jf.intel.com with ESMTP; 29 Jan 2021 07:01:37 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id A322B5C0D6D; Fri, 29 Jan 2021 17:01:35 +0200 (EET) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20210129120620.6516-1-chris@chris-wilson.co.uk> References: <20210129120620.6516-1-chris@chris-wilson.co.uk> Date: Fri, 29 Jan 2021 17:01:35 +0200 Message-ID: <87sg6j23e8.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/gt: Ignore error capturing a closed context 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: Chris Wilson 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: > To capture a context after a gpu hang, we suspend the request and then > resume its execution afterwards. If the context is already closed, we > can assume that no one is interested in the result, but instead we are > trying to terminate execution quickly as part of a forced-preemption. > In which case, do not waste time in suspending the request, capturing > the error, and just cancel it instead. > > Testcase: igt/gem_ctx_persistence/many-contexts > Signed-off-by: Chris Wilson Reviewed-by: Mika Kuoppala > --- > .../drm/i915/gt/intel_execlists_submission.c | 18 +++++++++++++----- > 1 file changed, 13 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > index e20ab2eab3a8..2280d1bd2c77 100644 > --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c > @@ -2249,10 +2249,21 @@ static u32 active_ccid(struct intel_engine_cs *engine) > static void execlists_capture(struct intel_engine_cs *engine) > { > struct execlists_capture *cap; > + struct i915_request *rq; > > if (!IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR)) > return; > > + rq = active_context(engine, active_ccid(engine)); > + > + /* > + * If the context is closed, assume no one is listening for the > + * associated state; the user is already gone. We can save a lot of > + * time around forced-preemption by just cancelling the guilty request. > + */ > + if (!rq || intel_context_is_closed(rq->context)) > + return; > + > /* > * We need to _quickly_ capture the engine state before we reset. > * We are inside an atomic section (softirq) here and we are delaying > @@ -2262,11 +2273,8 @@ static void execlists_capture(struct intel_engine_cs *engine) > if (!cap) > return; > > - cap->rq = active_context(engine, active_ccid(engine)); > - if (cap->rq) { > - cap->rq = active_request(cap->rq->context->timeline, cap->rq); > - cap->rq = i915_request_get_rcu(cap->rq); > - } > + rq = active_request(rq->context->timeline, rq); > + cap->rq = i915_request_get_rcu(rq); > if (!cap->rq) > goto err_free; > > -- > 2.20.1 > > _______________________________________________ > 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