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_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,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 DE929C4338F for ; Thu, 19 Aug 2021 14:44:00 +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 80B8061157 for ; Thu, 19 Aug 2021 14:44:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 80B8061157 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=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E47416E992; Thu, 19 Aug 2021 14:43:54 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 20B4B6E877; Thu, 19 Aug 2021 14:43:51 +0000 (UTC) X-IronPort-AV: E=McAfee;i="6200,9189,10081"; a="216565780" X-IronPort-AV: E=Sophos;i="5.84,335,1620716400"; d="scan'208";a="216565780" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 07:43:49 -0700 X-IronPort-AV: E=Sophos;i="5.84,335,1620716400"; d="scan'208";a="522455413" Received: from pbhadrir-mobl.gar.corp.intel.com (HELO localhost) ([10.251.211.137]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Aug 2021 07:43:46 -0700 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable In-Reply-To: <20210819082929.GB13928@zhen-hp.sh.intel.com> References: <20210727121224.GA2145868@nvidia.com> <20210728175925.GU1721383@nvidia.com> <20210729072022.GB31896@lst.de> <20210803094315.GF13928@zhen-hp.sh.intel.com> <20210803143058.GA1721383@nvidia.com> <20210804052606.GG13928@zhen-hp.sh.intel.com> <20210816173458.GA9183@lst.de> <20210817010851.GW13928@zhen-hp.sh.intel.com> <20210817052203.GX13928@zhen-hp.sh.intel.com> <20210819082929.GB13928@zhen-hp.sh.intel.com> From: Joonas Lahtinen To: Christoph Hellwig , Zhenyu Wang Cc: Jason Gunthorpe , "dri-devel@lists.freedesktop.org" , Greg KH , "intel-gfx@lists.freedesktop.org" , "linux-kernel@vger.kernel.org" , Jani Nikula , Gerd Hoffmann , "Vivi, Rodrigo" , "intel-gvt-dev@lists.freedesktop.org" , "Wang, Zhi A" , Jani Nikula Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Message-ID: <162938422376.18233.1867777087725408939@jlahtine-mobl.ger.corp.intel.com> User-Agent: alot/0.8.1 Date: Thu, 19 Aug 2021 17:43:43 +0300 Subject: Re: [Intel-gfx] refactor the i915 GVT support 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" Quoting Zhenyu Wang (2021-08-19 11:29:29) > On 2021.08.17 13:22:03 +0800, Zhenyu Wang wrote: > > > On 2021.08.16 19:34:58 +0200, Christoph Hellwig wrote: > > > > Any updates on this? I'd really hate to miss this merge window. > > >=20 > > > I'm still waiting for our validation team's report on this. I'm afraid > > > it might be missing for next version as i915 merge window is mostly > > > till rc5...and for any change outside of gvt, it still needs to be > > > acked by i915 maintainers. > >=20 > > Looks our validation team did have problem against recent i915 change. > > If you like to try, we have a gvt-staging branch on > > https://github.com/intel/gvt-linux which is generated against drm-tip > > with gvt changes for testing, currently it's broken. > >=20 > > One issue is with i915 export that intel_context_unpin has been > > changed into static inline function. Another is that intel_gvt.c > > should be part of i915 for gvt interface instead of depending on KVMGT > > config. >=20 > I'm working on below patch to resolve this. But I met a weird issue in > case when building i915 as module and also kvmgt module, it caused > busy wait on request_module("kvmgt") when boot, it doesn't happen if > building i915 into kernel. I'm not sure what could be the reason? >=20 > > But the problem I see is that after moving gvt device model (gvt/*.c > > except kvmgt.c) into kvmgt module, we'll have issue with initial mmio > > state which current gvt relies on, that is in design supposed to get > > initial HW state before i915 driver has taken any operation. As mentioned in some past discussions, I think it would be best rely on golden MMIO located in /lib/firmware or elsewhere. This way we will better isolate the guest system from host system updates/changes. This should also hopefully allow enabling kvmgt module after i915 has already loaded, as the initialization would not be conditional to capture the MMIO. Regards, Joonas > > Before > > we can ensure that, I think we may only remove MPT part first but > > still keep gvt device model as part of i915 with config. I'll try to > > split that out. >=20 > Sorry I misread the code that as we always request kvmgt module when > gvt init, so it should still apply original method that this isn't a > problem. Our current validation result has shown no regression as well. >=20 > ---8<--- > From 58ff84572f1a0f9d79ca1d7ec0cff5ecbe78d280 Mon Sep 17 00:00:00 2001 > From: Zhenyu Wang > Date: Thu, 19 Aug 2021 16:36:33 +0800 > Subject: [PATCH] TESTONLY:drm/i915/gvt: potential fix for refactor against > current tip >=20 > --- > drivers/gpu/drm/i915/Makefile | 4 +++- > drivers/gpu/drm/i915/gt/intel_context.c | 5 +++++ > drivers/gpu/drm/i915/gt/intel_context.h | 3 ++- > drivers/gpu/drm/i915/i915_trace.h | 1 + > 4 files changed, 11 insertions(+), 2 deletions(-) >=20 > diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile > index c4f953837f72..2248574428a1 100644 > --- a/drivers/gpu/drm/i915/Makefile > +++ b/drivers/gpu/drm/i915/Makefile > @@ -296,7 +296,9 @@ i915-$(CONFIG_DRM_I915_SELFTEST) +=3D \ > =20 > # virtual gpu code > i915-y +=3D i915_vgpu.o > -i915-$(CONFIG_DRM_I915_GVT_KVMGT) +=3D intel_gvt.o > +ifneq ($(CONFIG_DRM_I915_GVT_KVMGT),) > +i915-y +=3D intel_gvt.o > +endif > =20 > kvmgt-y +=3D gvt/kvmgt.o \ > gvt/gvt.o \ > diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i9= 15/gt/intel_context.c > index 745e84c72c90..20e7522fed84 100644 > --- a/drivers/gpu/drm/i915/gt/intel_context.c > +++ b/drivers/gpu/drm/i915/gt/intel_context.c > @@ -328,6 +328,11 @@ void __intel_context_do_unpin(struct intel_context *= ce, int sub) > intel_context_put(ce); > } > =20 > +void intel_context_unpin(struct intel_context *ce) > +{ > + _intel_context_unpin(ce); > +} > + > static void __intel_context_retire(struct i915_active *active) > { > struct intel_context *ce =3D container_of(active, typeof(*ce), ac= tive); > diff --git a/drivers/gpu/drm/i915/gt/intel_context.h b/drivers/gpu/drm/i9= 15/gt/intel_context.h > index c41098950746..f942cbf6300a 100644 > --- a/drivers/gpu/drm/i915/gt/intel_context.h > +++ b/drivers/gpu/drm/i915/gt/intel_context.h > @@ -131,7 +131,7 @@ static inline void intel_context_sched_disable_unpin(= struct intel_context *ce) > __intel_context_do_unpin(ce, 2); > } > =20 > -static inline void intel_context_unpin(struct intel_context *ce) > +static inline void _intel_context_unpin(struct intel_context *ce) > { > if (!ce->ops->sched_disable) { > __intel_context_do_unpin(ce, 1); > @@ -150,6 +150,7 @@ static inline void intel_context_unpin(struct intel_c= ontext *ce) > } > } > } > +void intel_context_unpin(struct intel_context *ce); > =20 > void intel_context_enter_engine(struct intel_context *ce); > void intel_context_exit_engine(struct intel_context *ce); > diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i91= 5_trace.h > index 806ad688274b..2c6a8bcef7c1 100644 > --- a/drivers/gpu/drm/i915/i915_trace.h > +++ b/drivers/gpu/drm/i915/i915_trace.h > @@ -17,6 +17,7 @@ > =20 > #undef TRACE_SYSTEM > #define TRACE_SYSTEM i915 > +#undef TRACE_INCLUDE_FILE > #define TRACE_INCLUDE_FILE i915_trace > =20 > /* watermark/fifo updates */ > --=20 > 2.32.0 > ---8<--- >=20 >=20