Received: by 10.213.65.68 with SMTP id h4csp865920imn; Tue, 20 Mar 2018 18:14:55 -0700 (PDT) X-Google-Smtp-Source: AG47ELtUo6hDqMCkko+8bK9zRMzJbfOQUhFME/D4WGEzqZt3QUGn/5ajLNnbMfXti+sZOQy2PfIY X-Received: by 10.99.163.67 with SMTP id v3mr13245157pgn.298.1521594895579; Tue, 20 Mar 2018 18:14:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521594895; cv=none; d=google.com; s=arc-20160816; b=dzHHKVcMF6nbUsEKGf9cv8ulIlI8jZGDn4oqnR2ysk5hhz5T+2ohfE8YDKSOuTbu79 3ZTIqKmJ4m+B53Vzbhp4TWpHKpRg2HVFJfVP1Ik2+ybQUBrFlRnHmJHyJqmbGuFEJ3mD wkpzFTE8F9EcFK/Cg8I0wdc115CGlNyYfOwgLpq2/J2VcgLd9NkEDOM9ci5uTsErTATW MAUuVqWkyWKwahIuwNurxGBWqNLmtoQdrelxIE/eUH5ThQugFVYVFdG+MOcBjMgysyK1 GVh7AmmvH49gQFwSit+/wsHd6D8kQ6LyQ1F7yLnHfi/EM7pd1fjL17LE3HYGb/X7Ub3Y egag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ilitOM/Pm7ylBLIiftcos3DBkL3IxIyAHtpfxgyDa78=; b=gIDgXS15LKT3xLVY7Zzkb5EjGgoOLdWGUHZZDo23x6fxSeYpDhTV/fFrwUlE+tnbrI 05ndR/lFu1A8AJR9ybnWYJimf+LTlNZmH1w/tkZ3AfvulO6bWJdsmNm8qvddCm01nelR 6Pxdm7FC5b4/BSzC4l6yEDo0IKWPpnR19ssAoL1sy7WOTMiZm7qwkktdFROU+aXeubOP CEdWT5cZ/Cd7ztjifCcejSMqfGgT5xyk/8+asqcLNX9xF1JBcNyvwe1Y1td1zbB4pIvh l1MQlrxQuCp61O5Y5YnHPgWBBEZ3q+BhUn7p6BKbd18G5+Cv5dxpOcZtVJEFIqbbuwWV G6zQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m72si2226275pfi.236.2018.03.20.18.14.41; Tue, 20 Mar 2018 18:14:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752178AbeCUBN1 (ORCPT + 99 others); Tue, 20 Mar 2018 21:13:27 -0400 Received: from mga09.intel.com ([134.134.136.24]:19664 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751832AbeCUBL1 (ORCPT ); Tue, 20 Mar 2018 21:11:27 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 Mar 2018 18:11:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,338,1517904000"; d="scan'208";a="39779397" Received: from vmm.bj.intel.com ([10.238.135.172]) by fmsmga001.fm.intel.com with ESMTP; 20 Mar 2018 18:11:24 -0700 From: Luwei Kang To: kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com, x86@kernel.org, pbonzini@redhat.com, rkrcmar@redhat.com, linux-kernel@vger.kernel.org, joro@8bytes.org, Luwei Kang Subject: [PATCH v6 08/11] KVM: x86: Introduce a function to initialize the PT configuration Date: Tue, 20 Mar 2018 19:21:55 +0800 Message-Id: <1521544918-31084-9-git-send-email-luwei.kang@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1521544918-31084-1-git-send-email-luwei.kang@intel.com> References: <1521544918-31084-1-git-send-email-luwei.kang@intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Initialize the Intel PT configuration when cpuid update. Include cpuid inforamtion, rtit_ctl bit mask and the number of address ranges. Signed-off-by: Luwei Kang --- arch/x86/kvm/vmx.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 34bcb30..5166d72 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -10191,6 +10191,71 @@ static void nested_vmx_cr_fixed1_bits_update(struct kvm_vcpu *vcpu) #undef cr4_fixed1_update } +static void update_intel_pt_cfg(struct kvm_vcpu *vcpu) +{ + struct vcpu_vmx *vmx = to_vmx(vcpu); + struct kvm_cpuid_entry2 *best = NULL; + int i; + + for (i = 0; i < PT_CPUID_LEAVES; i++) { + best = kvm_find_cpuid_entry(vcpu, 0x14, i); + if (!best) + return; + vmx->pt_desc.caps[CPUID_EAX + i*PT_CPUID_REGS_NUM] = best->eax; + vmx->pt_desc.caps[CPUID_EBX + i*PT_CPUID_REGS_NUM] = best->ebx; + vmx->pt_desc.caps[CPUID_ECX + i*PT_CPUID_REGS_NUM] = best->ecx; + vmx->pt_desc.caps[CPUID_EDX + i*PT_CPUID_REGS_NUM] = best->edx; + } + + /* Get the number of configurable Address Ranges for filtering */ + vmx->pt_desc.range_cnt = __pt_cap_get(vmx->pt_desc.caps, + PT_CAP_num_address_ranges); + + /* Clear the no dependency bits */ + vmx->pt_desc.ctl_bitmask = ~(RTIT_CTL_TRACEEN | RTIT_CTL_OS | + RTIT_CTL_USR | RTIT_CTL_TSC_EN | RTIT_CTL_DIS_RETC); + + /* If CPUID.(EAX=14H,ECX=0):EBX[0]=1 CR3Filter can be set */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_cr3_filtering)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_CR3_FILTER; + + /* + * If CPUID.(EAX=14H,ECX=0):EBX[1]=1 CYCEn, CycThresh and + * PSBFreq can be set + */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_psb_cyc)) + vmx->pt_desc.ctl_bitmask &= ~(RTIT_CTL_CYC_EN | + RTIT_CTL_CYC_THRESH | RTIT_CTL_PSB_FREQ); + + /* + * If CPUID.(EAX=14H,ECX=0):EBX[3]=1 MTCEn BranchEn and + * MTCFreq can be set + */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_mtc)) + vmx->pt_desc.ctl_bitmask &= ~(RTIT_CTL_MTC_EN | + RTIT_CTL_BRANCH_EN | RTIT_CTL_MTC_RANGE); + + /* If CPUID.(EAX=14H,ECX=0):EBX[4]=1 FUPonPTW and PTWEn can be set */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_ptwrite)) + vmx->pt_desc.ctl_bitmask &= ~(RTIT_CTL_FUP_ON_PTW | + RTIT_CTL_PTW_EN); + + /* If CPUID.(EAX=14H,ECX=0):EBX[5]=1 PwrEvEn can be set */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_power_event_trace)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_PWR_EVT_EN; + + /* If CPUID.(EAX=14H,ECX=0):ECX[0]=1 ToPA can be set */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_topa_output)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_TOPA; + /* If CPUID.(EAX=14H,ECX=0):ECX[3]=1 FabircEn can be set */ + if (__pt_cap_get(vmx->pt_desc.caps, PT_CAP_output_subsys)) + vmx->pt_desc.ctl_bitmask &= ~RTIT_CTL_FABRIC_EN; + + /* unmask address range configure area */ + for (i = 0; i < vmx->pt_desc.range_cnt; i++) + vmx->pt_desc.ctl_bitmask &= ~(0xf << (32 + i*4)); +} + static void vmx_cpuid_update(struct kvm_vcpu *vcpu) { struct vcpu_vmx *vmx = to_vmx(vcpu); @@ -10209,6 +10274,10 @@ static void vmx_cpuid_update(struct kvm_vcpu *vcpu) if (nested_vmx_allowed(vcpu)) nested_vmx_cr_fixed1_bits_update(vcpu); + + if (boot_cpu_has(X86_FEATURE_INTEL_PT) && + guest_cpuid_has(vcpu, X86_FEATURE_INTEL_PT)) + update_intel_pt_cfg(vcpu); } static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry) -- 1.8.3.1