On Tue, Nov 17, 2026, at 16:11, Christophe Leroy (CS GROUP) wrote:
> Le 16/11/2026 à 23:54, Arnd Bergmann a écrit :
>> On Mon, Nov 16, 2026, at 14:38, Christophe Leroy (CS GROUP) wrote:
>>> Le 16/11/2026 à 13:48, Arnd Bergmann a écrit :
>> 
>> --- 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
>
> Fine, thank should work allthough I would have used 0x10 - (PAGE_OFFSET 
>  >> 28)
>
>>           mtctr   r0
>> -       LOAD_REG_IMMEDIATE(r3, 0x20000000 | (0x111 * 0xc))
>> -        lis     r4, 0xc000
>> +       LOAD_REG_IMMEDIATE(r3, 0x20000000 | (0x111 * (PAGE_OFFSET >> 28)))
>
> Maybe an opportunity to replace 0x20000000 by SR_KP

Ok, changed both.

>>>> @@ -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?
>
> I'm also struggling to understand this so I might be wrong. My 
> understanding at the moment is that here we are looking for the physical 
> address matching that effective addr in order to find the 1:1 MMU 
> mapping. The particularity of booke is that you cannot turn off the MMU, 
> so to simulate MMU off you have to have a MMU translation to translate 
> logical address 0 to physical address 0.
>
> Therefore IIUC the correct calculation should be (eaddr - PAGE_OFFSET)

AIU that would be wrong for PAGE_OFFSET=0x70000000 if eaddr>0xf0000000
is a valid argument here, as that would still point into the linear
lowmem map. I've added Crystal and Alex to Cc with their current
work emails, maybe one of them knows.

     Arnd

Reply via email to