* [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV
@ 2021-04-22 13:35 Arnd Bergmann
2021-04-22 13:58 ` Jason Gunthorpe
0 siblings, 1 reply; 7+ messages in thread
From: Arnd Bergmann @ 2021-04-22 13:35 UTC (permalink / raw)
To: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie,
Daniel Vetter, Zhenyu Wang, Jason Gunthorpe, Alex Williamson,
Kevin Tian, Cornelia Huck
Cc: Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool'
symbol that depends on the 'tristate' VFIO_MDEV. This allows a
configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that
causes a link failure:
x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show':
gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev'
x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id'
x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show':
gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev'
x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id'
Clarify the dependency by specifically disallowing the broken
configuration. If VFIO_MDEV is built-in, it will work, but if
VFIO_MDEV=m, the i915 driver cannot be built-in here.
Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV")
Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/gpu/drm/i915/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 7a5b7a93d33e..791cc9556863 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -111,7 +111,7 @@ config DRM_I915_GVT
bool "Enable Intel GVT-g graphics virtualization host support"
depends on DRM_I915
depends on 64BIT
- depends on VFIO_MDEV
+ depends on VFIO_MDEV=y || VFIO_MDEV=DRM_I915
default n
help
Choose this option if you want to enable Intel GVT-g graphics
--
2.29.2
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV 2021-04-22 13:35 [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV Arnd Bergmann @ 2021-04-22 13:58 ` Jason Gunthorpe 2021-04-22 14:51 ` Jani Nikula 2021-04-23 3:54 ` Zhenyu Wang 0 siblings, 2 replies; 7+ messages in thread From: Jason Gunthorpe @ 2021-04-22 13:58 UTC (permalink / raw) To: Arnd Bergmann Cc: Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter, Zhenyu Wang, Alex Williamson, Kevin Tian, Cornelia Huck, Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel On Thu, Apr 22, 2021 at 03:35:33PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool' > symbol that depends on the 'tristate' VFIO_MDEV. This allows a > configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that > causes a link failure: > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show': > gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev' > x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id' > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show': > gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev' > x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id' > > Clarify the dependency by specifically disallowing the broken > configuration. If VFIO_MDEV is built-in, it will work, but if > VFIO_MDEV=m, the i915 driver cannot be built-in here. > > Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV") > Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > drivers/gpu/drm/i915/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Oh kconfig stuff like this makes my head hurt, thanks for finding it I also can't see an alternative to this ugly thing, besides having the i915 guys properly modularize this code someday Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Jason ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV 2021-04-22 13:58 ` Jason Gunthorpe @ 2021-04-22 14:51 ` Jani Nikula 2021-04-23 3:54 ` Zhenyu Wang 1 sibling, 0 replies; 7+ messages in thread From: Jani Nikula @ 2021-04-22 14:51 UTC (permalink / raw) To: Jason Gunthorpe, Arnd Bergmann Cc: Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter, Zhenyu Wang, Alex Williamson, Kevin Tian, Cornelia Huck, Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel, intel-gvt-dev, Zhenyu Wang, Zhi Wang Cc: gvt list & maintainers On Thu, 22 Apr 2021, Jason Gunthorpe <jgg@ziepe.ca> wrote: > On Thu, Apr 22, 2021 at 03:35:33PM +0200, Arnd Bergmann wrote: >> From: Arnd Bergmann <arnd@arndb.de> >> >> The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool' >> symbol that depends on the 'tristate' VFIO_MDEV. This allows a >> configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that >> causes a link failure: >> >> x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show': >> gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev' >> x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id' >> x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show': >> gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev' >> x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id' >> >> Clarify the dependency by specifically disallowing the broken >> configuration. If VFIO_MDEV is built-in, it will work, but if >> VFIO_MDEV=m, the i915 driver cannot be built-in here. >> >> Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV") >> Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes") >> Signed-off-by: Arnd Bergmann <arnd@arndb.de> >> --- >> drivers/gpu/drm/i915/Kconfig | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Oh kconfig stuff like this makes my head hurt, thanks for finding it > > I also can't see an alternative to this ugly thing, besides having the > i915 guys properly modularize this code someday > > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > > Jason -- Jani Nikula, Intel Open Source Graphics Center ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV 2021-04-22 13:58 ` Jason Gunthorpe 2021-04-22 14:51 ` Jani Nikula @ 2021-04-23 3:54 ` Zhenyu Wang 2021-04-23 12:07 ` Jason Gunthorpe 1 sibling, 1 reply; 7+ messages in thread From: Zhenyu Wang @ 2021-04-23 3:54 UTC (permalink / raw) To: Jason Gunthorpe Cc: Arnd Bergmann, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter, Zhenyu Wang, Alex Williamson, Kevin Tian, Cornelia Huck, Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel [-- Attachment #1: Type: text/plain, Size: 2011 bytes --] On 2021.04.22 10:58:10 -0300, Jason Gunthorpe wrote: > On Thu, Apr 22, 2021 at 03:35:33PM +0200, Arnd Bergmann wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > > > The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool' > > symbol that depends on the 'tristate' VFIO_MDEV. This allows a > > configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that > > causes a link failure: > > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show': > > gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev' > > x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id' > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show': > > gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev' > > x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id' > > > > Clarify the dependency by specifically disallowing the broken > > configuration. If VFIO_MDEV is built-in, it will work, but if > > VFIO_MDEV=m, the i915 driver cannot be built-in here. > > > > Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV") > > Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes") > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > drivers/gpu/drm/i915/Kconfig | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > Oh kconfig stuff like this makes my head hurt, thanks for finding it > > I also can't see an alternative to this ugly thing, besides having the > i915 guys properly modularize this code someday > > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > I don't really want this mess to propagate further. We should move mdev related stuff to kvmgt module instead, so not pretend any more to possibly use that for other hypervisor.. Sorry that I didn't realize this issue when Jason proposed this. Let me do the left cleanup. Thanks [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV 2021-04-23 3:54 ` Zhenyu Wang @ 2021-04-23 12:07 ` Jason Gunthorpe 2021-04-23 15:20 ` Alex Williamson 0 siblings, 1 reply; 7+ messages in thread From: Jason Gunthorpe @ 2021-04-23 12:07 UTC (permalink / raw) To: Zhenyu Wang, Alex Williamson Cc: Arnd Bergmann, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter, Kevin Tian, Cornelia Huck, Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel On Fri, Apr 23, 2021 at 11:54:26AM +0800, Zhenyu Wang wrote: > On 2021.04.22 10:58:10 -0300, Jason Gunthorpe wrote: > > On Thu, Apr 22, 2021 at 03:35:33PM +0200, Arnd Bergmann wrote: > > > From: Arnd Bergmann <arnd@arndb.de> > > > > > > The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool' > > > symbol that depends on the 'tristate' VFIO_MDEV. This allows a > > > configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that > > > causes a link failure: > > > > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show': > > > gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev' > > > x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id' > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show': > > > gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev' > > > x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id' > > > > > > Clarify the dependency by specifically disallowing the broken > > > configuration. If VFIO_MDEV is built-in, it will work, but if > > > VFIO_MDEV=m, the i915 driver cannot be built-in here. > > > > > > Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV") > > > Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes") > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > drivers/gpu/drm/i915/Kconfig | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Oh kconfig stuff like this makes my head hurt, thanks for finding it > > > > I also can't see an alternative to this ugly thing, besides having the > > i915 guys properly modularize this code someday > > > > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > > > > I don't really want this mess to propagate further. We should move > mdev related stuff to kvmgt module instead, so not pretend any more to > possibly use that for other hypervisor.. > > Sorry that I didn't realize this issue when Jason proposed this. Let > me do the left cleanup. It would be good, but Alex should still take this patch for the upcoming merge window, you can revert it when you do all the cleanups Jason ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV 2021-04-23 12:07 ` Jason Gunthorpe @ 2021-04-23 15:20 ` Alex Williamson 2021-04-25 3:23 ` Zhenyu Wang 0 siblings, 1 reply; 7+ messages in thread From: Alex Williamson @ 2021-04-23 15:20 UTC (permalink / raw) To: Jason Gunthorpe Cc: Zhenyu Wang, Arnd Bergmann, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter, Kevin Tian, Cornelia Huck, Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel On Fri, 23 Apr 2021 09:07:09 -0300 Jason Gunthorpe <jgg@ziepe.ca> wrote: > On Fri, Apr 23, 2021 at 11:54:26AM +0800, Zhenyu Wang wrote: > > On 2021.04.22 10:58:10 -0300, Jason Gunthorpe wrote: > > > On Thu, Apr 22, 2021 at 03:35:33PM +0200, Arnd Bergmann wrote: > > > > From: Arnd Bergmann <arnd@arndb.de> > > > > > > > > The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool' > > > > symbol that depends on the 'tristate' VFIO_MDEV. This allows a > > > > configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that > > > > causes a link failure: > > > > > > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show': > > > > gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev' > > > > x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id' > > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show': > > > > gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev' > > > > x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id' > > > > > > > > Clarify the dependency by specifically disallowing the broken > > > > configuration. If VFIO_MDEV is built-in, it will work, but if > > > > VFIO_MDEV=m, the i915 driver cannot be built-in here. > > > > > > > > Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV") > > > > Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes") > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > drivers/gpu/drm/i915/Kconfig | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > Oh kconfig stuff like this makes my head hurt, thanks for finding it > > > > > > I also can't see an alternative to this ugly thing, besides having the > > > i915 guys properly modularize this code someday > > > > > > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > > > > > > > I don't really want this mess to propagate further. We should move > > mdev related stuff to kvmgt module instead, so not pretend any more to > > possibly use that for other hypervisor.. > > > > Sorry that I didn't realize this issue when Jason proposed this. Let > > me do the left cleanup. > > It would be good, but Alex should still take this patch for the > upcoming merge window, you can revert it when you do all the cleanups I can include it, but I'll wait for confirmation from Zhenyu. Thanks, Alex ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV 2021-04-23 15:20 ` Alex Williamson @ 2021-04-25 3:23 ` Zhenyu Wang 0 siblings, 0 replies; 7+ messages in thread From: Zhenyu Wang @ 2021-04-25 3:23 UTC (permalink / raw) To: Alex Williamson Cc: Jason Gunthorpe, Zhenyu Wang, Arnd Bergmann, Jani Nikula, Joonas Lahtinen, Rodrigo Vivi, David Airlie, Daniel Vetter, Kevin Tian, Cornelia Huck, Arnd Bergmann, Andrew Morton, intel-gfx, dri-devel, linux-kernel [-- Attachment #1: Type: text/plain, Size: 2877 bytes --] On 2021.04.23 09:20:09 -0600, Alex Williamson wrote: > On Fri, 23 Apr 2021 09:07:09 -0300 > Jason Gunthorpe <jgg@ziepe.ca> wrote: > > > On Fri, Apr 23, 2021 at 11:54:26AM +0800, Zhenyu Wang wrote: > > > On 2021.04.22 10:58:10 -0300, Jason Gunthorpe wrote: > > > > On Thu, Apr 22, 2021 at 03:35:33PM +0200, Arnd Bergmann wrote: > > > > > From: Arnd Bergmann <arnd@arndb.de> > > > > > > > > > > The Kconfig dependency is incomplete since DRM_I915_GVT is a 'bool' > > > > > symbol that depends on the 'tristate' VFIO_MDEV. This allows a > > > > > configuration with VFIO_MDEV=m, DRM_I915_GVT=y and DRM_I915=y that > > > > > causes a link failure: > > > > > > > > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `available_instances_show': > > > > > gvt.c:(.text+0x67a): undefined reference to `mtype_get_parent_dev' > > > > > x86_64-linux-ld: gvt.c:(.text+0x6a5): undefined reference to `mtype_get_type_group_id' > > > > > x86_64-linux-ld: drivers/gpu/drm/i915/gvt/gvt.o: in function `description_show': > > > > > gvt.c:(.text+0x76e): undefined reference to `mtype_get_parent_dev' > > > > > x86_64-linux-ld: gvt.c:(.text+0x799): undefined reference to `mtype_get_type_group_id' > > > > > > > > > > Clarify the dependency by specifically disallowing the broken > > > > > configuration. If VFIO_MDEV is built-in, it will work, but if > > > > > VFIO_MDEV=m, the i915 driver cannot be built-in here. > > > > > > > > > > Fixes: 07e543f4f9d1 ("vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV") > > > > > Fixes: 9169cff168ff ("vfio/mdev: Correct the function signatures for the mdev_type_attributes") > > > > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > > > > drivers/gpu/drm/i915/Kconfig | 2 +- > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > Oh kconfig stuff like this makes my head hurt, thanks for finding it > > > > > > > > I also can't see an alternative to this ugly thing, besides having the > > > > i915 guys properly modularize this code someday > > > > > > > > Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> > > > > > > > > > > I don't really want this mess to propagate further. We should move > > > mdev related stuff to kvmgt module instead, so not pretend any more to > > > possibly use that for other hypervisor.. > > > > > > Sorry that I didn't realize this issue when Jason proposed this. Let > > > me do the left cleanup. > > > > It would be good, but Alex should still take this patch for the > > upcoming merge window, you can revert it when you do all the cleanups > > I can include it, but I'll wait for confirmation from Zhenyu. Thanks, > I'm ok with this, future cleanup fixes would still go through i915 pull, it only lefts for some tests, will send that for next kernel. Acked-by: Zhenyu Wang <zhenyuw@linux.intel.com> thanks [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 195 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-04-25 3:53 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-04-22 13:35 [PATCH] vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV Arnd Bergmann 2021-04-22 13:58 ` Jason Gunthorpe 2021-04-22 14:51 ` Jani Nikula 2021-04-23 3:54 ` Zhenyu Wang 2021-04-23 12:07 ` Jason Gunthorpe 2021-04-23 15:20 ` Alex Williamson 2021-04-25 3:23 ` Zhenyu Wang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).