Commit 53647510 authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Alex Williamson
Browse files

vfio/pci: Rename vfio_pci_device to vfio_pci_core_device 



This is a preparation patch for separating the vfio_pci driver to a
subsystem driver and a generic pci driver. This patch doesn't change any
logic.

The new vfio_pci_core_device structure will be the main structure of the
core driver and later on vfio_pci_device structure will be the main
structure of the generic vfio_pci driver.

Signed-off-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarYishai Hadas <yishaih@nvidia.com>
Link: https://lore.kernel.org/r/20210826103912.128972-4-yishaih@nvidia.com


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

drivers/vfio/pci/vfio_pci_config.c

+34 −34
Original line number Diff line number Diff line
@@ -108,9 +108,9 @@ static const u16 pci_ext_cap_length[PCI_EXT_CAP_ID_MAX + 1] = { 
struct perm_bits {

	u8	*virt;		/* read/write virtual data, not hw */

	u8	*write;		/* writeable bits */

	int	(*readfn)(struct vfio_pci_device *vdev, int pos, int count,

	int	(*readfn)(struct vfio_pci_core_device *vdev, int pos, int count,

			  struct perm_bits *perm, int offset, __le32 *val);

	int	(*writefn)(struct vfio_pci_device *vdev, int pos, int count,

	int	(*writefn)(struct vfio_pci_core_device *vdev, int pos, int count,

			   struct perm_bits *perm, int offset, __le32 val);

};
@@ -171,7 +171,7 @@ static int vfio_user_config_write(struct pci_dev *pdev, int offset, 
	return ret;

}



static int vfio_default_config_read(struct vfio_pci_device *vdev, int pos,

static int vfio_default_config_read(struct vfio_pci_core_device *vdev, int pos,

				    int count, struct perm_bits *perm,

				    int offset, __le32 *val)

{
@@ -197,7 +197,7 @@ static int vfio_default_config_read(struct vfio_pci_device *vdev, int pos, 
	return count;

}



static int vfio_default_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_default_config_write(struct vfio_pci_core_device *vdev, int pos,

				     int count, struct perm_bits *perm,

				     int offset, __le32 val)

{
@@ -244,7 +244,7 @@ static int vfio_default_config_write(struct vfio_pci_device *vdev, int pos, 
}



/* Allow direct read from hardware, except for capability next pointer */

static int vfio_direct_config_read(struct vfio_pci_device *vdev, int pos,

static int vfio_direct_config_read(struct vfio_pci_core_device *vdev, int pos,

				   int count, struct perm_bits *perm,

				   int offset, __le32 *val)

{
@@ -269,7 +269,7 @@ static int vfio_direct_config_read(struct vfio_pci_device *vdev, int pos, 
}



/* Raw access skips any kind of virtualization */

static int vfio_raw_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_raw_config_write(struct vfio_pci_core_device *vdev, int pos,

				 int count, struct perm_bits *perm,

				 int offset, __le32 val)

{
@@ -282,7 +282,7 @@ static int vfio_raw_config_write(struct vfio_pci_device *vdev, int pos, 
	return count;

}



static int vfio_raw_config_read(struct vfio_pci_device *vdev, int pos,

static int vfio_raw_config_read(struct vfio_pci_core_device *vdev, int pos,

				int count, struct perm_bits *perm,

				int offset, __le32 *val)

{
@@ -296,7 +296,7 @@ static int vfio_raw_config_read(struct vfio_pci_device *vdev, int pos, 
}



/* Virt access uses only virtualization */

static int vfio_virt_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_virt_config_write(struct vfio_pci_core_device *vdev, int pos,

				  int count, struct perm_bits *perm,

				  int offset, __le32 val)

{
@@ -304,7 +304,7 @@ static int vfio_virt_config_write(struct vfio_pci_device *vdev, int pos, 
	return count;

}



static int vfio_virt_config_read(struct vfio_pci_device *vdev, int pos,

static int vfio_virt_config_read(struct vfio_pci_core_device *vdev, int pos,

				 int count, struct perm_bits *perm,

				 int offset, __le32 *val)

{
@@ -396,7 +396,7 @@ static inline void p_setd(struct perm_bits *p, int off, u32 virt, u32 write) 
}



/* Caller should hold memory_lock semaphore */

bool __vfio_pci_memory_enabled(struct vfio_pci_device *vdev)

bool __vfio_pci_memory_enabled(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	u16 cmd = le16_to_cpu(*(__le16 *)&vdev->vconfig[PCI_COMMAND]);
@@ -413,7 +413,7 @@ bool __vfio_pci_memory_enabled(struct vfio_pci_device *vdev) 
 * Restore the *real* BARs after we detect a FLR or backdoor reset.

 * (backdoor = some device specific technique that we didn't catch)

 */

static void vfio_bar_restore(struct vfio_pci_device *vdev)

static void vfio_bar_restore(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	u32 *rbar = vdev->rbar;
@@ -460,7 +460,7 @@ static __le32 vfio_generate_bar_flags(struct pci_dev *pdev, int bar) 
 * Pretend we're hardware and tweak the values of the *virtual* PCI BARs

 * to reflect the hardware capabilities.  This implements BAR sizing.

 */

static void vfio_bar_fixup(struct vfio_pci_device *vdev)

static void vfio_bar_fixup(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	int i;
@@ -514,7 +514,7 @@ static void vfio_bar_fixup(struct vfio_pci_device *vdev) 
	vdev->bardirty = false;

}



static int vfio_basic_config_read(struct vfio_pci_device *vdev, int pos,

static int vfio_basic_config_read(struct vfio_pci_core_device *vdev, int pos,

				  int count, struct perm_bits *perm,

				  int offset, __le32 *val)

{
@@ -536,7 +536,7 @@ static int vfio_basic_config_read(struct vfio_pci_device *vdev, int pos, 
}



/* Test whether BARs match the value we think they should contain */

static bool vfio_need_bar_restore(struct vfio_pci_device *vdev)

static bool vfio_need_bar_restore(struct vfio_pci_core_device *vdev)

{

	int i = 0, pos = PCI_BASE_ADDRESS_0, ret;

	u32 bar;
@@ -552,7 +552,7 @@ static bool vfio_need_bar_restore(struct vfio_pci_device *vdev) 
	return false;

}



static int vfio_basic_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_basic_config_write(struct vfio_pci_core_device *vdev, int pos,

				   int count, struct perm_bits *perm,

				   int offset, __le32 val)

{
@@ -692,7 +692,7 @@ static int __init init_pci_cap_basic_perm(struct perm_bits *perm) 
	return 0;

}



static int vfio_pm_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_pm_config_write(struct vfio_pci_core_device *vdev, int pos,

				int count, struct perm_bits *perm,

				int offset, __le32 val)

{
@@ -747,7 +747,7 @@ static int __init init_pci_cap_pm_perm(struct perm_bits *perm) 
	return 0;

}



static int vfio_vpd_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_vpd_config_write(struct vfio_pci_core_device *vdev, int pos,

				 int count, struct perm_bits *perm,

				 int offset, __le32 val)

{
@@ -829,7 +829,7 @@ static int __init init_pci_cap_pcix_perm(struct perm_bits *perm) 
	return 0;

}



static int vfio_exp_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_exp_config_write(struct vfio_pci_core_device *vdev, int pos,

				 int count, struct perm_bits *perm,

				 int offset, __le32 val)

{
@@ -913,7 +913,7 @@ static int __init init_pci_cap_exp_perm(struct perm_bits *perm) 
	return 0;

}



static int vfio_af_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_af_config_write(struct vfio_pci_core_device *vdev, int pos,

				int count, struct perm_bits *perm,

				int offset, __le32 val)

{
@@ -1072,7 +1072,7 @@ int __init vfio_pci_init_perm_bits(void) 
	return ret;

}



static int vfio_find_cap_start(struct vfio_pci_device *vdev, int pos)

static int vfio_find_cap_start(struct vfio_pci_core_device *vdev, int pos)

{

	u8 cap;

	int base = (pos >= PCI_CFG_SPACE_SIZE) ? PCI_CFG_SPACE_SIZE :
@@ -1089,7 +1089,7 @@ static int vfio_find_cap_start(struct vfio_pci_device *vdev, int pos) 
	return pos;

}



static int vfio_msi_config_read(struct vfio_pci_device *vdev, int pos,

static int vfio_msi_config_read(struct vfio_pci_core_device *vdev, int pos,

				int count, struct perm_bits *perm,

				int offset, __le32 *val)

{
@@ -1109,7 +1109,7 @@ static int vfio_msi_config_read(struct vfio_pci_device *vdev, int pos, 
	return vfio_default_config_read(vdev, pos, count, perm, offset, val);

}



static int vfio_msi_config_write(struct vfio_pci_device *vdev, int pos,

static int vfio_msi_config_write(struct vfio_pci_core_device *vdev, int pos,

				 int count, struct perm_bits *perm,

				 int offset, __le32 val)

{
@@ -1189,7 +1189,7 @@ static int init_pci_cap_msi_perm(struct perm_bits *perm, int len, u16 flags) 
}



/* Determine MSI CAP field length; initialize msi_perms on 1st call per vdev */

static int vfio_msi_cap_len(struct vfio_pci_device *vdev, u8 pos)

static int vfio_msi_cap_len(struct vfio_pci_core_device *vdev, u8 pos)

{

	struct pci_dev *pdev = vdev->pdev;

	int len, ret;
@@ -1222,7 +1222,7 @@ static int vfio_msi_cap_len(struct vfio_pci_device *vdev, u8 pos) 
}



/* Determine extended capability length for VC (2 & 9) and MFVC */

static int vfio_vc_cap_len(struct vfio_pci_device *vdev, u16 pos)

static int vfio_vc_cap_len(struct vfio_pci_core_device *vdev, u16 pos)

{

	struct pci_dev *pdev = vdev->pdev;

	u32 tmp;
@@ -1263,7 +1263,7 @@ static int vfio_vc_cap_len(struct vfio_pci_device *vdev, u16 pos) 
	return len;

}



static int vfio_cap_len(struct vfio_pci_device *vdev, u8 cap, u8 pos)

static int vfio_cap_len(struct vfio_pci_core_device *vdev, u8 cap, u8 pos)

{

	struct pci_dev *pdev = vdev->pdev;

	u32 dword;
@@ -1338,7 +1338,7 @@ static int vfio_cap_len(struct vfio_pci_device *vdev, u8 cap, u8 pos) 
	return 0;

}



static int vfio_ext_cap_len(struct vfio_pci_device *vdev, u16 ecap, u16 epos)

static int vfio_ext_cap_len(struct vfio_pci_core_device *vdev, u16 ecap, u16 epos)

{

	struct pci_dev *pdev = vdev->pdev;

	u8 byte;
@@ -1412,7 +1412,7 @@ static int vfio_ext_cap_len(struct vfio_pci_device *vdev, u16 ecap, u16 epos) 
	return 0;

}



static int vfio_fill_vconfig_bytes(struct vfio_pci_device *vdev,

static int vfio_fill_vconfig_bytes(struct vfio_pci_core_device *vdev,

				   int offset, int size)

{

	struct pci_dev *pdev = vdev->pdev;
@@ -1459,7 +1459,7 @@ static int vfio_fill_vconfig_bytes(struct vfio_pci_device *vdev, 
	return ret;

}



static int vfio_cap_init(struct vfio_pci_device *vdev)

static int vfio_cap_init(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	u8 *map = vdev->pci_config_map;
@@ -1549,7 +1549,7 @@ static int vfio_cap_init(struct vfio_pci_device *vdev) 
	return 0;

}



static int vfio_ecap_init(struct vfio_pci_device *vdev)

static int vfio_ecap_init(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	u8 *map = vdev->pci_config_map;
@@ -1669,7 +1669,7 @@ static const struct pci_device_id known_bogus_vf_intx_pin[] = { 
 * for each area requiring emulated bits, but the array of pointers

 * would be comparable in size (at least for standard config space).

 */

int vfio_config_init(struct vfio_pci_device *vdev)

int vfio_config_init(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	u8 *map, *vconfig;
@@ -1773,7 +1773,7 @@ int vfio_config_init(struct vfio_pci_device *vdev) 
	return pcibios_err_to_errno(ret);

}



void vfio_config_free(struct vfio_pci_device *vdev)

void vfio_config_free(struct vfio_pci_core_device *vdev)

{

	kfree(vdev->vconfig);

	vdev->vconfig = NULL;
@@ -1790,7 +1790,7 @@ void vfio_config_free(struct vfio_pci_device *vdev) 
 * Find the remaining number of bytes in a dword that match the given

 * position.  Stop at either the end of the capability or the dword boundary.

 */

static size_t vfio_pci_cap_remaining_dword(struct vfio_pci_device *vdev,

static size_t vfio_pci_cap_remaining_dword(struct vfio_pci_core_device *vdev,

					   loff_t pos)

{

	u8 cap = vdev->pci_config_map[pos];
@@ -1802,7 +1802,7 @@ static size_t vfio_pci_cap_remaining_dword(struct vfio_pci_device *vdev, 
	return i;

}



static ssize_t vfio_config_do_rw(struct vfio_pci_device *vdev, char __user *buf,

static ssize_t vfio_config_do_rw(struct vfio_pci_core_device *vdev, char __user *buf,

				 size_t count, loff_t *ppos, bool iswrite)

{

	struct pci_dev *pdev = vdev->pdev;
@@ -1885,7 +1885,7 @@ static ssize_t vfio_config_do_rw(struct vfio_pci_device *vdev, char __user *buf, 
	return ret;

}



ssize_t vfio_pci_config_rw(struct vfio_pci_device *vdev, char __user *buf,

ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev, char __user *buf,

			   size_t count, loff_t *ppos, bool iswrite)

{

	size_t done = 0;

drivers/vfio/pci/vfio_pci_core.c

+60 −58
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static bool vfio_pci_is_denylisted(struct pci_dev *pdev) 
 */

static unsigned int vfio_pci_set_vga_decode(void *opaque, bool single_vga)

{

	struct vfio_pci_device *vdev = opaque;

	struct vfio_pci_core_device *vdev = opaque;

	struct pci_dev *tmp = NULL, *pdev = vdev->pdev;

	unsigned char max_busnr;

	unsigned int decodes;
@@ -155,7 +155,7 @@ static inline bool vfio_pci_is_vga(struct pci_dev *pdev) 
	return (pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA;

}



static void vfio_pci_probe_mmaps(struct vfio_pci_device *vdev)

static void vfio_pci_probe_mmaps(struct vfio_pci_core_device *vdev)

{

	struct resource *res;

	int i;
@@ -225,7 +225,7 @@ static void vfio_pci_probe_mmaps(struct vfio_pci_device *vdev) 


struct vfio_pci_group_info;

static bool vfio_pci_dev_set_try_reset(struct vfio_device_set *dev_set);

static void vfio_pci_disable(struct vfio_pci_device *vdev);

static void vfio_pci_disable(struct vfio_pci_core_device *vdev);

static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set,

				      struct vfio_pci_group_info *groups);
@@ -260,7 +260,7 @@ static bool vfio_pci_nointx(struct pci_dev *pdev) 
	return false;

}



static void vfio_pci_probe_power_state(struct vfio_pci_device *vdev)

static void vfio_pci_probe_power_state(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	u16 pmcsr;
@@ -280,7 +280,7 @@ static void vfio_pci_probe_power_state(struct vfio_pci_device *vdev) 
 * by PM capability emulation and separately from pci_dev internal saved state

 * to avoid it being overwritten and consumed around other resets.

 */

int vfio_pci_set_power_state(struct vfio_pci_device *vdev, pci_power_t state)

int vfio_pci_set_power_state(struct vfio_pci_core_device *vdev, pci_power_t state)

{

	struct pci_dev *pdev = vdev->pdev;

	bool needs_restore = false, needs_save = false;
@@ -311,7 +311,7 @@ int vfio_pci_set_power_state(struct vfio_pci_device *vdev, pci_power_t state) 
	return ret;

}



static int vfio_pci_enable(struct vfio_pci_device *vdev)

static int vfio_pci_enable(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	int ret;
@@ -399,7 +399,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) 
	return ret;

}



static void vfio_pci_disable(struct vfio_pci_device *vdev)

static void vfio_pci_disable(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	struct vfio_pci_dummy_resource *dummy_res, *tmp;
@@ -498,7 +498,7 @@ static void vfio_pci_disable(struct vfio_pci_device *vdev) 


static struct pci_driver vfio_pci_driver;



static struct vfio_pci_device *get_pf_vdev(struct vfio_pci_device *vdev)

static struct vfio_pci_core_device *get_pf_vdev(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *physfn = pci_physfn(vdev->pdev);

	struct vfio_device *pf_dev;
@@ -515,12 +515,12 @@ static struct vfio_pci_device *get_pf_vdev(struct vfio_pci_device *vdev) 
		return NULL;

	}



	return container_of(pf_dev, struct vfio_pci_device, vdev);

	return container_of(pf_dev, struct vfio_pci_core_device, vdev);

}



static void vfio_pci_vf_token_user_add(struct vfio_pci_device *vdev, int val)

static void vfio_pci_vf_token_user_add(struct vfio_pci_core_device *vdev, int val)

{

	struct vfio_pci_device *pf_vdev = get_pf_vdev(vdev);

	struct vfio_pci_core_device *pf_vdev = get_pf_vdev(vdev);



	if (!pf_vdev)

		return;
@@ -535,8 +535,8 @@ static void vfio_pci_vf_token_user_add(struct vfio_pci_device *vdev, int val) 


static void vfio_pci_close_device(struct vfio_device *core_vdev)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);



	vfio_pci_vf_token_user_add(vdev, -1);

	vfio_spapr_pci_eeh_release(vdev->pdev);
@@ -556,8 +556,8 @@ static void vfio_pci_close_device(struct vfio_device *core_vdev) 


static int vfio_pci_open_device(struct vfio_device *core_vdev)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);

	int ret = 0;



	ret = vfio_pci_enable(vdev);
@@ -569,7 +569,7 @@ static int vfio_pci_open_device(struct vfio_device *core_vdev) 
	return 0;

}



static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type)

static int vfio_pci_get_irq_count(struct vfio_pci_core_device *vdev, int irq_type)

{

	if (irq_type == VFIO_PCI_INTX_IRQ_INDEX) {

		u8 pin;
@@ -690,7 +690,7 @@ static int vfio_pci_for_each_slot_or_bus(struct pci_dev *pdev, 
	return walk.ret;

}



static int msix_mmappable_cap(struct vfio_pci_device *vdev,

static int msix_mmappable_cap(struct vfio_pci_core_device *vdev,

			      struct vfio_info_cap *caps)

{

	struct vfio_info_cap_header header = {
@@ -701,7 +701,7 @@ static int msix_mmappable_cap(struct vfio_pci_device *vdev, 
	return vfio_info_add_capability(caps, &header, sizeof(header));

}



int vfio_pci_register_dev_region(struct vfio_pci_device *vdev,

int vfio_pci_register_dev_region(struct vfio_pci_core_device *vdev,

				 unsigned int type, unsigned int subtype,

				 const struct vfio_pci_regops *ops,

				 size_t size, u32 flags, void *data)
@@ -730,8 +730,8 @@ int vfio_pci_register_dev_region(struct vfio_pci_device *vdev, 
static long vfio_pci_ioctl(struct vfio_device *core_vdev,

			   unsigned int cmd, unsigned long arg)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);

	unsigned long minsz;



	if (cmd == VFIO_DEVICE_GET_INFO) {
@@ -1271,7 +1271,7 @@ static long vfio_pci_ioctl(struct vfio_device *core_vdev, 
	return -ENOTTY;

}



static ssize_t vfio_pci_rw(struct vfio_pci_device *vdev, char __user *buf,

static ssize_t vfio_pci_rw(struct vfio_pci_core_device *vdev, char __user *buf,

			   size_t count, loff_t *ppos, bool iswrite)

{

	unsigned int index = VFIO_PCI_OFFSET_TO_INDEX(*ppos);
@@ -1305,8 +1305,8 @@ static ssize_t vfio_pci_rw(struct vfio_pci_device *vdev, char __user *buf, 
static ssize_t vfio_pci_read(struct vfio_device *core_vdev, char __user *buf,

			     size_t count, loff_t *ppos)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);



	if (!count)

		return 0;
@@ -1317,8 +1317,8 @@ static ssize_t vfio_pci_read(struct vfio_device *core_vdev, char __user *buf, 
static ssize_t vfio_pci_write(struct vfio_device *core_vdev, const char __user *buf,

			      size_t count, loff_t *ppos)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);



	if (!count)

		return 0;
@@ -1327,7 +1327,7 @@ static ssize_t vfio_pci_write(struct vfio_device *core_vdev, const char __user * 
}



/* Return 1 on zap and vma_lock acquired, 0 on contention (only with @try) */

static int vfio_pci_zap_and_vma_lock(struct vfio_pci_device *vdev, bool try)

static int vfio_pci_zap_and_vma_lock(struct vfio_pci_core_device *vdev, bool try)

{

	struct vfio_pci_mmap_vma *mmap_vma, *tmp;
@@ -1415,14 +1415,14 @@ static int vfio_pci_zap_and_vma_lock(struct vfio_pci_device *vdev, bool try) 
	}

}



void vfio_pci_zap_and_down_write_memory_lock(struct vfio_pci_device *vdev)

void vfio_pci_zap_and_down_write_memory_lock(struct vfio_pci_core_device *vdev)

{

	vfio_pci_zap_and_vma_lock(vdev, false);

	down_write(&vdev->memory_lock);

	mutex_unlock(&vdev->vma_lock);

}



u16 vfio_pci_memory_lock_and_enable(struct vfio_pci_device *vdev)

u16 vfio_pci_memory_lock_and_enable(struct vfio_pci_core_device *vdev)

{

	u16 cmd;
@@ -1435,14 +1435,14 @@ u16 vfio_pci_memory_lock_and_enable(struct vfio_pci_device *vdev) 
	return cmd;

}



void vfio_pci_memory_unlock_and_restore(struct vfio_pci_device *vdev, u16 cmd)

void vfio_pci_memory_unlock_and_restore(struct vfio_pci_core_device *vdev, u16 cmd)

{

	pci_write_config_word(vdev->pdev, PCI_COMMAND, cmd);

	up_write(&vdev->memory_lock);

}



/* Caller holds vma_lock */

static int __vfio_pci_add_vma(struct vfio_pci_device *vdev,

static int __vfio_pci_add_vma(struct vfio_pci_core_device *vdev,

			      struct vm_area_struct *vma)

{

	struct vfio_pci_mmap_vma *mmap_vma;
@@ -1468,7 +1468,7 @@ static void vfio_pci_mmap_open(struct vm_area_struct *vma) 


static void vfio_pci_mmap_close(struct vm_area_struct *vma)

{

	struct vfio_pci_device *vdev = vma->vm_private_data;

	struct vfio_pci_core_device *vdev = vma->vm_private_data;

	struct vfio_pci_mmap_vma *mmap_vma;



	mutex_lock(&vdev->vma_lock);
@@ -1485,7 +1485,7 @@ static void vfio_pci_mmap_close(struct vm_area_struct *vma) 
static vm_fault_t vfio_pci_mmap_fault(struct vm_fault *vmf)

{

	struct vm_area_struct *vma = vmf->vma;

	struct vfio_pci_device *vdev = vma->vm_private_data;

	struct vfio_pci_core_device *vdev = vma->vm_private_data;

	struct vfio_pci_mmap_vma *mmap_vma;

	vm_fault_t ret = VM_FAULT_NOPAGE;
@@ -1535,8 +1535,8 @@ static const struct vm_operations_struct vfio_pci_mmap_ops = { 


static int vfio_pci_mmap(struct vfio_device *core_vdev, struct vm_area_struct *vma)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);

	struct pci_dev *pdev = vdev->pdev;

	unsigned int index;

	u64 phys_len, req_len, pgoff, req_start;
@@ -1606,8 +1606,8 @@ static int vfio_pci_mmap(struct vfio_device *core_vdev, struct vm_area_struct *v 


static void vfio_pci_request(struct vfio_device *core_vdev, unsigned int count)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);

	struct pci_dev *pdev = vdev->pdev;



	mutex_lock(&vdev->igate);
@@ -1626,7 +1626,7 @@ static void vfio_pci_request(struct vfio_device *core_vdev, unsigned int count) 
	mutex_unlock(&vdev->igate);

}



static int vfio_pci_validate_vf_token(struct vfio_pci_device *vdev,

static int vfio_pci_validate_vf_token(struct vfio_pci_core_device *vdev,

				      bool vf_token, uuid_t *uuid)

{

	/*
@@ -1658,7 +1658,7 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_device *vdev, 
		return 0; /* No VF token provided or required */



	if (vdev->pdev->is_virtfn) {

		struct vfio_pci_device *pf_vdev = get_pf_vdev(vdev);

		struct vfio_pci_core_device *pf_vdev = get_pf_vdev(vdev);

		bool match;



		if (!pf_vdev) {
@@ -1722,8 +1722,8 @@ static int vfio_pci_validate_vf_token(struct vfio_pci_device *vdev, 


static int vfio_pci_match(struct vfio_device *core_vdev, char *buf)

{

	struct vfio_pci_device *vdev =

		container_of(core_vdev, struct vfio_pci_device, vdev);

	struct vfio_pci_core_device *vdev =

		container_of(core_vdev, struct vfio_pci_core_device, vdev);

	bool vf_token = false;

	uuid_t uuid;

	int ret;
@@ -1785,8 +1785,8 @@ static const struct vfio_device_ops vfio_pci_ops = { 
static int vfio_pci_bus_notifier(struct notifier_block *nb,

				 unsigned long action, void *data)

{

	struct vfio_pci_device *vdev = container_of(nb,

						    struct vfio_pci_device, nb);

	struct vfio_pci_core_device *vdev = container_of(nb,

						    struct vfio_pci_core_device, nb);

	struct device *dev = data;

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *physfn = pci_physfn(pdev);
@@ -1810,7 +1810,7 @@ static int vfio_pci_bus_notifier(struct notifier_block *nb, 
	return 0;

}



static int vfio_pci_vf_init(struct vfio_pci_device *vdev)

static int vfio_pci_vf_init(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	int ret;
@@ -1834,7 +1834,7 @@ static int vfio_pci_vf_init(struct vfio_pci_device *vdev) 
	return 0;

}



static void vfio_pci_vf_uninit(struct vfio_pci_device *vdev)

static void vfio_pci_vf_uninit(struct vfio_pci_core_device *vdev)

{

	if (!vdev->vf_token)

		return;
@@ -1845,7 +1845,7 @@ static void vfio_pci_vf_uninit(struct vfio_pci_device *vdev) 
	kfree(vdev->vf_token);

}



static int vfio_pci_vga_init(struct vfio_pci_device *vdev)

static int vfio_pci_vga_init(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;

	int ret;
@@ -1860,7 +1860,7 @@ static int vfio_pci_vga_init(struct vfio_pci_device *vdev) 
	return 0;

}



static void vfio_pci_vga_uninit(struct vfio_pci_device *vdev)

static void vfio_pci_vga_uninit(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *pdev = vdev->pdev;
@@ -1874,7 +1874,7 @@ static void vfio_pci_vga_uninit(struct vfio_pci_device *vdev) 


static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)

{

	struct vfio_pci_device *vdev;

	struct vfio_pci_core_device *vdev;

	struct iommu_group *group;

	int ret;
@@ -1978,7 +1978,7 @@ static int vfio_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) 


static void vfio_pci_remove(struct pci_dev *pdev)

{

	struct vfio_pci_device *vdev = dev_get_drvdata(&pdev->dev);

	struct vfio_pci_core_device *vdev = dev_get_drvdata(&pdev->dev);



	pci_disable_sriov(pdev);
@@ -2002,14 +2002,14 @@ static void vfio_pci_remove(struct pci_dev *pdev) 
static pci_ers_result_t vfio_pci_aer_err_detected(struct pci_dev *pdev,

						  pci_channel_state_t state)

{

	struct vfio_pci_device *vdev;

	struct vfio_pci_core_device *vdev;

	struct vfio_device *device;



	device = vfio_device_get_from_dev(&pdev->dev);

	if (device == NULL)

		return PCI_ERS_RESULT_DISCONNECT;



	vdev = container_of(device, struct vfio_pci_device, vdev);

	vdev = container_of(device, struct vfio_pci_core_device, vdev);



	mutex_lock(&vdev->igate);
@@ -2060,7 +2060,7 @@ static struct pci_driver vfio_pci_driver = { 
	.err_handler		= &vfio_err_handlers,

};



static bool vfio_dev_in_groups(struct vfio_pci_device *vdev,

static bool vfio_dev_in_groups(struct vfio_pci_core_device *vdev,

			       struct vfio_pci_group_info *groups)

{

	unsigned int i;
@@ -2104,7 +2104,8 @@ vfio_pci_dev_set_resettable(struct vfio_device_set *dev_set) 
	 * reset, so any pci_dev will have the same outcomes for

	 * pci_probe_reset_*() and pci_reset_bus().

	 */

	pdev = list_first_entry(&dev_set->device_list, struct vfio_pci_device,

	pdev = list_first_entry(&dev_set->device_list,

				struct vfio_pci_core_device,

				vdev.dev_set_list)->pdev;



	/* pci_reset_bus() is supported */
@@ -2126,16 +2127,17 @@ vfio_pci_dev_set_resettable(struct vfio_device_set *dev_set) 
static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set,

				      struct vfio_pci_group_info *groups)

{

	struct vfio_pci_device *cur_mem;

	struct vfio_pci_device *cur_vma;

	struct vfio_pci_device *cur;

	struct vfio_pci_core_device *cur_mem;

	struct vfio_pci_core_device *cur_vma;

	struct vfio_pci_core_device *cur;

	struct pci_dev *pdev;

	bool is_mem = true;

	int ret;



	mutex_lock(&dev_set->lock);

	cur_mem = list_first_entry(&dev_set->device_list,

				   struct vfio_pci_device, vdev.dev_set_list);

				   struct vfio_pci_core_device,

				   vdev.dev_set_list);



	pdev = vfio_pci_dev_set_resettable(dev_set);

	if (!pdev) {
@@ -2193,7 +2195,7 @@ static int vfio_pci_dev_set_hot_reset(struct vfio_device_set *dev_set, 


static bool vfio_pci_dev_set_needs_reset(struct vfio_device_set *dev_set)

{

	struct vfio_pci_device *cur;

	struct vfio_pci_core_device *cur;

	bool needs_reset = false;



	list_for_each_entry(cur, &dev_set->device_list, vdev.dev_set_list) {
@@ -2215,7 +2217,7 @@ static bool vfio_pci_dev_set_needs_reset(struct vfio_device_set *dev_set) 
 */

static bool vfio_pci_dev_set_try_reset(struct vfio_device_set *dev_set)

{

	struct vfio_pci_device *cur;

	struct vfio_pci_core_device *cur;

	struct pci_dev *pdev;

	int ret;

drivers/vfio/pci/vfio_pci_core.h

+26 −26

File changed.

Preview size limit exceeded, changes collapsed.

drivers/vfio/pci/vfio_pci_igd.c

+9 −8
Original line number Diff line number Diff line
@@ -25,8 +25,9 @@ 
#define OPREGION_RVDS		0x3c2

#define OPREGION_VERSION	0x16



static ssize_t vfio_pci_igd_rw(struct vfio_pci_device *vdev, char __user *buf,

			       size_t count, loff_t *ppos, bool iswrite)

static ssize_t vfio_pci_igd_rw(struct vfio_pci_core_device *vdev,

			       char __user *buf, size_t count, loff_t *ppos,

			       bool iswrite)

{

	unsigned int i = VFIO_PCI_OFFSET_TO_INDEX(*ppos) - VFIO_PCI_NUM_REGIONS;

	void *base = vdev->region[i].data;
@@ -45,7 +46,7 @@ static ssize_t vfio_pci_igd_rw(struct vfio_pci_device *vdev, char __user *buf, 
	return count;

}



static void vfio_pci_igd_release(struct vfio_pci_device *vdev,

static void vfio_pci_igd_release(struct vfio_pci_core_device *vdev,

				 struct vfio_pci_region *region)

{

	memunmap(region->data);
@@ -56,7 +57,7 @@ static const struct vfio_pci_regops vfio_pci_igd_regops = { 
	.release	= vfio_pci_igd_release,

};



static int vfio_pci_igd_opregion_init(struct vfio_pci_device *vdev)

static int vfio_pci_igd_opregion_init(struct vfio_pci_core_device *vdev)

{

	__le32 *dwordp = (__le32 *)(vdev->vconfig + OPREGION_PCI_ADDR);

	u32 addr, size;
@@ -160,7 +161,7 @@ static int vfio_pci_igd_opregion_init(struct vfio_pci_device *vdev) 
	return ret;

}



static ssize_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev,

static ssize_t vfio_pci_igd_cfg_rw(struct vfio_pci_core_device *vdev,

				   char __user *buf, size_t count, loff_t *ppos,

				   bool iswrite)

{
@@ -253,7 +254,7 @@ static ssize_t vfio_pci_igd_cfg_rw(struct vfio_pci_device *vdev, 
	return count;

}



static void vfio_pci_igd_cfg_release(struct vfio_pci_device *vdev,

static void vfio_pci_igd_cfg_release(struct vfio_pci_core_device *vdev,

				     struct vfio_pci_region *region)

{

	struct pci_dev *pdev = region->data;
@@ -266,7 +267,7 @@ static const struct vfio_pci_regops vfio_pci_igd_cfg_regops = { 
	.release	= vfio_pci_igd_cfg_release,

};



static int vfio_pci_igd_cfg_init(struct vfio_pci_device *vdev)

static int vfio_pci_igd_cfg_init(struct vfio_pci_core_device *vdev)

{

	struct pci_dev *host_bridge, *lpc_bridge;

	int ret;
@@ -314,7 +315,7 @@ static int vfio_pci_igd_cfg_init(struct vfio_pci_device *vdev) 
	return 0;

}



int vfio_pci_igd_init(struct vfio_pci_device *vdev)

int vfio_pci_igd_init(struct vfio_pci_core_device *vdev)

{

	int ret;

drivers/vfio/pci/vfio_pci_intrs.c

+20 −20

File changed.

Preview size limit exceeded, changes collapsed.