On Mon, 4 Nov 2024 12:21:31 +0200 Yishai Hadas <yishaih@xxxxxxxxxx> wrote: > Now that the driver supports live migration, only the legacy IO > functionality depends on config VIRTIO_PCI_ADMIN_LEGACY. > > Move the legacy IO into a separate file to be compiled only once > VIRTIO_PCI_ADMIN_LEGACY was configured and let the live migration > depends only on VIRTIO_PCI. > > As part of this, modify the default driver operations (i.e., > vfio_device_ops) to use the live migration set, and extend it to include > legacy I/O operations if they are compiled and supported. > > Signed-off-by: Yishai Hadas <yishaih@xxxxxxxxxx> > --- > drivers/vfio/pci/virtio/Kconfig | 4 +- > drivers/vfio/pci/virtio/Makefile | 1 + > drivers/vfio/pci/virtio/common.h | 19 ++ > drivers/vfio/pci/virtio/legacy_io.c | 420 ++++++++++++++++++++++++++++ > drivers/vfio/pci/virtio/main.c | 416 ++------------------------- > 5 files changed, 469 insertions(+), 391 deletions(-) > create mode 100644 drivers/vfio/pci/virtio/legacy_io.c > > diff --git a/drivers/vfio/pci/virtio/Kconfig b/drivers/vfio/pci/virtio/Kconfig > index bd80eca4a196..af1dd9e84a5c 100644 > --- a/drivers/vfio/pci/virtio/Kconfig > +++ b/drivers/vfio/pci/virtio/Kconfig > @@ -1,7 +1,7 @@ > # SPDX-License-Identifier: GPL-2.0-only > config VIRTIO_VFIO_PCI > tristate "VFIO support for VIRTIO NET PCI devices" > - depends on VIRTIO_PCI && VIRTIO_PCI_ADMIN_LEGACY > + depends on VIRTIO_PCI > select VFIO_PCI_CORE > help > This provides support for exposing VIRTIO NET VF devices which support > @@ -11,5 +11,7 @@ config VIRTIO_VFIO_PCI > As of that this driver emulates I/O BAR in software to let a VF be > seen as a transitional device by its users and let it work with > a legacy driver. > + In addition, it provides migration support for VIRTIO NET VF devices > + using the VFIO framework. The first half of this now describes something that may or may not be enabled by this config option and the additional help text for migration is vague enough relative to PF requirements to get user reports that the driver doesn't work as intended. For the former, maybe we still want a separate config item that's optionally enabled if VIRTIO_VFIO_PCI && VFIO_PCI_ADMIN_LEGACY. Thanks, Alex
