From patchwork Wed Nov 21 00:24:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Mattson X-Patchwork-Id: 10691475 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 4807F13AD for ; Wed, 21 Nov 2018 00:25:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 33CD72AED1 for ; Wed, 21 Nov 2018 00:25:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 271C52AEE1; Wed, 21 Nov 2018 00:25:14 +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=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL 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 C3EB82AED1 for ; Wed, 21 Nov 2018 00:25:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726950AbeKUK5G (ORCPT ); Wed, 21 Nov 2018 05:57:06 -0500 Received: from mail-qk1-f202.google.com ([209.85.222.202]:41102 "EHLO mail-qk1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726060AbeKUK5G (ORCPT ); Wed, 21 Nov 2018 05:57:06 -0500 Received: by mail-qk1-f202.google.com with SMTP id n68so5082331qkn.8 for ; Tue, 20 Nov 2018 16:25:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=d7+nle5YWnS2LJSeYAYVBOxLJ5tr3Ng3dE6eX4Ss5KI=; b=AnOyShcw4xUH+26be844RXAJb+tO8AuhSBJ8hRdcdIVV1TbXv00RTEtsz1yZmpGUIH 6KaQp9UOrUr1oFIn3rRJ5pzIFSESc70kkxpSS/A+TFstTODCfGMDGxTtCx+AaDcLLSAj 53klGOcJ6V2TO6Taw/h2/eBoQMW5KqNGZjBIxewhUByh98oiFF8PwuiZWPv2BOWYxdLn S2EQRaemAJFAYFDhn/efsnX+SfWLx+uakfepEZO4vmOpqHVOxM1vn6iogfonjaTL2tP3 nq+ZDxh0ikmcTPW4mr+uHtmCqC8atSa92EbTcAbkn50R+IKx3zyU5Xz2llrFm65+VtU5 E7iA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=d7+nle5YWnS2LJSeYAYVBOxLJ5tr3Ng3dE6eX4Ss5KI=; b=KrhOf2sEzjws4xELxMXrwgwAxllMyyRn8kE0lhWelbxwYJjO+7dy/0p4PNN5ndDJzV mnNKvhY1iKDGZxhkjhNOO4kqk4z810jId3vaYc6QmMNTtF/aQ7GgyM5mBeK6qaGYVbT5 80/VQsZfhnnRH/w8oroSY0HbNl9osxU3ONvJvuIYbJ9PnpfDmKZkySRGQzd5DJVt46Rr uUHW04OzPwkgx/8m8Sr1qrjymEYO20t1+ZNwEJRPVTrQRkcaUahzdil/U5DIP7/Yrn2u RsLfgPJ5qj5Of+PRr4WSEqmQWy31U+HR6wPSppJ3oi+9ZcLVAoPO+L8i20KxiWjgCSh7 q34w== X-Gm-Message-State: AGRZ1gKYD0lKDpt/VoaEepECh8l7CoVBClOg8kxSJQKeuFvlMs/Za4Lw 4NfiJREU+pD5/9IF1wCtXZGwfiqGE56gD2lM8JrpzbmBdT2uAPu2BXjD7rNEFmzF4K38EjDAlAa mP8xDJAfqo9oRpgEEBWOTw9Zvop1tAFoDctfHhCIwpvoI3/aN8yXpkXV6KMEQBbM= X-Google-Smtp-Source: AJdET5exi7eRrxnYeTazzvu5HEi7XzX/w6ajZsUapzA57LMVHJsTa1YKTktD+L+aCiCNTJ5bhxguvnlwJRZMYA== X-Received: by 2002:aed:23fd:: with SMTP id k58mr2655749qtc.39.1542759911425; Tue, 20 Nov 2018 16:25:11 -0800 (PST) Date: Tue, 20 Nov 2018 16:24:58 -0800 In-Reply-To: <20181121002458.239673-1-jmattson@google.com> Message-Id: <20181121002458.239673-2-jmattson@google.com> Mime-Version: 1.0 References: <20181121002458.239673-1-jmattson@google.com> X-Mailer: git-send-email 2.19.1.1215.g8438c0b245-goog Subject: [PATCH 2/2] kvm: nVMX: interrupt-window exiting should wake L2 from HLT From: Jim Mattson To: kvm@vger.kernel.org Cc: Jim Mattson , Peter Shier Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP According to the SDM, "interrupt-window exiting" VM-exits wake a logical processor from the same inactive states as would an external interrupt. Specifically, they wake a logical processor from the states entered using the HLT and MWAIT instructions. Fixes: 6dfacadd5858 ("KVM: nVMX: Add support for activity state HLT") Signed-off-by: Jim Mattson Reviewed-by: Peter Shier --- arch/x86/kvm/vmx.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5f5c79e72a49..2dfd150f83bd 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -13432,6 +13432,18 @@ static bool nested_vmx_nmi_window_exit(struct kvm_vcpu *vcpu) (GUEST_INTR_STATE_NMI | GUEST_INTR_STATE_MOV_SS)); } +static bool nested_vmx_intr_window_exit(struct kvm_vcpu *vcpu) +{ + struct vmcs12 *vmcs12 = get_vmcs12(vcpu); + + return (vmcs12->cpu_based_vm_exec_control & + CPU_BASED_VIRTUAL_INTR_PENDING) && + vmcs12->guest_activity_state != GUEST_ACTIVITY_WAIT_SIPI && + (vmcs12->guest_rflags & X86_EFLAGS_IF) && + !(vmcs12->guest_interruptibility_info & + (GUEST_INTR_STATE_STI | GUEST_INTR_STATE_MOV_SS)); +} + /* * nested_vmx_run() handles a nested entry, i.e., a VMLAUNCH or VMRESUME on L1 * for running an L2 nested guest. @@ -13524,12 +13536,13 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) /* * If we're entering a halted L2 vcpu and the L2 vcpu won't be - * awakened by event injection or by an NMI-window VM-exit, - * halt the vcpu. + * awakened by event injection or by an NMI-window VM-exit or + * by an interrupt-window VM-exit, halt the vcpu. */ if ((vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) && !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK) && - !nested_vmx_nmi_window_exit(vcpu)) { + !nested_vmx_nmi_window_exit(vcpu) && + !nested_vmx_intr_window_exit(vcpu)) { vmx->nested.nested_run_pending = 0; return kvm_vcpu_halt(vcpu); }