Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp266624pxv; Wed, 21 Jul 2021 22:44:42 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztNhiWDtmwp2PZMLsd+Ui7bmhIctnVzu0UZe2M1JhSVBEe3BXqAM5QMp0W2KMenJAYctg+ X-Received: by 2002:a05:6e02:de6:: with SMTP id m6mr26688319ilj.203.1626932682428; Wed, 21 Jul 2021 22:44:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626932682; cv=none; d=google.com; s=arc-20160816; b=WhjNc7B8waCM/kR1VmjDBx0mB0GZxvzrAPQBn4AJ8kcb3lQB23mXRH5jWW44AB2Zay ehAdUaIgYvllBiZ3DrUDhCMmakZmpqwyy4DnSFiVyMLFDgVQdUjXybqAU/b56SVD5F37 y0o0XEHlBhoLdke/6RqJk//Fka+VQNrL2QoqFdIFf5ASpXX77EN/GaljRI0PNqqHtPNX bxSh927iHJ7wlg1E07FtS3OnS3lQum0dfoRt/4ps8jm6lhYH5zBo7MHLpJz3PXJXYOcx AD/GbepDM9bHMDk4saQxKa5nhy9NrdSQV2BREDL2ukxEAwqA5tGffMOtc1Ggp+AoTufL 556w== 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 :references:in-reply-to:message-id:date:subject:cc:to:from; bh=oEJFDlIYI6p9ydwHHOEaGm9roSWGqx+KSSO4EJrT9Cc=; b=zs9B19zSliz0WHFHqAg1YCro3jJPdWKludmHVbUXvuqgiHSQvOxz7m0p56zAWX9dzx UbGmvvhWTcxIO55gmItG022h9EQ3iLchCYGCBa72aQWmuJMH1xQJtTT4QRM/rs1LFS1M oMAHHBzHvYTQ+E6OLqnn0hDyF7h9Bsj05PKpqGjtTGMI6Mf260udcmWEFpyyT12OT1gY i65AoWIov0ZHR+X8VeD1ha37arq0smq0JnkgrlmIzmm9k6Tieuio/kMTcmpB6VzuLbaQ dYjq38pfbf1uIYtqS9yoBUiUOWA07JDAkMfmDfN6r6yBADY5SGqkuHoocFq0T9v0hec0 e1Ew== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g4si15317358ile.131.2021.07.21.22.44.31; Wed, 21 Jul 2021 22:44:42 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231139AbhGVFCm (ORCPT + 99 others); Thu, 22 Jul 2021 01:02:42 -0400 Received: from mga06.intel.com ([134.134.136.31]:24064 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231150AbhGVFCb (ORCPT ); Thu, 22 Jul 2021 01:02:31 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="272686953" X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="272686953" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 22:43:07 -0700 X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="512372499" Received: from vmm_a4_icx.sh.intel.com (HELO localhost.localdomain) ([10.239.53.245]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Jul 2021 22:43:03 -0700 From: Zhu Lingshan To: peterz@infradead.org, pbonzini@redhat.com Cc: bp@alien8.de, seanjc@google.com, vkuznets@redhat.com, wanpengli@tencent.com, jmattson@google.com, joro@8bytes.org, kan.liang@linux.intel.com, ak@linux.intel.com, wei.w.wang@intel.com, eranian@google.com, liuxiangdong5@huawei.com, linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org, like.xu.linux@gmail.com, boris.ostrvsky@oracle.com, Like Xu , Zhu Lingshan Subject: [PATCH V9 10/18] KVM: x86/pmu: Adjust precise_ip to emulate Ice Lake guest PDIR counter Date: Thu, 22 Jul 2021 13:41:51 +0800 Message-Id: <20210722054159.4459-11-lingshan.zhu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210722054159.4459-1-lingshan.zhu@intel.com> References: <20210722054159.4459-1-lingshan.zhu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Like Xu The PEBS-PDIR facility on Ice Lake server is supported on IA31_FIXED0 only. If the guest configures counter 32 and PEBS is enabled, the PEBS-PDIR facility is supposed to be used, in which case KVM adjusts attr.precise_ip to 3 and request host perf to assign the exactly requested counter or fail. The CPU model check is also required since some platforms may place the PEBS-PDIR facility in another counter index. Signed-off-by: Like Xu Signed-off-by: Zhu Lingshan --- arch/x86/kvm/pmu.c | 2 ++ arch/x86/kvm/pmu.h | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c index d76b0a5d80d7..b907aba35ff3 100644 --- a/arch/x86/kvm/pmu.c +++ b/arch/x86/kvm/pmu.c @@ -153,6 +153,8 @@ static void pmc_reprogram_counter(struct kvm_pmc *pmc, u32 type, * could possibly care here is unsupported and needs changes. */ attr.precise_ip = 1; + if (x86_match_cpu(vmx_icl_pebs_cpu) && pmc->idx == 32) + attr.precise_ip = 3; } if (pebs || intr) ovf = kvm_perf_overflow_intr; diff --git a/arch/x86/kvm/pmu.h b/arch/x86/kvm/pmu.h index 67e753edfa22..1af86ae1d3f2 100644 --- a/arch/x86/kvm/pmu.h +++ b/arch/x86/kvm/pmu.h @@ -4,6 +4,8 @@ #include +#include + #define vcpu_to_pmu(vcpu) (&(vcpu)->arch.pmu) #define pmu_to_vcpu(pmu) (container_of((pmu), struct kvm_vcpu, arch.pmu)) #define pmc_to_pmu(pmc) (&(pmc)->vcpu->arch.pmu) @@ -16,6 +18,11 @@ #define VMWARE_BACKDOOR_PMC_APPARENT_TIME 0x10002 #define MAX_FIXED_COUNTERS 3 +static const struct x86_cpu_id vmx_icl_pebs_cpu[] = { + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_D, NULL), + X86_MATCH_INTEL_FAM6_MODEL(ICELAKE_X, NULL), + {} +}; struct kvm_event_hw_type_mapping { u8 eventsel; -- 2.27.0