[Xen-changelog] [xen-3.2-testing] vt-d: for 32-bit Xen, we disable VT-d table output on DMA page faults.

["Xen patchbot-3.2-testing" <patchbot-3.2-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1216991016 -3600
# Node ID d51dae1c04881e97e79d2939d6295d0d544bcaff
# Parent  9ed6fe0070cef54b7214177aebd758eb5dd7f287
vt-d: for 32-bit Xen, we disable VT-d table output on DMA page faults.

This changeset is back-ported from xen-unstable.
The original description of the changeset is:

vt-d: Disable VT-d table output on DMA page faults

Printing VT-d tables requires map_domain_page() which can not be
called from interrupt context (on x86_32).

Signed-off-by: Espen Skoglund <espen.skoglund@xxxxxxxxxxxxx>
xen-unstable changeset: 18066:cec304746b360d0fccb2ab3944787bfb912902cb
xen-unstable date: Wed Jul 16 11:15:14 2008 +0100

Considering Xen 3.2, for 32-bit Xen, maddr_to_virt() can not be used
in print_vtd_entries() since the pages (except the pgd) are allocated
from domheap.

Signed-off-by: Dexuan Cui <dexuan.cui@xxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vtd/intel-iommu.c |    5 +++++
 1 files changed, 5 insertions(+)

diff -r 9ed6fe0070ce -r d51dae1c0488 xen/arch/x86/hvm/vmx/vtd/intel-iommu.c
--- a/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c    Fri Jul 18 11:30:29 2008 +0100
+++ b/xen/arch/x86/hvm/vmx/vtd/intel-iommu.c    Fri Jul 25 14:03:36 2008 +0100
@@ -758,8 +758,13 @@ static int iommu_page_fault_do_one(struc
             (source_id >> 8), PCI_SLOT(source_id & 0xFF),
             PCI_FUNC(source_id & 0xFF), addr, fault_reason);
 
+ /* For 32-bit Xen, maddr_to_virt() can not be used in print_vtd_entries()
+  * since the pages (except the pgd) are allocated from domheap.
+  */
+#ifndef __i386__
     print_vtd_entries(current->domain, (source_id >> 8),(source_id & 0xff),
                       (addr >> PAGE_SHIFT)); 
+#endif
     return 0;
 }
 

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog