Commit 864aa198 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Zheng Zengkai
Browse files

x86, kvm: use proper ASM macros for kvm_vcpu_is_preempted 

stable inclusion
from stable-v5.10.133
commit 81f20e5000eca278a8bab4959c4fa1beda1fbed5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5PTAS
CVE: CVE-2022-29900,CVE-2022-23816,CVE-2022-29901

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=81f20e5000eca278a8bab4959c4fa1beda1fbed5



--------------------------------

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 a4cfff3f ("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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarLin Yujun <linyujun809@huawei.com>
Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 9c061fec

arch/x86/kernel/kvm.c

+1 −1
Original line number Diff line number Diff line
@@ -958,7 +958,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");