From: James Morse <james.morse@arm.com> To: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Linux ARM <linux-arm-kernel@lists.infradead.org>, Mark Rutland <mark.rutland@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Linux-Renesas <linux-renesas-soc@vger.kernel.org> Subject: Re: [PATCH] arm64: mm: Use #ifdef for the __PAGETABLE_P?D_FOLDED defines Date: Tue, 9 Oct 2018 14:25:17 +0100 [thread overview] Message-ID: <5eeebac5-b296-219d-f768-f81eaeec5498@arm.com> (raw) In-Reply-To: <CAMuHMdUFzHUJk7dT9CqF1uCg3bPr-Mh6LWTj6RpdcXLPRQkFEw@mail.gmail.com> Hi Geert! On 09/10/2018 13:37, Geert Uytterhoeven wrote: > On Fri, Oct 5, 2018 at 3:55 PM James Morse <james.morse@arm.com> wrote: >> __is_defined(__PAGETABLE_P?D_FOLDED) doesn't quite work as intended >> as these symbols are internal to asm-generic and aren't defined in the >> way kconfig expects. This makes them always evaluate to false. >> Switch to #ifdef. > This is now e9ed821be48600ea ("arm64: mm: Use #ifdef for the > __PAGETABLE_P?D_FOLDED defines") in arm64/for-next/core. > > If CONFIG_DEBUG_VIRTUAL=y, it prints a few times during boot on > several R-Car Gen3 platforms: Aha, I didn't test this with debug-virtual ... and the new __pa() to setup the fixmap for swapper is what is causing this: >From arch/arm64/mm/mmu.c: | void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd) | { | pgd_t *fixmap_pgdp; | | spin_lock(&swapper_pgdir_lock); | fixmap_pgdp = pgd_set_fixmap(__pa(pgdp)); | WRITE_ONCE(*fixmap_pgdp, pgd); This patch is just exposing the problem on your configuration, its commit 2330b7ca78350efcb ("arm64/mm: use fixmap to modify swapper_pg_dir") that missed this. We always know pgdp here will point within swapper_pg_dir, so I think its fair to switch this to the __pa_symbol() version. This fixes it for me: --------------------------%<-------------------------- diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 6f0e2edcc114..6deb836a102a 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -74,7 +74,7 @@ void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd) pgd_t *fixmap_pgdp; spin_lock(&swapper_pgdir_lock); - fixmap_pgdp = pgd_set_fixmap(__pa(pgdp)); + fixmap_pgdp = pgd_set_fixmap(__pa_symbol(pgdp)); WRITE_ONCE(*fixmap_pgdp, pgd); /* * We need dsb(ishst) here to ensure the page-table-walker sees --------------------------%<-------------------------- (which I will post shortly). Passing not-a-symbol-name to __pa_symbol() doesn't look nice, but lm_alias() would do this too. Manually calculating the offset in swapper_pg_dir is some logic that is already wrapped up in pgd_set_fixmap(). Thanks! James
WARNING: multiple messages have this Message-ID (diff)
From: james.morse@arm.com (James Morse) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm64: mm: Use #ifdef for the __PAGETABLE_P?D_FOLDED defines Date: Tue, 9 Oct 2018 14:25:17 +0100 [thread overview] Message-ID: <5eeebac5-b296-219d-f768-f81eaeec5498@arm.com> (raw) In-Reply-To: <CAMuHMdUFzHUJk7dT9CqF1uCg3bPr-Mh6LWTj6RpdcXLPRQkFEw@mail.gmail.com> Hi Geert! On 09/10/2018 13:37, Geert Uytterhoeven wrote: > On Fri, Oct 5, 2018 at 3:55 PM James Morse <james.morse@arm.com> wrote: >> __is_defined(__PAGETABLE_P?D_FOLDED) doesn't quite work as intended >> as these symbols are internal to asm-generic and aren't defined in the >> way kconfig expects. This makes them always evaluate to false. >> Switch to #ifdef. > This is now e9ed821be48600ea ("arm64: mm: Use #ifdef for the > __PAGETABLE_P?D_FOLDED defines") in arm64/for-next/core. > > If CONFIG_DEBUG_VIRTUAL=y, it prints a few times during boot on > several R-Car Gen3 platforms: Aha, I didn't test this with debug-virtual ... and the new __pa() to setup the fixmap for swapper is what is causing this: >From arch/arm64/mm/mmu.c: | void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd) | { | pgd_t *fixmap_pgdp; | | spin_lock(&swapper_pgdir_lock); | fixmap_pgdp = pgd_set_fixmap(__pa(pgdp)); | WRITE_ONCE(*fixmap_pgdp, pgd); This patch is just exposing the problem on your configuration, its commit 2330b7ca78350efcb ("arm64/mm: use fixmap to modify swapper_pg_dir") that missed this. We always know pgdp here will point within swapper_pg_dir, so I think its fair to switch this to the __pa_symbol() version. This fixes it for me: --------------------------%<-------------------------- diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c index 6f0e2edcc114..6deb836a102a 100644 --- a/arch/arm64/mm/mmu.c +++ b/arch/arm64/mm/mmu.c @@ -74,7 +74,7 @@ void set_swapper_pgd(pgd_t *pgdp, pgd_t pgd) pgd_t *fixmap_pgdp; spin_lock(&swapper_pgdir_lock); - fixmap_pgdp = pgd_set_fixmap(__pa(pgdp)); + fixmap_pgdp = pgd_set_fixmap(__pa_symbol(pgdp)); WRITE_ONCE(*fixmap_pgdp, pgd); /* * We need dsb(ishst) here to ensure the page-table-walker sees --------------------------%<-------------------------- (which I will post shortly). Passing not-a-symbol-name to __pa_symbol() doesn't look nice, but lm_alias() would do this too. Manually calculating the offset in swapper_pg_dir is some logic that is already wrapped up in pgd_set_fixmap(). Thanks! James
next prev parent reply other threads:[~2018-10-09 20:42 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-10-05 13:49 [PATCH] arm64: mm: Use #ifdef for the __PAGETABLE_P?D_FOLDED defines James Morse 2018-10-05 14:53 ` Mark Rutland 2018-10-05 16:20 ` Catalin Marinas 2018-10-09 12:37 ` Geert Uytterhoeven 2018-10-09 12:37 ` Geert Uytterhoeven 2018-10-09 13:25 ` James Morse [this message] 2018-10-09 13:25 ` James Morse 2018-10-09 14:19 ` Geert Uytterhoeven 2018-10-09 14:19 ` Geert Uytterhoeven
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=5eeebac5-b296-219d-f768-f81eaeec5498@arm.com \ --to=james.morse@arm.com \ --cc=catalin.marinas@arm.com \ --cc=geert@linux-m68k.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-renesas-soc@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=will.deacon@arm.com \ /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.