From patchwork Wed Nov 30 03:24:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: athorlton@sgi.com X-Patchwork-Id: 9453545 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4587B60585 for ; Wed, 30 Nov 2016 03:26:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A88528113 for ; Wed, 30 Nov 2016 03:26:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1F63328476; Wed, 30 Nov 2016 03:26:55 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9EB3528113 for ; Wed, 30 Nov 2016 03:26:54 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBvVt-00064E-0T; Wed, 30 Nov 2016 03:24:53 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cBvVr-00063j-F8 for xen-devel@lists.xenproject.org; Wed, 30 Nov 2016 03:24:51 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id A8/DC-15390-2864E385; Wed, 30 Nov 2016 03:24:50 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrALMWRWlGSWpSXmKPExsVywGCLo26Tm12 EweV13Bbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8bVeboFbYIV3z4eYGlgfMLXxcjFISSwm1Hi 7JWdLF2MnEBOrcTkCQsYQWw2AXWJF682gNkiAgoSm3ufsYI0MAs0Mkt8afsFlODgEBYIknjcw glSwyKgKnFuwwp2EJtXwEnizLwdTCC2BFBvx4ZjYHFOAWeJtcdOM0PsqpRYPmsd2wRG7gWMDK sY1YtTi8pSi3SN9ZKKMtMzSnITM3N0DQ3M9HJTi4sT01NzEpOK9ZLzczcxAn3LAAQ7GDv+OR1 ilORgUhLllbK0ixDiS8pPqcxILM6ILyrNSS0+xCjDwaEkwevsCpQTLEpNT61Iy8wBBhlMWoKD R0mEtwokzVtckJhbnJkOkTrFqMvxZtfLB0xCLHn5ealS4rz1IEUCIEUZpXlwI2ABf4lRVkqYl xHoKCGegtSi3MwSVPlXjOIcjErCvF4gU3gy80rgNr0COoIJ6Ii3r61BjihJREhJNTBq381/cW nuzannvm8V923ULaxN/C6k1qruGmmj9+eSkcjft0eltdfVWPtO4Jr7dYLoW6bgb3u67fynbX3 41DdO8GXkVpGddcFrY8ImJh3w/nTnzsOkvIQJ4m8y71homOy6tNfvfWHzzedhYeU6EVY3LB8a 1GXxmZo3FAiw3lNebK6/4lFXSIASS3FGoqEWc1FxIgCT/hyrcwIAAA== X-Env-Sender: athorlton@sgi.com X-Msg-Ref: server-2.tower-21.messagelabs.com!1480476289!31914080!1 X-Originating-IP: [192.48.180.65] X-SpamReason: No, hits=0.3 required=7.0 tests=MAILTO_TO_SPAM_ADDR X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59015 invoked from network); 30 Nov 2016 03:24:49 -0000 Received: from relay2.sgi.com (HELO relay.sgi.com) (192.48.180.65) by server-2.tower-21.messagelabs.com with SMTP; 30 Nov 2016 03:24:49 -0000 Received: from stormcage.americas.sgi.com (stormcage.americas.sgi.com [128.162.236.70]) by relay2.corp.sgi.com (Postfix) with ESMTP id 3CEFD304062; Tue, 29 Nov 2016 19:24:48 -0800 (PST) Received: by stormcage.americas.sgi.com (Postfix, from userid 48426) id EF926202A55B2; Tue, 29 Nov 2016 21:24:47 -0600 (CST) From: Alex Thorlton To: linux-kernel@vger.kernel.org Date: Tue, 29 Nov 2016 21:24:47 -0600 Message-Id: <1480476287-232878-3-git-send-email-athorlton@sgi.com> X-Mailer: git-send-email 1.8.5.6 In-Reply-To: <1480476287-232878-1-git-send-email-athorlton@sgi.com> References: <1479168677-23633-1-git-send-email-athorlton@sgi.com> <1480476287-232878-1-git-send-email-athorlton@sgi.com> Cc: Russ Anderson , Juergen Gross , Denys Vlasenko , Boris Ostrovsky , x86@kernel.org, Ingo Molnar , David Vrabel , "H. Peter Anvin" , xen-devel@lists.xenproject.org, Alex Thorlton , Thomas Gleixner Subject: [Xen-devel] [PATCH 2/2] xen/x86: Increase xen_e820_map to E820_X_MAX possible entries X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP On systems with sufficiently large e820 tables, and several IOAPICs, it is possible for the XENMEM_machine_memory_map callback (and its counterpart, XENMEM_memory_map) to attempt to return an e820 table with more than 128 entries. This callback adds entries to the BIOS-provided e820 table to account for IOAPIC registers, which, on sufficiently large systems, can result in an e820 table that is too large to copy back into xen_e820_map. This change simply increases the size of xen_e820_map to E820_X_MAX to ensure that there is enough room to store the entire e820 map returned from this callback. Signed-off-by: Alex Thorlton Suggested-by: Boris Ostrovsky Cc: Russ Anderson Cc: David Vrabel Cc: Ingo Molnar Cc: Juergen Gross Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Denys Vlasenko Cc: Boris Ostrovsky Cc: x86@kernel.org Cc: xen-devel@lists.xenproject.org Reviewed-by: Juergen Gross --- arch/x86/xen/setup.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index f8960fc..8c394e3 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -41,7 +41,7 @@ unsigned long xen_released_pages; /* E820 map used during setting up memory. */ -static struct e820entry xen_e820_map[E820MAX] __initdata; +static struct e820entry xen_e820_map[E820_X_MAX] __initdata; static u32 xen_e820_map_entries __initdata; /* @@ -750,7 +750,7 @@ char * __init xen_memory_setup(void) max_pfn = min(max_pfn, xen_start_info->nr_pages); mem_end = PFN_PHYS(max_pfn); - memmap.nr_entries = E820MAX; + memmap.nr_entries = ARRAY_SIZE(xen_e820_map); set_xen_guest_handle(memmap.buffer, xen_e820_map); op = xen_initial_domain() ? @@ -923,7 +923,7 @@ char * __init xen_auto_xlated_memory_setup(void) int i; int rc; - memmap.nr_entries = E820MAX; + memmap.nr_entries = ARRAY_SIZE(xen_e820_map); set_xen_guest_handle(memmap.buffer, xen_e820_map); rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);