Skip to content

Commit 15223c4

Browse files
ubizjaksean-jc
authored andcommitted
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>
1 parent c52ffad commit 15223c4

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

arch/x86/kvm/svm/vmenter.S

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,16 @@ SYM_FUNC_START(__svm_vcpu_run)
270270
RESTORE_GUEST_SPEC_CTRL_BODY
271271
RESTORE_HOST_SPEC_CTRL_BODY
272272

273-
10: cmpb $0, kvm_rebooting
273+
10: cmpb $0, _ASM_RIP(kvm_rebooting)
274274
jne 2b
275275
ud2
276-
30: cmpb $0, kvm_rebooting
276+
30: cmpb $0, _ASM_RIP(kvm_rebooting)
277277
jne 4b
278278
ud2
279-
50: cmpb $0, kvm_rebooting
279+
50: cmpb $0, _ASM_RIP(kvm_rebooting)
280280
jne 6b
281281
ud2
282-
70: cmpb $0, kvm_rebooting
282+
70: cmpb $0, _ASM_RIP(kvm_rebooting)
283283
jne 8b
284284
ud2
285285

@@ -381,7 +381,7 @@ SYM_FUNC_START(__svm_sev_es_vcpu_run)
381381
RESTORE_GUEST_SPEC_CTRL_BODY
382382
RESTORE_HOST_SPEC_CTRL_BODY
383383

384-
3: cmpb $0, kvm_rebooting
384+
3: cmpb $0, _ASM_RIP(kvm_rebooting)
385385
jne 2b
386386
ud2
387387

arch/x86/kvm/vmx/vmenter.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ SYM_INNER_LABEL_ALIGN(vmx_vmexit, SYM_L_GLOBAL)
289289
RET
290290

291291
.Lfixup:
292-
cmpb $0, kvm_rebooting
292+
cmpb $0, _ASM_RIP(kvm_rebooting)
293293
jne .Lvmfail
294294
ud2
295295
.Lvmfail:

0 commit comments

Comments
 (0)