From patchwork Tue Sep 20 00:35:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 9340833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B227A607D0 for ; Tue, 20 Sep 2016 00:36:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A32FB29080 for ; Tue, 20 Sep 2016 00:36:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 97D6C291DD; Tue, 20 Sep 2016 00:36:10 +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=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=unavailable 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 4964229080 for ; Tue, 20 Sep 2016 00:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752814AbcITAfx (ORCPT ); Mon, 19 Sep 2016 20:35:53 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:34444 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751579AbcITAfw (ORCPT ); Mon, 19 Sep 2016 20:35:52 -0400 Received: by mail-pa0-f67.google.com with SMTP id vz6so97775pab.1; Mon, 19 Sep 2016 17:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oaEVfG3K1O7Kd71Bc6R2DAk8I/9JqdBLjLSNCiovYxA=; b=OOlkvK5KLQZrqcoQ1lmKowz9ejzF1Swwl8CUUiqAc1sqMxgCJh+vGd6YCNlTBoMRGl lubHTt/2Xs7hVRPVnhbVxxfczuDDQkOnBKFT3DX8z7AMCqCLYz1GEOWzUGMJCHpcTVf3 8bPqYuWj51OrQ4jmNrFdv7gXkhVgt3zU81mewYKZDbKYnbpcQJsrcmuOOHH5cRYIi2Ph xRyl2HexdKCFsbDP/gBqHzjqsbpS8uZ643fA+m4EQPOXVfE4mgkNPhhjlIj6OTWuc37s KnqJMpR0PDatDLJSwyhwRNSlRLOAkS3u4qOI0K3ncB0Z6XGEVR8XGKBul81oxFva6Te1 bitw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oaEVfG3K1O7Kd71Bc6R2DAk8I/9JqdBLjLSNCiovYxA=; b=EZI8GDoWLUxumMxKm4e9BM4V4M0fKtXtYZoED5A+/ZgaMLpQJ/f1tjuJrdFNuTG1tz gjeDAvc2uFX8ii7Qaikg/A0njpftllUBbdT3/1eWFhX9YvBbzTZu7hveVSdCJSAOmPwh F0Hm1YwfkHSmhWupBSbGLvHHxPTKT9OeeCbGUPzTEbhNFPL57DYtyQjS+RKzIJEaLBp9 mbj2gXjGfaPt21UtKT75QCVoUZyMNb4POh0u7GOl4qASrnjlnmDvqenDMBz8utAArbpO 50Ib44UPZXvLQbYQeOjBY5oJki58/XwSI5EIQB737Ih+sBg4+Ptoszp3ReGH1KdVdscC 0bDg== X-Gm-Message-State: AE9vXwMdjvqVtrdZGuXZjf9qfthU/tCz8W1KgmUgVNskygCL+VjKC9SEHUgr/NYNpgNGEQ== X-Received: by 10.66.182.167 with SMTP id ef7mr51375748pac.128.1474331751107; Mon, 19 Sep 2016 17:35:51 -0700 (PDT) Received: from kernel.kingsoft.cn ([114.255.44.132]) by smtp.gmail.com with ESMTPSA id u19sm31655149pfa.40.2016.09.19.17.35.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 19 Sep 2016 17:35:50 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Wanpeng Li , Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Wincy Van , Yang Zhang Subject: [PATCH v2] KVM: VMX: Enable MSR-BASED TPR shadow even if w/o APICv Date: Tue, 20 Sep 2016 08:35:46 +0800 Message-Id: <1474331746-3648-1-git-send-email-wanpeng.li@hotmail.com> X-Mailer: git-send-email 1.9.1 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: Wanpeng Li I observed that kvmvapic(to optimize flexpriority=N or AMD) is used to boost TPR access when testing kvm-unit-test/eventinj.flat tpr case on my haswell desktop (w/ flexpriority, w/o APICv). Commit (8d14695f9542 x86, apicv: add virtual x2apic support) disable virtual x2apic mode completely if w/o APICv, and the author also told me that windows guest can't enter into x2apic mode when he developed the APICv feature several years ago. However, it is not truth currently, Interrupt Remapping and vIOMMU is added to qemu and the developers from Intel test windows 8 can work in x2apic mode w/ Interrupt Remapping enabled recently. This patch enables TPR shadow for virtual x2apic mode to boost windows guest in x2apic mode even if w/o APICv. Can pass the kvm-unit-test. Suggested-by: Wincy Van Cc: Paolo Bonzini Cc: Radim Krčmář Cc: Wincy Van Cc: Yang Zhang Signed-off-by: Wanpeng Li --- v1 -> v2: * leverage the cached msr bitmap arch/x86/kvm/vmx.c | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 5cede40..7d884e1 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6464,17 +6464,23 @@ static __init int hardware_setup(void) set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ - for (msr = 0x800; msr <= 0x8ff; msr++) - vmx_disable_intercept_msr_read_x2apic(msr); - - /* TMCCT */ - vmx_enable_intercept_msr_read_x2apic(0x839); - /* TPR */ - vmx_disable_intercept_msr_write_x2apic(0x808); - /* EOI */ - vmx_disable_intercept_msr_write_x2apic(0x80b); - /* SELF-IPI */ - vmx_disable_intercept_msr_write_x2apic(0x83f); + if (enable_apicv) { + for (msr = 0x800; msr <= 0x8ff; msr++) + vmx_disable_intercept_msr_read_x2apic(msr); + + /* TMCCT */ + vmx_enable_intercept_msr_read_x2apic(0x839); + /* TPR */ + vmx_disable_intercept_msr_write_x2apic(0x808); + /* EOI */ + vmx_disable_intercept_msr_write_x2apic(0x80b); + /* SELF-IPI */ + vmx_disable_intercept_msr_write_x2apic(0x83f); + } else if (cpu_has_vmx_tpr_shadow()) { + /* TPR */ + vmx_disable_intercept_msr_read_x2apic(0x808); + vmx_disable_intercept_msr_write_x2apic(0x808); + } if (enable_ept) { kvm_mmu_set_mask_ptes(VMX_EPT_READABLE_MASK, @@ -8435,12 +8441,7 @@ static void vmx_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set) return; } - /* - * There is not point to enable virtualize x2apic without enable - * apicv - */ - if (!cpu_has_vmx_virtualize_x2apic_mode() || - !kvm_vcpu_apicv_active(vcpu)) + if (!cpu_has_vmx_virtualize_x2apic_mode()) return; if (!cpu_need_tpr_shadow(vcpu))