From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7B64CA9ED0 for ; Fri, 1 Nov 2019 14:11:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id AE66B218AC for ; Fri, 1 Nov 2019 14:11:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AE66B218AC Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 2A6B86B0008; Fri, 1 Nov 2019 10:11:02 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 257926B0286; Fri, 1 Nov 2019 10:11:02 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16D926B0289; Fri, 1 Nov 2019 10:11:02 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0035.hostedemail.com [216.40.44.35]) by kanga.kvack.org (Postfix) with ESMTP id E6B526B0008 for ; Fri, 1 Nov 2019 10:11:01 -0400 (EDT) Received: from smtpin16.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with SMTP id 82786181AC1E9 for ; Fri, 1 Nov 2019 14:11:01 +0000 (UTC) X-FDA: 76107895122.16.test97_43188c0e2d535 X-HE-Tag: test97_43188c0e2d535 X-Filterd-Recvd-Size: 8311 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by imf15.hostedemail.com (Postfix) with ESMTP for ; Fri, 1 Nov 2019 14:11:00 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 75ACF95E; Fri, 1 Nov 2019 07:11:00 -0700 (PDT) Received: from e112269-lin.cambridge.arm.com (e112269-lin.cambridge.arm.com [10.1.194.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DF4B83F718; Fri, 1 Nov 2019 07:10:57 -0700 (PDT) From: Steven Price To: Andrew Morton , 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, Mark Rutland , "Liang, Kan" Subject: [PATCH v15 23/23] mm: ptdump: Reduce level numbers by 1 in note_page() Date: Fri, 1 Nov 2019 14:09:42 +0000 Message-Id: <20191101140942.51554-24-steven.price@arm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191101140942.51554-1-steven.price@arm.com> References: <20191101140942.51554-1-steven.price@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: Rather than having to increment the 'depth' number by 1 in ptdump_hole(), let's change the meaning of 'level' in note_page() since that makes the code simplier. Note that for x86, the level numbers were previously increased by 1 in commit 45dcd2091363 ("x86/mm/dump_pagetables: Fix printout of p4d level") and the comment "Bit 7 has a different meaning" was not updated, so this change also makes the code match the comment again. Reviewed-by: Catalin Marinas Signed-off-by: Steven Price --- arch/arm64/mm/dump.c | 6 +++--- arch/x86/mm/dump_pagetables.c | 19 ++++++++++--------- include/linux/ptdump.h | 1 + mm/ptdump.c | 16 ++++++++-------- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/arch/arm64/mm/dump.c b/arch/arm64/mm/dump.c index 3203dd8e6d0a..4997ce244172 100644 --- a/arch/arm64/mm/dump.c +++ b/arch/arm64/mm/dump.c @@ -175,8 +175,7 @@ struct pg_level { }; =20 static struct pg_level pg_level[] =3D { - { - }, { /* pgd */ + { /* pgd */ .name =3D "PGD", .bits =3D pte_bits, .num =3D ARRAY_SIZE(pte_bits), @@ -256,7 +255,7 @@ static void note_page(struct ptdump_state *pt_st, uns= igned long addr, int level, if (level >=3D 0) prot =3D val & pg_level[level].mask; =20 - if (!st->level) { + if (st->level =3D=3D -1) { st->level =3D level; st->current_prot =3D prot; st->start_address =3D addr; @@ -350,6 +349,7 @@ void ptdump_check_wx(void) { 0, NULL}, { -1, NULL}, }, + .level =3D -1, .check_wx =3D true, .ptdump =3D { .note_page =3D note_page, diff --git a/arch/x86/mm/dump_pagetables.c b/arch/x86/mm/dump_pagetables.= c index 77a1332c6cd4..d3c28b3765fc 100644 --- a/arch/x86/mm/dump_pagetables.c +++ b/arch/x86/mm/dump_pagetables.c @@ -176,7 +176,7 @@ static struct addr_marker address_markers[] =3D { static void printk_prot(struct seq_file *m, pgprotval_t pr, int level, b= ool dmsg) { static const char * const level_name[] =3D - { "cr3", "pgd", "p4d", "pud", "pmd", "pte" }; + { "pgd", "p4d", "pud", "pmd", "pte" }; =20 if (!(pr & _PAGE_PRESENT)) { /* Not present */ @@ -200,12 +200,12 @@ static void printk_prot(struct seq_file *m, pgprotv= al_t pr, int level, bool dmsg pt_dump_cont_printf(m, dmsg, " "); =20 /* Bit 7 has a different meaning on level 3 vs 4 */ - if (level <=3D 4 && pr & _PAGE_PSE) + if (level <=3D 3 && pr & _PAGE_PSE) pt_dump_cont_printf(m, dmsg, "PSE "); else pt_dump_cont_printf(m, dmsg, " "); - if ((level =3D=3D 5 && pr & _PAGE_PAT) || - ((level =3D=3D 4 || level =3D=3D 3) && pr & _PAGE_PAT_LARGE)) + if ((level =3D=3D 4 && pr & _PAGE_PAT) || + ((level =3D=3D 3 || level =3D=3D 2) && pr & _PAGE_PAT_LARGE)) pt_dump_cont_printf(m, dmsg, "PAT "); else pt_dump_cont_printf(m, dmsg, " "); @@ -267,15 +267,15 @@ static void note_page(struct ptdump_state *pt_st, u= nsigned long addr, int level, =20 new_prot =3D val & PTE_FLAGS_MASK; =20 - if (level > 1) { - new_eff =3D effective_prot(st->prot_levels[level - 2], + if (level > 0) { + new_eff =3D effective_prot(st->prot_levels[level - 1], new_prot); } else { new_eff =3D new_prot; } =20 - if (level > 0) - st->prot_levels[level - 1] =3D new_eff; + if (level >=3D 0) + st->prot_levels[level] =3D new_eff; =20 /* * If we have a "break" in the series, we need to flush the state that @@ -285,7 +285,7 @@ static void note_page(struct ptdump_state *pt_st, uns= igned long addr, int level, cur =3D st->current_prot; eff =3D st->effective_prot; =20 - if (!st->level) { + if (st->level =3D=3D -1) { /* First entry */ st->current_prot =3D new_prot; st->effective_prot =3D new_eff; @@ -376,6 +376,7 @@ static void ptdump_walk_pgd_level_core(struct seq_fil= e *m, struct mm_struct *mm, .note_page =3D note_page, .range =3D ptdump_ranges }, + .level =3D -1, .to_dmesg =3D dmesg, .check_wx =3D checkwx, .seq =3D m diff --git a/include/linux/ptdump.h b/include/linux/ptdump.h index a0fb8dd2be97..b28f3f2acf90 100644 --- a/include/linux/ptdump.h +++ b/include/linux/ptdump.h @@ -11,6 +11,7 @@ struct ptdump_range { }; =20 struct ptdump_state { + /* level is 0:PGD to 4:PTE, or -1 if unknown */ void (*note_page)(struct ptdump_state *st, unsigned long addr, int level, unsigned long val); const struct ptdump_range *range; diff --git a/mm/ptdump.c b/mm/ptdump.c index 79e63454f1f7..9987baede3f2 100644 --- a/mm/ptdump.c +++ b/mm/ptdump.c @@ -11,7 +11,7 @@ static int ptdump_pgd_entry(pgd_t *pgd, unsigned long a= ddr, pgd_t val =3D READ_ONCE(*pgd); =20 if (pgd_leaf(val)) - st->note_page(st, addr, 1, pgd_val(val)); + st->note_page(st, addr, 0, pgd_val(val)); =20 return 0; } @@ -23,7 +23,7 @@ static int ptdump_p4d_entry(p4d_t *p4d, unsigned long a= ddr, p4d_t val =3D READ_ONCE(*p4d); =20 if (p4d_leaf(val)) - st->note_page(st, addr, 2, p4d_val(val)); + st->note_page(st, addr, 1, p4d_val(val)); =20 return 0; } @@ -35,7 +35,7 @@ static int ptdump_pud_entry(pud_t *pud, unsigned long a= ddr, pud_t val =3D READ_ONCE(*pud); =20 if (pud_leaf(val)) - st->note_page(st, addr, 3, pud_val(val)); + st->note_page(st, addr, 2, pud_val(val)); =20 return 0; } @@ -47,7 +47,7 @@ static int ptdump_pmd_entry(pmd_t *pmd, unsigned long a= ddr, pmd_t val =3D READ_ONCE(*pmd); =20 if (pmd_leaf(val)) - st->note_page(st, addr, 4, pmd_val(val)); + st->note_page(st, addr, 3, pmd_val(val)); =20 return 0; } @@ -57,7 +57,7 @@ static int ptdump_pte_entry(pte_t *pte, unsigned long a= ddr, { struct ptdump_state *st =3D walk->private; =20 - st->note_page(st, addr, 5, pte_val(READ_ONCE(*pte))); + st->note_page(st, addr, 4, pte_val(READ_ONCE(*pte))); =20 return 0; } @@ -75,7 +75,7 @@ static inline int note_kasan_page_table(struct mm_walk = *walk, { struct ptdump_state *st =3D walk->private; =20 - st->note_page(st, addr, 5, pte_val(kasan_early_shadow_pte[0])); + st->note_page(st, addr, 4, pte_val(kasan_early_shadow_pte[0])); return 1; } =20 @@ -115,7 +115,7 @@ static int ptdump_hole(unsigned long addr, unsigned l= ong next, { struct ptdump_state *st =3D walk->private; =20 - st->note_page(st, addr, depth + 1, 0); + st->note_page(st, addr, depth, 0); =20 return 0; } @@ -147,5 +147,5 @@ void ptdump_walk_pgd(struct ptdump_state *st, struct = mm_struct *mm) up_read(&mm->mmap_sem); =20 /* Flush out the last page */ - st->note_page(st, 0, 0, 0); + st->note_page(st, 0, -1, 0); } --=20 2.20.1