From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754554Ab2LRHT5 (ORCPT ); Tue, 18 Dec 2012 02:19:57 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:39046 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754258Ab2LRHQd (ORCPT ); Tue, 18 Dec 2012 02:16:33 -0500 From: Yinghai Lu To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" Cc: "Eric W. Biederman" , Andrew Morton , linux-kernel@vger.kernel.org, Yinghai Lu Subject: [PATCH v7 18/27] x86, kexec: only set ident mapping for ram. Date: Mon, 17 Dec 2012 23:15:50 -0800 Message-Id: <1355814959-10573-19-git-send-email-yinghai@kernel.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1355814959-10573-1-git-send-email-yinghai@kernel.org> References: <1355814959-10573-1-git-send-email-yinghai@kernel.org> X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We should not set mapping for all under max_pfn. That causes same problem that is fixed by x86, mm: Only direct map addresses that are marked as E820_RAM This patch expose pfn_mapped array, and only set ident mapping for range in that array. This patch rely on new ident_mapping_init that could handle sharing pgd/pud between different calling. Signed-off-by: Yinghai Lu --- arch/x86/include/asm/page.h | 4 ++++ arch/x86/kernel/machine_kexec_64.c | 13 ++++++++++--- arch/x86/mm/init.c | 4 ++-- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 3698a6a..c878924 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -17,6 +17,10 @@ struct page; +#include +extern struct range pfn_mapped[]; +extern int nr_pfn_mapped; + static inline void clear_user_page(void *page, unsigned long vaddr, struct page *pg) { diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index a0bf7fb..cc6d0e3 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c @@ -157,9 +157,16 @@ static int init_pgtable(struct kimage *image, unsigned long start_pgtable) level4p = (pgd_t *)__va(start_pgtable); clear_page(level4p); - result = ident_mapping_init(image, level4p, 0, max_pfn << PAGE_SHIFT); - if (result) - return result; + + for (i = 0; i < nr_pfn_mapped; i++) { + mstart = pfn_mapped[i].start << PAGE_SHIFT; + mend = pfn_mapped[i].end << PAGE_SHIFT; + + result = ident_mapping_init(image, level4p, mstart, mend); + + if (result) + return result; + } /* * segments's mem ranges could be outside 0 ~ max_pfn, diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index ab26a15..d704b36 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -300,8 +300,8 @@ static int __meminit split_mem_range(struct map_range *mr, int nr_range, return nr_range; } -static struct range pfn_mapped[E820_X_MAX]; -static int nr_pfn_mapped; +struct range pfn_mapped[E820_X_MAX]; +int nr_pfn_mapped; static void add_pfn_range_mapped(unsigned long start_pfn, unsigned long end_pfn) { -- 1.7.10.4