From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AG47ELuppOwRR1Zv3tL8XKpDrtZJcxg+ZALjzuMmO9R15kW+UO4dzvO3eLnXEYm9jeaXaMPrFsLx ARC-Seal: i=1; a=rsa-sha256; t=1520245581; cv=none; d=google.com; s=arc-20160816; b=sfi1MmSn8DEVK8o6k2BTFV0De63st5jey4oK7CJ91HqLDZmTqs94aWP2hwRJuHKaR/ i/cOPC7NdCLmFTrQTG8w1RSlcD5GUWcjFCUSylv1EMScH7spBwsshQh5MP6v0AXlarj5 Dyicuk0n8OhMmeDelx33YBL1chorBsDHun+bi835QzoWQYB/fQTcgD/j8azQIHaYeKDk KxdtqJikl1enfkZVkPF3Q0/tId4Z6K3XyFcxsYdBStAJoCr9zptNWfvV3wKjqkqVpY9n 7Lt0TaIiGugi4j4KDin72cIb7vwX3OmF5vhdLDTyQUbOweoKrIFL7fgy1APuqoM+HHew XNgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=TBtohe2X5SHsmPjdTDHZdNzRuX9gI4sKHKxpvfjShHc=; b=OB4wIf53cXak33ZwVZmVXjLUzNBlbKPbFEsq1tlKs+VHwlD9pBCMKdoOXjzF3gAE7J /UouCOPtKYOzFljorssSn9dKAq+n74avcXV4VxoJ9N6vujpZ43IRrboAzp94qEz8+EbP g0FY5CGpJ0XSObPSasmILtNF7sV5ArdDxg3whP5G0eT3lbmPjUGnKjr3FzaXycXH+gih s5GEg+0TCNzBTvqh6Qw1hN38H5FAzvUIEAuer2sVx2PQ7ISdp571vCDTXhZC9U9TeU7k lPSeGvGag3jVLXpqYCl6OKgP/Df8JQedUcjv9b6KaFANPtsuKfmyIl6JeV0SgOu0hEWb NqAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Pa8xxOpK; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=Pa8xxOpK; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org From: Joerg Roedel To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Andy Lutomirski , Dave Hansen , Josh Poimboeuf , Juergen Gross , Peter Zijlstra , Borislav Petkov , Jiri Kosina , Boris Ostrovsky , Brian Gerst , David Laight , Denys Vlasenko , Eduardo Valentin , Greg KH , Will Deacon , aliguori@amazon.com, daniel.gruss@iaik.tugraz.at, hughd@google.com, keescook@google.com, Andrea Arcangeli , Waiman Long , Pavel Machek , jroedel@suse.de, joro@8bytes.org Subject: [PATCH 27/34] x86/mm/dump_pagetables: Define INIT_PGD Date: Mon, 5 Mar 2018 11:25:56 +0100 Message-Id: <1520245563-8444-28-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520245563-8444-1-git-send-email-joro@8bytes.org> References: <1520245563-8444-1-git-send-email-joro@8bytes.org> X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1594093030904193949?= X-GMAIL-MSGID: =?utf-8?q?1594093030904193949?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Joerg Roedel Define INIT_PGD to point to the correct initial page-table for 32 and 64 bit and use it where needed. This fixes the build on 32 bit with CONFIG_PAGE_TABLE_ISOLATION enabled. Signed-off-by: Joerg Roedel --- arch/x86/mm/dump_pagetables.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 2a4849e..2151ebb 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -105,6 +105,8 @@ static struct addr_marker address_markers[] = { [END_OF_SPACE_NR] = { -1, NULL } }; +#define INIT_PGD ((pgd_t *) &init_top_pgt) + #else /* CONFIG_X86_64 */ enum address_markers_idx { @@ -133,6 +135,8 @@ static struct addr_marker address_markers[] = { [END_OF_SPACE_NR] = { -1, NULL } }; +#define INIT_PGD (swapper_pg_dir) + #endif /* !CONFIG_X86_64 */ /* Multipliers for offsets within the PTEs */ @@ -478,11 +482,7 @@ static inline bool is_hypervisor_range(int idx) static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd, bool checkwx, bool dmesg) { -#ifdef CONFIG_X86_64 - pgd_t *start = (pgd_t *) &init_top_pgt; -#else - pgd_t *start = swapper_pg_dir; -#endif + pgd_t *start = INIT_PGD; pgprotval_t prot; int i; struct pg_state st = {}; @@ -543,7 +543,7 @@ EXPORT_SYMBOL_GPL(ptdump_walk_pgd_level_debugfs); static void ptdump_walk_user_pgd_level_checkwx(void) { #ifdef CONFIG_PAGE_TABLE_ISOLATION - pgd_t *pgd = (pgd_t *) &init_top_pgt; + pgd_t *pgd = INIT_PGD; if (!static_cpu_has(X86_FEATURE_PTI)) return; -- 2.7.4