Attachment 288781 Details for Bug 294811 – xen-unstable 12402:ade94aa072c5 ported to 2.6.18-53.el5

[patch] xen-unstable 12402:ade94aa072c5 ported to 2.6.18-53.el5

xen-unstable-12402-ade94aa072c5 (text/plain), 6.51 KB, created by Ian Campbell on 2007-12-14 09:09:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2007-12-14 09:09:35 UTC

Size: 6.51 KB

patch

obsolete

># HG changeset patch
># User kfraser@localhost.localdomain
># Node ID ade94aa072c51e7b0834405569436ab1eb334d9a
># Parent  9d88f224b7f1c655515765e8cf483951ac1a1ad3
>[LINUX] Preserve flags when converting PTEs from machine to phys.
>Signed-off-by: John Byrne <john.l.byrne@hp.com>
>xen-unstable changeset: 12402:ade94aa072c51e7b0834405569436ab1eb334d9a
>xen-unstable date: Tue Nov 14 11:57:53 2006 +0000
>
>Index: linux-2.6.18-8.1.4.el5/include/asm-i386/mach-xen/asm/maddr.h
>===================================================================
>--- linux-2.6.18-8.1.4.el5.orig/include/asm-i386/mach-xen/asm/maddr.h	2007-09-18 15:01:47.000000000 +0100
>+++ linux-2.6.18-8.1.4.el5/include/asm-i386/mach-xen/asm/maddr.h	2007-09-18 15:02:58.000000000 +0100
>@@ -127,6 +127,7 @@
> 	machine = (machine << PAGE_SHIFT) | (phys & ~PAGE_MASK);
> 	return machine;
> }
>+
> static inline paddr_t machine_to_phys(maddr_t machine)
> {
> 	paddr_t phys = mfn_to_pfn(machine >> PAGE_SHIFT);
>@@ -134,6 +135,19 @@
> 	return phys;
> }
> 
>+static inline paddr_t pte_machine_to_phys(maddr_t machine)
>+{
>+	/*
>+	 * In PAE mode, the NX bit needs to be dealt with in the value
>+	 * passed to mfn_to_pfn(). On x86_64, we need to mask it off,
>+	 * but for i386 the conversion to ulong for the argument will
>+	 * clip it off.
>+	 */
>+	paddr_t phys = mfn_to_pfn(machine >> PAGE_SHIFT);
>+	phys = (phys << PAGE_SHIFT) | (machine & ~PHYSICAL_PAGE_MASK);
>+	return phys;
>+}
>+
> /* VIRT <-> MACHINE conversion */
> #define virt_to_machine(v)	(phys_to_machine(__pa(v)))
> #define virt_to_mfn(v)		(pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
>Index: linux-2.6.18-8.1.4.el5/include/asm-i386/mach-xen/asm/page.h
>===================================================================
>--- linux-2.6.18-8.1.4.el5.orig/include/asm-i386/mach-xen/asm/page.h	2007-09-18 15:01:47.000000000 +0100
>+++ linux-2.6.18-8.1.4.el5/include/asm-i386/mach-xen/asm/page.h	2007-09-18 15:02:58.000000000 +0100
>@@ -6,6 +6,16 @@
> #define PAGE_SIZE	(1UL << PAGE_SHIFT)
> #define PAGE_MASK	(~(PAGE_SIZE-1))
> 
>+#ifdef CONFIG_X86_PAE
>+#define __PHYSICAL_MASK_SHIFT	36
>+#define __PHYSICAL_MASK		((1ULL << __PHYSICAL_MASK_SHIFT) - 1)
>+#define PHYSICAL_PAGE_MASK	(~((1ULL << PAGE_SHIFT) - 1) & __PHYSICAL_MASK)
>+#else
>+#define __PHYSICAL_MASK_SHIFT	32
>+#define __PHYSICAL_MASK		(~0UL)
>+#define PHYSICAL_PAGE_MASK	(PAGE_MASK & __PHYSICAL_MASK)
>+#endif
>+
> #define LARGE_PAGE_MASK (~(LARGE_PAGE_SIZE-1))
> #define LARGE_PAGE_SIZE (1UL << PMD_SHIFT)
> 
>@@ -84,7 +94,7 @@
> 
> 	if (x.pte_low) {
> 		ret = x.pte_low | (unsigned long long)x.pte_high << 32;
>-		ret = machine_to_phys(ret) | 1;
>+		ret = pte_machine_to_phys(ret) | 1;
> 	} else {
> 		ret = 0;
> 	}
>@@ -93,13 +103,13 @@
> static inline unsigned long long pmd_val(pmd_t x)
> {
> 	unsigned long long ret = x.pmd;
>-	if (ret) ret = machine_to_phys(ret) | 1;
>+	if (ret) ret = pte_machine_to_phys(ret) | 1;
> 	return ret;
> }
> static inline unsigned long long pgd_val(pgd_t x)
> {
> 	unsigned long long ret = x.pgd;
>-	if (ret) ret = machine_to_phys(ret) | 1;
>+	if (ret) ret = pte_machine_to_phys(ret) | 1;
> 	return ret;
> }
> static inline unsigned long long pte_val_ma(pte_t x)
>@@ -114,7 +124,8 @@
> #define pgprot_val(x)	((x).pgprot)
> #include <asm/maddr.h>
> #define boot_pte_t pte_t /* or would you rather have a typedef */
>-#define pte_val(x)	(((x).pte_low & 1) ? machine_to_phys((x).pte_low) : \
>+#define pte_val(x)	(((x).pte_low & 1) ? \
>+			 pte_machine_to_phys((x).pte_low) : \
> 			 (x).pte_low)
> #define pte_val_ma(x)	((x).pte_low)
> #define __pte(x) ({ unsigned long _x = (x); \
>@@ -124,7 +135,7 @@
> static inline unsigned long pgd_val(pgd_t x)
> {
> 	unsigned long ret = x.pgd;
>-	if (ret) ret = machine_to_phys(ret) | 1;
>+	if (ret) ret = pte_machine_to_phys(ret) | 1;
> 	return ret;
> }
> #define HPAGE_SHIFT	22
>Index: linux-2.6.18-8.1.4.el5/include/asm-x86_64/mach-xen/asm/maddr.h
>===================================================================
>--- linux-2.6.18-8.1.4.el5.orig/include/asm-x86_64/mach-xen/asm/maddr.h	2007-09-18 15:01:47.000000000 +0100
>+++ linux-2.6.18-8.1.4.el5/include/asm-x86_64/mach-xen/asm/maddr.h	2007-09-18 15:02:58.000000000 +0100
>@@ -127,6 +127,14 @@
> 	return phys;
> }
> 
>+static inline paddr_t pte_machine_to_phys(maddr_t machine)
>+{
>+	paddr_t phys;
>+	phys = mfn_to_pfn((machine & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT);
>+	phys = (phys << PAGE_SHIFT) | (machine & ~PHYSICAL_PAGE_MASK);
>+	return phys;
>+}
>+
> /* VIRT <-> MACHINE conversion */
> #define virt_to_machine(v)	(phys_to_machine(__pa(v)))
> #define virt_to_mfn(v)		(pfn_to_mfn(__pa(v) >> PAGE_SHIFT))
>Index: linux-2.6.18-8.1.4.el5/include/asm-x86_64/mach-xen/asm/page.h
>===================================================================
>--- linux-2.6.18-8.1.4.el5.orig/include/asm-x86_64/mach-xen/asm/page.h	2007-09-18 15:01:47.000000000 +0100
>+++ linux-2.6.18-8.1.4.el5/include/asm-x86_64/mach-xen/asm/page.h	2007-09-18 15:03:42.000000000 +0100
>@@ -30,6 +30,13 @@
> #define PAGE_SHIFT	12
> #define PAGE_SIZE	(_AC(1,UL) << PAGE_SHIFT)
> #define PAGE_MASK	(~(PAGE_SIZE-1))
>+
>+/* See Documentation/x86_64/mm.txt for a description of the memory map. */
>+#define __PHYSICAL_MASK_SHIFT	46
>+#define __PHYSICAL_MASK		((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1)
>+#define __VIRTUAL_MASK_SHIFT	48
>+#define __VIRTUAL_MASK		((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1)
>+
> #define PHYSICAL_PAGE_MASK	(~(PAGE_SIZE-1) & __PHYSICAL_MASK)
> 
> #define THREAD_ORDER 1 
>@@ -87,28 +94,28 @@
> 
> typedef struct { unsigned long pgprot; } pgprot_t;
> 
>-#define pte_val(x)	(((x).pte & 1) ? machine_to_phys((x).pte) : \
>+#define pte_val(x)	(((x).pte & 1) ? pte_machine_to_phys((x).pte) : \
> 			 (x).pte)
> #define pte_val_ma(x)	((x).pte)
> 
> static inline unsigned long pmd_val(pmd_t x)
> {
> 	unsigned long ret = x.pmd;
>-	if (ret) ret = machine_to_phys(ret);
>+	if (ret) ret = pte_machine_to_phys(ret);
> 	return ret;
> }
> 
> static inline unsigned long pud_val(pud_t x)
> {
> 	unsigned long ret = x.pud;
>-	if (ret) ret = machine_to_phys(ret);
>+	if (ret) ret = pte_machine_to_phys(ret);
> 	return ret;
> }
> 
> static inline unsigned long pgd_val(pgd_t x)
> {
> 	unsigned long ret = x.pgd;
>-	if (ret) ret = machine_to_phys(ret);
>+	if (ret) ret = pte_machine_to_phys(ret);
> 	return ret;
> }
> 
>@@ -153,12 +160,6 @@
> /* to align the pointer to the (next) page boundary */
> #define PAGE_ALIGN(addr)	(((addr)+PAGE_SIZE-1)&PAGE_MASK)
> 
>-/* See Documentation/x86_64/mm.txt for a description of the memory map. */
>-#define __PHYSICAL_MASK_SHIFT	46
>-#define __PHYSICAL_MASK		((_AC(1,UL) << __PHYSICAL_MASK_SHIFT) - 1)
>-#define __VIRTUAL_MASK_SHIFT	48
>-#define __VIRTUAL_MASK		((_AC(1,UL) << __VIRTUAL_MASK_SHIFT) - 1)
>-
> #define KERNEL_TEXT_SIZE  (_AC(40,UL)*1024*1024)
> #define KERNEL_TEXT_START _AC(0xffffffff80000000,UL)
>

Actions: View | Diff

Attachments on bug 294811: 198411 | 288051 | 288751 | 288761 | 288771 | 288781 | 288791 | 288801