From patchwork Wed Oct 11 20:30:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Garnier X-Patchwork-Id: 10000583 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 BACA76037F for ; Wed, 11 Oct 2017 20:33:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AEA1628B37 for ; Wed, 11 Oct 2017 20:33:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A296628B6B; Wed, 11 Oct 2017 20:33:45 +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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, RCVD_IN_DNSWL_MED, 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 518D128B37 for ; Wed, 11 Oct 2017 20:33:45 +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 1e2NfL-0000uW-B7; Wed, 11 Oct 2017 20:31:43 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e2NfJ-0000rO-PL for xen-devel@lists.xenproject.org; Wed, 11 Oct 2017 20:31:41 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 00/AC-01544-DAF7ED95; Wed, 11 Oct 2017 20:31:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrHIsWRWlGSWpSXmKPExsVyMfTAZt019fc iDRYd4bf4vmUykwOjx+EPV1gCGKNYM/OS8isSWDNO/njBXnCBreLyv+0sDYxPWLsYuTiEBKYz SjRP+MYC4rAIvGKR2PXmDjOIIyHQzyoxbe85IIcDyMmS+Lifs4uRE8hMk9jQ/40dwq6Q+DxpB QuILSSgJLF1w1JmiKn/GCUuHfrLDJJgE9CS2NMwnwkkISJwQlhi04ffjCAOs8AZJonjfSdZQT YIC4RK7JouCdLAIqAqsW7SfEaQMK+ApcShZ5IQyywkjh07DLaMEyj8feMhZojFFhIrZ51nncA ouICRYRWjRnFqUVlqka6RmV5SUWZ6RkluYmaOrqGBqV5uanFxYnpqTmJSsV5yfu4mRmDI1TMw MO5gvD3Z7xCjJAeTkijvw5h7kUJ8SfkplRmJxRnxRaU5qcWHGGU4OJQkeJPqgHKCRanpqRVpm TnA4IdJS3DwKInwNoGkeYsLEnOLM9MhUqcY7Tku3Ln0h4njxsPrQPLAnltAsuPm3T9MQix5+X mpUuK8pSBtAiBtGaV5cENh0XqJUVZKmJeRgYFBiKcgtSg3swRV/hWjOAejkjDvYZApPJl5JXC 7XwGdxQR0lmjaHZCzShIRUlINjDOct9auTvoyWX9/yoOmk1uKZ+x9tu7DuvJfSkuP+tvsSf3l rfVunavC121PpXiZrUxm9/1p7X+Y6b5j6ZODExX2V+pO6uqt/Seb0yTV0fuAR8otIGOqBNd01 bW6H2qZnn1nixe8puRUdSOx0TbacDG3cvLWaWaRRjdbJWZriUxn0tOYy/lOXYmlOCPRUIu5qD gRAE0fRYHRAgAA X-Env-Sender: thgarnie@google.com X-Msg-Ref: server-3.tower-206.messagelabs.com!1507753899!102975376!1 X-Originating-IP: [209.85.192.179] 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 28932 invoked from network); 11 Oct 2017 20:31:40 -0000 Received: from mail-pf0-f179.google.com (HELO mail-pf0-f179.google.com) (209.85.192.179) by server-3.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 11 Oct 2017 20:31:40 -0000 Received: by mail-pf0-f179.google.com with SMTP id x7so1963704pfa.1 for ; Wed, 11 Oct 2017 13:31:40 -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=OZWjVg24wXxKBDNbQnAWt5HmoC3jzLYSZ4aDG0CXKys=; b=l9dbEKKKT/YFx47F4tNRuEWrtMXVBbEjsqRC/VcGlXGXoOyLdF918aaRW+9Mjujt9V Hwu+urCLPNq6rScEqipXOWQR9DcI+sXjX4l6l94nZLIAezxJHELDvLC0idtQZd65S/Pf r8/jLpdXK5wVXfIFY+RmvlCnbZOzIVazybzI4wQdbspnNZCMGRlp1dN51EsZ2fyoMU8/ IQLf87EcmLdZ46t1/7nPKI/JvQAzcg2UsRshbBGB/ntVWtDq3ncq38WJeyVxtT+85MQA KQOY1wo6pNVGO6NFV1iVaNMw1TwJyAevtgG/6OIkk1C5uIlBkcHT/1HU/ey9kMk36vV2 YqqQ== 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=OZWjVg24wXxKBDNbQnAWt5HmoC3jzLYSZ4aDG0CXKys=; b=P2/ECo6I1TRhk6Q3Dn4vMWRJLmEJIGJL6JQtmoiMBVgBp/U+BhgNYJiyFgOvk2qiQp cz89hZoafPfS2sFBOlury2elxFe1X89FeqWK+xQhR/HXtQB3+LmM3nSuYUosRzH5sQY8 YRN8DLApTK2l2Ct3/KFWWy43PopVpN5v+gkRqaYl/IxkmdPaAOGJjLelzZMfmhjAzQqV 06mwq89BGyASt6wllbqjaDHxFBV0Hz13SGOwkdBabz+sf1tRSsN/vkh/uwr9/QVdsfbK SQpAcsqwZLY0e1tkFYDZ4elQSViQeAnH8BqKr9aMLY/ZnkVrsc9GAb+Re+PG5z0AO96l zk0A== X-Gm-Message-State: AMCzsaWoytJHRoD4n34IvZO2sDQcIM7GAYGfP9OotC1GSuFTB0tB7JVK SbFwiZWg0nPtEl/1/badvg/h7w== X-Google-Smtp-Source: AOwi7QD5fGAi7gCaqCAw0YINWD1i2SyLe3y2uMhRny7cDvcPe+r0BweuMxbBaNy0tBNU6bFQi/QAqA== X-Received: by 10.98.35.212 with SMTP id q81mr163530pfj.273.1507753898005; Wed, 11 Oct 2017 13:31:38 -0700 (PDT) Received: from skynet.sea.corp.google.com ([172.31.92.33]) by smtp.gmail.com with ESMTPSA id n12sm20691913pfb.149.2017.10.11.13.31.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 Oct 2017 13:31:37 -0700 (PDT) From: Thomas Garnier To: Herbert Xu , "David S . Miller" , Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" , Peter Zijlstra , Josh Poimboeuf , Arnd Bergmann , Thomas Garnier , Kees Cook , Andrey Ryabinin , 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 , Paul Gortmaker , Andrew Morton , Alexey Dobriyan , "Paul E . McKenney" , Nicolas Pitre , Borislav Petkov , "Luis R . Rodriguez" , Greg Kroah-Hartman , Christopher Li , Steven Rostedt , Jason Baron , Mika Westerberg , Dou Liyang , "Rafael J . Wysocki" , 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 , Jonathan Corbet , Michal Hocko , Peter Foley , Paul Bolle , Jiri Kosina , "H . J . Lu" , Rob Landley , Baoquan He , =?UTF-8?q?Jan=20H=20=2E=20Sch=C3=B6nherr?= , Daniel Micay Date: Wed, 11 Oct 2017 13:30:21 -0700 Message-Id: <20171011203027.11248-22-thgarnie@google.com> X-Mailer: git-send-email 2.15.0.rc0.271.g36b669edcc-goog In-Reply-To: <20171011203027.11248-1-thgarnie@google.com> References: <20171011203027.11248-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] [PATCH v1 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,