From patchwork Wed Oct 4 21:19:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 9985541 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 0EE8D60586 for ; Wed, 4 Oct 2017 21:23:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F3F9428C2E for ; Wed, 4 Oct 2017 21:23:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E765728C2C; Wed, 4 Oct 2017 21:23:16 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID 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 91B4228C2C for ; Wed, 4 Oct 2017 21:23:16 +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 1dzr6f-0003NE-Vx; Wed, 04 Oct 2017 21:21:29 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dzr6e-0003JX-4l for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 21:21:28 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id 0A/CB-03454-7D055D95; Wed, 04 Oct 2017 21:21:27 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrJIsWRWlGSWpSXmKPExsXiVRtsrHst4Gq kweQFihbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0bvzJeMBWfYKg5uLm9gfMDaxcjFISQwk1Fi 2YcXYA6LwCsWiQt/NzGBOBIC/awSv3c3s3cxcgI5WRLN29awQthpEjNfv4OK10icen+VEcQWE lCS2LphKTOE/ZdRYt6tOhCbTUBLYk/DfLChIgKzRCRuve5hA3GYBc4wSRzvOwk2VVggWOL2yo 1sIDaLgKrE+5WfwOK8ApYSfVvuMENsM5F4eOQaWJwTKH7kxBuobRYSrWfuM01gFFzAyLCKUaM 4tagstUjX0FAvqSgzPaMkNzEzR9fQwEwvN7W4ODE9NScxqVgvOT93EyMw6BiAYAfjp2UBhxgl OZiURHk3+V6NFOJLyk+pzEgszogvKs1JLT7EKMPBoSTB+9AfKCdYlJqeWpGWmQMMf5i0BAePk gjvZJA0b3FBYm5xZjpE6hSjJceNh9f/MHHs23MLSHbcvPuHSYglLz8vVUqcdzNIgwBIQ0ZpHt w4WIxeYpSVEuZlBDpQiKcgtSg3swRV/hWjOAejkjCvLDDihXgy80rgtr4COogJ6KA5TVdADip JREhJNTDaCyffbj58239lYOKOuGum72tCo+92fVRbtmVrXK7MRaeC2/W/+UwZX6w5l1Ua3KTG tbQ4wNHg9eYtinkrt7EVvbl6L9CgL7ucb3/jNVebd6mJa58Y6n7lOCyssnX7hNdxepWeC9c+e hRiny/4+szifNelXAvWGF2f1axzMqhX4WWu+XKTpxZKLMUZiYZazEXFiQCpIM+bzAIAAA== X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1507152085!76237971!1 X-Originating-IP: [74.125.83.51] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 19857 invoked from network); 4 Oct 2017 21:21:26 -0000 Received: from mail-pg0-f51.google.com (HELO mail-pg0-f51.google.com) (74.125.83.51) by server-15.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 4 Oct 2017 21:21:26 -0000 Received: by mail-pg0-f51.google.com with SMTP id c137so7166320pga.11 for ; Wed, 04 Oct 2017 14:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=46B52AFPMSIdRCP95921HMb/ImgD/FvaG/AH6hTdj8E=; b=F4mbxkP9MMgkpxL2i0FNqYEmNPTmKzYhcNGtcGAXmR1skIESVLl36I6isr03lRSVQE pGkQinWYQL2Cjpqn/ZQKvfqMrAkhAbEas7kmtBh3lpSoR8x/Oiid/TnEdbTGRDxqU8rD j3FQcaNrSU82op5AL/aKPm0H0b5STdpggawuOGgRoh2aAev4OHIdce7q2ssUPtd7jUTs uNNEJL+CnNh8k0UgMu3UBVnipLsUnyyq8i1W89hkNwefQCA6koeBucBtLXsWOau8P4dz A1Y8vch8nbW9eiE0PAuuPaIjCzWueVJoxeChcv+/8vtOPlsRqiPppzyNvL/7aOYUV1VQ hQRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=46B52AFPMSIdRCP95921HMb/ImgD/FvaG/AH6hTdj8E=; b=XLOa7BttGjU9IwULgMgWXUdcBIz9GL1zqeHv83alzHvMcf1MmaC1PlJj/g/d6AdGCp ujW6mV3DMJZv5iDd7nx6N1+XScXZQwbormH+M+Num8CIBM86obXgkAU1FaUUNxpHI0OO bPUm9a/FED5fIwmlB5A2ZpIMAMXPVa5ls7tC8hDG6VZXyPFIlZDFOky4qr1YAQzl4IR8 BGUQ6aY+/UsisQeOAXI2IVGWKRxI/7Ncqy7gqZzDf0fJIh97nZn9nDDsLHpoVJQ6qhxr K7/6fhIcnEardG0c1ESoaFv7i7ceTDwnZ8YnmXiqus8106Nunu8LlcRd7Wwr2jnaC74y T2ZQ== X-Gm-Message-State: AHPjjUhK3grhuksFoBP2kojEXZUx+BjBEeJSJvvdJ50ApQYtXVNHCG3w 5Y8drfm5ctfgJbU0mEL4fla6WQ== X-Google-Smtp-Source: AOwi7QA7CRCA5V1U8bnt5IKCaaRLz1yhysYsGqW3BiVV7/DDzRON8hOT8DcujWhpBmjnb470x6QZYg== X-Received: by 10.159.204.138 with SMTP id t10mr20760372plo.450.1507152083977; Wed, 04 Oct 2017 14:21:23 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id s68sm30204019pfd.72.2017.10.04.14.21.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Oct 2017 14:21:22 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Thomas Garnier , Arnd Bergmann , Kees Cook , Matthias Kaehlcke , Tom Lendacky , Andy Lutomirski , "Kirill A . Shutemov" , Borislav Petkov , "Rafael J . Wysocki" , Len Brown , Pavel Machek , Juergen Gross , Chris Wright , Alok Kataria , Rusty Russell , Tejun Heo , Christoph Lameter , Boris Ostrovsky , Alexey Dobriyan , Andrew Morton , Paul Gortmaker , Chris Metcalf , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Dou Liyang , "Rafael J . Wysocki" , Mika Westerberg , Lukas Wunner , Masahiro Yamada , Alexei Starovoitov , Daniel Borkmann , Markus Trippelsdorf , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Rik van Riel , David Howells , Ard Biesheuvel , Waiman Long , Kyle Huey , Andrey Ryabinin , Jonathan Corbet , Matthew Wilcox , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , Rob Landley , "H . J . Lu" , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 4 Oct 2017 14:19:57 -0700 Message-Id: <20171004212003.28296-22-thgarnie@google.com> X-Mailer: git-send-email 2.14.2.920.gcf0c67979c-goog In-Reply-To: <20171004212003.28296-1-thgarnie@google.com> References: <20171004212003.28296-1-thgarnie@google.com> Cc: linux-arch@vger.kernel.org, kvm@vger.kernel.org, linux-pm@vger.kernel.org, x86@kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, linux-sparse@vger.kernel.org, linux-crypto@vger.kernel.org, kernel-hardening@lists.openwall.com, xen-devel@lists.xenproject.org Subject: [Xen-devel] [RFC v3 21/27] x86/mm/dump_pagetables: Fix address markers index on x86_64 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 The address_markers_idx enum is not aligned with the table when EFI is enabled. Add an EFI_VA_END_NR entry in this case. Signed-off-by: Thomas Garnier --- arch/x86/mm/dump_pagetables.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 5e3ac6fe6c9e..8691a57da63e 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -52,12 +52,15 @@ enum address_markers_idx { LOW_KERNEL_NR, VMALLOC_START_NR, VMEMMAP_START_NR, -#ifdef CONFIG_KASAN +# ifdef CONFIG_KASAN KASAN_SHADOW_START_NR, KASAN_SHADOW_END_NR, -#endif +# endif # ifdef CONFIG_X86_ESPFIX64 ESPFIX_START_NR, +# endif +# ifdef CONFIG_EFI + EFI_VA_END_NR, # endif HIGH_KERNEL_NR, MODULES_VADDR_NR,