]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
x86/kvm/vmx: Make noinstr clean
authorPeter Zijlstra <peterz@infradead.org>
Tue, 14 Jun 2022 21:15:32 +0000 (23:15 +0200)
committerThadeu Lima de Souza Cascardo <cascardo@canonical.com>
Tue, 19 Jul 2022 19:17:35 +0000 (16:17 -0300)
commit571dd547b243ef6e49c236bb02544aeb3f4931f1
tree6bb914b98d1b35edcb0407533a2e7726cf216056
parent3e06bec370a22adc6697b8e6aea6981f3f453ab0
x86/kvm/vmx: Make noinstr clean

commit 742ab6df974ae8384a2dd213db1a3a06cf6d8936 upstream.

The recent mmio_stale_data fixes broke the noinstr constraints:

  vmlinux.o: warning: objtool: vmx_vcpu_enter_exit+0x15b: call to wrmsrl.constprop.0() leaves .noinstr.text section
  vmlinux.o: warning: objtool: vmx_vcpu_enter_exit+0x1bf: call to kvm_arch_has_assigned_device() leaves .noinstr.text section

make it all happy again.

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
CVE-2022-29900
CVE-2022-29901
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
arch/x86/kvm/vmx/vmx.c
arch/x86/kvm/x86.c
include/linux/kvm_host.h