From patchwork Mon Oct 24 11:29:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp433224wru; Mon, 24 Oct 2022 05:48:52 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7rVuLvP61mXbDNK7WFYXzQJcJzKYyzTUcMOkxVqbTuOeO7Z7oQB4PP/MkolKrbODN2rhZ+ X-Received: by 2002:a17:902:d503:b0:185:457a:9325 with SMTP id b3-20020a170902d50300b00185457a9325mr33632408plg.140.1666615732234; Mon, 24 Oct 2022 05:48:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615732; cv=none; d=google.com; s=arc-20160816; b=x67BZUMWdqUrIxR7iKrJleWr3AELoE1C2IKbywGG5MRFwv+9usugnA/+fcu+Fc82CG jdl6nH82haAAqC0sRFemQJcph7Xprl52PoBYtQamFjuJ9+ciiwEffepeZrWSE660bux6 ubVz6SHDkU9261bDOOgnMV+h/eAXKnE6ffg8N4cXXPqTPsaeO/SSbsTc+0qJbPwElzAX x0wga+6kxyy/+RCEdMhJRHk9D9tuJ6JYsN6YluURJJ5uiZetV6vEropzRafCF42Bg+jY 36kBRBZX+/qkFTt3690tJUSnzq6Avmx39YKZ/mb7Ip7JRvSRIzrs9MTxJhLvbQpK1Mpq 20yg== 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=Cjv+lgp5MI7aFg0f603nyp/tII/rp6/XXqdoo5/eUBE=; b=aCNQXS4epDaHwW2rdzcAPwg3XxmpzyP/EEdcD/T0npNrTwYyewMdPSiUlIxuWgOM4v jzyCM53DZdZ97JY87eOBlchOKo+XJaDPqfVrGbefl+Rqw8Xq/oxnCrJAGOYZzYTzZqPd oJZVVCIo8WOK0BJJ/D/iIRmCWJH5SiVnuhoKEhbsN+UhS8+pM9fcPZs9Q0hmhPzjHj/D 3E8pUeQ2p8U7AGoGea+jj1nq7U18xTte/TcH4N6cWkPFcO6qVA6r2s301yBuJEI4r3m0 YnqTkbREQlNwLLmyJW64d/1l4pkcQuMaiA3rl08mH+2cgFLIcNX5SjN9Q2Tt1T7FnuUC h0wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YLZQNHOu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hk2-20020a17090b224200b00200435da17asi2303912pjb.128.2022.10.24.05.48.38; Mon, 24 Oct 2022 05:48:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=YLZQNHOu; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 S234187AbiJXMmJ (ORCPT + 99 others); Mon, 24 Oct 2022 08:42:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234249AbiJXMjV (ORCPT ); Mon, 24 Oct 2022 08:39:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F02778A7CB; Mon, 24 Oct 2022 05:07:02 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 826DD61218; Mon, 24 Oct 2022 12:07:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 97FFCC433D6; Mon, 24 Oct 2022 12:07:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666613222; bh=eS/afclanA9Sgmy7PVNXgX/5pYFFrMUi897ywUNNzFg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YLZQNHOuUVTpOg2nXBZalZ8W34oa8VndzFsdlVmmtv0sXK5GBcUJH81NbHoQKrVTo rdzSRVgNzfl13N8w/UaiSRORzpGhiBekg34lZlyWiN9adK68lOuSg7UJWmiiZFqbWq zQXsyReEDgJk/239fG4Hyl6OWW6buHwz/JsEjGvY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sean Christopherson , Jim Mattson , Maxim Levitsky , Paolo Bonzini Subject: [PATCH 5.4 053/255] KVM: nVMX: Unconditionally purge queued/injected events on nested "exit" Date: Mon, 24 Oct 2022 13:29:23 +0200 Message-Id: <20221024113004.183945639@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113002.471093005@linuxfoundation.org> References: <20221024113002.471093005@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747573258156608733?= X-GMAIL-MSGID: =?utf-8?q?1747573258156608733?= From: Sean Christopherson commit d953540430c5af57f5de97ea9e36253908204027 upstream. Drop pending exceptions and events queued for re-injection when leaving nested guest mode, even if the "exit" is due to VM-Fail, SMI, or forced by host userspace. Failure to purge events could result in an event belonging to L2 being injected into L1. This _should_ never happen for VM-Fail as all events should be blocked by nested_run_pending, but it's possible if KVM, not the L1 hypervisor, is the source of VM-Fail when running vmcs02. SMI is a nop (barring unknown bugs) as recognition of SMI and thus entry to SMM is blocked by pending exceptions and re-injected events. Forced exit is definitely buggy, but has likely gone unnoticed because userspace probably follows the forced exit with KVM_SET_VCPU_EVENTS (or some other ioctl() that purges the queue). Fixes: 4f350c6dbcb9 ("kvm: nVMX: Handle deferred early VMLAUNCH/VMRESUME failure properly") Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson Reviewed-by: Jim Mattson Reviewed-by: Maxim Levitsky Link: https://lore.kernel.org/r/20220830231614.3580124-2-seanjc@google.com Signed-off-by: Paolo Bonzini Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/vmx/nested.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -3762,14 +3762,6 @@ static void prepare_vmcs12(struct kvm_vc nested_vmx_abort(vcpu, VMX_ABORT_SAVE_GUEST_MSR_FAIL); } - - /* - * Drop what we picked up for L2 via vmx_complete_interrupts. It is - * preserved above and would only end up incorrectly in L1. - */ - vcpu->arch.nmi_injected = false; - kvm_clear_exception_queue(vcpu); - kvm_clear_interrupt_queue(vcpu); } /* @@ -4104,6 +4096,17 @@ void nested_vmx_vmexit(struct kvm_vcpu * WARN_ON_ONCE(nested_early_check); } + /* + * Drop events/exceptions that were queued for re-injection to L2 + * (picked up via vmx_complete_interrupts()), as well as exceptions + * that were pending for L2. Note, this must NOT be hoisted above + * prepare_vmcs12(), events/exceptions queued for re-injection need to + * be captured in vmcs12 (see vmcs12_save_pending_event()). + */ + vcpu->arch.nmi_injected = false; + kvm_clear_exception_queue(vcpu); + kvm_clear_interrupt_queue(vcpu); + vmx_switch_vmcs(vcpu, &vmx->vmcs01); /* Update any VMCS fields that might have changed while L2 ran */