Commit 8cc02d22 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Alex Williamson
Browse files

vfio: move the vfio_iommu_driver_ops interface out of <linux/vfio.h> 



Create a new private drivers/vfio/vfio.h header for the interface between
the VFIO core and the iommu drivers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Link: https://lore.kernel.org/r/20210924155705.4258-10-hch@lst.de


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

drivers/vfio/vfio.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/vfio.h>

#include <linux/wait.h>

#include <linux/sched/signal.h>

#include "vfio.h"



#define DRIVER_VERSION	"0.3"

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

drivers/vfio/vfio.h

0 → 100644
+47 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (C) 2012 Red Hat, Inc.  All rights reserved.

 *     Author: Alex Williamson <alex.williamson@redhat.com>

 */



/* events for the backend driver notify callback */

enum vfio_iommu_notify_type {

	VFIO_IOMMU_CONTAINER_CLOSE = 0,

};



/**

 * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks

 */

struct vfio_iommu_driver_ops {

	char		*name;

	struct module	*owner;

	void		*(*open)(unsigned long arg);

	void		(*release)(void *iommu_data);

	long		(*ioctl)(void *iommu_data, unsigned int cmd,

				 unsigned long arg);

	int		(*attach_group)(void *iommu_data,

					struct iommu_group *group);

	void		(*detach_group)(void *iommu_data,

					struct iommu_group *group);

	int		(*pin_pages)(void *iommu_data,

				     struct iommu_group *group,

				     unsigned long *user_pfn,

				     int npage, int prot,

				     unsigned long *phys_pfn);

	int		(*unpin_pages)(void *iommu_data,

				       unsigned long *user_pfn, int npage);

	int		(*register_notifier)(void *iommu_data,

					     unsigned long *events,

					     struct notifier_block *nb);

	int		(*unregister_notifier)(void *iommu_data,

					       struct notifier_block *nb);

	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,

				  void *data, size_t count, bool write);

	struct iommu_domain *(*group_iommu_domain)(void *iommu_data,

						   struct iommu_group *group);

	void		(*notify)(void *iommu_data,

				  enum vfio_iommu_notify_type event);

};



int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);

void vfio_unregister_iommu_driver(const struct vfio_iommu_driver_ops *ops);

drivers/vfio/vfio_iommu_spapr_tce.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/sched/mm.h>

#include <linux/sched/signal.h>

#include <linux/mm.h>

#include "vfio.h"



#include <asm/iommu.h>

#include <asm/tce.h>

drivers/vfio/vfio_iommu_type1.c

+1 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
#include <linux/notifier.h>

#include <linux/dma-iommu.h>

#include <linux/irqdomain.h>

#include "vfio.h"



#define DRIVER_VERSION  "0.2"

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

include/linux/vfio.h

+0 −44
Original line number Diff line number Diff line
@@ -82,50 +82,6 @@ extern void vfio_device_put(struct vfio_device *device); 


int vfio_assign_device_set(struct vfio_device *device, void *set_id);



/* events for the backend driver notify callback */

enum vfio_iommu_notify_type {

	VFIO_IOMMU_CONTAINER_CLOSE = 0,

};



/**

 * struct vfio_iommu_driver_ops - VFIO IOMMU driver callbacks

 */

struct vfio_iommu_driver_ops {

	char		*name;

	struct module	*owner;

	void		*(*open)(unsigned long arg);

	void		(*release)(void *iommu_data);

	long		(*ioctl)(void *iommu_data, unsigned int cmd,

				 unsigned long arg);

	int		(*attach_group)(void *iommu_data,

					struct iommu_group *group);

	void		(*detach_group)(void *iommu_data,

					struct iommu_group *group);

	int		(*pin_pages)(void *iommu_data,

				     struct iommu_group *group,

				     unsigned long *user_pfn,

				     int npage, int prot,

				     unsigned long *phys_pfn);

	int		(*unpin_pages)(void *iommu_data,

				       unsigned long *user_pfn, int npage);

	int		(*register_notifier)(void *iommu_data,

					     unsigned long *events,

					     struct notifier_block *nb);

	int		(*unregister_notifier)(void *iommu_data,

					       struct notifier_block *nb);

	int		(*dma_rw)(void *iommu_data, dma_addr_t user_iova,

				  void *data, size_t count, bool write);

	struct iommu_domain *(*group_iommu_domain)(void *iommu_data,

						   struct iommu_group *group);

	void		(*notify)(void *iommu_data,

				  enum vfio_iommu_notify_type event);

};



extern int vfio_register_iommu_driver(const struct vfio_iommu_driver_ops *ops);



extern void vfio_unregister_iommu_driver(

				const struct vfio_iommu_driver_ops *ops);



/*

 * External user API

 */