x86/kexec: Remove spurious unconditional JMP from from identity_mapped()
authorNikolay Borisov <nik.borisov@suse.com>
Wed, 29 May 2024 15:28:50 +0000 (18:28 +0300)
committerBorislav Petkov (AMD) <bp@alien8.de>
Mon, 17 Jun 2024 15:45:19 +0000 (17:45 +0200)
This seemingly straightforward JMP was introduced in the initial version
of the the 64bit kexec code without any explanation.

It turns out (check accompanying Link) it's likely a copy/paste artefact
from 32-bit code, where such a JMP could be used as a serializing
instruction for the 486's prefetch queue. On x86_64 that's not needed
because there's already a preceding write to cr4 which itself is
a serializing operation.

  [ bp: Typos. Let's try this and see what cries out. If it does,
    reverting it is trivial. ]

Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Link: https://lore.kernel.org/all/55bc0649-c017-49ab-905d-212f140a403f@citrix.com/
arch/x86/kernel/relocate_kernel_64.S

index 56cab1bb25f5136e89b74997d19b9980b482b9b4..54e620021c7e824c5cff8ef50cde6d450470020e 100644 (file)
@@ -153,9 +153,6 @@ SYM_CODE_START_LOCAL_NOALIGN(identity_mapped)
 1:
        movq    %rax, %cr4
 
-       jmp 1f
-1:
-
        /* Flush the TLB (needed?) */
        movq    %r9, %cr3