Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp266729pxv; Wed, 21 Jul 2021 22:44:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQyrvny23m1v+a+a8Wl3ipTAeSCXT8zy9e9Pz+0PQz1gzin3xhDad/rARLY+P5/+YiW76l X-Received: by 2002:a92:ddcf:: with SMTP id d15mr13578525ilr.184.1626932697880; Wed, 21 Jul 2021 22:44:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626932697; cv=none; d=google.com; s=arc-20160816; b=xTZxOQvmjveW8iVigpvTmFj71VLKPioTDoWJKRyJ61FRmFTgyGQwq+lf3HF0me8Mcz BY0iHeuH0z1duXIHS4R268kyopzNN8dPxJFF4lF4JhXFmsbi7/GnUhk3tS4refYkMo5d UzGLcwYld3UZPhg3HaGwEcql/zZTzCsUsZbyWSuL6sw1tBakYUo6Xfc7QvHHfPlcE3hO aHrzhocV70+iNquna5RFR2ChBFAyc/lcUNYs/8wOdqL+PPWV6ik3CWlDLEpzBqYqYPZX H0ZmIbjdhzjq4IoiDZTOQyQGGWBB0aF3zS35y2fVLpmz12T18kF1CRgjDAHuD+W2KV5R vDow== 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=wK0EguiDzzLrq3AFYzlfEdlJTafDH3RWEq9tAOL5Zkk=; b=qfPdaEtO7TqWRw+8GCg1JzCncduQpOiKgULmnUThDsjdLpOfSRc2d6B0qGSvVflA5h crmrtHmMOVcDcOXEsgHoG0juUaO4+WOXzOWxfx+CVw3/vO9bw8IgivZmN1GjYTB1e/4o WJREF1k6cgXAXlh6sgeOK6BxMmLmYvVrgwYEn/QTeR/7mnw4J7xHowKej57ORGwh257L ezoEoJf1ydVohqvGedtEqo73mW5UpT1W2H7DbqF6vuJtdZqkhsvA02yKGanUiTbL4kDr GEZfeEmafG91G+MqOdaGO7V2yEjRYhcN4eL8vcP/ruuqVEenezwZKHCv4inF70vShfYc vPYA== 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 f11si30778478ils.120.2021.07.21.22.44.46; Wed, 21 Jul 2021 22:44:57 -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 S231196AbhGVFDD (ORCPT + 99 others); Thu, 22 Jul 2021 01:03:03 -0400 Received: from mga06.intel.com ([134.134.136.31]:24089 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231169AbhGVFCp (ORCPT ); Thu, 22 Jul 2021 01:02:45 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10052"; a="272686978" X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="272686978" 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:20 -0700 X-IronPort-AV: E=Sophos;i="5.84,260,1620716400"; d="scan'208";a="512372563" 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:16 -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 13/18] KVM: x86: Set PEBS_UNAVAIL in IA32_MISC_ENABLE when PEBS is enabled Date: Thu, 22 Jul 2021 13:41:54 +0800 Message-Id: <20210722054159.4459-14-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 bit 12 represents "Processor Event Based Sampling Unavailable (RO)" : 1 = PEBS is not supported. 0 = PEBS is supported. A write to this PEBS_UNAVL available bit will bring #GP(0) when guest PEBS is enabled. Some PEBS drivers in guest may care about this bit. Signed-off-by: Like Xu Signed-off-by: Zhu Lingshan --- arch/x86/kvm/vmx/pmu_intel.c | 2 ++ arch/x86/kvm/x86.c | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/kvm/vmx/pmu_intel.c b/arch/x86/kvm/vmx/pmu_intel.c index 58f32a55cc2e..296246bf253d 100644 --- a/arch/x86/kvm/vmx/pmu_intel.c +++ b/arch/x86/kvm/vmx/pmu_intel.c @@ -588,6 +588,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) bitmap_set(pmu->all_valid_pmc_idx, INTEL_PMC_IDX_FIXED_VLBR, 1); if (vcpu->arch.perf_capabilities & PERF_CAP_PEBS_FORMAT) { + vcpu->arch.ia32_misc_enable_msr &= ~MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL; if (vcpu->arch.perf_capabilities & PERF_CAP_PEBS_BASELINE) { pmu->pebs_enable_mask = ~pmu->global_ctrl; pmu->reserved_bits &= ~ICL_EVENTSEL_ADAPTIVE; @@ -601,6 +602,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) ~((1ull << pmu->nr_arch_gp_counters) - 1); } } else { + vcpu->arch.ia32_misc_enable_msr |= MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL; vcpu->arch.perf_capabilities &= ~PERF_CAP_PEBS_MASK; } } diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 2f5d1ed00e4a..d3987a217ebe 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3322,6 +3322,10 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) break; case MSR_IA32_MISC_ENABLE: data &= ~MSR_IA32_MISC_ENABLE_EMON; + if (!msr_info->host_initiated && + (vcpu->arch.perf_capabilities & PERF_CAP_PEBS_FORMAT) && + (data & MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL)) + return 1; if (!kvm_check_has_quirk(vcpu->kvm, KVM_X86_QUIRK_MISC_ENABLE_NO_MWAIT) && ((vcpu->arch.ia32_misc_enable_msr ^ data) & MSR_IA32_MISC_ENABLE_MWAIT)) { if (!guest_cpuid_has(vcpu, X86_FEATURE_XMM3)) -- 2.27.0