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 0D374C33C8C for ; Tue, 7 Jan 2020 15:05:35 +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 DA370208C4 for ; Tue, 7 Jan 2020 15:05:34 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA370208C4 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 7485A6E02A; Tue, 7 Jan 2020 15:05:34 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id 81E2C89C28 for ; Tue, 7 Jan 2020 15:05:32 +0000 (UTC) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Jan 2020 07:05:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.69,406,1571727600"; d="scan'208";a="217178073" Received: from gaia.fi.intel.com ([10.237.72.192]) by fmsmga007.fm.intel.com with ESMTP; 07 Jan 2020 07:05:30 -0800 Received: by gaia.fi.intel.com (Postfix, from userid 1000) id B8DAC5C1DEA; Tue, 7 Jan 2020 17:05:00 +0200 (EET) From: Mika Kuoppala To: Chris Wilson , intel-gfx@lists.freedesktop.org In-Reply-To: <20200107143118.3288995-1-chris@chris-wilson.co.uk> References: <20200107143118.3288995-1-chris@chris-wilson.co.uk> Date: Tue, 07 Jan 2020 17:05:00 +0200 Message-ID: <87blrfux2b.fsf@gaia.fi.intel.com> MIME-Version: 1.0 Subject: Re: [Intel-gfx] [PATCH] drm/i915/gt: Take responsibility for engine->release as the last step 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: , 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: > In order to avoid a double cleanup on error, take ownership of > engine->release past the point of no [error] return. > > Reported-by: Mika Kuoppala > Fixes: e26b6d434147 ("drm/i915/gt: Pull GT initialisation under intel_gt_init()") > Signed-off-by: Chris Wilson > Cc: Mika Kuoppala fwiw, in the context of avoiding refcount underflow in error path, Tested-by: Mika Kuoppala Reviewed-by: Mika Kuoppala > --- > drivers/gpu/drm/i915/gt/intel_lrc.c | 4 +++- > drivers/gpu/drm/i915/gt/intel_ring_submission.c | 5 +++-- > 2 files changed, 6 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gt/intel_lrc.c b/drivers/gpu/drm/i915/gt/intel_lrc.c > index f6174e597dd3..5f171e43f79c 100644 > --- a/drivers/gpu/drm/i915/gt/intel_lrc.c > +++ b/drivers/gpu/drm/i915/gt/intel_lrc.c > @@ -3925,7 +3925,6 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) > { > /* Default vfuncs which can be overriden by each engine. */ > > - engine->release = execlists_release; > engine->resume = execlists_resume; > > engine->cops = &execlists_context_ops; > @@ -4040,6 +4039,9 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) > > reset_csb_pointers(engine); > > + /* Finally, take ownership and responsibility for cleanup! */ > + engine->release = execlists_release; > + > return 0; > } > > diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c > index 2e1478a48a4b..0525d67c6fc3 100644 > --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c > +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c > @@ -1840,8 +1840,6 @@ static void setup_common(struct intel_engine_cs *engine) > > setup_irq(engine); > > - engine->release = ring_release; > - > engine->resume = xcs_resume; > engine->reset.prepare = reset_prepare; > engine->reset.rewind = reset_rewind; > @@ -2007,6 +2005,9 @@ int intel_ring_submission_setup(struct intel_engine_cs *engine) > > GEM_BUG_ON(timeline->hwsp_ggtt != engine->status_page.vma); > > + /* Finally, take ownership and responsibility for cleanup! */ > + engine->release = ring_release; > + > return 0; > > err_ring: > -- > 2.25.0.rc1 _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx