Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1041470AbdDURKC (ORCPT ); Fri, 21 Apr 2017 13:10:02 -0400 Received: from aserp1050.oracle.com ([141.146.126.70]:23539 "EHLO aserp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422821AbdDURIV (ORCPT ); Fri, 21 Apr 2017 13:08:21 -0400 From: Boris Ostrovsky To: jgross@suse.com Cc: xen-devel@lists.xenproject.org, linux-kernel@vger.kernel.org, Boris Ostrovsky Subject: [PATCH v2] xen/pvh: Do not fill kernel's e820 map in init_pvh_bootparams() Date: Fri, 21 Apr 2017 11:13:14 -0400 Message-Id: <1492787594-13725-1-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserp1040.oracle.com [141.146.126.69] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2226 Lines: 64 e820 map is updated with information from the zeropage (i.e. pvh_bootparams) by default_machine_specific_memory_setup(). With the way things are done now, we end up with a duplicated e820 map. Signed-off-by: Boris Ostrovsky --- v2: * Drop sanitize_e820_map() since it will be called later anyway, possibly more than once. * Also use pvh_bootparams.e820_entries instead of memmap.nr_entries when adding ISA range. arch/x86/xen/enlighten_pvh.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 331d769..2bc7d5b 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -33,7 +33,6 @@ static void xen_pvh_arch_setup(void) static void __init init_pvh_bootparams(void) { struct xen_memory_map memmap; - unsigned int i; int rc; memset(&pvh_bootparams, 0, sizeof(pvh_bootparams)); @@ -45,28 +44,19 @@ static void __init init_pvh_bootparams(void) xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc); BUG(); } + pvh_bootparams.e820_entries = memmap.nr_entries; - if (memmap.nr_entries < E820MAX - 1) { - pvh_bootparams.e820_map[memmap.nr_entries].addr = + if (pvh_bootparams.e820_entries < E820MAX - 1) { + pvh_bootparams.e820_map[pvh_bootparams.e820_entries].addr = ISA_START_ADDRESS; - pvh_bootparams.e820_map[memmap.nr_entries].size = + pvh_bootparams.e820_map[pvh_bootparams.e820_entries].size = ISA_END_ADDRESS - ISA_START_ADDRESS; - pvh_bootparams.e820_map[memmap.nr_entries].type = + pvh_bootparams.e820_map[pvh_bootparams.e820_entries].type = E820_RESERVED; - memmap.nr_entries++; + pvh_bootparams.e820_entries++; } else xen_raw_printk("Warning: Can fit ISA range into e820\n"); - sanitize_e820_map(pvh_bootparams.e820_map, - ARRAY_SIZE(pvh_bootparams.e820_map), - &memmap.nr_entries); - - pvh_bootparams.e820_entries = memmap.nr_entries; - for (i = 0; i < pvh_bootparams.e820_entries; i++) - e820_add_region(pvh_bootparams.e820_map[i].addr, - pvh_bootparams.e820_map[i].size, - pvh_bootparams.e820_map[i].type); - pvh_bootparams.hdr.cmd_line_ptr = pvh_start_info.cmdline_paddr; -- 2.9.3