Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp930387imj; Fri, 15 Feb 2019 09:08:28 -0800 (PST) X-Google-Smtp-Source: AHgI3IZ40AS9c2j160kV4MiM0ci7GByD3WHAkl5GgOdMq0EvdiiUx03zMPebjhq21cjkJt1x+wyJ X-Received: by 2002:aa7:85d1:: with SMTP id z17mr10649643pfn.226.1550250508199; Fri, 15 Feb 2019 09:08:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550250508; cv=none; d=google.com; s=arc-20160816; b=Jb2b9ROF4B1EBpr/900XePswqbfWAWlkEA+Bb6XYmrMmnU9LgEPQdGMpsyzBT/Kofw V9FTeXAlB6p3qp7Z+uhUAeDMHaIy9TM+wbIS6VI5UyOE0+TE0uY7F0V+Z3fMNku00vfQ 0/IKs5S7qxKiSk/A01gjt5EunCa2n/QR3+cbwasCOvGrPlWTaihCLDywc2dF8wBV/WwD omls9hdiByVXqszu7nkuKfNeAcdiZ9aC3CCiIOA6aRtWLbv7w4FRZ6PrhUP2sdp2WsMf pejr8Cjo0QFNIF+eGu3oqTeqvOV6KIjQIGKTjoVPT2GMr30I42lmU7E/0JmrPwyzx1eE 23nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=p4xRgAKusZHkTC7J5q8NQBkr68Ska5Iak032oO+4xKM=; b=Wcc1Tr+Py2wK6u4LxvN9H9cufD7VdqX3nljcpkHk26CstLNi/hpldyHZcEVDOwvSV9 rbFvMKgpiH2ugl5qmwOLcysg3OyWL4IMu1faCOH7R2JogUX/PufInQK4hIsJ3SZgvnkS v6PICO5F9PVG2KATzrLOCapjyTofaG0uRC1ZWaKkPIIWhsldMwHPfRrZJJyZKWOJNBuN Ew7XSAa11K3cWyMWfNJdZObxaWidFS1ZvogOzKYjT0Sqsuj4mGR41H5dozgrqDbKWbJy xSlfBfb84c2wAXQIbHBcMwQY7FC1LrZUoho/0XKBwHyYkxwLfNepkvmAlZKUKJjrL50U Bsgw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id bc7si6022812plb.120.2019.02.15.09.08.12; Fri, 15 Feb 2019 09:08:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731168AbfBORDr (ORCPT + 99 others); Fri, 15 Feb 2019 12:03:47 -0500 Received: from foss.arm.com ([217.140.101.70]:35968 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730972AbfBORDo (ORCPT ); Fri, 15 Feb 2019 12:03:44 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 78711169E; Fri, 15 Feb 2019 09:03:44 -0800 (PST) Received: from e112269-lin.arm.com (e112269-lin.cambridge.arm.com [10.1.196.69]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 84F443F557; Fri, 15 Feb 2019 09:03:41 -0800 (PST) From: Steven Price To: linux-mm@kvack.org Cc: Steven Price , Andy Lutomirski , Ard Biesheuvel , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Dave Hansen , Ingo Molnar , James Morse , =?UTF-8?q?J=C3=A9r=C3=B4me=20Glisse?= , Peter Zijlstra , Thomas Gleixner , Will Deacon , x86@kernel.org, "H. Peter Anvin" , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/13] x86/mm: Convert ptdump_walk_pgd_level_core() to take an mm_struct Date: Fri, 15 Feb 2019 17:02:33 +0000 Message-Id: <20190215170235.23360-13-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190215170235.23360-1-steven.price@arm.com> References: <20190215170235.23360-1-steven.price@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An mm_struct is needed to enable x86 to use of the generic walk_page_range() function. In the case of walking the user page tables (when CONFIG_PAGE_TABLE_ISOLATION is enabled), it is necessary to create a fake_mm structure because there isn't an mm_struct with a pointer to the pgd of the user page tables. This fake_mm structure is initialised with the minimum necessary for the generic page walk code. Signed-off-by: Steven Price --- arch/x86/mm/dump_pagetables.c | 36 ++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index 18fb6193311f..ddb22e7f81b3 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -111,8 +111,6 @@ 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 { @@ -147,8 +145,6 @@ 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 */ @@ -522,10 +518,10 @@ static inline bool is_hypervisor_range(int idx) #endif } -static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd, +static void ptdump_walk_pgd_level_core(struct seq_file *m, struct mm_struct *mm, bool checkwx, bool dmesg) { - pgd_t *start = pgd; + pgd_t *start = mm->pgd; pgprotval_t prot, eff; int i; struct pg_state st = {}; @@ -572,39 +568,49 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd, void ptdump_walk_pgd_level(struct seq_file *m, struct mm_struct *mm) { - ptdump_walk_pgd_level_core(m, mm->pgd, false, true); + ptdump_walk_pgd_level_core(m, mm, false, true); } +#ifdef CONFIG_PAGE_TABLE_ISOLATION +static void ptdump_walk_pgd_level_user_core(struct seq_file *m, + struct mm_struct *mm, + bool checkwx, bool dmesg) +{ + struct mm_struct fake_mm = { + .pgd = kernel_to_user_pgdp(mm->pgd) + }; + init_rwsem(&fake_mm.mmap_sem); + ptdump_walk_pgd_level_core(m, &fake_mm, checkwx, dmesg); +} +#endif + void ptdump_walk_pgd_level_debugfs(struct seq_file *m, struct mm_struct *mm, bool user) { - pgd_t *pgd = mm->pgd; #ifdef CONFIG_PAGE_TABLE_ISOLATION if (user && static_cpu_has(X86_FEATURE_PTI)) - pgd = kernel_to_user_pgdp(pgd); + ptdump_walk_pgd_level_user_core(m, mm, false, false); + else #endif - ptdump_walk_pgd_level_core(m, pgd, false, false); + ptdump_walk_pgd_level_core(m, mm, false, false); } EXPORT_SYMBOL_GPL(ptdump_walk_pgd_level_debugfs); void ptdump_walk_user_pgd_level_checkwx(void) { #ifdef CONFIG_PAGE_TABLE_ISOLATION - pgd_t *pgd = INIT_PGD; - if (!(__supported_pte_mask & _PAGE_NX) || !static_cpu_has(X86_FEATURE_PTI)) return; pr_info("x86/mm: Checking user space page tables\n"); - pgd = kernel_to_user_pgdp(pgd); - ptdump_walk_pgd_level_core(NULL, pgd, true, false); + ptdump_walk_pgd_level_user_core(NULL, &init_mm, true, false); #endif } void ptdump_walk_pgd_level_checkwx(void) { - ptdump_walk_pgd_level_core(NULL, INIT_PGD, true, false); + ptdump_walk_pgd_level_core(NULL, &init_mm, true, false); } static int __init pt_dump_init(void) -- 2.20.1