Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 3ad26d8139a82b0510b1e0435ee82ae461d33401

Authored by Marcelo Tosatti
1 parent 506f0d6f9c
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

KVM: use gfn_to_pfn_memslot in kvm_iommu_map_pages 

So its possible to iommu map a memslot before making it visible to
kvm.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Showing 3 changed files with 8 additions and 10 deletions Side-by-side Diff

include/linux/kvm_host.h
Diff comments   View file @ 3ad26d8
... ... @@ -440,8 +440,7 @@
440 440 #define KVM_IOMMU_CACHE_COHERENCY 0x1
441 441  
442 442 #ifdef CONFIG_IOMMU_API
443   -int kvm_iommu_map_pages(struct kvm *kvm, gfn_t base_gfn,
444   - unsigned long npages);
  443 +int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot);
445 444 int kvm_iommu_map_guest(struct kvm *kvm);
446 445 int kvm_iommu_unmap_guest(struct kvm *kvm);
447 446 int kvm_assign_device(struct kvm *kvm,
... ... @@ -32,10 +32,10 @@
32 32 static void kvm_iommu_put_pages(struct kvm *kvm,
33 33 gfn_t base_gfn, unsigned long npages);
34 34  
35   -int kvm_iommu_map_pages(struct kvm *kvm,
36   - gfn_t base_gfn, unsigned long npages)
  35 +int kvm_iommu_map_pages(struct kvm *kvm, struct kvm_memory_slot *slot)
37 36 {
38   - gfn_t gfn = base_gfn;
  37 + gfn_t gfn = slot->base_gfn;
  38 + unsigned long npages = slot->npages;
39 39 pfn_t pfn;
40 40 int i, r = 0;
41 41 struct iommu_domain *domain = kvm->arch.iommu_domain;
... ... @@ -54,7 +54,7 @@
54 54 if (iommu_iova_to_phys(domain, gfn_to_gpa(gfn)))
55 55 continue;
56 56  
57   - pfn = gfn_to_pfn(kvm, gfn);
  57 + pfn = gfn_to_pfn_memslot(kvm, slot, gfn);
58 58 r = iommu_map_range(domain,
59 59 gfn_to_gpa(gfn),
60 60 pfn_to_hpa(pfn),
... ... @@ -69,7 +69,7 @@
69 69 return 0;
70 70  
71 71 unmap_pages:
72   - kvm_iommu_put_pages(kvm, base_gfn, i);
  72 + kvm_iommu_put_pages(kvm, slot->base_gfn, i);
73 73 return r;
74 74 }
75 75  
... ... @@ -81,8 +81,7 @@
81 81 slots = kvm->memslots;
82 82  
83 83 for (i = 0; i < slots->nmemslots; i++) {
84   - r = kvm_iommu_map_pages(kvm, slots->memslots[i].base_gfn,
85   - slots->memslots[i].npages);
  84 + r = kvm_iommu_map_pages(kvm, &slots->memslots[i]);
86 85 if (r)
87 86 break;
88 87 }
... ... @@ -684,7 +684,7 @@
684 684 spin_unlock(&kvm->mmu_lock);
685 685 #ifdef CONFIG_DMAR
686 686 /* map the pages in iommu page table */
687   - r = kvm_iommu_map_pages(kvm, base_gfn, npages);
  687 + r = kvm_iommu_map_pages(kvm, memslot);
688 688 if (r)
689 689 goto out;
690 690 #endif