From: Steven Price <steven.price@arm.com> To: linux-mm@kvack.org Cc: "Steven Price" <steven.price@arm.com>, "Andy Lutomirski" <luto@kernel.org>, "Ard Biesheuvel" <ard.biesheuvel@linaro.org>, "Arnd Bergmann" <arnd@arndb.de>, "Borislav Petkov" <bp@alien8.de>, "Catalin Marinas" <catalin.marinas@arm.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Ingo Molnar" <mingo@redhat.com>, "James Morse" <james.morse@arm.com>, "Jérôme Glisse" <jglisse@redhat.com>, "Peter Zijlstra" <peterz@infradead.org>, "Thomas Gleixner" <tglx@linutronix.de>, "Will Deacon" <will.deacon@arm.com>, x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, "Mark Rutland" <Mark.Rutland@arm.com>, "Liang, Kan" <kan.liang@linux.intel.com>, "Andrew Morton" <akpm@linux-foundation.org> Subject: [PATCH v8 17/20] x86: mm+efi: Convert ptdump_walk_pgd_level() to take a mm_struct Date: Wed, 3 Apr 2019 15:16:24 +0100 [thread overview] Message-ID: <20190403141627.11664-18-steven.price@arm.com> (raw) In-Reply-To: <20190403141627.11664-1-steven.price@arm.com> 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 <steven.price@arm.com> --- 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 0dd04cf6ebeb..579959750f34 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 3d12ac031144..ddf8ea6b059d 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
WARNING: multiple messages have this Message-ID (diff)
From: Steven Price <steven.price@arm.com> To: linux-mm@kvack.org Cc: "Mark Rutland" <Mark.Rutland@arm.com>, x86@kernel.org, "Arnd Bergmann" <arnd@arndb.de>, "Ard Biesheuvel" <ard.biesheuvel@linaro.org>, "Peter Zijlstra" <peterz@infradead.org>, "Catalin Marinas" <catalin.marinas@arm.com>, "Dave Hansen" <dave.hansen@linux.intel.com>, "Will Deacon" <will.deacon@arm.com>, linux-kernel@vger.kernel.org, "Steven Price" <steven.price@arm.com>, "Jérôme Glisse" <jglisse@redhat.com>, "Ingo Molnar" <mingo@redhat.com>, "Borislav Petkov" <bp@alien8.de>, "Andy Lutomirski" <luto@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>, "James Morse" <james.morse@arm.com>, "Thomas Gleixner" <tglx@linutronix.de>, "Andrew Morton" <akpm@linux-foundation.org>, linux-arm-kernel@lists.infradead.org, "Liang, Kan" <kan.liang@linux.intel.com> Subject: [PATCH v8 17/20] x86: mm+efi: Convert ptdump_walk_pgd_level() to take a mm_struct Date: Wed, 3 Apr 2019 15:16:24 +0100 [thread overview] Message-ID: <20190403141627.11664-18-steven.price@arm.com> (raw) In-Reply-To: <20190403141627.11664-1-steven.price@arm.com> 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 <steven.price@arm.com> --- 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 0dd04cf6ebeb..579959750f34 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 3d12ac031144..ddf8ea6b059d 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2019-04-03 14:18 UTC|newest] Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-04-03 14:16 [PATCH v8 00/20] Convert x86 & arm64 to use generic page walk Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 01/20] arc: mm: Add p?d_large() definitions Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 02/20] arm64: " Steven Price 2019-04-03 14:16 ` Steven Price 2019-06-11 15:36 ` Will Deacon 2019-06-11 15:36 ` Will Deacon 2019-04-03 14:16 ` [PATCH v8 03/20] mips: " Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 04/20] powerpc: " Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 05/20] KVM: PPC: Book3S HV: Remove pmd_is_leaf() Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-29 2:05 ` Paul Mackerras 2019-04-29 2:05 ` Paul Mackerras 2019-04-29 2:05 ` Paul Mackerras 2019-04-29 2:05 ` Paul Mackerras 2019-05-09 15:03 ` Steven Price 2019-05-09 15:03 ` Steven Price 2019-05-09 15:03 ` Steven Price 2019-05-09 15:03 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 06/20] riscv: mm: Add p?d_large() definitions Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-05 4:14 ` Anup Patel 2019-04-05 4:14 ` Anup Patel 2019-04-05 4:14 ` Anup Patel 2019-04-03 14:16 ` [PATCH v8 07/20] s390: " Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 08/20] sparc: " Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 09/20] x86: " Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 10/20] mm: Add generic p?d_large() macros Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 11/20] mm: pagewalk: Add p4d_entry() and pgd_entry() Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 12/20] mm: pagewalk: Allow walking without vma Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 13/20] mm: pagewalk: Add test_p?d callbacks Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 14/20] arm64: mm: Convert mm/dump.c to use walk_page_range() Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 15/20] x86: mm: Don't display pages which aren't present in debugfs Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 16/20] x86: mm: Point to struct seq_file from struct pg_state Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` Steven Price [this message] 2019-04-03 14:16 ` [PATCH v8 17/20] x86: mm+efi: Convert ptdump_walk_pgd_level() to take a mm_struct Steven Price 2019-04-03 14:16 ` [PATCH v8 18/20] x86: mm: Convert ptdump_walk_pgd_level_debugfs() to take an mm_struct Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 19/20] x86: mm: Convert ptdump_walk_pgd_level_core() " Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-03 14:16 ` [PATCH v8 20/20] x86: mm: Convert dump_pagetables to use walk_page_range Steven Price 2019-04-03 14:16 ` Steven Price 2019-04-10 14:56 ` [PATCH v8 00/20] Convert x86 & arm64 to use generic page walk Steven Price 2019-04-10 14:56 ` Steven Price 2019-04-12 14:44 ` Dave Hansen 2019-04-12 14:44 ` Dave Hansen 2019-04-17 14:28 ` Steven Price 2019-04-17 14:28 ` Steven Price 2019-04-17 14:34 ` [RFC PATCH 1/3] mm: Add generic ptdump Steven Price 2019-04-17 14:34 ` Steven Price 2019-04-17 14:34 ` [RFC PATCH 2/3] arm64: mm: Switch to using generic pt_dump Steven Price 2019-04-17 14:34 ` Steven Price 2019-04-17 14:34 ` [RFC PATCH 3/3] x86: " Steven Price 2019-04-17 14:34 ` Steven Price
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190403141627.11664-18-steven.price@arm.com \ --to=steven.price@arm.com \ --cc=Mark.Rutland@arm.com \ --cc=akpm@linux-foundation.org \ --cc=ard.biesheuvel@linaro.org \ --cc=arnd@arndb.de \ --cc=bp@alien8.de \ --cc=catalin.marinas@arm.com \ --cc=dave.hansen@linux.intel.com \ --cc=hpa@zytor.com \ --cc=james.morse@arm.com \ --cc=jglisse@redhat.com \ --cc=kan.liang@linux.intel.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=luto@kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=tglx@linutronix.de \ --cc=will.deacon@arm.com \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.