dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

KVM: Device Assignment: Map mmio pages into VT-d page table 

Assigned device could DMA to mmio pages, so also need to map mmio pages
into VT-d page table.

Signed-off-by: Weidong Han <weidong.han@intel.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Weidong Han 2008-09-25 23:32:02 +08:00 committed by Avi Kivity
parent e48258009d
commit e5fcfc821a
3 changed files with 12 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arch/x86/kvm/vtd.c
View File

@ -36,37 +36,30 @@ int kvm_iommu_map_pages(struct kvm *kvm,
{
gfn_t gfn = base_gfn;
pfn_t pfn;
int i, r;
int i, r = 0;
struct dmar_domain *domain = kvm->arch.intel_iommu_domain;
/* check if iommu exists and in use */
if (!domain)
return 0;
r = -EINVAL;
for (i = 0; i < npages; i++) {
/* check if already mapped */
pfn = (pfn_t)intel_iommu_iova_to_pfn(domain,
gfn_to_gpa(gfn));
if (pfn && !is_mmio_pfn(pfn))
if (pfn)
continue;
pfn = gfn_to_pfn(kvm, gfn);
if (!is_mmio_pfn(pfn)) {
r = intel_iommu_page_mapping(domain,
gfn_to_gpa(gfn),
pfn_to_hpa(pfn),
PAGE_SIZE,
DMA_PTE_READ |
DMA_PTE_WRITE);
if (r) {
printk(KERN_DEBUG "kvm_iommu_map_pages:"
"iommu failed to map pfn=%lx\n", pfn);
goto unmap_pages;
}
} else {
printk(KERN_DEBUG "kvm_iommu_map_page:"
"invalid pfn=%lx\n", pfn);
r = intel_iommu_page_mapping(domain,
gfn_to_gpa(gfn),
pfn_to_hpa(pfn),
PAGE_SIZE,
DMA_PTE_READ |
DMA_PTE_WRITE);
if (r) {
printk(KERN_ERR "kvm_iommu_map_pages:"
"iommu failed to map pfn=%lx\n", pfn);
goto unmap_pages;
}
gfn++;

2
include/asm-x86/kvm_host.h
View File

@ -502,8 +502,6 @@ int emulator_write_phys(struct kvm_vcpu *vcpu, gpa_t gpa,
int kvm_pv_mmu_op(struct kvm_vcpu *vcpu, unsigned long bytes,
gpa_t addr, unsigned long *ret);
int is_mmio_pfn(pfn_t pfn);
extern bool tdp_enabled;
enum emulation_result {

2
virt/kvm/kvm_main.c
View File

@ -76,7 +76,7 @@ static inline int valid_vcpu(int n)
return likely(n >= 0 && n < KVM_MAX_VCPUS);
}
inline int is_mmio_pfn(pfn_t pfn)
static inline int is_mmio_pfn(pfn_t pfn)
{
if (pfn_valid(pfn))
return PageReserved(pfn_to_page(pfn));