Commit 8c9c727b authored by Joao Martins's avatar Joao Martins Committed by Jason Gunthorpe
Browse files

vfio: Move iova_bitmap into iommufd 

Both VFIO and IOMMUFD will need iova bitmap for storing dirties and walking
the user bitmaps, so move to the common dependency into IOMMUFD.  In doing
so, create the symbol IOMMUFD_DRIVER which designates the builtin code that
will be used by drivers when selected. Today this means MLX5_VFIO_PCI and
PDS_VFIO_PCI. IOMMU drivers will do the same (in future patches) when
supporting dirty tracking and select IOMMUFD_DRIVER accordingly.

Given that the symbol maybe be disabled, add header definitions in
iova_bitmap.h for when IOMMUFD_DRIVER=n

Link: https://lore.kernel.org/r/20231024135109.73787-3-joao.m.martins@oracle.com


Signed-off-by: default avatarJoao Martins <joao.m.martins@oracle.com>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarBrett Creeley <brett.creeley@amd.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarAlex Williamson <alex.williamson@redhat.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent 53f0b020

drivers/iommu/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,10 @@ config IOMMU_IOVA 
config IOMMU_API

	bool



config IOMMUFD_DRIVER

	bool

	default n



menuconfig IOMMU_SUPPORT

	bool "IOMMU Hardware Support"

	depends on MMU

drivers/iommu/iommufd/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -11,3 +11,4 @@ iommufd-y := \ 
iommufd-$(CONFIG_IOMMUFD_TEST) += selftest.o



obj-$(CONFIG_IOMMUFD) += iommufd.o

obj-$(CONFIG_IOMMUFD_DRIVER) += iova_bitmap.o

drivers/vfio/Makefile

+1 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_VFIO) += vfio.o



vfio-y += vfio_main.o \

	  iova_bitmap.o

vfio-y += vfio_main.o

vfio-$(CONFIG_VFIO_DEVICE_CDEV) += device_cdev.o

vfio-$(CONFIG_VFIO_GROUP) += group.o

vfio-$(CONFIG_IOMMUFD) += iommufd.o

drivers/vfio/pci/mlx5/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config MLX5_VFIO_PCI 
	tristate "VFIO support for MLX5 PCI devices"

	depends on MLX5_CORE

	select VFIO_PCI_CORE

	select IOMMUFD_DRIVER

	help

	  This provides migration support for MLX5 devices using the VFIO

	  framework.