From: "Arnd Bergmann" <arnd@arndb.de>
To: "Christophe Leroy" <chleroy@kernel.org>,
"Arnd Bergmann" <arnd@kernel.org>,
linux-mm@kvack.org
Cc: "Andreas Larsson" <andreas@gaisler.com>,
"Andrew Morton" <akpm@linux-foundation.org>,
"Dave Hansen" <dave.hansen@linux.intel.com>,
"David Hildenbrand (Red Hat)" <david@kernel.org>,
"H. Peter Anvin" <hpa@zytor.com>,
"Ingo Molnar" <mingo@redhat.com>,
"Jason Gunthorpe" <jgg@nvidia.com>,
"Linus Walleij" <linusw@kernel.org>,
"Lorenzo Stoakes" <ljs@kernel.org>,
"Lucas Stach" <l.stach@pengutronix.de>,
"Madhavan Srinivasan" <maddy@linux.ibm.com>,
"Malin Jonsson" <malin.jonsson@est.tech>,
"Matthew Wilcox" <willy@infradead.org>,
"Michael Ellerman" <mpe@ellerman.id.au>,
"Michal Simek" <monstr@monstr.eu>,
"Mike Rapoport" <rppt@kernel.org>,
"Nicholas Piggin" <npiggin@gmail.com>,
"Nishanth Menon" <nm@ti.com>,
"Richard Weinberger" <richard@nod.at>,
"Russell King" <linux@armlinux.org.uk>,
"Thomas Gleixner" <tglx@linutronix.de>,
linux-arm-kernel@lists.infradead.org,
linux-fsdevel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
x86@kernel.org
Subject: Re: [PATCH v3 04/10] powerpc: kvm: allow flexible PAGE_OFFSET
Date: Mon, 16 Nov 2026 23:54:02 +0100 [thread overview]
Message-ID: <83495d02-4e09-40f0-94fe-e57a1e73d1a3@app.fastmail.com> (raw)
In-Reply-To: <afebfaf5-f3ee-4234-875d-e5ebf1ee64fd@kernel.org>
On Mon, Nov 16, 2026, at 14:38, Christophe Leroy (CS GROUP) wrote:
> Le 16/11/2026 à 13:48, Arnd Bergmann a écrit :
>> diff --git a/arch/powerpc/kvm/book3s_32_sr.S b/arch/powerpc/kvm/book3s_32_sr.S
>> index 6cfcd20d4668..0d8a7857f2bd 100644
>> --- a/arch/powerpc/kvm/book3s_32_sr.S
>> +++ b/arch/powerpc/kvm/book3s_32_sr.S
>> @@ -113,8 +113,8 @@
>>
>> li r0, 4
>> mtctr r0
>> - LOAD_REG_IMMEDIATE(r3, 0x20000000 | (0x111 * 0xc))
>> - lis r4, 0xc000
>> + LOAD_REG_IMMEDIATE(r3, 0x20000000 | (0x111 * (PAGE_OFFSET >> 28)))
>> + lis r4, (PAGE_OFFSET >> 16)
>
> This is not enough I think. You need to load ctr with the number of
> segments you want to populate. Here above it is hardcoded to 4.
Ok, trying this one now
--- a/arch/powerpc/kvm/book3s_32_sr.S
+++ b/arch/powerpc/kvm/book3s_32_sr.S
@@ -107,14 +107,12 @@
KVM_LOAD_BAT(2, r9, r10, r11)
KVM_LOAD_BAT(3, r9, r10, r11)
- /* Restore Segment Registers */
-
- /* 0xc - 0xf */
-
- li r0, 4
+ /* Restore Segment Registers, assumes PAGE_OFFSET is segment aligned */
+ li r0, (0x100000000 - PAGE_OFFSET) >> 28
mtctr r0
- LOAD_REG_IMMEDIATE(r3, 0x20000000 | (0x111 * 0xc))
- lis r4, 0xc000
+ LOAD_REG_IMMEDIATE(r3, 0x20000000 | (0x111 * (PAGE_OFFSET >> 28)))
+
+ lis r4, PAGE_OFFSET@h
3: mtsrin r3, r4
addi r3, r3, 0x111 /* increment VSID */
addis r4, r4, 0x1000 /* address of next segment */
>> /* Restore host IVPR before re-enabling interrupts. We cheat and know
>> - * that Linux IVPR is always 0xc0000000. */
>> - lis r3, 0xc000
>> + * that Linux IVPR is always PAGE_OFFSET. */
>> + lis r3, PAGE_OFFSET >> 16
>
> Maybe use PAGE_OFFSET@h instead of PAGE_OFFSET >> 16.
>
>> mtspr SPRN_IVPR, r3
>
> That's probably valid but wouldn't it be more correct to use
> interrupt_base@h as in head_44x.S and head_85xx.S :
>
> lis r4,interrupt_base@h /* IVPR only uses the high 16-bits */
> mtspr SPRN_IVPR,r4
Ok, copying that version now:
--- a/arch/powerpc/kvm/booke_interrupts.S
+++ b/arch/powerpc/kvm/booke_interrupts.S
@@ -229,9 +229,8 @@ _GLOBAL(kvmppc_resume_host)
mtspr SPRN_PID1, r3
#endif
- /* Restore host IVPR before re-enabling interrupts. We cheat and know
- * that Linux IVPR is always PAGE_OFFSET. */
- lis r3, PAGE_OFFSET >> 16
+ /* Restore host IVPR before re-enabling interrupts. */
+ lis r3, interrupt_base@h /* IVPR only uses the high 16-bits */
mtspr SPRN_IVPR, r3
/* Switch to kernel stack and jump to handler. */
>> @@ -115,7 +115,8 @@ static u32 get_host_mas0(unsigned long eaddr)
>> mtspr(SPRN_MAS6, 0);
>> mas4 = mfspr(SPRN_MAS4);
>> mtspr(SPRN_MAS4, mas4 & ~MAS4_TLBSEL_MASK);
>> - asm volatile("tlbsx 0, %0" : : "b" (eaddr & ~CONFIG_PAGE_OFFSET));
>> + asm volatile("tlbsx 0, %0" :
>> + : "b" (eaddr & (rounddown_pow_of_two(PAGE_OFFSET)-1)));
>
> I think this is not valid.
>
> With PAGE_OFFSET equal to 0xc0000000,
>
> Before:
>
> eaddr & 0x3fffffff
>
> Now:
>
> eaddr & (0x80000000 - 1) = eaddr & 0x7fffffff
I'm probably still misunderstanding the intention of this code then,
my reading of the comment was that both 0x3fffffff and 0x7fffffff
would be valid choices here as both are below PAGE_OFFSET and
large enough to alias the correct set.
What are the actual requirements for the mask?
Thanks for looking at these bits in detail, I'm quite out of my
comfort zone here, especially with the book-e stuff.
Arnd
next prev parent reply other threads:[~2026-11-16 22:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-16 12:48 [PATCH v3 00/10] mm: highmem cleanups Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 01/10] ARM: remove support for highmem on VIVT Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 02/10] ARM: drop CONFIG_HIGHPTE support Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 03/10] ARM: pxa: support arbitrary PAGE_OFFSET Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 04/10] powerpc: kvm: allow flexible PAGE_OFFSET Arnd Bergmann
2026-11-16 13:38 ` Christophe Leroy (CS GROUP)
2026-11-16 22:54 ` Arnd Bergmann [this message]
2026-11-16 12:48 ` [PATCH v3 05/10] ARM: add CONFIG_VMSPLIT_2G_OPT option Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 06/10] arch/*: increase lowmem size to avoid highmem use Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 07/10] ARM: defconfig: turn off highmem in favor of CONFIG_VMSPLIT_2G_OPT Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 08/10] mm: remove ARCH_NEEDS_KMAP_HIGH_GET Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 09/10] mm: drop HIGHPTE support altogether Arnd Bergmann
2026-11-16 12:48 ` [PATCH v3 10/10] mm: print pte in __print_bad_page_map_pgtable() Arnd Bergmann
2026-11-16 13:00 ` Mike Rapoport
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=83495d02-4e09-40f0-94fe-e57a1e73d1a3@app.fastmail.com \
--to=arnd@arndb.de \
--cc=akpm@linux-foundation.org \
--cc=andreas@gaisler.com \
--cc=arnd@kernel.org \
--cc=chleroy@kernel.org \
--cc=dave.hansen@linux.intel.com \
--cc=david@kernel.org \
--cc=hpa@zytor.com \
--cc=jgg@nvidia.com \
--cc=l.stach@pengutronix.de \
--cc=linusw@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux@armlinux.org.uk \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=ljs@kernel.org \
--cc=maddy@linux.ibm.com \
--cc=malin.jonsson@est.tech \
--cc=mingo@redhat.com \
--cc=monstr@monstr.eu \
--cc=mpe@ellerman.id.au \
--cc=nm@ti.com \
--cc=npiggin@gmail.com \
--cc=richard@nod.at \
--cc=rppt@kernel.org \
--cc=tglx@linutronix.de \
--cc=willy@infradead.org \
--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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox