From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934306AbdACEtG (ORCPT ); Mon, 2 Jan 2017 23:49:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55752 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755686AbdACEs6 (ORCPT ); Mon, 2 Jan 2017 23:48:58 -0500 Date: Mon, 2 Jan 2017 21:48:57 -0700 From: Alex Williamson To: Zhenyu Wang Cc: Stephen Rothwell , Daniel Vetter , Intel Graphics , DRI , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Jike Song Subject: Re: linux-next: build failure after merge of the drm-intel-fixes tree Message-ID: <20170102214857.6ad8f2eb@t450s.home> In-Reply-To: <20170103025929.35gp5n27uc7iszra@zhen-hp.sh.intel.com> References: <20170103104239.67dd95ba@canb.auug.org.au> <20170103025929.35gp5n27uc7iszra@zhen-hp.sh.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Tue, 03 Jan 2017 04:48:59 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, 3 Jan 2017 10:59:29 +0800 Zhenyu Wang wrote: > On 2017.01.03 10:42:39 +1100, Stephen Rothwell wrote: > > Hi all, > > > > After merging the drm-intel-fixes tree, today's linux-next build (x86_64 > > allmodconfig) failed like this: > > > > drivers/gpu/drm/i915/gvt/kvmgt.c: In function 'intel_vgpu_open': > > drivers/gpu/drm/i915/gvt/kvmgt.c:511:32: error: dereferencing pointer to incomplete type 'struct mdev_device' > > vfio_unregister_notifier(&mdev->dev, VFIO_GROUP_NOTIFY, > > ^ > > > > Caused by commit > > > > 99e3123e3d72 ("vfio-mdev: Make mdev_device private and abstract interfaces") > > > > from the vfio-fixes tree interacting with commit > > > > 364fb6b789ff ("drm/i915/gvt/kvmgt: prevent double-release of vgpu") > > > > from the drm-intel-fixes tree. > > Alex, I liked to have kvmgt related mdev interface change be merged through > vfio tree, but wasn't awared one of Jike's fix had conflict. Could you apply > below fix in your tree? I think in general for possible interface change in > future we still need a pull request for i915 to resolve dependence earlier. Hi Zhenyu, Hopefully this abstraction will help to isolate vendor drivers from mdev API changes in the future. I can certainly roll this patch into the original to maintain bisectability. I want to get these changes in for rc3, will a pull request for the i915 changes be sent this week? Thanks for spotting and fixing this, Stephen. Thanks, Alex > > I applied this merge fix patch: > > > > From: Stephen Rothwell > > Date: Tue, 3 Jan 2017 10:38:48 +1100 > > Subject: [PATCH] vfio-mdev: fixup for "Make mdev_device private and abstract interfaces" > > > > Signed-off-by: Stephen Rothwell > > --- > > drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/i915/gvt/kvmgt.c b/drivers/gpu/drm/i915/gvt/kvmgt.c > > index c24b665e007b..faaae07ae487 100644 > > --- a/drivers/gpu/drm/i915/gvt/kvmgt.c > > +++ b/drivers/gpu/drm/i915/gvt/kvmgt.c > > @@ -508,7 +508,7 @@ static int intel_vgpu_open(struct mdev_device *mdev) > > return ret; > > > > undo_group: > > - vfio_unregister_notifier(&mdev->dev, VFIO_GROUP_NOTIFY, > > + vfio_unregister_notifier(mdev_dev(mdev), VFIO_GROUP_NOTIFY, > > &vgpu->vdev.group_notifier); > > > > undo_iommu: > > -- > > 2.10.2 > > > > -- > > Cheers, > > Stephen Rothwell >