These patches remove kvm_inject_gp from the RDMSR/WRMSR emulation path, with the purpose of letting SEV-ES inject the #GP through the GHCB instead. The main idea is to introduce a complete_emulated_msr callback that is call-compatible with kvm_complete_insn_gp, so that svm.c can just call kvm_complete_insn_gp in the common case. I have more patches to use kvm_complete_insn_gp instead of kvm_inject_gp in other paths, but they are not necessary for SEV-ES so they can be delayed to 5.12. Paolo Paolo Bonzini (3): KVM: x86: remove bogus #GP injection KVM: x86: use kvm_complete_insn_gp in emulating RDMSR/WRMSR KVM: x86: introduce complete_emulated_msr callback arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/mtrr.c | 6 +---- arch/x86/kvm/svm/svm.c | 1 + arch/x86/kvm/vmx/vmx.c | 1 + arch/x86/kvm/x86.c | 42 +++++++++++++-------------------- 5 files changed, 20 insertions(+), 31 deletions(-) -- 2.26.2
