lkml.org 
[lkml]   [2022]   [Jul]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 132/148] x86, kvm: use proper ASM macros for kvm_vcpu_is_preempted
    Date
    From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    commit edbaf6e5e93acda96aae23ba134ef3c1466da3b5 upstream.

    The build rightfully complains about:
    arch/x86/kernel/kvm.o: warning: objtool: __raw_callee_save___kvm_vcpu_is_preempted()+0x12: missing int3 after ret

    because the ASM_RET call is not being used correctly in kvm_vcpu_is_preempted().

    This was hand-fixed-up in the kvm merge commit a4cfff3f0f8c ("Merge branch
    'kvm-older-features' into HEAD") which of course can not be backported to
    stable kernels, so just fix this up directly instead.

    Cc: Paolo Bonzini <pbonzini@redhat.com>
    Cc: Ben Hutchings <bwh@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/x86/kernel/kvm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/arch/x86/kernel/kvm.c
    +++ b/arch/x86/kernel/kvm.c
    @@ -953,7 +953,7 @@ asm(
    "movq __per_cpu_offset(,%rdi,8), %rax;"
    "cmpb $0, " __stringify(KVM_STEAL_TIME_preempted) "+steal_time(%rax);"
    "setne %al;"
    -"ret;"
    +ASM_RET
    ".size __raw_callee_save___kvm_vcpu_is_preempted, .-__raw_callee_save___kvm_vcpu_is_preempted;"
    ".popsection");


    \
     
     \ /
      Last update: 2022-07-23 12:13    [W:4.085 / U:0.904 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site