Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp928814imj; Fri, 15 Feb 2019 09:07:11 -0800 (PST) X-Google-Smtp-Source: AHgI3Iakbk2idfv6ugTmQTOJVbn7Um+HfBkZ834RbvBT/lTee9GKrH4NsQ5OTGhywbDpIVdLvSKZ X-Received: by 2002:a17:902:2e03:: with SMTP id q3mr11528639plb.330.1550250431872; Fri, 15 Feb 2019 09:07:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550250431; cv=none; d=google.com; s=arc-20160816; b=yAby51Ifu+W4nbKeXbVh8SS7u5J+FW4egr2Eq70kToKPyeAE87loZW+AE/g70uHhIE EHU8oRZkns0tIIrpCbl6Z0+I++XY2+W5EX8BBMmWIvW7VlCll88KDg7IbmBFSSv/593C PKy5chscGfsoU6k0uH026JNDH5eG9qTVOrs/+wQJXsC3T+sX3oR/6l42DVENFZzL+4Co 7crcnmPyqCDKZj1wtZIESDsAkzJ2b0IdtRQBicXY1ma71Hdgd91u6wLqONPTN5xF1r1Y vYMpe0n7HT55hyV36rPM342DmRZx+OHcOJxOPzGAEgJzBW/FzoMyr8xb0DM5R6DoHL7K QhsQ== 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=ZxfOscDKXutNwaZpM2VXWTmUvZzMiqbo2UDKLtcN8fs=; b=JCCckqNx+iPspWnMGQ0QLiPZ5NGUHz2lxQswidIx6o+3vlCal6uRuWPVwm7inPNkvx A9xbSrqMCymkwXYXkffWjuAb/Icfb0V2LCA0Dnd8pYtyNk9H1aYN6ClKiYDf4Bp1fX2Q qdj4nGkAZF8LrnIltFzt7CA48r27GuJzcABRSTTg09Vdfo8vSpL72Uyk3hkNyyVYxgnp 5G4dQ8+Mozy5Mn6xTBI43j7fJAQLT6ba7RUdIo+9/CSJPaensVHhbu7P9j5RBjgTQoEW fC2NtTCRPScV4g0cyekZ9Lw7749zwfibsvJ5ocQwKGfmsrhcgIBeHbAXB7a0T0U3Lm2v 1Q2A== 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 j2si5410608pgp.418.2019.02.15.09.06.55; Fri, 15 Feb 2019 09:07:11 -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 S1730958AbfBORDl (ORCPT + 99 others); Fri, 15 Feb 2019 12:03:41 -0500 Received: from foss.arm.com ([217.140.101.70]:35908 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726694AbfBORDi (ORCPT ); Fri, 15 Feb 2019 12:03:38 -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 12BAE1596; Fri, 15 Feb 2019 09:03:38 -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 1F3883F557; Fri, 15 Feb 2019 09:03:34 -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 10/13] x86/mm+efi: Convert ptdump_walk_pgd_level() to take a mm_struct Date: Fri, 15 Feb 2019 17:02:31 +0000 Message-Id: <20190215170235.23360-11-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 To enable x86 to use the generic walk_page_range() function, the callers of ptdump_walk_pgd_level() need to pass an mm_struct rather than the raw pgd_t pointer. Luckily since commit 7e904a91bf60 ("efi: Use efi_mm in x86 as well as ARM") we now have an mm_struct for EFI on x86. Signed-off-by: Steven Price --- arch/x86/include/asm/pgtable.h | 2 +- arch/x86/mm/dump_pagetables.c | 4 ++-- arch/x86/platform/efi/efi_32.c | 2 +- arch/x86/platform/efi/efi_64.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 3695f6acb6af..371901283d5f 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h @@ -27,7 +27,7 @@ extern pgd_t early_top_pgt[PTRS_PER_PGD]; int __init __early_make_pgtable(unsigned long address, pmdval_t pmd); -void ptdump_walk_pgd_level(struct seq_file *m, pgd_t *pgd); +void ptdump_walk_pgd_level(struct seq_file *m, struct mm_struct *mm); void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user); void ptdump_walk_pgd_level_checkwx(void); void ptdump_walk_user_pgd_level_checkwx(void); diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.c index ad6986c9e8e7..1a4a03e3a6bd 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -574,9 +574,9 @@ static void ptdump_walk_pgd_level_core(struct seq_file *m, pgd_t *pgd, pr_info("x86/mm: Checked W+X mappings: passed, no W+X pages found.\n"); } -void ptdump_walk_pgd_level(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, pgd, false, true); + ptdump_walk_pgd_level_core(m, mm->pgd, false, true); } void ptdump_walk_pgd_level_debugfs(struct seq_file *m, pgd_t *pgd, bool user) diff --git a/arch/x86/platform/efi/efi_32.c b/arch/x86/platform/efi/efi_32.c index 9959657127f4..9175ceaa6e72 100644 --- a/arch/x86/platform/efi/efi_32.c +++ b/arch/x86/platform/efi/efi_32.c @@ -49,7 +49,7 @@ void efi_sync_low_kernel_mappings(void) {} void __init efi_dump_pagetable(void) { #ifdef CONFIG_EFI_PGT_DUMP - ptdump_walk_pgd_level(NULL, swapper_pg_dir); + ptdump_walk_pgd_level(NULL, init_mm); #endif } diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index cf0347f61b21..a2e0f9800190 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -611,9 +611,9 @@ void __init efi_dump_pagetable(void) { #ifdef CONFIG_EFI_PGT_DUMP if (efi_enabled(EFI_OLD_MEMMAP)) - ptdump_walk_pgd_level(NULL, swapper_pg_dir); + ptdump_walk_pgd_level(NULL, init_mm); else - ptdump_walk_pgd_level(NULL, efi_mm.pgd); + ptdump_walk_pgd_level(NULL, efi_mm); #endif } -- 2.20.1