From patchwork Fri Feb 15 17:02:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Price X-Patchwork-Id: 10815489 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1BB371390 for ; Fri, 15 Feb 2019 17:03:55 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09C892ED13 for ; Fri, 15 Feb 2019 17:03:55 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F195D2ED5D; Fri, 15 Feb 2019 17:03:54 +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=-2.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7CB4C2ED13 for ; Fri, 15 Feb 2019 17:03:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC5BA8E000F; Fri, 15 Feb 2019 12:03:47 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B76768E0001; Fri, 15 Feb 2019 12:03:47 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A3B558E000F; Fri, 15 Feb 2019 12:03:47 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.70]) by kanga.kvack.org (Postfix) with ESMTP id 4CA4D8E0001 for ; Fri, 15 Feb 2019 12:03:47 -0500 (EST) Received: by mail-ed1-f70.google.com with SMTP id w51so4195625edw.7 for ; Fri, 15 Feb 2019 09:03:47 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=p4xRgAKusZHkTC7J5q8NQBkr68Ska5Iak032oO+4xKM=; b=TsE4X3UUGHLGom0dMRvJ40y0sltdLwDiv+s7N5ex3zq6N0bYgmQSC0xhtfiIaUJe08 n4ZIHdrRrrenvRZGERMMRjOdYZaIJ8JUhZ7g90E/jIQEwF6tWEZzcA2fB7nJLKua1D9a g36t/961eHs/8ymvhWm1zNxs05sZFscFRVruMR2LKxRJ8K/vMEs7+KqmlvbIi4gRRP+I 2KQEnAMLtgCWHWs+BY2CLmeaVnyNMzR7v2mLPEazjVntDIMj8szx2EWOHYMqzYyJb1Nj XusaVSqBkV/ewuHR+UxQ1L1nV8Lm0lu5PkL2GQrh3SZHeWaiLx/Km0E6Knzu1aEFPXOj WavA== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com X-Gm-Message-State: AHQUAuaLVip2MhSgNc1Yof+n/mDjvrKDr+4HG7pLag7yPSg6nBFlDThR dY6qkzQE/Aifz5m88lbOi4rWhG1+ysgzg2WqXyIhWuOQfBL/F1uLnr3yWndFenGuRYZklyyCvXb 9WqBqTR1RrBwZ50Jc5UCuxgyRA3DnUIoFKE3SZ9Rm9lJ/m0xhblIW5lVUcixMfCuAVw== X-Received: by 2002:aa7:c5d0:: with SMTP id h16mr8308276eds.107.1550250226762; Fri, 15 Feb 2019 09:03:46 -0800 (PST) X-Google-Smtp-Source: AHgI3Iaux92P3muc9T5MheL0oybHsiV7QrZnUKngU81sBAsej1p4Ixvvr5ynS9ofT6gus5L+26uJ X-Received: by 2002:aa7:c5d0:: with SMTP id h16mr8308210eds.107.1550250225586; Fri, 15 Feb 2019 09:03:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550250225; cv=none; d=google.com; s=arc-20160816; b=CoR7zqYGACccnhYwz/jRTRdeb3dZhh4ZSqtB72X5SMHem3Ti1RQg5Sd+iqenZlkIB5 /o+1CGE9Laplfejoj6Kp7fBC/Yc0Ejj2OjDtq7l7L9UVfKFmduR2swelNFarujF/hKNj VhvmSXwk3qlMV7weP26Wh0EUEJyKP0rjeO246K6duLc6bH28xnZReJMNnQAeqlnDgMzH XYU6XvStq3LE+WH9+KDyN/IbHIkq8Jyo6KeNaXJhABfgjvRHkaBMJess3FlCoCRHli17 9nPtizsIkums68x7QOeJ4Pb/1b+jdofYEODwKBFb6jlTgn5e/G/iYPugqgqGVPiqXcEU kEeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=p4xRgAKusZHkTC7J5q8NQBkr68Ska5Iak032oO+4xKM=; b=wGR2ObXaq1Du72V7KyxVYEz0PkOh8AWKnVnq+DP8W7C3wa6eQ3Hw2n+Q1o5Gne2kZY pNfQMV5nkyab+fQ/wPnAYuCQL+Q/+/I2hTZwHbXH3y9jdTHt1Pu67vxUZwDgbFzQPbsT 4bnD/auw6tt7aiZSRoCHblTZayGd8Ec6tnIFBr4E4KZpZ/UacWWopUhypyOdKD8pV3Y4 CF6awKn54CYvxN9tkM57NCTrfYJLYha7JZVYs8jotD+E0flF/6QAFRsFgsVS4hSz6D6R JrqdljjDqROP3hK4RggUSS88xLQfmZEHYzo75n+Ub5MlIRReWmCvMh1gOi2LauI0G5m8 OfUA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com Received: from foss.arm.com (foss.arm.com. [217.140.101.70]) by mx.google.com with ESMTP id r15si2789729edd.226.2019.02.15.09.03.45 for ; Fri, 15 Feb 2019 09:03:45 -0800 (PST) Received-SPF: pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) client-ip=217.140.101.70; Authentication-Results: mx.google.com; spf=pass (google.com: domain of steven.price@arm.com designates 217.140.101.70 as permitted sender) smtp.mailfrom=steven.price@arm.com 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?b?SsOpcsO0bWUgR2xpc3Nl?= , 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 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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)