| Message ID | 1577514324-18362-1-git-send-email-linmiaohe@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] KVM: nVMX: vmread should not set rflags to specify success in case of #PF | expand |
On Sat, Dec 28, 2019 at 02:25:24PM +0800, linmiaohe wrote: > From: Miaohe Lin <linmiaohe@huawei.com> > > In case writing to vmread destination operand result in a #PF, vmread > should not call nested_vmx_succeed() to set rflags to specify success. > Similar to as done in VMPTRST (See handle_vmptrst()). > > Reviewed-by: Liran Alon <liran.alon@oracle.com> > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com>
On Mon, Jan 13, 2020 at 12:09:42PM -0800, Sean Christopherson wrote: > On Sat, Dec 28, 2019 at 02:25:24PM +0800, linmiaohe wrote: > > From: Miaohe Lin <linmiaohe@huawei.com> > > > > In case writing to vmread destination operand result in a #PF, vmread > > should not call nested_vmx_succeed() to set rflags to specify success. > > Similar to as done in VMPTRST (See handle_vmptrst()). > > > > Reviewed-by: Liran Alon <liran.alon@oracle.com> > > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > > Reviewed-by: Sean Christopherson <sean.j.christopherson@intel.com> Gah, got trigger happy. This could also have "Cc: stable@vger.kernel.org". With that, my Reviewed-by stands :-).
On 28/12/19 07:25, linmiaohe wrote: > From: Miaohe Lin <linmiaohe@huawei.com> > > In case writing to vmread destination operand result in a #PF, vmread > should not call nested_vmx_succeed() to set rflags to specify success. > Similar to as done in VMPTRST (See handle_vmptrst()). > > Reviewed-by: Liran Alon <liran.alon@oracle.com> > Signed-off-by: Miaohe Lin <linmiaohe@huawei.com> > --- > v2: > rephrase commit title & message > --- > arch/x86/kvm/vmx/nested.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c > index 8edefdc9c0cb..c1ec9f25a417 100644 > --- a/arch/x86/kvm/vmx/nested.c > +++ b/arch/x86/kvm/vmx/nested.c > @@ -4799,8 +4799,10 @@ static int handle_vmread(struct kvm_vcpu *vcpu) > instr_info, true, len, &gva)) > return 1; > /* _system ok, nested_vmx_check_permission has verified cpl=0 */ > - if (kvm_write_guest_virt_system(vcpu, gva, &value, len, &e)) > + if (kvm_write_guest_virt_system(vcpu, gva, &value, len, &e)) { > kvm_inject_page_fault(vcpu, &e); > + return 1; > + } > } > > return nested_vmx_succeed(vcpu); > Queued, thanks. Paolo
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 8edefdc9c0cb..c1ec9f25a417 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -4799,8 +4799,10 @@ static int handle_vmread(struct kvm_vcpu *vcpu) instr_info, true, len, &gva)) return 1; /* _system ok, nested_vmx_check_permission has verified cpl=0 */ - if (kvm_write_guest_virt_system(vcpu, gva, &value, len, &e)) + if (kvm_write_guest_virt_system(vcpu, gva, &value, len, &e)) { kvm_inject_page_fault(vcpu, &e); + return 1; + } } return nested_vmx_succeed(vcpu);