From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0AB9BC4CED3 for ; Wed, 18 Sep 2019 06:27:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D4E4021924 for ; Wed, 18 Sep 2019 06:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568788068; bh=e2SKe0d1r0FnPGDKgUrqxsSyXHcE1lOe8ABJ4w+dG7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ceI2wXIetaMa2Q8nVKX1hC4SZk4JOdTBCFsmywkA1Z+TIyZL8vBU9SdPSsC0ka7bK SwkfInSdiO363dgCl/JUZxr4XjCLomCADsp8pXn1im2iku1O91fpnwlES9UhCNwlal 43TfdYNPfr2bQiXD8fL5ri8QRg4PIS1HPOm/vwfs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730593AbfIRG1s (ORCPT ); Wed, 18 Sep 2019 02:27:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:49836 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730588AbfIRG1r (ORCPT ); Wed, 18 Sep 2019 02:27:47 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9730521925; Wed, 18 Sep 2019 06:27:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568788067; bh=e2SKe0d1r0FnPGDKgUrqxsSyXHcE1lOe8ABJ4w+dG7Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=2U4Jq5ePWUSTggBIv5o+bg5NkD9BR151A7f4NGyxOzBe6279k6kiIHLa/W99UCsJG skD156epGJ6GG2hdRaOPgA9PNhqhdttdct+4i3l0uNZXlrWc0gFd0AaryibxTJxKas K66ZJXaH2ySnxycf1CYkXjzYBjUprjugZDS+dhFk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paolo Bonzini Subject: [PATCH 5.2 47/85] KVM: nVMX: handle page fault in vmread Date: Wed, 18 Sep 2019 08:19:05 +0200 Message-Id: <20190918061235.619611195@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190918061234.107708857@linuxfoundation.org> References: <20190918061234.107708857@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paolo Bonzini commit f7eea636c3d505fe6f1d1066234f1aaf7171b681 upstream. The implementation of vmread to memory is still incomplete, as it lacks the ability to do vmread to I/O memory just like vmptrst. Cc: stable@vger.kernel.org Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/vmx/nested.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -4411,6 +4411,7 @@ static int handle_vmread(struct kvm_vcpu int len; gva_t gva = 0; struct vmcs12 *vmcs12; + struct x86_exception e; if (!nested_vmx_check_permission(vcpu)) return 1; @@ -4451,7 +4452,8 @@ static int handle_vmread(struct kvm_vcpu vmx_instruction_info, true, len, &gva)) return 1; /* _system ok, nested_vmx_check_permission has verified cpl=0 */ - kvm_write_guest_virt_system(vcpu, gva, &field_value, len, NULL); + if (kvm_write_guest_virt_system(vcpu, gva, &field_value, len, &e)) + kvm_inject_page_fault(vcpu, &e); } return nested_vmx_succeed(vcpu);