From patchwork Thu Jul 25 10:46:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 11058589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C613313A0 for ; Thu, 25 Jul 2019 10:46:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B406428864 for ; Thu, 25 Jul 2019 10:46:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A803F288AF; Thu, 25 Jul 2019 10:46:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 20A0F28864 for ; Thu, 25 Jul 2019 10:46:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728288AbfGYKqx (ORCPT ); Thu, 25 Jul 2019 06:46:53 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:34773 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728569AbfGYKqv (ORCPT ); Thu, 25 Jul 2019 06:46:51 -0400 Received: by mail-wm1-f67.google.com with SMTP id w9so35467916wmd.1 for ; Thu, 25 Jul 2019 03:46:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rT2+tyA6pTmguoDJ8MW+YlSOOFSIN1Vu53Mbq2U4pRc=; b=qTqi2XoaXMpbmxB/rSnGU0R0GKYqqkwOuLuGL76caiZE7NkL1ECBxkNhOz4Kd0oX/O n2KMXxwjYAYJFz5v89NPrVp7OJiJgsNVqKOtGbpZyhw0SmvlSoHOmjb/StVvSihGkZWz HlDC7H6hVwBapb8LSZMWsSYLuZFiUbXLSnZeqWxzmTRe/3VMhjZWE7MTQ5u7CzgB9hu+ Ysy+8APwgkweOqIgUfYsuoIGS7iMHt+lrHr8/iB6t1PfBscXFjBrGKnKxG0U1wqgGY9w vHhJISnijdOTFlztOt2yCE1QmBJCycCMiX25NjfVhji/sdXwsjt6ylBuYewFMZq+XEar Zyfw== X-Gm-Message-State: APjAAAWPffobnRfqSrOCZBA1+Tas42oO8qUaASew62aK58cB2CA2hnuo Qov+NQuKXGpb7idJY04aOvhKxVrHWyA= X-Google-Smtp-Source: APXvYqwTcecpPSHGjHuXabH4BPu7LoiVzTbv2SdE24oH8xT1yDoFoSRpS5PQy97iHgQ88CuC5+fdjQ== X-Received: by 2002:a7b:c7cb:: with SMTP id z11mr72257839wmk.24.1564051609799; Thu, 25 Jul 2019 03:46:49 -0700 (PDT) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id f204sm72042696wme.18.2019.07.25.03.46.48 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 25 Jul 2019 03:46:49 -0700 (PDT) From: Vitaly Kuznetsov To: stable@vger.kernel.org Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Subject: [PATCH stable-4.19 2/2] KVM: nVMX: Clear pending KVM_REQ_GET_VMCS12_PAGES when leaving nested Date: Thu, 25 Jul 2019 12:46:45 +0200 Message-Id: <20190725104645.30642-3-vkuznets@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190725104645.30642-1-vkuznets@redhat.com> References: <20190725104645.30642-1-vkuznets@redhat.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jan Kiszka [ Upstream commit cf64527bb33f6cec2ed50f89182fc4688d0056b6 ] Letting this pend may cause nested_get_vmcs12_pages to run against an invalid state, corrupting the effective vmcs of L1. This was triggerable in QEMU after a guest corruption in L2, followed by a L1 reset. Signed-off-by: Jan Kiszka Reviewed-by: Liran Alon Cc: stable@vger.kernel.org Fixes: 7f7f1ba33cf2 ("KVM: x86: do not load vmcs12 pages while still in SMM") Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 880bc36a0d5d..4cf16378dffe 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -8490,6 +8490,8 @@ static void free_nested(struct vcpu_vmx *vmx) if (!vmx->nested.vmxon && !vmx->nested.smm.vmxon) return; + kvm_clear_request(KVM_REQ_GET_VMCS12_PAGES, &vmx->vcpu); + hrtimer_cancel(&vmx->nested.preemption_timer); vmx->nested.vmxon = false; vmx->nested.smm.vmxon = false;