This patch series provides fixes for the recent x86/boot rip-relative
addressing changes that causes system crashes when booting with 5-level
pagetables and SME active.

I thought I had tested 5-level paging with SME, but must have missed
it. There are two patches to fix the issues that can be squashed into
a single patch with multiple Fixes: tags if desired.

The second patch is sort of a revert, but instead uses the newer
RIP_REL_REF() macro instead of reverting the fix and continuing to use
the fixup_pointer() support.

---

Patches based on:
  https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git master
  30052fd948a3 ("Merge branch into tip/master: 'x86/shstk'")

Tom Lendacky (2):
  x86/boot/64: Apply encryption mask to 5-level pagetable update
  x86/boot/64: Move 5-level paging global variable assignments back

 arch/x86/kernel/head64.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

-- 
2.43.2

On Fri, 22 Mar 2024 at 17:41, Tom Lendacky <thomas.lendacky@amd.com> wrote:
>
> This patch series provides fixes for the recent x86/boot rip-relative
> addressing changes that causes system crashes when booting with 5-level
> pagetables and SME active.
>
> I thought I had tested 5-level paging with SME, but must have missed
> it. There are two patches to fix the issues that can be squashed into
> a single patch with multiple Fixes: tags if desired.
>

Perhaps you tested the entire series, where the final patch removed
those variables altogether?

> The second patch is sort of a revert, but instead uses the newer
> RIP_REL_REF() macro instead of reverting the fix and continuing to use
> the fixup_pointer() support.
>

Thanks for fixing this.

Series

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

On 3/22/24 11:10, Ard Biesheuvel wrote:
> On Fri, 22 Mar 2024 at 17:41, Tom Lendacky <thomas.lendacky@amd.com> wrote:
>>
>> This patch series provides fixes for the recent x86/boot rip-relative
>> addressing changes that causes system crashes when booting with 5-level
>> pagetables and SME active.
>>
>> I thought I had tested 5-level paging with SME, but must have missed
>> it. There are two patches to fix the issues that can be squashed into
>> a single patch with multiple Fixes: tags if desired.
>>
> 
> Perhaps you tested the entire series, where the final patch removed
> those variables altogether?

Maybe, but that wouldn't explain the first fix in the series. I should've 
encountered an issue no matter what. I probably used the wrong config file 
or ...  who knows at this point.

Thanks,
Tom

> 
>> The second patch is sort of a revert, but instead uses the newer
>> RIP_REL_REF() macro instead of reverting the fix and continuing to use
>> the fixup_pointer() support.
>>
> 
> Thanks for fixing this.
> 
> Series
> 
> Reviewed-by: Ard Biesheuvel <ardb@kernel.org>