]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
riscv: kvm: use ".L" local labels in assembly when applicable
authorClément Léger <cleger@rivosinc.com>
Tue, 24 Oct 2023 13:26:55 +0000 (15:26 +0200)
committerAnup Patel <anup@brainfault.org>
Fri, 29 Dec 2023 07:01:33 +0000 (12:31 +0530)
For the sake of coherency, use local labels in assembly when
applicable. This also avoid kprobes being confused when applying a
kprobe since the size of function is computed by checking where the
next visible symbol is located. This might end up in computing some
function size to be way shorter than expected and thus failing to apply
kprobes to the specified offset.

Signed-off-by: Clément Léger <cleger@rivosinc.com>
Reviewed-by: Andrew Jones <ajones@ventanamicro.com>
Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
Signed-off-by: Anup Patel <anup@brainfault.org>
arch/riscv/kvm/vcpu_switch.S

index 8b18473780ace50f7533fb89c1cda39cd3354c13..0c26189aa01cf5b0ca5c6ef6ddbaa70153f3132c 100644 (file)
@@ -45,7 +45,7 @@ SYM_FUNC_START(__kvm_riscv_switch_to)
        REG_L   t0, (KVM_ARCH_GUEST_SSTATUS)(a0)
        REG_L   t1, (KVM_ARCH_GUEST_HSTATUS)(a0)
        REG_L   t2, (KVM_ARCH_GUEST_SCOUNTEREN)(a0)
-       la      t4, __kvm_switch_return
+       la      t4, .Lkvm_switch_return
        REG_L   t5, (KVM_ARCH_GUEST_SEPC)(a0)
 
        /* Save Host and Restore Guest SSTATUS */
@@ -113,7 +113,7 @@ SYM_FUNC_START(__kvm_riscv_switch_to)
 
        /* Back to Host */
        .align 2
-__kvm_switch_return:
+.Lkvm_switch_return:
        /* Swap Guest A0 with SSCRATCH */
        csrrw   a0, CSR_SSCRATCH, a0