Commit e2d55709 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Alex Williamson
Browse files

vfio: Fold vfio_virqfd.ko into vfio.ko 



This is only 1.8k, putting it in its own module is not really
necessary. The kconfig infrastructure is still there to completely remove
it for systems that are trying for small footprint.

Put it in the main vfio.ko module now that kbuild can support multiple .c
files.

Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarCornelia Huck <cohuck@redhat.com>
Link: https://lore.kernel.org/r/5-v5-fc5346cacfd4+4c482-vfio_modules_jgg@nvidia.com


Signed-off-by: default avatarAlex Williamson <alex.williamson@redhat.com>
parent 20601c45

drivers/vfio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ config VFIO_IOMMU_SPAPR_TCE 
	default VFIO



config VFIO_VIRQFD

	tristate

	bool

	select EVENTFD

	default n

drivers/vfio/Makefile

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

vfio_virqfd-y := virqfd.o



obj-$(CONFIG_VFIO) += vfio.o



vfio-y += vfio_main.o \

	  iova_bitmap.o \

	  container.o

vfio-$(CONFIG_VFIO_VIRQFD) += virqfd.o



obj-$(CONFIG_VFIO_VIRQFD) += vfio_virqfd.o

obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o

obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o

obj-$(CONFIG_VFIO_PCI) += pci/

drivers/vfio/vfio.h

+13 −0
Original line number Diff line number Diff line
@@ -124,6 +124,19 @@ long vfio_container_ioctl_check_extension(struct vfio_container *container, 
int __init vfio_container_init(void);

void vfio_container_cleanup(void);



#if IS_ENABLED(CONFIG_VFIO_VIRQFD)

int __init vfio_virqfd_init(void);

void vfio_virqfd_exit(void);

#else

static inline int __init vfio_virqfd_init(void)

{

	return 0;

}

static inline void vfio_virqfd_exit(void)

{

}

#endif



#ifdef CONFIG_VFIO_NOIOMMU

extern bool vfio_noiommu __read_mostly;

#else

drivers/vfio/vfio_main.c

+7 −0
Original line number Diff line number Diff line
@@ -1832,6 +1832,10 @@ static int __init vfio_init(void) 
	if (ret)

		return ret;



	ret = vfio_virqfd_init();

	if (ret)

		goto err_virqfd;



	/* /dev/vfio/$GROUP */

	vfio.class = class_create(THIS_MODULE, "vfio");

	if (IS_ERR(vfio.class)) {
@@ -1862,6 +1866,8 @@ static int __init vfio_init(void) 
	class_destroy(vfio.class);

	vfio.class = NULL;

err_group_class:

	vfio_virqfd_exit();

err_virqfd:

	vfio_container_cleanup();

	return ret;

}
@@ -1876,6 +1882,7 @@ static void __exit vfio_cleanup(void) 
	class_destroy(vfio.device_class);

	vfio.device_class = NULL;

	class_destroy(vfio.class);

	vfio_virqfd_exit();

	vfio_container_cleanup();

	vfio.class = NULL;

	xa_destroy(&vfio_device_set_xa);

drivers/vfio/virqfd.c

+3 −14
Original line number Diff line number Diff line
@@ -12,15 +12,12 @@ 
#include <linux/file.h>

#include <linux/module.h>

#include <linux/slab.h>



#define DRIVER_VERSION  "0.1"

#define DRIVER_AUTHOR   "Alex Williamson <alex.williamson@redhat.com>"

#define DRIVER_DESC     "IRQFD support for VFIO bus drivers"

#include "vfio.h"



static struct workqueue_struct *vfio_irqfd_cleanup_wq;

static DEFINE_SPINLOCK(virqfd_lock);



static int __init vfio_virqfd_init(void)

int __init vfio_virqfd_init(void)

{

	vfio_irqfd_cleanup_wq =

		create_singlethread_workqueue("vfio-irqfd-cleanup");
@@ -30,7 +27,7 @@ static int __init vfio_virqfd_init(void) 
	return 0;

}



static void __exit vfio_virqfd_exit(void)

void vfio_virqfd_exit(void)

{

	destroy_workqueue(vfio_irqfd_cleanup_wq);

}
@@ -216,11 +213,3 @@ void vfio_virqfd_disable(struct virqfd **pvirqfd) 
	flush_workqueue(vfio_irqfd_cleanup_wq);

}

EXPORT_SYMBOL_GPL(vfio_virqfd_disable);
 


module_init(vfio_virqfd_init);

module_exit(vfio_virqfd_exit);



MODULE_VERSION(DRIVER_VERSION);

MODULE_LICENSE("GPL v2");

MODULE_AUTHOR(DRIVER_AUTHOR);

MODULE_DESCRIPTION(DRIVER_DESC);