Received: by 2002:a17:90a:1609:0:0:0:0 with SMTP id n9csp855767pja; Wed, 1 Apr 2020 09:55:09 -0700 (PDT) X-Google-Smtp-Source: APiQypJ73VtzBuaRmlCJJlz+2B87gV3CSCSueyCCUl8Dqt0C1GCddnS0fEPhHbgCsgLTB04D4G6H X-Received: by 2002:aca:5444:: with SMTP id i65mr3339790oib.101.1585760109541; Wed, 01 Apr 2020 09:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585760109; cv=none; d=google.com; s=arc-20160816; b=RwHy9LfJ6lm06xcgTPYLFs49J26X3sjg4KNAgOFLXkfxITIWzfxL7pNqwnXkqEGK8b jCosnPu5hXOCaK4iks2kshcj/Cd7Ve2ru3FAuVd8MdwqqNElERzSNz4LuMiIjFDQQlO0 AMdwYfI5EEr8drPZ38wvtIOUNx+yhShCpKPUrNlkLbyO9PTCajSMoPOfeuCxsWgZj5ED HItO8WcqfhmQbf+FA57bLEUw6C2xH9Q1T49hFTUSyZhlNR80+bF6qb1fGWMv/a2b5KRS Wu0ekTdVm8VDtPdMqOhvW9PIUJvZ+QXcibINukquSimjabYHMJp0akCZXxyn8VtHx0U6 Urcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=v6zBSX54ZXkP8LLYb8YwksDNJP2RZqb9jbBbeb7AapA=; b=b6KDdXI6elloCvks+U/SnptbCs/Klzn2x3JCk4l5BchjDt0aYZDiUbdyydQ7DTeglh Ds0v6Dy20rdCgh2Y4fQbvQOdAQDqUg758r8XBNdKcICCgLnkhHbFvMWJDPjxQiDmPSnU srJUvurBSELGz4M6jogHLfs+X5yyjymBxiiPdb7KhPNvegQAZ5mjL3liGKf33qd3oTQp z27LjFAtMsHRkapiizZmaERAlN41XwFJjZKFuOO52mV7yjTQEQEahFyiRnZAJYQeWqfX ndJsezNFivPqX0ueuM/gdhPztdVHCfWPRx31Ybpxl8EDIZB7RRcXLbqlX/fiVfbYQJem 7DVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dOXJbAU6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d16si1079064oti.42.2020.04.01.09.54.56; Wed, 01 Apr 2020 09:55:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=dOXJbAU6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388064AbgDAQxn (ORCPT + 99 others); Wed, 1 Apr 2020 12:53:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:57892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388328AbgDAQbj (ORCPT ); Wed, 1 Apr 2020 12:31:39 -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 228B12063A; Wed, 1 Apr 2020 16:31:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585758698; bh=mtfkkCt5SFGhLPN1U7MCkZ3jcSv/3FhZA5jJUw2+TxU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOXJbAU6S/pg/fW0wQ4ib5dnwpjCZgDCWwUd1azR5hfbxGIG5TvJsslwslNSCLBVP Spl2WOM1ig9nNXwnF3cv9xNapHciXwP1g8QwBfpewbrf2DdpPNSn8f5kglBFpXcIzu TfC0vzxNgdgLKdqL3yjMrOxfXLtXVqK4M3/+my6s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vitaly Kuznetsov , Sean Christopherson , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Sasha Levin Subject: [PATCH 4.4 47/91] KVM: VMX: Do not allow reexecute_instruction() when skipping MMIO instr Date: Wed, 1 Apr 2020 18:17:43 +0200 Message-Id: <20200401161529.578652949@linuxfoundation.org> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200401161512.917494101@linuxfoundation.org> References: <20200401161512.917494101@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Christopherson [ Upstream commit c4409905cd6eb42cfd06126e9226b0150e05a715 ] Re-execution after an emulation decode failure is only intended to handle a case where two or vCPUs race to write a shadowed page, i.e. we should never re-execute an instruction as part of MMIO emulation. As handle_ept_misconfig() is only used for MMIO emulation, it should pass EMULTYPE_NO_REEXECUTE when using the emulator to skip an instr in the fast-MMIO case where VM_EXIT_INSTRUCTION_LEN is invalid. And because the cr2 value passed to x86_emulate_instruction() is only destined for use when retrying or reexecuting, we can simply call emulate_instruction(). Fixes: d391f1207067 ("x86/kvm/vmx: do not use vm-exit instruction length for fast MMIO when running nested") Cc: Vitaly Kuznetsov Signed-off-by: Sean Christopherson Cc: stable@vger.kernel.org Signed-off-by: Radim Krčmář Signed-off-by: Sasha Levin --- arch/x86/kvm/vmx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 78daf891abec8..2634b45562026 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6187,8 +6187,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) return 1; } else - return x86_emulate_instruction(vcpu, gpa, EMULTYPE_SKIP, - NULL, 0) == EMULATE_DONE; + return emulate_instruction(vcpu, EMULTYPE_SKIP) == + EMULATE_DONE; } ret = handle_mmio_page_fault(vcpu, gpa, true); -- 2.20.1