KVM: SVM,VMX: Use %rip-relative addressing to access kvm_rebooting

Instruction with %rip-relative address operand is one byte shorter than
its absolute address counterpart and is also compatible with position
independent executable (-fpie) build.

No functional changes intended.

Cc: Sean Christopherson <seanjc@google.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Uros Bizjak <ubizjak@gmail.com>
Link: https://lore.kernel.org/r/20231031075312.47525-1-ubizjak@gmail.com
Signed-off-by: Sean Christopherson <seanjc@google.com>

diff --git a/arch/x86/kvm/svm/vmenter.S b/arch/x86/kvm/svm/vmenter.S
index ef2ebabb059c8cdf2f88eb7b98682e29940e4dd8..9499f9c6b07711bb1254ce574584ebc166d293fc 100644 (file)
--- a/arch/x86/kvm/svm/vmenter.S
+++ b/arch/x86/kvm/svm/vmenter.S
@@ -270,16 +270,16 @@ SYM_FUNC_START(__svm_vcpu_run)
        RESTORE_GUEST_SPEC_CTRL_BODY
        RESTORE_HOST_SPEC_CTRL_BODY
 
-10:    cmpb $0, kvm_rebooting
+10:    cmpb $0, _ASM_RIP(kvm_rebooting)
        jne 2b
        ud2
-30:    cmpb $0, kvm_rebooting
+30:    cmpb $0, _ASM_RIP(kvm_rebooting)
        jne 4b
        ud2
-50:    cmpb $0, kvm_rebooting
+50:    cmpb $0, _ASM_RIP(kvm_rebooting)
        jne 6b
        ud2
-70:    cmpb $0, kvm_rebooting
+70:    cmpb $0, _ASM_RIP(kvm_rebooting)
        jne 8b
        ud2
 
@@ -381,7 +381,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run)
        RESTORE_GUEST_SPEC_CTRL_BODY
        RESTORE_HOST_SPEC_CTRL_BODY
 
-3:     cmpb $0, kvm_rebooting
+3:     cmpb $0, _ASM_RIP(kvm_rebooting)
        jne 2b
        ud2
 

diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S
index be275a0410a89957e79ffe57747e50ed36876e2f..906ecd001511355d0939e4e90a3994a7bd9809e3 100644 (file)
--- a/arch/x86/kvm/vmx/vmenter.S
+++ b/arch/x86/kvm/vmx/vmenter.S
@@ -289,7 +289,7 @@ SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL)
        RET
 
 .Lfixup:
-       cmpb $0, kvm_rebooting
+       cmpb $0, _ASM_RIP(kvm_rebooting)
        jne .Lvmfail
        ud2
 .Lvmfail: