mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-04 16:23:55 -06:00
vfio/container: pass MemoryRegion to DMA operations
Pass through the MemoryRegion to DMA operation handlers of vfio containers. The vfio-user container will need this later, to translate the vaddr into an offset for the dma map vfio-user message; CPR will also will need this. Originally-by: John Johnson <john.g.johnson@oracle.com> Signed-off-by: Jagannathan Raman <jag.raman@oracle.com> Signed-off-by: Elena Ufimtseva <elena.ufimtseva@oracle.com> Signed-off-by: John Levon <john.levon@nutanix.com> Reviewed-by: Cédric Le Goater <clg@redhat.com> Reviewed-by: Steve Sistare <steven.sistare@oracle.com> Link: https://lore.kernel.org/qemu-devel/20250521215534.2688540-1-john.levon@nutanix.com Signed-off-by: Cédric Le Goater <clg@redhat.com>
This commit is contained in:
parent
e3353d63e1
commit
44d0acf834
5 changed files with 14 additions and 11 deletions
|
@ -75,12 +75,12 @@ void vfio_address_space_insert(VFIOAddressSpace *space,
|
||||||
|
|
||||||
int vfio_container_dma_map(VFIOContainerBase *bcontainer,
|
int vfio_container_dma_map(VFIOContainerBase *bcontainer,
|
||||||
hwaddr iova, ram_addr_t size,
|
hwaddr iova, ram_addr_t size,
|
||||||
void *vaddr, bool readonly)
|
void *vaddr, bool readonly, MemoryRegion *mr)
|
||||||
{
|
{
|
||||||
VFIOIOMMUClass *vioc = VFIO_IOMMU_GET_CLASS(bcontainer);
|
VFIOIOMMUClass *vioc = VFIO_IOMMU_GET_CLASS(bcontainer);
|
||||||
|
|
||||||
g_assert(vioc->dma_map);
|
g_assert(vioc->dma_map);
|
||||||
return vioc->dma_map(bcontainer, iova, size, vaddr, readonly);
|
return vioc->dma_map(bcontainer, iova, size, vaddr, readonly, mr);
|
||||||
}
|
}
|
||||||
|
|
||||||
int vfio_container_dma_unmap(VFIOContainerBase *bcontainer,
|
int vfio_container_dma_unmap(VFIOContainerBase *bcontainer,
|
||||||
|
|
|
@ -207,7 +207,8 @@ static int vfio_legacy_dma_unmap(const VFIOContainerBase *bcontainer,
|
||||||
}
|
}
|
||||||
|
|
||||||
static int vfio_legacy_dma_map(const VFIOContainerBase *bcontainer, hwaddr iova,
|
static int vfio_legacy_dma_map(const VFIOContainerBase *bcontainer, hwaddr iova,
|
||||||
ram_addr_t size, void *vaddr, bool readonly)
|
ram_addr_t size, void *vaddr, bool readonly,
|
||||||
|
MemoryRegion *mr)
|
||||||
{
|
{
|
||||||
const VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
const VFIOContainer *container = container_of(bcontainer, VFIOContainer,
|
||||||
bcontainer);
|
bcontainer);
|
||||||
|
|
|
@ -34,7 +34,8 @@
|
||||||
TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio"
|
TYPE_HOST_IOMMU_DEVICE_IOMMUFD "-vfio"
|
||||||
|
|
||||||
static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
|
static int iommufd_cdev_map(const VFIOContainerBase *bcontainer, hwaddr iova,
|
||||||
ram_addr_t size, void *vaddr, bool readonly)
|
ram_addr_t size, void *vaddr, bool readonly,
|
||||||
|
MemoryRegion *mr)
|
||||||
{
|
{
|
||||||
const VFIOIOMMUFDContainer *container =
|
const VFIOIOMMUFDContainer *container =
|
||||||
container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
|
container_of(bcontainer, VFIOIOMMUFDContainer, bcontainer);
|
||||||
|
|
|
@ -170,7 +170,7 @@ static void vfio_iommu_map_notify(IOMMUNotifier *n, IOMMUTLBEntry *iotlb)
|
||||||
*/
|
*/
|
||||||
ret = vfio_container_dma_map(bcontainer, iova,
|
ret = vfio_container_dma_map(bcontainer, iova,
|
||||||
iotlb->addr_mask + 1, vaddr,
|
iotlb->addr_mask + 1, vaddr,
|
||||||
read_only);
|
read_only, mr);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
error_report("vfio_container_dma_map(%p, 0x%"HWADDR_PRIx", "
|
error_report("vfio_container_dma_map(%p, 0x%"HWADDR_PRIx", "
|
||||||
"0x%"HWADDR_PRIx", %p) = %d (%s)",
|
"0x%"HWADDR_PRIx", %p) = %d (%s)",
|
||||||
|
@ -240,7 +240,7 @@ static int vfio_ram_discard_notify_populate(RamDiscardListener *rdl,
|
||||||
vaddr = memory_region_get_ram_ptr(section->mr) + start;
|
vaddr = memory_region_get_ram_ptr(section->mr) + start;
|
||||||
|
|
||||||
ret = vfio_container_dma_map(bcontainer, iova, next - start,
|
ret = vfio_container_dma_map(bcontainer, iova, next - start,
|
||||||
vaddr, section->readonly);
|
vaddr, section->readonly, section->mr);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
/* Rollback */
|
/* Rollback */
|
||||||
vfio_ram_discard_notify_discard(rdl, section);
|
vfio_ram_discard_notify_discard(rdl, section);
|
||||||
|
@ -564,7 +564,7 @@ static void vfio_listener_region_add(MemoryListener *listener,
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = vfio_container_dma_map(bcontainer, iova, int128_get64(llsize),
|
ret = vfio_container_dma_map(bcontainer, iova, int128_get64(llsize),
|
||||||
vaddr, section->readonly);
|
vaddr, section->readonly, section->mr);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
error_setg(&err, "vfio_container_dma_map(%p, 0x%"HWADDR_PRIx", "
|
error_setg(&err, "vfio_container_dma_map(%p, 0x%"HWADDR_PRIx", "
|
||||||
"0x%"HWADDR_PRIx", %p) = %d (%s)",
|
"0x%"HWADDR_PRIx", %p) = %d (%s)",
|
||||||
|
|
|
@ -78,7 +78,7 @@ void vfio_address_space_insert(VFIOAddressSpace *space,
|
||||||
|
|
||||||
int vfio_container_dma_map(VFIOContainerBase *bcontainer,
|
int vfio_container_dma_map(VFIOContainerBase *bcontainer,
|
||||||
hwaddr iova, ram_addr_t size,
|
hwaddr iova, ram_addr_t size,
|
||||||
void *vaddr, bool readonly);
|
void *vaddr, bool readonly, MemoryRegion *mr);
|
||||||
int vfio_container_dma_unmap(VFIOContainerBase *bcontainer,
|
int vfio_container_dma_unmap(VFIOContainerBase *bcontainer,
|
||||||
hwaddr iova, ram_addr_t size,
|
hwaddr iova, ram_addr_t size,
|
||||||
IOMMUTLBEntry *iotlb, bool unmap_all);
|
IOMMUTLBEntry *iotlb, bool unmap_all);
|
||||||
|
@ -151,20 +151,21 @@ struct VFIOIOMMUClass {
|
||||||
/**
|
/**
|
||||||
* @dma_map
|
* @dma_map
|
||||||
*
|
*
|
||||||
* Map an address range into the container.
|
* Map an address range into the container. Note that the memory region is
|
||||||
|
* referenced within an RCU read lock region across this call.
|
||||||
*
|
*
|
||||||
* @bcontainer: #VFIOContainerBase to use
|
* @bcontainer: #VFIOContainerBase to use
|
||||||
* @iova: start address to map
|
* @iova: start address to map
|
||||||
* @size: size of the range to map
|
* @size: size of the range to map
|
||||||
* @vaddr: process virtual address of mapping
|
* @vaddr: process virtual address of mapping
|
||||||
* @readonly: true if mapping should be readonly
|
* @readonly: true if mapping should be readonly
|
||||||
|
* @mr: the memory region for this mapping
|
||||||
*
|
*
|
||||||
* Returns 0 to indicate success and -errno otherwise.
|
* Returns 0 to indicate success and -errno otherwise.
|
||||||
*/
|
*/
|
||||||
int (*dma_map)(const VFIOContainerBase *bcontainer,
|
int (*dma_map)(const VFIOContainerBase *bcontainer,
|
||||||
hwaddr iova, ram_addr_t size,
|
hwaddr iova, ram_addr_t size,
|
||||||
void *vaddr, bool readonly);
|
void *vaddr, bool readonly, MemoryRegion *mr);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @dma_unmap
|
* @dma_unmap
|
||||||
*
|
*
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue