| Message ID | 20230110091009.474427-3-hch@lst.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/4] vfio-mdev: allow building the samples into the kernel | expand |
Reviewed-by: Tony Krowiak <akrowiak@linux.ibm.com> On 1/10/23 4:10 AM, Christoph Hellwig wrote: > VFIO_MDEV is just a library with helpers for the drivers. Stop making > it a user choice and just select it by the drivers that use the helpers. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > Documentation/s390/vfio-ap.rst | 1 - > arch/s390/Kconfig | 6 ++++-- > arch/s390/configs/debug_defconfig | 1 - > arch/s390/configs/defconfig | 1 - > drivers/gpu/drm/i915/Kconfig | 2 +- > drivers/vfio/mdev/Kconfig | 8 +------- > samples/Kconfig | 6 +++--- > 7 files changed, 9 insertions(+), 16 deletions(-) > > diff --git a/Documentation/s390/vfio-ap.rst b/Documentation/s390/vfio-ap.rst > index 00f4a04f6d4c6a..d46e98c7c1ec6c 100644 > --- a/Documentation/s390/vfio-ap.rst > +++ b/Documentation/s390/vfio-ap.rst > @@ -553,7 +553,6 @@ These are the steps: > * ZCRYPT > * S390_AP_IOMMU > * VFIO > - * VFIO_MDEV > * KVM > > If using make menuconfig select the following to build the vfio_ap module:: > diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig > index 318fce77601d35..60fddcdad495e6 100644 > --- a/arch/s390/Kconfig > +++ b/arch/s390/Kconfig > @@ -705,7 +705,8 @@ config EADM_SCH > config VFIO_CCW > def_tristate n > prompt "Support for VFIO-CCW subchannels" > - depends on S390_CCW_IOMMU && VFIO_MDEV > + depends on S390_CCW_IOMMU > + select VFIO_MDEV > help > This driver allows usage of I/O subchannels via VFIO-CCW. > > @@ -715,7 +716,8 @@ config VFIO_CCW > config VFIO_AP > def_tristate n > prompt "VFIO support for AP devices" > - depends on S390_AP_IOMMU && VFIO_MDEV && KVM > + depends on S390_AP_IOMMU && KVM > + select VFIO_MDEV > depends on ZCRYPT > help > This driver grants access to Adjunct Processor (AP) devices > diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig > index 2a827002934bc6..e78fc3ba7d442a 100644 > --- a/arch/s390/configs/debug_defconfig > +++ b/arch/s390/configs/debug_defconfig > @@ -596,7 +596,6 @@ CONFIG_SYNC_FILE=y > CONFIG_VFIO=m > CONFIG_VFIO_PCI=m > CONFIG_MLX5_VFIO_PCI=m > -CONFIG_VFIO_MDEV=m > CONFIG_VIRTIO_PCI=m > CONFIG_VIRTIO_BALLOON=m > CONFIG_VIRTIO_INPUT=y > diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig > index fb780e80e4c8f7..f7eb2e527b6e65 100644 > --- a/arch/s390/configs/defconfig > +++ b/arch/s390/configs/defconfig > @@ -585,7 +585,6 @@ CONFIG_SYNC_FILE=y > CONFIG_VFIO=m > CONFIG_VFIO_PCI=m > CONFIG_MLX5_VFIO_PCI=m > -CONFIG_VFIO_MDEV=m > CONFIG_VIRTIO_PCI=m > CONFIG_VIRTIO_BALLOON=m > CONFIG_VIRTIO_INPUT=y > diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig > index 3efce05d7b57ca..d06da455253cdb 100644 > --- a/drivers/gpu/drm/i915/Kconfig > +++ b/drivers/gpu/drm/i915/Kconfig > @@ -116,9 +116,9 @@ config DRM_I915_GVT_KVMGT > depends on X86 > depends on 64BIT > depends on KVM > - depends on VFIO_MDEV > select DRM_I915_GVT > select KVM_EXTERNAL_WRITE_TRACKING > + select VFIO_MDEV > > help > Choose this option if you want to enable Intel GVT-g graphics > diff --git a/drivers/vfio/mdev/Kconfig b/drivers/vfio/mdev/Kconfig > index 646dbed44eb283..e5fb84e0796507 100644 > --- a/drivers/vfio/mdev/Kconfig > +++ b/drivers/vfio/mdev/Kconfig > @@ -1,10 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0-only > > config VFIO_MDEV > - tristate "Mediated device driver framework" > - default n > - help > - Provides a framework to virtualize devices. > - See Documentation/driver-api/vfio-mediated-device.rst for more details. > - > - If you don't know what do here, say N. > + tristate > diff --git a/samples/Kconfig b/samples/Kconfig > index f1b8d4ff123036..56b191d128d88f 100644 > --- a/samples/Kconfig > +++ b/samples/Kconfig > @@ -185,14 +185,14 @@ config SAMPLE_UHID > > config SAMPLE_VFIO_MDEV_MTTY > tristate "Build VFIO mtty example mediated device sample code" > - depends on VFIO_MDEV > + select VFIO_MDEV > help > Build a virtual tty sample driver for use as a VFIO > mediated device > > config SAMPLE_VFIO_MDEV_MDPY > tristate "Build VFIO mdpy example mediated device sample code" > - depends on VFIO_MDEV > + select VFIO_MDEV > help > Build a virtual display sample driver for use as a VFIO > mediated device. It is a simple framebuffer and supports > @@ -209,7 +209,7 @@ config SAMPLE_VFIO_MDEV_MDPY_FB > > config SAMPLE_VFIO_MDEV_MBOCHS > tristate "Build VFIO mdpy example mediated device sample code" > - depends on VFIO_MDEV > + select VFIO_MDEV > select DMA_SHARED_BUFFER > help > Build a virtual display sample driver for use as a VFIO
On Tue, Jan 10, 2023 at 10:10:07AM +0100, Christoph Hellwig wrote: > VFIO_MDEV is just a library with helpers for the drivers. Stop making > it a user choice and just select it by the drivers that use the helpers. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > Documentation/s390/vfio-ap.rst | 1 - > arch/s390/Kconfig | 6 ++++-- > arch/s390/configs/debug_defconfig | 1 - > arch/s390/configs/defconfig | 1 - > drivers/gpu/drm/i915/Kconfig | 2 +- > drivers/vfio/mdev/Kconfig | 8 +------- > samples/Kconfig | 6 +++--- > 7 files changed, 9 insertions(+), 16 deletions(-) Reviewed-by: Jason Gunthorpe <jgg@nvidia.com> Jason
diff --git a/Documentation/s390/vfio-ap.rst b/Documentation/s390/vfio-ap.rst index 00f4a04f6d4c6a..d46e98c7c1ec6c 100644 --- a/Documentation/s390/vfio-ap.rst +++ b/Documentation/s390/vfio-ap.rst @@ -553,7 +553,6 @@ These are the steps: * ZCRYPT * S390_AP_IOMMU * VFIO - * VFIO_MDEV * KVM If using make menuconfig select the following to build the vfio_ap module:: diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 318fce77601d35..60fddcdad495e6 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -705,7 +705,8 @@ config EADM_SCH config VFIO_CCW def_tristate n prompt "Support for VFIO-CCW subchannels" - depends on S390_CCW_IOMMU && VFIO_MDEV + depends on S390_CCW_IOMMU + select VFIO_MDEV help This driver allows usage of I/O subchannels via VFIO-CCW. @@ -715,7 +716,8 @@ config VFIO_CCW config VFIO_AP def_tristate n prompt "VFIO support for AP devices" - depends on S390_AP_IOMMU && VFIO_MDEV && KVM + depends on S390_AP_IOMMU && KVM + select VFIO_MDEV depends on ZCRYPT help This driver grants access to Adjunct Processor (AP) devices diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig index 2a827002934bc6..e78fc3ba7d442a 100644 --- a/arch/s390/configs/debug_defconfig +++ b/arch/s390/configs/debug_defconfig @@ -596,7 +596,6 @@ CONFIG_SYNC_FILE=y CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_MLX5_VFIO_PCI=m -CONFIG_VFIO_MDEV=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=y diff --git a/arch/s390/configs/defconfig b/arch/s390/configs/defconfig index fb780e80e4c8f7..f7eb2e527b6e65 100644 --- a/arch/s390/configs/defconfig +++ b/arch/s390/configs/defconfig @@ -585,7 +585,6 @@ CONFIG_SYNC_FILE=y CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_MLX5_VFIO_PCI=m -CONFIG_VFIO_MDEV=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m CONFIG_VIRTIO_INPUT=y diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig index 3efce05d7b57ca..d06da455253cdb 100644 --- a/drivers/gpu/drm/i915/Kconfig +++ b/drivers/gpu/drm/i915/Kconfig @@ -116,9 +116,9 @@ config DRM_I915_GVT_KVMGT depends on X86 depends on 64BIT depends on KVM - depends on VFIO_MDEV select DRM_I915_GVT select KVM_EXTERNAL_WRITE_TRACKING + select VFIO_MDEV help Choose this option if you want to enable Intel GVT-g graphics diff --git a/drivers/vfio/mdev/Kconfig b/drivers/vfio/mdev/Kconfig index 646dbed44eb283..e5fb84e0796507 100644 --- a/drivers/vfio/mdev/Kconfig +++ b/drivers/vfio/mdev/Kconfig @@ -1,10 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-only config VFIO_MDEV - tristate "Mediated device driver framework" - default n - help - Provides a framework to virtualize devices. - See Documentation/driver-api/vfio-mediated-device.rst for more details. - - If you don't know what do here, say N. + tristate diff --git a/samples/Kconfig b/samples/Kconfig index f1b8d4ff123036..56b191d128d88f 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -185,14 +185,14 @@ config SAMPLE_UHID config SAMPLE_VFIO_MDEV_MTTY tristate "Build VFIO mtty example mediated device sample code" - depends on VFIO_MDEV + select VFIO_MDEV help Build a virtual tty sample driver for use as a VFIO mediated device config SAMPLE_VFIO_MDEV_MDPY tristate "Build VFIO mdpy example mediated device sample code" - depends on VFIO_MDEV + select VFIO_MDEV help Build a virtual display sample driver for use as a VFIO mediated device. It is a simple framebuffer and supports @@ -209,7 +209,7 @@ config SAMPLE_VFIO_MDEV_MDPY_FB config SAMPLE_VFIO_MDEV_MBOCHS tristate "Build VFIO mdpy example mediated device sample code" - depends on VFIO_MDEV + select VFIO_MDEV select DMA_SHARED_BUFFER help Build a virtual display sample driver for use as a VFIO
VFIO_MDEV is just a library with helpers for the drivers. Stop making it a user choice and just select it by the drivers that use the helpers. Signed-off-by: Christoph Hellwig <hch@lst.de> --- Documentation/s390/vfio-ap.rst | 1 - arch/s390/Kconfig | 6 ++++-- arch/s390/configs/debug_defconfig | 1 - arch/s390/configs/defconfig | 1 - drivers/gpu/drm/i915/Kconfig | 2 +- drivers/vfio/mdev/Kconfig | 8 +------- samples/Kconfig | 6 +++--- 7 files changed, 9 insertions(+), 16 deletions(-)