Subject: linux-next: manual merge of the vfio tree with the drm tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 25 Nov 2025 00:01:51 +1100

Hi all,

Today's linux-next merge of the vfio tree got a conflict in:

  drivers/gpu/drm/i915/gvt/kvmgt.c

between commit:

  69b4d367fff6 ("drm/i915/gvt: Simplify case switch in intel_vgpu_ioctl")

from the drm tree and commits:

  e664067b6035 ("vfio/gvt: Provide a get_region_info op")
  93165757c023 ("vfio/gvt: Convert to get_region_info_caps")

from the vfio tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc drivers/gpu/drm/i915/gvt/kvmgt.c
index bbeba0d3fca8,96d23717684f..000000000000
--- a/drivers/gpu/drm/i915/gvt/kvmgt.c
+++ b/drivers/gpu/drm/i915/gvt/kvmgt.c
@@@ -1141,6 -1140,126 +1141,121 @@@ static int intel_vgpu_set_irqs(struct i
  	return func(vgpu, index, start, count, flags, data);
  }
  
+ static int intel_vgpu_ioctl_get_region_info(struct vfio_device *vfio_dev,
+ 					    struct vfio_region_info *info,
+ 					    struct vfio_info_cap *caps)
+ {
+ 	struct vfio_region_info_cap_sparse_mmap *sparse = NULL;
+ 	struct intel_vgpu *vgpu = vfio_dev_to_vgpu(vfio_dev);
+ 	int nr_areas = 1;
+ 	int cap_type_id;
+ 	unsigned int i;
+ 	int ret;
+ 
+ 	switch (info->index) {
+ 	case VFIO_PCI_CONFIG_REGION_INDEX:
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->size = vgpu->gvt->device_info.cfg_space_size;
+ 		info->flags = VFIO_REGION_INFO_FLAG_READ |
+ 			      VFIO_REGION_INFO_FLAG_WRITE;
+ 		break;
+ 	case VFIO_PCI_BAR0_REGION_INDEX:
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->size = vgpu->cfg_space.bar[info->index].size;
+ 		if (!info->size) {
+ 			info->flags = 0;
+ 			break;
+ 		}
+ 
+ 		info->flags = VFIO_REGION_INFO_FLAG_READ |
+ 			      VFIO_REGION_INFO_FLAG_WRITE;
+ 		break;
+ 	case VFIO_PCI_BAR1_REGION_INDEX:
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->size = 0;
+ 		info->flags = 0;
+ 		break;
+ 	case VFIO_PCI_BAR2_REGION_INDEX:
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->flags = VFIO_REGION_INFO_FLAG_CAPS |
+ 			      VFIO_REGION_INFO_FLAG_MMAP |
+ 			      VFIO_REGION_INFO_FLAG_READ |
+ 			      VFIO_REGION_INFO_FLAG_WRITE;
+ 		info->size = gvt_aperture_sz(vgpu->gvt);
+ 
+ 		sparse = kzalloc(struct_size(sparse, areas, nr_areas),
+ 				 GFP_KERNEL);
+ 		if (!sparse)
+ 			return -ENOMEM;
+ 
+ 		sparse->header.id = VFIO_REGION_INFO_CAP_SPARSE_MMAP;
+ 		sparse->header.version = 1;
+ 		sparse->nr_areas = nr_areas;
+ 		cap_type_id = VFIO_REGION_INFO_CAP_SPARSE_MMAP;
+ 		sparse->areas[0].offset =
+ 			PAGE_ALIGN(vgpu_aperture_offset(vgpu));
+ 		sparse->areas[0].size = vgpu_aperture_sz(vgpu);
+ 		break;
+ 
+ 	case VFIO_PCI_BAR3_REGION_INDEX ... VFIO_PCI_BAR5_REGION_INDEX:
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->size = 0;
+ 		info->flags = 0;
+ 
+ 		gvt_dbg_core("get region info bar:%d\n", info->index);
+ 		break;
+ 
+ 	case VFIO_PCI_ROM_REGION_INDEX:
+ 	case VFIO_PCI_VGA_REGION_INDEX:
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->size = 0;
+ 		info->flags = 0;
+ 
+ 		gvt_dbg_core("get region info index:%d\n", info->index);
+ 		break;
+ 	default: {
+ 		struct vfio_region_info_cap_type cap_type = {
+ 			.header.id = VFIO_REGION_INFO_CAP_TYPE,
+ 			.header.version = 1
+ 		};
+ 
+ 		if (info->index >= VFIO_PCI_NUM_REGIONS + vgpu->num_regions)
+ 			return -EINVAL;
+ 		info->index = array_index_nospec(
+ 			info->index, VFIO_PCI_NUM_REGIONS + vgpu->num_regions);
+ 
+ 		i = info->index - VFIO_PCI_NUM_REGIONS;
+ 
+ 		info->offset = VFIO_PCI_INDEX_TO_OFFSET(info->index);
+ 		info->size = vgpu->region[i].size;
+ 		info->flags = vgpu->region[i].flags;
+ 
+ 		cap_type.type = vgpu->region[i].type;
+ 		cap_type.subtype = vgpu->region[i].subtype;
+ 
+ 		ret = vfio_info_add_capability(caps, &cap_type.header,
+ 					       sizeof(cap_type));
+ 		if (ret)
+ 			return ret;
+ 	}
+ 	}
+ 
+ 	if ((info->flags & VFIO_REGION_INFO_FLAG_CAPS) && sparse) {
 -		switch (cap_type_id) {
 -		case VFIO_REGION_INFO_CAP_SPARSE_MMAP:
++		ret = -EINVAL;
++		if (cap_type_id == VFIO_REGION_INFO_CAP_SPARSE_MMAP)
+ 			ret = vfio_info_add_capability(
+ 				caps, &sparse->header,
+ 				struct_size(sparse, areas, sparse->nr_areas));
 -			if (ret) {
 -				kfree(sparse);
 -				return ret;
 -			}
 -			break;
 -		default:
++		if (ret) {
+ 			kfree(sparse);
 -			return -EINVAL;
++			return ret;
+ 		}
+ 	}
+ 
+ 	kfree(sparse);
+ 	return 0;
+ }
+ 
  static long intel_vgpu_ioctl(struct vfio_device *vfio_dev, unsigned int cmd,
  			     unsigned long arg)
  {