From: "Jan Beulich" Subject: [PATCH] fix amd64-agp aperture validation Date: Tue, 19 Jun 2007 12:35:44 +0100 Message-ID: <4677DBB0.76E4.0078.0@novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Return-path: Content-Disposition: inline List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: xen-devel@lists.xensource.com List-Id: xen-devel@lists.xenproject.org Under Xen, pfn_valid() on a machine address makes no sense. But even on native, under CONFIG_DISCONTIGMEM, assuming that a !pfn_valid() implies all subsequent pfn-s are also invalid is wrong. Thus replace this by explicitly checking against the E820 map. Patch is in 2.6.22-rc4, but was not tested against 2.6.18. Signed-off-by: Jan Beulich Acked-by: Mark Langsdorf Index: sle10sp1-2007-03-28/arch/i386/kernel/setup-xen.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sle10sp1-2007-03-28.orig/arch/i386/kernel/setup-xen.c 2007-04-04 = 17:07:13.000000000 +0200 +++ sle10sp1-2007-03-28/arch/i386/kernel/setup-xen.c 2007-04-04 = 16:45:36.000000000 +0200 @@ -1029,6 +1029,35 @@ efi_memory_present_wrapper(unsigned long return 0; } =20 +/* + * This function checks if any part of the range is mapped + * with type. + */ +int +e820_any_mapped(u64 start, u64 end, unsigned type) +{ + int i; + +#ifndef CONFIG_XEN + for (i =3D 0; i < e820.nr_map; i++) { + const struct e820entry *ei =3D &e820.map[i]; +#else + if (!is_initial_xendomain()) + return 0; + for (i =3D 0; i < machine_e820.nr_map; ++i) { + const struct e820entry *ei =3D &machine_e820.map[i]; +#endif + + if (type && ei->type !=3D type) + continue; + if (ei->addr >=3D end || ei->addr + ei->size <=3D start) + continue; + return 1; + } + return 0; +} +EXPORT_SYMBOL_GPL(e820_any_mapped); + /* * This function checks if the entire range is mapped with = type. * Index: sle10sp1-2007-03-28/arch/i386/kernel/setup.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sle10sp1-2007-03-28.orig/arch/i386/kernel/setup.c 2007-04-04 = 17:07:13.000000000 +0200 +++ sle10sp1-2007-03-28/arch/i386/kernel/setup.c 2007-04-04 = 16:45:36.000000000 +0200 @@ -1029,6 +1029,28 @@ efi_memory_present_wrapper(unsigned long return 0; } =20 +/* + * This function checks if any part of the range is mapped + * with type. + */ +int +e820_any_mapped(u64 start, u64 end, unsigned type) +{ + int i; + + for (i =3D 0; i < e820.nr_map; i++) { + const struct e820entry *ei =3D &e820.map[i]; + + if (type && ei->type !=3D type) + continue; + if (ei->addr >=3D end || ei->addr + ei->size <=3D start) + continue; + return 1; + } + return 0; +} +EXPORT_SYMBOL_GPL(e820_any_mapped); + /* * This function checks if the entire range is mapped with = type. * Index: sle10sp1-2007-03-28/arch/x86_64/kernel/e820-xen.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sle10sp1-2007-03-28.orig/arch/x86_64/kernel/e820-xen.c 2007-04-04 = 17:07:13.000000000 +0200 +++ sle10sp1-2007-03-28/arch/x86_64/kernel/e820-xen.c 2007-04-04 = 17:07:28.000000000 +0200 @@ -88,17 +88,26 @@ static inline int bad_addr(unsigned long return 0; }=20 =20 -#ifndef CONFIG_XEN /* * This function checks if any part of the range is mapped * with type. */ -int __meminit -e820_any_mapped(unsigned long start, unsigned long end, unsigned type) +int e820_any_mapped(unsigned long start, unsigned long end, unsigned = type) {=20 int i; + +#ifndef CONFIG_XEN for (i =3D 0; i < e820.nr_map; i++) {=20 struct e820entry *ei =3D &e820.map[i];=20 +#else + extern struct e820map machine_e820; + + if (!is_initial_xendomain()) + return 0; + for (i =3D 0; i < machine_e820.nr_map; i++) { + const struct e820entry *ei =3D &machine_e820.map[i]; +#endif + if (type && ei->type !=3D type)=20 continue; if (ei->addr >=3D end || ei->addr + ei->size <=3D start) @@ -107,7 +116,7 @@ int __meminit e820_any_mapped(unsigned l }=20 return 0; } -#endif +EXPORT_SYMBOL_GPL(e820_any_mapped); =20 /* * This function checks if the entire range is mapped with = type. Index: head-2007-03-19/arch/x86_64/kernel/e820.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- head-2007-03-19.orig/arch/x86_64/kernel/e820.c 2007-04-02 = 09:21:22.000000000 +0200 +++ head-2007-03-19/arch/x86_64/kernel/e820.c 2007-04-02 09:21:39.0000000= 00 +0200 @@ -98,7 +98,7 @@ static inline int bad_addr(unsigned long * This function checks if any part of the range is mapped * with type. */ -int __meminit +int e820_any_mapped(unsigned long start, unsigned long end, unsigned type) {=20 int i; @@ -112,6 +112,7 @@ e820_any_mapped(unsigned long start, uns }=20 return 0; } +EXPORT_SYMBOL_GPL(e820_any_mapped); =20 /* * This function checks if the entire range is mapped with = type. Index: sle10sp1-2007-03-28/drivers/char/agp/amd64-agp.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sle10sp1-2007-03-28.orig/drivers/char/agp/amd64-agp.c 2007-04-04 = 17:07:13.000000000 +0200 +++ sle10sp1-2007-03-28/drivers/char/agp/amd64-agp.c 2007-04-04 = 16:45:36.000000000 +0200 @@ -15,6 +15,7 @@ #include #include /* PAGE_SIZE */ #include +#include #include "agp.h" =20 /* PTE bits. */ @@ -259,7 +260,6 @@ static const struct agp_bridge_driver am /* Some basic sanity checks for the aperture. */ static int __devinit aperture_valid(u64 aper, u32 size) { - u32 pfn, c; if (aper =3D=3D 0) { printk(KERN_ERR PFX "No aperture\n"); return 0; @@ -272,14 +272,9 @@ static int __devinit aperture_valid(u64=20 printk(KERN_ERR PFX "Aperture out of bounds\n"); return 0; } - pfn =3D aper >> PAGE_SHIFT; - for (c =3D 0; c < size/PAGE_SIZE; c++) { - if (!pfn_valid(pfn + c)) - break; - if (!PageReserved(pfn_to_page(pfn + c))) { - printk(KERN_ERR PFX "Aperture pointing to RAM\n"); - return 0; - } + if (e820_any_mapped(aper, aper + size, E820_RAM)) { + printk(KERN_ERR PFX "Aperture pointing to RAM\n"); + return 0; } =20 /* Request the Aperture. This catches cases when someone else Index: sle10sp1-2007-03-28/include/asm-i386/e820.h =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- sle10sp1-2007-03-28.orig/include/asm-i386/e820.h 2007-04-04 = 17:07:13.000000000 +0200 +++ sle10sp1-2007-03-28/include/asm-i386/e820.h 2007-04-04 16:45:36.0000000= 00 +0200 @@ -38,6 +38,7 @@ extern struct e820map e820; =20 extern int e820_all_mapped(unsigned long start, unsigned long end, unsigned type); +extern int e820_any_mapped(u64 start, u64 end, unsigned type); =20 #endif/*!__ASSEMBLY__*/ =20