[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/11] vfio/spapr: Use iommu memory region's get_attr
From: |
Alex Williamson |
Subject: |
[Qemu-devel] [PULL 02/11] vfio/spapr: Use iommu memory region's get_attr() |
Date: |
Tue, 06 Feb 2018 11:43:03 -0700 |
User-agent: |
StGit/0.18-102-gdf9f |
From: Alexey Kardashevskiy <address@hidden>
In order to enable TCE operations support in KVM, we have to inform
the KVM about VFIO groups being attached to specific LIOBNs. The KVM
already knows about VFIO groups, the only bit missing is which
in-kernel TCE table (the one with user visible TCEs) should update
the attached broups. There is an KVM_DEV_VFIO_GROUP_SET_SPAPR_TCE
attribute of the VFIO KVM device which receives a groupfd/tablefd couple.
This uses a new memory_region_iommu_get_attr() helper to get the IOMMU fd
and calls KVM to establish the link.
As get_attr() is not implemented yet, this should cause no behavioural
change.
Signed-off-by: Alexey Kardashevskiy <address@hidden>
Acked-by: Paolo Bonzini <address@hidden>
Acked-by: David Gibson <address@hidden>
Signed-off-by: Alex Williamson <address@hidden>
---
hw/vfio/common.c | 27 +++++++++++++++++++++++++++
hw/vfio/trace-events | 1 +
2 files changed, 28 insertions(+)
diff --git a/hw/vfio/common.c b/hw/vfio/common.c
index b77be3a8b36b..ec41f93b7479 100644
--- a/hw/vfio/common.c
+++ b/hw/vfio/common.c
@@ -457,6 +457,33 @@ static void vfio_listener_region_add(MemoryListener
*listener,
vfio_host_win_add(container, section->offset_within_address_space,
section->offset_within_address_space +
int128_get64(section->size) - 1, pgsize);
+#ifdef CONFIG_KVM
+ if (kvm_enabled()) {
+ VFIOGroup *group;
+ IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);
+ struct kvm_vfio_spapr_tce param;
+ struct kvm_device_attr attr = {
+ .group = KVM_DEV_VFIO_GROUP,
+ .attr = KVM_DEV_VFIO_GROUP_SET_SPAPR_TCE,
+ .addr = (uint64_t)(unsigned long)¶m,
+ };
+
+ if (!memory_region_iommu_get_attr(iommu_mr,
IOMMU_ATTR_SPAPR_TCE_FD,
+ ¶m.tablefd)) {
+ QLIST_FOREACH(group, &container->group_list, container_next) {
+ param.groupfd = group->fd;
+ if (ioctl(vfio_kvm_device_fd, KVM_SET_DEVICE_ATTR, &attr))
{
+ error_report("vfio: failed to setup fd %d "
+ "for a group with fd %d: %s",
+ param.tablefd, param.groupfd,
+ strerror(errno));
+ return;
+ }
+ trace_vfio_spapr_group_attach(param.groupfd,
param.tablefd);
+ }
+ }
+ }
+#endif
}
hostwin_found = false;
diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
index fae096c0724f..3d34fe8a93f1 100644
--- a/hw/vfio/trace-events
+++ b/hw/vfio/trace-events
@@ -123,3 +123,4 @@ vfio_prereg_register(uint64_t va, uint64_t size, int ret)
"va=0x%"PRIx64" size=0
vfio_prereg_unregister(uint64_t va, uint64_t size, int ret) "va=0x%"PRIx64"
size=0x%"PRIx64" ret=%d"
vfio_spapr_create_window(int ps, uint64_t ws, uint64_t off) "pageshift=0x%x
winsize=0x%"PRIx64" offset=0x%"PRIx64
vfio_spapr_remove_window(uint64_t off) "offset=0x%"PRIx64
+vfio_spapr_group_attach(int groupfd, int tablefd) "Attached groupfd %d to
liobn fd %d"
- [Qemu-devel] [PULL 00/11] VFIO updates 2018-02-06, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 01/11] memory/iommu: Add get_attr(), Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 02/11] vfio/spapr: Use iommu memory region's get_attr(),
Alex Williamson <=
- [Qemu-devel] [PULL 03/11] spapr/iommu: Enable in-kernel TCE acceleration via VFIO KVM device, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 04/11] vfio/pci: Fixup VFIOMSIXInfo comment, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 05/11] vfio/pci: Add base BAR MemoryRegion, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 06/11] vfio/pci: Emulate BARs, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 07/11] qapi: Create DEFINE_PROP_OFF_AUTO_PCIBAR, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 08/11] vfio/pci: Allow relocating MSI-X MMIO, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 09/11] hw/vfio/platform: Init the interrupt mutex, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 10/11] vfio/common: Remove redundant copy of local variable, Alex Williamson, 2018/02/06
- [Qemu-devel] [PULL 11/11] vfio/pci: Add option to disable GeForce quirks, Alex Williamson, 2018/02/06
- Re: [Qemu-devel] [PULL 00/11] VFIO updates 2018-02-06, Peter Maydell, 2018/02/07