Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp102473pxb; Mon, 13 Sep 2021 14:09:16 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTQRx0zfSsCMeKEA4sG2FK9fsBIbhndxCjxN9x8R9Vw3+Puq5Cs38aPhzlVMwJgbOWRLj/ X-Received: by 2002:a92:c70e:: with SMTP id a14mr8889425ilp.299.1631567356256; Mon, 13 Sep 2021 14:09:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631567356; cv=none; d=google.com; s=arc-20160816; b=Ekxmpc6jGwdgKuX5nGAnSkOvBnsjSJk0ydke/kHqyQMYe/GN0WUgWIHQWjkYXCp0Fp BnfRdHxpV9yiVLcXIAFpyJ8Ex5ZCLkg5npZ4usHnmda9dGF7xLVZluixXLN182VUtBCy auVed2bkgEgr836BlBMuWQzo4IcAvQlAcYLDCA1WsZZKWAGYruuSTOFIAGU11YSkKkY6 JNHp86sJ6GxwzZgNHRJgVoPMRoZOusk4hJCpgcfotMOxPU9R2+wYCtXeCF929b/Yn1E8 PTyOxBjUFT+7Qtgk2WmTMbyusmFomqbsrxFmyV2Xhlc/ltXBKgCzTHFSfhHFHGJpR8Hx dgag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=TARG1qase+PqysOwXcXsqw5dzeV434JvP+c6/xTalXw=; b=An8ldTeAsXeKNnLJAO/82tVLWivoaZl03GMzpXeyCJB3LttLF7L0vF9AzwkCrAjoXd ykXkD6LwBDz6JV1kh+S+qHSfisTl5OCutYZx1cqSUw107DdiHnE9cMMZ0UIEfTx+J6bL hiSoTBHyY0WCDy27XfMcZ2NlPZ0qtMXDwVeh1qJ6ZZERleM3Q9Rait8tzvNJbi/V6fZl ODJdI7+ufMhL6rB9YuKcbSbt6B3y9T05CmlSOYBXSEQ43UtLoY7Ayi7Gs6sbXQiPQG7P u+qk3bw5fTtjnF2juixP8/k3bixTXaTF6TmNywcR/61cZe5EzWfMuvMC78X0zOFUa/Z4 //GQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="1W/nj1TY"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m22si7893033jaa.92.2021.09.13.14.09.04; Mon, 13 Sep 2021 14:09:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="1W/nj1TY"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244943AbhIMNv0 (ORCPT + 99 others); Mon, 13 Sep 2021 09:51:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:56854 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244105AbhIMNrg (ORCPT ); Mon, 13 Sep 2021 09:47:36 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D0F736136F; Mon, 13 Sep 2021 13:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631539955; bh=13hYmdXLlkorhJU2QzWcDCNAEbmIkT6E+r+w6YIrh9M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1W/nj1TY9VT/cGX23+zaTpU7USd8QcuWn9N5sBIBAmJuD0LdH2geiyWowHHftxd90 4znJ/Tc5uzU+3Awu3+YoL9Qn+hL1nB/S/m6cAlBJjDc7e/dcaxH5jV8GbkENhg4Oqh Xc6NefG7xG+2WqbnD5Edt8queYdLtFqQMkBB6imc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jim Mattson , Sean Christopherson , Paolo Bonzini Subject: [PATCH 5.10 228/236] KVM: nVMX: Unconditionally clear nested.pi_pending on nested VM-Enter Date: Mon, 13 Sep 2021 15:15:33 +0200 Message-Id: <20210913131108.106828896@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210913131100.316353015@linuxfoundation.org> References: <20210913131100.316353015@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Sean Christopherson commit f7782bb8d818d8f47c26b22079db10599922787a upstream. Clear nested.pi_pending on nested VM-Enter even if L2 will run without posted interrupts enabled. If nested.pi_pending is left set from a previous L2, vmx_complete_nested_posted_interrupt() will pick up the stale flag and exit to userspace with an "internal emulation error" due the new L2 not having a valid nested.pi_desc. Arguably, vmx_complete_nested_posted_interrupt() should first check for posted interrupts being enabled, but it's also completely reasonable that KVM wouldn't screw up a fundamental flag. Not to mention that the mere existence of nested.pi_pending is a long-standing bug as KVM shouldn't move the posted interrupt out of the IRR until it's actually processed, e.g. KVM effectively drops an interrupt when it performs a nested VM-Exit with a "pending" posted interrupt. Fixing the mess is a future problem. Prior to vmx_complete_nested_posted_interrupt() interpreting a null PI descriptor as an error, this was a benign bug as the null PI descriptor effectively served as a check on PI not being enabled. Even then, the new flow did not become problematic until KVM started checking the result of kvm_check_nested_events(). Fixes: 705699a13994 ("KVM: nVMX: Enable nested posted interrupt processing") Fixes: 966eefb89657 ("KVM: nVMX: Disable vmcs02 posted interrupts if vmcs12 PID isn't mappable") Fixes: 47d3530f86c0 ("KVM: x86: Exit to userspace when kvm_check_nested_events fails") Cc: stable@vger.kernel.org Cc: Jim Mattson Signed-off-by: Sean Christopherson Message-Id: <20210810144526.2662272-1-seanjc@google.com> Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/vmx/nested.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -2243,12 +2243,11 @@ static void prepare_vmcs02_early(struct ~PIN_BASED_VMX_PREEMPTION_TIMER); /* Posted interrupts setting is only taken from vmcs12. */ - if (nested_cpu_has_posted_intr(vmcs12)) { + vmx->nested.pi_pending = false; + if (nested_cpu_has_posted_intr(vmcs12)) vmx->nested.posted_intr_nv = vmcs12->posted_intr_nv; - vmx->nested.pi_pending = false; - } else { + else exec_control &= ~PIN_BASED_POSTED_INTR; - } pin_controls_set(vmx, exec_control); /*