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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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 26315C432BE for ; Thu, 2 Sep 2021 15:22:30 +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 B82D260F4B for ; Thu, 2 Sep 2021 15:22:29 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B82D260F4B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ffwll.ch Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B5C996E5B9; Thu, 2 Sep 2021 15:22:23 +0000 (UTC) Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8B7426E5B9 for ; Thu, 2 Sep 2021 15:22:21 +0000 (UTC) Received: by mail-wm1-x32b.google.com with SMTP id 192-20020a1c04c9000000b002f7a4ab0a49so1354828wme.0 for ; Thu, 02 Sep 2021 08:22:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=eYfNsjWAGWa623rCnflxklPtZi93OK2VSo08Skapft0=; b=jAQNe9N2U/atme78b/13J15ozOYPCGbEps3ZyjxAttsei66SH8RTeZg0TXaxipMk62 fcd79kytBoQOY3rNfjtHmYht32ADLlrhxaS7++SBEczPseHEatj2ngROEV9EraqyZslx jkSVHWRIuH5m6mExUMm9ulnenvMvLTjteWfl0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:content-transfer-encoding :in-reply-to; bh=eYfNsjWAGWa623rCnflxklPtZi93OK2VSo08Skapft0=; b=fYHJ0SVPtC42pLuuBPNL34DXXOYVF1FOyZwKrhEVytMHy/qatvurXJh08CyItaYuog wQXHqQCLm8/dGYqrCjoehYjmOzqXIyrsZVgvRTyzoa4HbDvX6Zr5NVdZCg7dqKVFIunB lwu5c5qHrsozLVERRp2qAm6Z7LdmqRPHFhBgXJbwsD5ZEv5jDk8W8jz8qWEQn+7LJI4h zsDB0aUQpaZpOzXFdRxYbOKiGZnu5rRDJtL/4EpKbhtLQrPbgOLGMxzIAS+qp8I/lwAX 0DagiBI3RuObIn/G8YAvAcGuBDajJ6To28XtCDKfEPOI/T9RaOLVBITRjxchN8h1XPvH NIBA== X-Gm-Message-State: AOAM532l5aLequrtDuZIXWODBz3BFjW6mx3vAJbi5BPAMRmRmqcRa3+V dzXyc0lo33HXdfkqoTb4tzcfhw== X-Google-Smtp-Source: ABdhPJx6wGelPQ7D98WnZI6ng3+BeepkX5B4B9tMqYfjH+GLU0kX5M6jDrCiayUdLVHvychTAB7QSw== X-Received: by 2002:a7b:c94f:: with SMTP id i15mr3711733wml.58.1630596140022; Thu, 02 Sep 2021 08:22:20 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id w9sm1868297wmc.19.2021.09.02.08.22.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Sep 2021 08:22:19 -0700 (PDT) Date: Thu, 2 Sep 2021 17:22:17 +0200 From: Daniel Vetter To: Tvrtko Ursulin Cc: Daniel Vetter , DRI Development , Intel Graphics Development , Maarten Lankhorst , Daniel Vetter , Jon Bloomfield , Chris Wilson , Joonas Lahtinen , Thomas =?iso-8859-1?Q?Hellstr=F6m?= , Matthew Auld , Lionel Landwerlin , Dave Airlie , Jason Ekstrand Message-ID: References: <20210902142057.929669-1-daniel.vetter@ffwll.ch> <20210902142057.929669-7-daniel.vetter@ffwll.ch> <1cb4b910-ad02-ff02-46ef-7b3b4f393eb3@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1cb4b910-ad02-ff02-46ef-7b3b4f393eb3@linux.intel.com> X-Operating-System: Linux phenom 5.10.0-8-amd64 Subject: Re: [Intel-gfx] [PATCH 07/11] drm/i915: Add i915_gem_context_is_full_ppgtt 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: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Thu, Sep 02, 2021 at 03:54:36PM +0100, Tvrtko Ursulin wrote: > On 02/09/2021 15:20, Daniel Vetter wrote: > > And use it anywhere we have open-coded checks for ctx->vm that really > > only check for full ppgtt. > > > > Plus for paranoia add a GEM_BUG_ON that checks it's really only set > > when we have full ppgtt, just in case. gem_context->vm is different > > since it's NULL in ggtt mode, unlike intel_context->vm or gt->vm, > > which is always set. > > > > v2: 0day found a testcase that I missed. > > > > Reviewed-by: Maarten Lankhorst > > Signed-off-by: Daniel Vetter > > Cc: Jon Bloomfield > > Cc: Chris Wilson > > Cc: Maarten Lankhorst > > Cc: Joonas Lahtinen > > Cc: Daniel Vetter > > Cc: "Thomas Hellström" > > Cc: Matthew Auld > > Cc: Lionel Landwerlin > > Cc: Dave Airlie > > Cc: Jason Ekstrand > > --- > > drivers/gpu/drm/i915/gem/i915_gem_context.c | 2 +- > > drivers/gpu/drm/i915/gem/i915_gem_context.h | 7 +++++++ > > drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- > > drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c | 6 +++--- > > 4 files changed, 12 insertions(+), 5 deletions(-) > > > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.c b/drivers/gpu/drm/i915/gem/i915_gem_context.c > > index 7a566fb7cca4..1eec85944c1f 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.c > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.c > > @@ -1566,7 +1566,7 @@ static int get_ppgtt(struct drm_i915_file_private *file_priv, > > int err; > > u32 id; > > - if (!rcu_access_pointer(ctx->vm)) > > + if (!i915_gem_context_is_full_ppgtt(ctx)) > > It reads a bit wrong because GEM context cannot *be* full ppggt. It can be > associated with a VM which is or isn't full ppgtt. So a test on a VM > retrieved from a context is semnntically more correct. Perhaps you want to > consider adding a helper to that effect instead? It could mean splitting > into two helpers (getter + test) or maybe just renaming would work. Like > i915_gem_context_has_full_ppgtt_vm(ctx)? The pointer isn't set when the driver/context isn't running in full ppgtt mode. This is why I've added the GEM_BUG_ON to check we're not breaking any invariants. So yeah it is a full ppgtt context or it's not, that is indeed the question here. I'm happy to bikeshed the naming, but I don't see how your suggestion is an improvement. -Daniel > > Regards, > > Tvrtko > > > return -ENODEV; > > rcu_read_lock(); > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_context.h b/drivers/gpu/drm/i915/gem/i915_gem_context.h > > index da6e8b506d96..37536a260e6e 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_context.h > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_context.h > > @@ -154,6 +154,13 @@ i915_gem_context_vm(struct i915_gem_context *ctx) > > return rcu_dereference_protected(ctx->vm, lockdep_is_held(&ctx->mutex)); > > } > > +static inline bool i915_gem_context_is_full_ppgtt(struct i915_gem_context *ctx) > > +{ > > + GEM_BUG_ON(!!rcu_access_pointer(ctx->vm) != HAS_FULL_PPGTT(ctx->i915)); > > + > > + return !!rcu_access_pointer(ctx->vm); > > +} > > + > > static inline struct i915_address_space * > > i915_gem_context_get_eb_vm(struct i915_gem_context *ctx) > > { > > diff --git a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > > index 905b1cbd22d5..40f08948f0b2 100644 > > --- a/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > > +++ b/drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c > > @@ -749,7 +749,7 @@ static int eb_select_context(struct i915_execbuffer *eb) > > return PTR_ERR(ctx); > > eb->gem_context = ctx; > > - if (rcu_access_pointer(ctx->vm)) > > + if (i915_gem_context_is_full_ppgtt(ctx)) > > eb->invalid_flags |= EXEC_OBJECT_NEEDS_GTT; > > return 0; > > diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > > index fc7fb33a3a52..947154e445a7 100644 > > --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > > +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_context.c > > @@ -704,7 +704,7 @@ static int igt_ctx_exec(void *arg) > > pr_err("Failed to fill dword %lu [%lu/%lu] with gpu (%s) [full-ppgtt? %s], err=%d\n", > > ndwords, dw, max_dwords(obj), > > engine->name, > > - yesno(!!rcu_access_pointer(ctx->vm)), > > + yesno(i915_gem_context_is_full_ppgtt(ctx)), > > err); > > intel_context_put(ce); > > kernel_context_close(ctx); > > @@ -838,7 +838,7 @@ static int igt_shared_ctx_exec(void *arg) > > pr_err("Failed to fill dword %lu [%lu/%lu] with gpu (%s) [full-ppgtt? %s], err=%d\n", > > ndwords, dw, max_dwords(obj), > > engine->name, > > - yesno(!!rcu_access_pointer(ctx->vm)), > > + yesno(i915_gem_context_is_full_ppgtt(ctx)), > > err); > > intel_context_put(ce); > > kernel_context_close(ctx); > > @@ -1417,7 +1417,7 @@ static int igt_ctx_readonly(void *arg) > > pr_err("Failed to fill dword %lu [%lu/%lu] with gpu (%s) [full-ppgtt? %s], err=%d\n", > > ndwords, dw, max_dwords(obj), > > ce->engine->name, > > - yesno(!!ctx_vm(ctx)), > > + yesno(i915_gem_context_is_full_ppgtt(ctx)), > > err); > > i915_gem_context_unlock_engines(ctx); > > goto out_file; > > -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch