@@ -184,6 +184,8 @@ struct kvmppc_spapr_tce_table {
u32 page_shift;
u64 offset; /* in pages */
u64 size; /* in pages */
+ struct iommu_table *tbl;
+ struct iommu_group *refgrp;/* reference counting only */
struct page *pages[0];
};
@@ -129,6 +129,11 @@ extern int kvmppc_spapr_tce_init(struct kvm_vcpu *vcpu);
extern void kvmppc_spapr_tce_free(struct kvm_vcpu *vcpu);
extern void kvmppc_iommu_hugepages_init(struct kvm_arch *ka);
extern void kvmppc_iommu_hugepages_cleanup(struct kvm_arch *ka);
+struct iommu_group;
+extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm,
+ unsigned long liobn,
+ phys_addr_t start_addr,
+ struct iommu_group *grp);
extern long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,
struct kvm_create_spapr_tce_64 *args);
extern struct kvmppc_spapr_tce_table *kvmppc_find_tce_table(
@@ -28,6 +28,7 @@
#include <linux/hugetlb.h>
#include <linux/list.h>
#include <linux/anon_inodes.h>
+#include <linux/iommu.h>
#include <asm/tlbflush.h>
#include <asm/kvm_ppc.h>
@@ -205,6 +206,10 @@ static void release_spapr_tce_table(struct kvmppc_spapr_tce_table *stt)
mutex_lock(&kvm->lock);
list_del(&stt->list);
+
+ if (stt->refgrp)
+ iommu_group_put(stt->refgrp);
+
for (i = 0; i < npages; i++)
__free_page(stt->pages[i]);
@@ -253,6 +258,29 @@ static const struct file_operations kvm_spapr_tce_fops = {
.release = kvm_spapr_tce_release,
};
+extern long kvm_spapr_tce_attach_iommu_group(struct kvm *kvm,
+ unsigned long liobn,
+ phys_addr_t start_addr,
+ struct iommu_group *grp)
+{
+ struct kvmppc_spapr_tce_table *stt = NULL;
+
+ /* Check this LIOBN hasn't been previously allocated */
+ list_for_each_entry(stt, &kvm->arch.spapr_tce_tables, list) {
+ if (stt->liobn == liobn) {
+ struct spapr_tce_iommu_group *data;
+
+ data = iommu_group_get_iommudata(grp);
+ BUG_ON(!data);
+ stt->tbl = data->ops->get_table(data, start_addr);
+ stt->refgrp = grp;
+ return 0;
+ }
+ }
+
+ return -ENODEV;
+}
+
long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,
struct kvm_create_spapr_tce_64 *args)
{
The existing in-kernel TCE table for emulated devices contains guest physical addresses which are accesses by emulated devices. Since we need to keep this information for VFIO devices too in order to implement H_GET_TCE, we are reusing it. This adds iommu_group* and iommu_table* pointers to kvmppc_spapr_tce_table. This adds kvm_spapr_tce_attach_iommu_group() helper to initialize the pointers. This puts the group when guest copy of TCE table is destroyed which happens when TCE table fd is closed. Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- arch/powerpc/include/asm/kvm_host.h | 2 ++ arch/powerpc/include/asm/kvm_ppc.h | 5 +++++ arch/powerpc/kvm/book3s_64_vio.c | 28 ++++++++++++++++++++++++++++ 3 files changed, 35 insertions(+)