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=-14.3 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 C7FD0C47088 for ; Wed, 26 May 2021 08:40: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 65CE5613BC for ; Wed, 26 May 2021 08:40:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 65CE5613BC 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=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CC516EA8F; Wed, 26 May 2021 08:40:33 +0000 (UTC) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by gabe.freedesktop.org (Postfix) with ESMTPS id 8F35B6E4A1; Wed, 26 May 2021 08:40:31 +0000 (UTC) IronPort-SDR: P3sC4dcH9m+a8OyFJXXKuc2HMpai5vZDOGnPAFr6o9mKTBK3Xi9uaJwJ3cV1nxtTahlB08qVEE nGV4HLHExT+g== X-IronPort-AV: E=McAfee;i="6200,9189,9995"; a="287991034" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="287991034" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 01:40:27 -0700 IronPort-SDR: j76VhOPFiGZ4skj7Ebqc8b1yX6u20B0bcZATcDUdeBZLZNWEafjGufg0AK5gPsA/wsqMky/eCj NY2IIs12vukA== X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="471784398" Received: from wardmich-mobl.ger.corp.intel.com (HELO [10.213.209.181]) ([10.213.209.181]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 01:40:26 -0700 Subject: Re: [Intel-gfx] [RFC PATCH 60/97] drm/i915: Track 'serial' counts for virtual engines To: Matthew Brost References: <20210506191451.77768-1-matthew.brost@intel.com> <20210506191451.77768-61-matthew.brost@intel.com> <20210525175239.GA21324@sdutt-i7> From: Tvrtko Ursulin Organization: Intel Corporation UK Plc Message-ID: <6f6a1266-fe48-9cf1-beba-0b4463000ca7@linux.intel.com> Date: Wed, 26 May 2021 09:40:24 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: <20210525175239.GA21324@sdutt-i7> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jason.ekstrand@intel.com, daniel.vetter@intel.com, intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 25/05/2021 18:52, Matthew Brost wrote: > On Tue, May 25, 2021 at 11:16:12AM +0100, Tvrtko Ursulin wrote: >> >> On 06/05/2021 20:14, Matthew Brost wrote: >>> From: John Harrison >>> >>> The serial number tracking of engines happens at the backend of >>> request submission and was expecting to only be given physical >>> engines. However, in GuC submission mode, the decomposition of virtual >>> to physical engines does not happen in i915. Instead, requests are >>> submitted to their virtual engine mask all the way through to the >>> hardware (i.e. to GuC). This would mean that the heart beat code >>> thinks the physical engines are idle due to the serial number not >>> incrementing. >>> >>> This patch updates the tracking to decompose virtual engines into >>> their physical constituents and tracks the request against each. This >>> is not entirely accurate as the GuC will only be issuing the request >>> to one physical engine. However, it is the best that i915 can do given >>> that it has no knowledge of the GuC's scheduling decisions. >> >> Commit text sounds a bit defeatist. I think instead of making up the serial >> counts, which has downsides (could you please document in the commit what >> they are), we should think how to design things properly. >> > > IMO, I don't think fixing serial counts is the scope of this series. We > should focus on getting GuC submission in not cleaning up all the crap > that is in the i915. Let's make a note of this though so we can revisit > later. I will say again - commit message implies it is introducing an unspecified downside by not fully fixing an also unspecified issue. It is completely reasonable, and customary even, to ask for both to be documented in the commit message. If we are abandoning the normal review process someone please say so I don't waste my time reading it. Regards, Tvrtko > Matt > >> Regards, >> >> Tvrtko >> >>> Signed-off-by: John Harrison >>> Signed-off-by: Matthew Brost >>> --- >>> drivers/gpu/drm/i915/gt/intel_engine_types.h | 2 ++ >>> .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 ++++++ >>> drivers/gpu/drm/i915/gt/intel_ring_submission.c | 6 ++++++ >>> drivers/gpu/drm/i915/gt/mock_engine.c | 6 ++++++ >>> .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 16 ++++++++++++++++ >>> drivers/gpu/drm/i915/i915_request.c | 4 +++- >>> 6 files changed, 39 insertions(+), 1 deletion(-) >>> >>> diff --git a/drivers/gpu/drm/i915/gt/intel_engine_types.h b/drivers/gpu/drm/i915/gt/intel_engine_types.h >>> index 86302e6d86b2..e2b5cda6dbc4 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_engine_types.h >>> +++ b/drivers/gpu/drm/i915/gt/intel_engine_types.h >>> @@ -389,6 +389,8 @@ struct intel_engine_cs { >>> void (*park)(struct intel_engine_cs *engine); >>> void (*unpark)(struct intel_engine_cs *engine); >>> + void (*bump_serial)(struct intel_engine_cs *engine); >>> + >>> void (*set_default_submission)(struct intel_engine_cs *engine); >>> const struct intel_context_ops *cops; >>> diff --git a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c >>> index ae12d7f19ecd..02880ea5d693 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_execlists_submission.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_execlists_submission.c >>> @@ -3199,6 +3199,11 @@ static void execlists_release(struct intel_engine_cs *engine) >>> lrc_fini_wa_ctx(engine); >>> } >>> +static void execlist_bump_serial(struct intel_engine_cs *engine) >>> +{ >>> + engine->serial++; >>> +} >>> + >>> static void >>> logical_ring_default_vfuncs(struct intel_engine_cs *engine) >>> { >>> @@ -3208,6 +3213,7 @@ logical_ring_default_vfuncs(struct intel_engine_cs *engine) >>> engine->cops = &execlists_context_ops; >>> engine->request_alloc = execlists_request_alloc; >>> + engine->bump_serial = execlist_bump_serial; >>> engine->reset.prepare = execlists_reset_prepare; >>> engine->reset.rewind = execlists_reset_rewind; >>> diff --git a/drivers/gpu/drm/i915/gt/intel_ring_submission.c b/drivers/gpu/drm/i915/gt/intel_ring_submission.c >>> index 14aa31879a37..39dd7c4ed0a9 100644 >>> --- a/drivers/gpu/drm/i915/gt/intel_ring_submission.c >>> +++ b/drivers/gpu/drm/i915/gt/intel_ring_submission.c >>> @@ -1045,6 +1045,11 @@ static void setup_irq(struct intel_engine_cs *engine) >>> } >>> } >>> +static void ring_bump_serial(struct intel_engine_cs *engine) >>> +{ >>> + engine->serial++; >>> +} >>> + >>> static void setup_common(struct intel_engine_cs *engine) >>> { >>> struct drm_i915_private *i915 = engine->i915; >>> @@ -1064,6 +1069,7 @@ static void setup_common(struct intel_engine_cs *engine) >>> engine->cops = &ring_context_ops; >>> engine->request_alloc = ring_request_alloc; >>> + engine->bump_serial = ring_bump_serial; >>> /* >>> * Using a global execution timeline; the previous final breadcrumb is >>> diff --git a/drivers/gpu/drm/i915/gt/mock_engine.c b/drivers/gpu/drm/i915/gt/mock_engine.c >>> index bd005c1b6fd5..97b10fd60b55 100644 >>> --- a/drivers/gpu/drm/i915/gt/mock_engine.c >>> +++ b/drivers/gpu/drm/i915/gt/mock_engine.c >>> @@ -292,6 +292,11 @@ static void mock_engine_release(struct intel_engine_cs *engine) >>> intel_engine_fini_retire(engine); >>> } >>> +static void mock_bump_serial(struct intel_engine_cs *engine) >>> +{ >>> + engine->serial++; >>> +} >>> + >>> struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, >>> const char *name, >>> int id) >>> @@ -318,6 +323,7 @@ struct intel_engine_cs *mock_engine(struct drm_i915_private *i915, >>> engine->base.cops = &mock_context_ops; >>> engine->base.request_alloc = mock_request_alloc; >>> + engine->base.bump_serial = mock_bump_serial; >>> engine->base.emit_flush = mock_emit_flush; >>> engine->base.emit_fini_breadcrumb = mock_emit_breadcrumb; >>> engine->base.submit_request = mock_submit_request; >>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c >>> index dc79d287c50a..f0e5731bcef6 100644 >>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c >>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c >>> @@ -1500,6 +1500,20 @@ static void guc_release(struct intel_engine_cs *engine) >>> lrc_fini_wa_ctx(engine); >>> } >>> +static void guc_bump_serial(struct intel_engine_cs *engine) >>> +{ >>> + engine->serial++; >>> +} >>> + >>> +static void virtual_guc_bump_serial(struct intel_engine_cs *engine) >>> +{ >>> + struct intel_engine_cs *e; >>> + intel_engine_mask_t tmp, mask = engine->mask; >>> + >>> + for_each_engine_masked(e, engine->gt, mask, tmp) >>> + e->serial++; >>> +} >>> + >>> static void guc_default_vfuncs(struct intel_engine_cs *engine) >>> { >>> /* Default vfuncs which can be overridden by each engine. */ >>> @@ -1508,6 +1522,7 @@ static void guc_default_vfuncs(struct intel_engine_cs *engine) >>> engine->cops = &guc_context_ops; >>> engine->request_alloc = guc_request_alloc; >>> + engine->bump_serial = guc_bump_serial; >>> engine->sched_engine->schedule = i915_schedule; >>> @@ -1843,6 +1858,7 @@ guc_create_virtual(struct intel_engine_cs **siblings, unsigned int count) >>> ve->base.cops = &virtual_guc_context_ops; >>> ve->base.request_alloc = guc_request_alloc; >>> + ve->base.bump_serial = virtual_guc_bump_serial; >>> ve->base.submit_request = guc_submit_request; >>> diff --git a/drivers/gpu/drm/i915/i915_request.c b/drivers/gpu/drm/i915/i915_request.c >>> index 9542a5baa45a..127d60b36422 100644 >>> --- a/drivers/gpu/drm/i915/i915_request.c >>> +++ b/drivers/gpu/drm/i915/i915_request.c >>> @@ -692,7 +692,9 @@ bool __i915_request_submit(struct i915_request *request) >>> request->ring->vaddr + request->postfix); >>> trace_i915_request_execute(request); >>> - engine->serial++; >>> + if (engine->bump_serial) >>> + engine->bump_serial(engine); >>> + >>> result = true; >>> GEM_BUG_ON(test_bit(I915_FENCE_FLAG_ACTIVE, &request->fence.flags)); >>>