x86-64, gart: Fix allocation with memblock (32e3f2b0) · Commits · 戴 / test

When trying to change alloc_bootmem with memblock to go with real top-down Found one old system: [ 0.000000] Node 0: aperture @ ac000000 size 64 MB [ 0.000000] Aperture pointing to e820 RAM. Ignoring. [ 0.000000] Your BIOS doesn't leave a aperture memory hole [ 0.000000] Please enable the IOMMU option in the BIOS setup [ 0.000000] This costs you 64 MB of RAM [ 0.000000] memblock_x86_reserve_range: [0x2020000000-0x2023ffffff] aperture64 [ 0.000000] Cannot allocate aperture memory hole (ffff882020000000,65536K) [ 0.000000] memblock_x86_free_range: [0x2020000000-0x2023ffffff] [ 0.000000] Kernel panic - not syncing: Not enough memory for aperture [ 0.000000] Pid: 0, comm: swapper Not tainted 2.6.37-rc5-tip-yh-06229-gb792dc2-dirty #331 [ 0.000000] Call Trace: [ 0.000000] [<ffffffff81cf50fe>] ? panic+0x91/0x1a3 [ 0.000000] [<ffffffff827c66b2>] ? gart_iommu_hole_init+0x3d7/0x4a3 [ 0.000000] [<ffffffff81d026a9>] ? _etext+0x0/0x3 [ 0.000000] [<ffffffff827ba940>] ? pci_iommu_alloc+0x47/0x71 [ 0.000000] [<ffffffff827c820b>] ? mem_init+0x19/0xec [ 0.000000] [<ffffffff827b3c40>] ? start_kernel+0x20a/0x3e8 [ 0.000000] [<ffffffff827b32cc>] ? x86_64_start_reservations+0x9c/0xa0 [ 0.000000] [<ffffffff827b33e4>] ? x86_64_start_kernel+0x114/0x11b it means __alloc_bootmem_nopanic() get too high for that aperture. Use memblock_find_in_range() with limit directly. Signed-off-by:

Yinghai Lu <yinghai@kernel.org> LKML-Reference: <4D0C0740.90104@kernel.org> Signed-off-by:

H. Peter Anvin <hpa@linux.intel.com>

arch/x86/kernel/aperture_64.c

+16 −17

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		#include <linux/kernel.h>
		#include <linux/types.h>
		#include <linux/init.h>
		#include <linux/bootmem.h>
		#include <linux/memblock.h>
		#include <linux/mmzone.h>
		#include <linux/pci_ids.h>
		#include <linux/pci.h>
		@@ -69,7 +69,7 @@ static void __init insert_aperture_resource(u32 aper_base, u32 aper_size)
		static u32 __init allocate_aperture(void)
		{
		u32 aper_size;
		void *p;
		unsigned long addr;

		/* aper_size should <= 1G */
		if (fallback_aper_order > 5)
		@@ -95,27 +95,26 @@ static u32 __init allocate_aperture(void)
		* so don't use 512M below as gart iommu, leave the space for kernel
		* code for safe
		*/
		p = __alloc_bootmem_nopanic(aper_size, aper_size, 512ULL<<20);
		addr = memblock_find_in_range(0, 1ULL<<32, aper_size, 512ULL<<20);
		if (addr == MEMBLOCK_ERROR \|\| addr + aper_size > 0xffffffff) {
		printk(KERN_ERR
		"Cannot allocate aperture memory hole (%lx,%uK)\n",
		addr, aper_size>>10);
		return 0;
		}
		memblock_x86_reserve_range(addr, addr + aper_size, "aperture64");
		/*
		* Kmemleak should not scan this block as it may not be mapped via the
		* kernel direct mapping.
		*/
		kmemleak_ignore(p);
		if (!p \|\| __pa(p)+aper_size > 0xffffffff) {
		printk(KERN_ERR
		"Cannot allocate aperture memory hole (%p,%uK)\n",
		p, aper_size>>10);
		if (p)
		free_bootmem(__pa(p), aper_size);
		return 0;
		}
		kmemleak_ignore(phys_to_virt(addr));
		printk(KERN_INFO "Mapping aperture over %d KB of RAM @ %lx\n",
		aper_size >> 10, __pa(p));
		insert_aperture_resource((u32)__pa(p), aper_size);
		register_nosave_region((u32)__pa(p) >> PAGE_SHIFT,
		(u32)__pa(p+aper_size) >> PAGE_SHIFT);
		aper_size >> 10, addr);
		insert_aperture_resource((u32)addr, aper_size);
		register_nosave_region(addr >> PAGE_SHIFT,
		(addr+aper_size) >> PAGE_SHIFT);

		return (u32)__pa(p);
		return (u32)addr;
		}

Admin message