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=-11.5 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 894E1C433DF for ; Mon, 10 Aug 2020 12:58:48 +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 6B1C02070B for ; Mon, 10 Aug 2020 12:58:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6B1C02070B 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 053F289DFC; Mon, 10 Aug 2020 12:58:48 +0000 (UTC) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by gabe.freedesktop.org (Postfix) with ESMTPS id E076989DFC for ; Mon, 10 Aug 2020 12:58:46 +0000 (UTC) IronPort-SDR: oNLjJOTEMqUWsmU0LIa349+F9OkMVOReAvt3LIJySJI8BFU5SKbE2vC5zkjOsTGccFmg+TAWht BPJxBI8XBf+A== X-IronPort-AV: E=McAfee;i="6000,8403,9708"; a="217863990" X-IronPort-AV: E=Sophos;i="5.75,457,1589266800"; d="scan'208";a="217863990" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Aug 2020 05:58:46 -0700 IronPort-SDR: fbn9HyMIBARpRVrqRT2GG1EcPUkfr0ab4aMqNtExed6t6PywdZYYdD1iamA99ydLpv8Qz5rAW+ Cc/vaFITH9NQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,457,1589266800"; d="scan'208";a="317342598" Received: from chadjitt-mobl1.ger.corp.intel.com (HELO [10.249.44.177]) ([10.249.44.177]) by fmsmga004.fm.intel.com with ESMTP; 10 Aug 2020 05:58:45 -0700 To: Intel Graphics Development References: <20200810103103.303818-1-maarten.lankhorst@linux.intel.com> <20200810103103.303818-10-maarten.lankhorst@linux.intel.com> From: Maarten Lankhorst Message-ID: Date: Mon, 10 Aug 2020 14:58:44 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200810103103.303818-10-maarten.lankhorst@linux.intel.com> Content-Language: en-US Subject: Re: [Intel-gfx] [PATCH 09/24] drm/i915: make lockdep slightly happier about execbuf. 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" Op 10-08-2020 om 12:30 schreef Maarten Lankhorst: > As soon as we install fences, we should stop allocating memory > in order to prevent any potential deadlocks. > > This is required later on, when we start adding support for > dma-fence annotations, and also required for userptr. This patch causes the dmesg-fail in gem_busy, can be dropped for now, will investigate what's going wrong. > Signed-off-by: Maarten Lankhorst > --- > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 18 ++++++++++++------ > drivers/gpu/drm/i915/i915_vma.c | 8 +++++--- > drivers/gpu/drm/i915/i915_vma.h | 3 +++ > 3 files changed, 20 insertions(+), 9 deletions(-) > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > index 5d08ce71f341..12397fbc0971 100644 > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > @@ -48,11 +48,12 @@ enum { > #define DBG_FORCE_RELOC 0 /* choose one of the above! */ > }; > > -#define __EXEC_OBJECT_HAS_PIN BIT(31) > -#define __EXEC_OBJECT_HAS_FENCE BIT(30) > -#define __EXEC_OBJECT_NEEDS_MAP BIT(29) > -#define __EXEC_OBJECT_NEEDS_BIAS BIT(28) > -#define __EXEC_OBJECT_INTERNAL_FLAGS (~0u << 28) /* all of the above */ > +/* __EXEC_OBJECT_NO_RESERVE is BIT(31), defined in i915_vma.h */ > +#define __EXEC_OBJECT_HAS_PIN BIT(30) > +#define __EXEC_OBJECT_HAS_FENCE BIT(29) > +#define __EXEC_OBJECT_NEEDS_MAP BIT(28) > +#define __EXEC_OBJECT_NEEDS_BIAS BIT(27) > +#define __EXEC_OBJECT_INTERNAL_FLAGS (~0u << 27) /* all of the above + */ > #define __EXEC_OBJECT_RESERVED (__EXEC_OBJECT_HAS_PIN | __EXEC_OBJECT_HAS_FENCE) > > #define __EXEC_HAS_RELOC BIT(31) > @@ -2094,7 +2095,8 @@ static int eb_move_to_gpu(struct i915_execbuffer *eb) > } > > if (err == 0) > - err = i915_vma_move_to_active(vma, eb->request, flags); > + err = i915_vma_move_to_active(vma, eb->request, > + flags | __EXEC_OBJECT_NO_RESERVE); > } > > if (unlikely(err)) > @@ -2291,6 +2293,10 @@ static int eb_parse_pipeline(struct i915_execbuffer *eb, > if (err) > goto err_commit; > > + err = dma_resv_reserve_shared(shadow->resv, 1); > + if (err) > + goto err_commit; > + > /* Wait for all writes (and relocs) into the batch to complete */ > err = i915_sw_fence_await_reservation(&pw->base.chain, > pw->batch->resv, NULL, false, > diff --git a/drivers/gpu/drm/i915/i915_vma.c b/drivers/gpu/drm/i915/i915_vma.c > index c6bf04ca2032..8066f167d6b9 100644 > --- a/drivers/gpu/drm/i915/i915_vma.c > +++ b/drivers/gpu/drm/i915/i915_vma.c > @@ -1227,9 +1227,11 @@ int i915_vma_move_to_active(struct i915_vma *vma, > obj->write_domain = I915_GEM_DOMAIN_RENDER; > obj->read_domains = 0; > } else { > - err = dma_resv_reserve_shared(vma->resv, 1); > - if (unlikely(err)) > - return err; > + if (!(flags & __EXEC_OBJECT_NO_RESERVE)) { > + err = dma_resv_reserve_shared(vma->resv, 1); > + if (unlikely(err)) > + return err; > + } > > dma_resv_add_shared_fence(vma->resv, &rq->fence); > obj->write_domain = 0; > diff --git a/drivers/gpu/drm/i915/i915_vma.h b/drivers/gpu/drm/i915/i915_vma.h > index d0d01f909548..4b325a670a04 100644 > --- a/drivers/gpu/drm/i915/i915_vma.h > +++ b/drivers/gpu/drm/i915/i915_vma.h > @@ -52,6 +52,9 @@ static inline bool i915_vma_is_active(const struct i915_vma *vma) > return !i915_active_is_idle(&vma->active); > } > > +/* do not reserve memory to prevent deadlocks */ > +#define __EXEC_OBJECT_NO_RESERVE BIT(31) > + > int __must_check __i915_vma_move_to_active(struct i915_vma *vma, > struct i915_request *rq); > int __must_check i915_vma_move_to_active(struct i915_vma *vma, _______________________________________________ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/intel-gfx