[Xen-changelog] Fix region0 virtual accesses

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID d7bcc7bbf981ea4c4532a3b821362bc0aa96488a
# Parent  2f98977d9f85467df850d96dcdb11ef8762b1313
Fix region0 virtual accesses
Signed-off by: Dan Magenheimer <dan.magenheimer@xxxxxx>

diff -r 2f98977d9f85 -r d7bcc7bbf981 xen/arch/ia64/xen/regionreg.c
--- a/xen/arch/ia64/xen/regionreg.c     Thu Nov 10 21:24:29 2005
+++ b/xen/arch/ia64/xen/regionreg.c     Fri Nov 11 18:51:08 2005
@@ -188,12 +188,6 @@
 {
        ia64_set_rr(rr, vmMangleRID(rrval));
        ia64_srlz_d();
-}
-
-unsigned long
-get_rr(unsigned long rr)
-{
-       return vmUnmangleRID(ia64_get_rr(rr));
 }
 
 static inline int validate_page_size(unsigned long ps)
diff -r 2f98977d9f85 -r d7bcc7bbf981 xen/arch/ia64/xen/vcpu.c
--- a/xen/arch/ia64/xen/vcpu.c  Thu Nov 10 21:24:29 2005
+++ b/xen/arch/ia64/xen/vcpu.c  Fri Nov 11 18:51:08 2005
@@ -1256,7 +1256,6 @@
        UINT64 Mask = (1L << pta_sz) - 1;
        UINT64 Mask_60_15 = (Mask >> 15) & 0x3fffffffffff;
        UINT64 compMask_60_15 = ~Mask_60_15;
-       //UINT64 rr_ps = RR_TO_PS(get_rr(vadr));
        UINT64 rr_ps = vcpu_get_rr_ps(vcpu,vadr);
        UINT64 VHPT_offset = (vadr >> rr_ps) << 3;
        UINT64 VHPT_addr1 = vadr & 0xe000000000000000L;
@@ -1287,26 +1286,36 @@
 unsigned long recover_to_page_fault_count = 0;
 unsigned long recover_to_break_fault_count = 0;
 
+int warn_region0_address = 0; // FIXME later: tie to a boot parameter?
+
 IA64FAULT vcpu_translate(VCPU *vcpu, UINT64 address, BOOLEAN is_data, UINT64 
*pteval, UINT64 *itir, UINT64 *iha)
 {
        unsigned long pta, pte, rid, rr;
        int i;
        TR_ENTRY *trp;
 
-       if (!(address >> 61)) {
-               if (!PSCB(vcpu,metaphysical_mode)) {
-                       REGS *regs = vcpu_regs(vcpu);
-                       unsigned long viip = PSCB(vcpu,iip);
-                       unsigned long vipsr = PSCB(vcpu,ipsr);
-                       unsigned long iip = regs->cr_iip;
-                       unsigned long ipsr = regs->cr_ipsr;
-                       printk("vcpu_translate: bad address %p, viip=%p, 
vipsr=%p, iip=%p, ipsr=%p continuing\n", address, viip, vipsr, iip, ipsr);
+       if (PSCB(vcpu,metaphysical_mode)) {
+               unsigned long region = address >> 61;
+               // dom0 may generate an uncacheable physical address (msb=1)
+               if (region && ((region != 4) || (vcpu->domain != dom0))) {
+// FIXME: This seems to happen even though it shouldn't.  Need to track
+// this down, but since it has been apparently harmless, just flag it for now
+//                     panic_domain(vcpu_regs(vcpu),
+                       printk(
+                        "vcpu_translate: bad physical address: %p\n",address);
                }
-
                *pteval = (address & _PAGE_PPN_MASK) | __DIRTY_BITS | 
_PAGE_PL_2 | _PAGE_AR_RWX;
                *itir = PAGE_SHIFT << 2;
                phys_translate_count++;
                return IA64_NO_FAULT;
+       }
+       else if (!(address >> 61) && warn_region0_address) {
+               REGS *regs = vcpu_regs(vcpu);
+               unsigned long viip = PSCB(vcpu,iip);
+               unsigned long vipsr = PSCB(vcpu,ipsr);
+               unsigned long iip = regs->cr_iip;
+               unsigned long ipsr = regs->cr_ipsr;
+               printk("vcpu_translate: bad address %p, viip=%p, vipsr=%p, 
iip=%p, ipsr=%p continuing\n", address, viip, vipsr, iip, ipsr);
        }
 
        rr = PSCB(vcpu,rrs)[address>>61];
@@ -1685,7 +1694,7 @@
        UINT64 ps;
 
        trp->itir = itir;
-       trp->rid = virtualize_rid(current, get_rr(ifa) & RR_RID_MASK);
+       trp->rid = VCPU(current,rrs[ifa>>61]) & RR_RID_MASK;
        trp->p = 1;
        ps = trp->ps;
        trp->page_flags = pte;
@@ -1760,7 +1769,8 @@
        // PAGE_SIZE mapping in the vhpt for now, else purging is complicated
        else vhpt_insert(vaddr,pte,PAGE_SHIFT<<2);
 #endif
-       if ((mp_pte == -1UL) || (IorD & 0x4)) return;  // don't place in 
1-entry TLB
+       if ((mp_pte == -1UL) || (IorD & 0x4)) // don't place in 1-entry TLB
+               return;
        if (IorD & 0x1) {
                vcpu_set_tr_entry(&PSCBX(vcpu,itlb),pte,ps<<2,vaddr);
                PSCBX(vcpu,itlb_pte) = mp_pte;
@@ -1775,6 +1785,7 @@
 {
        unsigned long pteval, logps = (itir >> 2) & 0x3f;
        unsigned long translate_domain_pte(UINT64,UINT64,UINT64);
+       BOOLEAN swap_rr0 = (!(ifa>>61) && PSCB(vcpu,metaphysical_mode));
 
        if (logps < PAGE_SHIFT) {
                printf("vcpu_itc_d: domain trying to use smaller page size!\n");
@@ -1784,7 +1795,9 @@
        //itir = (itir & ~0xfc) | (PAGE_SHIFT<<2); // ignore domain's pagesize
        pteval = translate_domain_pte(pte,ifa,itir);
        if (!pteval) return IA64_ILLOP_FAULT;
+       if (swap_rr0) set_one_rr(0x0,PSCB(vcpu,rrs[0]));
        vcpu_itc_no_srlz(vcpu,2,ifa,pteval,pte,logps);
+       if (swap_rr0) set_metaphysical_rr0();
        return IA64_NO_FAULT;
 }
 
@@ -1792,6 +1805,7 @@
 {
        unsigned long pteval, logps = (itir >> 2) & 0x3f;
        unsigned long translate_domain_pte(UINT64,UINT64,UINT64);
+       BOOLEAN swap_rr0 = (!(ifa>>61) && PSCB(vcpu,metaphysical_mode));
 
        // FIXME: validate ifa here (not in Xen space), COULD MACHINE CHECK!
        if (logps < PAGE_SHIFT) {
@@ -1803,7 +1817,9 @@
        pteval = translate_domain_pte(pte,ifa,itir);
        // FIXME: what to do if bad physical address? (machine check?)
        if (!pteval) return IA64_ILLOP_FAULT;
+       if (swap_rr0) set_one_rr(0x0,PSCB(vcpu,rrs[0]));
        vcpu_itc_no_srlz(vcpu, 1,ifa,pteval,pte,logps);
+       if (swap_rr0) set_metaphysical_rr0();
        return IA64_NO_FAULT;
 }
 

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