Re: PAE xen + linux kernel boots ...

[Scott Parish <srparish@us.ibm.com>]

[-- Attachment #1: Type: text/plain, Size: 718 bytes --]

On Mon, May 02, 2005 at 04:03:05PM +0200, Gerd Knorr wrote:

> > That didn't quite do the trick, but killing the machine_to_physical()
> > conversion in pte_val() got things working.
> 
> That looks like hiding a bug somewhere else.  All the p??_val()
> functions have a separate _ma() version which doesn't do the machine
> to physical translation, so I'd suspect that happening due to some
> place in the code using the wrong version of the macro, not due to
> the macro itself being broken ...

I'm pretty sure that set_pte_atomic() should be calling the _ma version
of pte_val; compare and note that set_pte() is doing no machine_to_phys().

sRp

Signed-off-by: Scott Parish <srparish@us.ibm.com>

-- 
Scott Parish

[-- Attachment #2: set-pte-atomic.diff --]
[-- Type: text/plain, Size: 1046 bytes --]

* looking for pae@localhost/linux--pae--1.0--patch-2 to compare with
* comparing to pae@localhost/linux--pae--1.0--patch-2
M  include/asm-xen/asm-i386/page.h
M  include/asm-xen/asm-i386/pgtable-3level.h

* modified files

--- orig/include/asm-xen/asm-i386/page.h
+++ mod/include/asm-xen/asm-i386/page.h
@@ -116,7 +116,10 @@
 	if (ret) ret = machine_to_phys(ret) | 1;
 	return ret;
 }
-#define pte_val_ma(v) ((v).pte_low) /* FIXME */
+static inline unsigned long long pte_val_ma(pte_t x)
+{
+	return (unsigned long long)x.pte_high << 32 | x.pte_low;
+}
 #define HPAGE_SHIFT	21
 #else
 typedef struct { unsigned long pte_low; } pte_t;


--- orig/include/asm-xen/asm-i386/pgtable-3level.h
+++ mod/include/asm-xen/asm-i386/pgtable-3level.h
@@ -60,7 +60,7 @@
 	ptep->pte_low = pte.pte_low;
 }
 # define set_pte_atomic(pteptr,pteval) \
-		set_64bit((unsigned long long *)(pteptr),pte_val(pteval))
+		set_64bit((unsigned long long *)(pteptr),pte_val_ma(pteval))
 #else
 # define set_pte(pteptr,pteval)				\
 		xen_l1_entry_update((pteptr), (pteval))




[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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