Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753728Ab3FOA5J (ORCPT ); Fri, 14 Jun 2013 20:57:09 -0400 Received: from aserp1040.oracle.com ([141.146.126.69]:47590 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752857Ab3FOA5D (ORCPT ); Fri, 14 Jun 2013 20:57:03 -0400 From: Yinghai Lu To: "H. Peter Anvin" Cc: Thomas Gleixner , Ingo Molnar , Andrew Morton , Tejun Heo , Thomas Renninger , Tang Chen , linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v5 00/22] x86, ACPI, numa: Parse numa info early Date: Fri, 14 Jun 2013 17:56:18 -0700 Message-Id: <1371257800-11720-1-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.8.1.4 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4801 Lines: 103 One commit that tried to parse SRAT early get reverted before v3.9-rc1. | commit e8d1955258091e4c92d5a975ebd7fd8a98f5d30f | Author: Tang Chen | Date: Fri Feb 22 16:33:44 2013 -0800 | | acpi, memory-hotplug: parse SRAT before memblock is ready It broke several things, like acpi override and fall back path etc. This patchset is clean implementation that will parse numa info early. 1. keep the acpi table initrd override working by split finding with copying. finding is done at head_32.S and head64.c stage, in head_32.S, initrd is accessed in 32bit flat mode with phys addr. in head64.c, initrd is accessed via kernel low mapping address with help of #PF set page table. copying is done with early_ioremap just after memblock is setup. 2. keep fallback path working. numaq and ACPI and amd_nmua and dummy. seperate initmem_init to two stages. early_initmem_init will only extract numa info early into numa_meminfo. initmem_init will keep slit and emulation handling. 3. keep other old code flow untouched like relocate_initrd and initmem_init. early_initmem_init will take old init_mem_mapping position. it call early_x86_numa_init and init_mem_mapping for every nodes. For 64bit, we avoid having size limit on initrd, as relocate_initrd is still after init_mem_mapping for all memory. 4. last patch will try to put page table on local node, so that memory hotplug will be happy. In short, early_initmem_init will parse numa info early and call init_mem_mapping to set page table for every nodes's mem. could be found at: git://git.kernel.org/pub/scm/linux/kernel/git/yinghai/linux-yinghai.git for-x86-mm and it is based on today's Linus tree. -v2: Address tj's review and split patches to small ones. -v3: Add some Acked-by from tj, also stop abusing cpio_data for acpi_files info -v4: fix one typo found by Tang Chen. Also added tested-by from Thomas Renninger and Tony. -v5: rebase to v3.10-rc3, and add tested-by from Tang Chang fix one warning for 32bit found by Fengguang. resend as Tang's rebase seems broken and fail the compiling test in Fengguang test bots. Thanks Yinghai Yinghai Lu (22): x86: Change get_ramdisk_image() to global x86, microcode: Use common get_ramdisk_image() x86, ACPI, mm: Kill max_low_pfn_mapped x86, ACPI: Search buffer above 4G in second try for acpi override tables x86, ACPI: Increase override tables number limit x86, ACPI: Split acpi_initrd_override to find/copy two functions x86, ACPI: Store override acpi tables phys addr in cpio files info array x86, ACPI: Make acpi_initrd_override_find work with 32bit flat mode x86, ACPI: Find acpi tables in initrd early from head_32.S/head64.c x86, mm, numa: Move two functions calling on successful path later x86, mm, numa: Call numa_meminfo_cover_memory() checking early x86, mm, numa: Move node_map_pfn alignment() to x86 x86, mm, numa: Use numa_meminfo to check node_map_pfn alignment x86, mm, numa: Set memblock nid later x86, mm, numa: Move node_possible_map setting later x86, mm, numa: Move emulation handling down. x86, ACPI, numa, ia64: split SLIT handling out x86, mm, numa: Add early_initmem_init() stub x86, mm: Parse numa info early x86, mm: Add comments for step_size shift x86, mm: Make init_mem_mapping be able to be called several times x86, mm, numa: Put pagetable on local node ram for 64bit arch/ia64/kernel/setup.c | 4 +- arch/x86/include/asm/acpi.h | 3 +- arch/x86/include/asm/page_types.h | 2 +- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/include/asm/setup.h | 9 ++ arch/x86/kernel/head64.c | 2 + arch/x86/kernel/head_32.S | 4 + arch/x86/kernel/microcode_intel_early.c | 8 +- arch/x86/kernel/setup.c | 86 +++++++----- arch/x86/mm/init.c | 122 ++++++++++------ arch/x86/mm/numa.c | 240 +++++++++++++++++++++++++------- arch/x86/mm/numa_emulation.c | 2 +- arch/x86/mm/numa_internal.h | 2 + arch/x86/mm/srat.c | 11 +- drivers/acpi/numa.c | 13 +- drivers/acpi/osl.c | 139 ++++++++++++------ include/linux/acpi.h | 20 +-- include/linux/mm.h | 3 - mm/page_alloc.c | 52 +------ 19 files changed, 477 insertions(+), 247 deletions(-) -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/