From nobody Sun Feb 8 23:13:25 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=cloud.com ARC-Seal: i=1; a=rsa-sha256; t=1698262239; cv=none; d=zohomail.com; s=zohoarc; b=AnD5PbwG46vHDH+K9Iw+YDC5zpQeACrwhKq2YsYZ8w9lWsj9yG6we6HUMHslsHbdlaOB9ms4K/MzS5jfFQviad09EbhcJhZjfeCSmSx7v63iplv1s4kJLB3UtgFB5ykvZ01IJ1hbd6i8La1JvFjXAeN6sLfp6I9M//NivS3An2o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1698262239; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=+4Ugom2BHWfSCQHaZ15aBTStdezniWO/0GIfarrnvRY=; b=f+VLBEBCLk1Uvpyzt0owIie+oiuSVuSiTTm3nNeJwuP5rwCVs750Woa1288MNgCVFoLXnvTXumbpUODwuFMpWfcnxHKD7djn2729NczJqhAYoXtPyOX7ObFzHgcoNtfkMS9rZmlAZkhxO3oF+zBU0dEziyCc583adofss+/ksNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1698262239974770.3904247568719; Wed, 25 Oct 2023 12:30:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.623193.970823 (Exim 4.92) (envelope-from ) id 1qvjZu-0002My-Kf; Wed, 25 Oct 2023 19:30:06 +0000 Received: by outflank-mailman (output) from mailman id 623193.970823; Wed, 25 Oct 2023 19:30:06 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qvjZu-0002Kv-DY; Wed, 25 Oct 2023 19:30:06 +0000 Received: by outflank-mailman (input) for mailman id 623193; Wed, 25 Oct 2023 19:30:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qvjZs-0001Lv-QD for xen-devel@lists.xenproject.org; Wed, 25 Oct 2023 19:30:04 +0000 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [2a00:1450:4864:20::62b]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id e4840e10-736c-11ee-9b0e-b553b5be7939; Wed, 25 Oct 2023 21:30:02 +0200 (CEST) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9b95622c620so24431766b.0 for ; Wed, 25 Oct 2023 12:30:02 -0700 (PDT) Received: from edvint-x-u.eng.citrite.net ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id hv6-20020a17090760c600b00985ed2f1584sm10408710ejc.187.2023.10.25.12.30.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 12:30:01 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e4840e10-736c-11ee-9b0e-b553b5be7939 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1698262202; x=1698867002; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+4Ugom2BHWfSCQHaZ15aBTStdezniWO/0GIfarrnvRY=; b=G41IVVsNTjuJuI25uQ+S8ZI+6uaSBM+X0OQUVuFP55E7xqx+bipBRsMuJURzQk8/u3 SyNLZb2zWPFF7iLO43mrUEwdmRXQPRaFJjQOaRCKyjmr4/vcXJ07yOP1KkU4toczYsUR Oc7O7mUbhx9wTi+C4B3kvwN1GS2Wk3NcQYNXM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698262202; x=1698867002; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+4Ugom2BHWfSCQHaZ15aBTStdezniWO/0GIfarrnvRY=; b=ILn+uP2EHgrdFC4Aq2UnVS3HYngjOAS1sr2N1mtHOwopE/cEunLKPmRSeRqxLgyQOj mcaCNKNmhBL9spala2WXnJL2JYgg8yIym/iKF2HkdapIqftrd+U1c9HGD+YTncee/J7u MMZwQSUtWqlStQONPFksbitZ3LP/rD2d4nUNGAJ/rmzXA6i8ML0ZRzgd4lMvcCbapfKg tQBzlUIx5tmFCDhV495s+wJMSnhjbwhdFBwh6xEV4TyBMrmj4y2IpLYRAYoLYlCnOux0 a3RsPGBqMlRDmGdJdeJXHJ/u48Nbz49VpZWEJJlvsjb6M8cXpMIteZK3rM3FAgqqCQMA CbFQ== X-Gm-Message-State: AOJu0YwnU57yRXJw0xWOVKNd6udXW73t0yQnsJqBz+2ig5pZQ7SOdH4F /efIkOMr2HzCJFZpDGMw6BnPUbSRXmIhkRNzOOJyQHwr X-Google-Smtp-Source: AGHT+IHlyeNic58eWA6AVEhtXnW5b2tNaVHDqvEIfpVl/o8VVXuxMwbs+BxoU7A+kDntpz0Nz79TiA== X-Received: by 2002:a17:906:c14b:b0:9ad:a59f:331a with SMTP id dp11-20020a170906c14b00b009ada59f331amr13625243ejc.57.1698262201789; Wed, 25 Oct 2023 12:30:01 -0700 (PDT) From: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Edwin=20T=C3=B6r=C3=B6k?= , Jun Nakajima , Kevin Tian , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Wei Liu Subject: [RFC PATCH 05/22] x86/PMUv1: report correct information in 0xa CPUID Date: Wed, 25 Oct 2023 20:29:35 +0100 Message-Id: <4a00165999a0cc250f097fc8eaab0649f1c05ac0.1698261255.git.edwin.torok@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @cloud.com) X-ZM-MESSAGEID: 1698262241531100002 From: Edwin T=C3=B6r=C3=B6k The 0xa CPUID leaf has to report supported number of: - fixed performance counters - general purpose performance counters - architectural predefined events And the PMU version (which was already limited to 3). Type punning is used, which should be safe due to -fno-strict-aliasing. This limits the number of arch events supported when vpmu=3Darch on Icelake. Backport: 4.0+ Signed-off-by: Edwin T=C3=B6r=C3=B6k --- xen/arch/x86/cpu/vpmu_intel.c | 2 +- xen/arch/x86/cpuid.c | 39 ++++++++++++++++++++++++++++++--- xen/arch/x86/include/asm/vpmu.h | 4 ++++ 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/cpu/vpmu_intel.c b/xen/arch/x86/cpu/vpmu_intel.c index fa5b40c65c..9602728f1b 100644 --- a/xen/arch/x86/cpu/vpmu_intel.c +++ b/xen/arch/x86/cpu/vpmu_intel.c @@ -66,7 +66,7 @@ static bool_t __read_mostly full_width_write; #define ARCH_CNTR_PIN_CONTROL (1ULL << 19) =20 /* Number of general-purpose and fixed performance counters */ -static unsigned int __read_mostly arch_pmc_cnt, fixed_pmc_cnt; +unsigned int __read_mostly arch_pmc_cnt, fixed_pmc_cnt; =20 /* Masks used for testing whether and MSR is valid */ #define ARCH_CTRL_MASK (~((1ull << 32) - 1) | (1ull << 21) | ARCH_CNTR_PI= N_CONTROL) diff --git a/xen/arch/x86/cpuid.c b/xen/arch/x86/cpuid.c index 455a09b2dd..dfbcd1b3a4 100644 --- a/xen/arch/x86/cpuid.c +++ b/xen/arch/x86/cpuid.c @@ -304,9 +304,42 @@ void guest_cpuid(const struct vcpu *v, uint32_t leaf, *res =3D EMPTY_LEAF; else { - /* Report at most v3 since that's all we currently emulate. */ - if ( (res->a & 0xff) > 3 ) - res->a =3D (res->a & ~0xff) | 3; + union { + uint32_t eax; + struct { + uint8_t version; + uint8_t general_nr; + uint8_t general_width; + uint8_t arch_nr; + }; + } u; + u.eax =3D res->a; + + /* Report at most VPMU_VERSION_MAX since that's all we current= ly emulate. */ + if ( u.version > VPMU_VERSION_MAX ) { + gdprintk(XENLOG_WARNING, "Limiting PMU version to %d (actu= al %d)", VPMU_VERSION_MAX, u.version); + u.version =3D VPMU_VERSION_MAX; + } + + if ( u.general_nr > arch_pmc_cnt ) { + gdprintk(XENLOG_WARNING, "Limiting general purpose PMU cou= nt to %d (actual %d)", arch_pmc_cnt, u.general_nr); + u.general_nr =3D arch_pmc_cnt; + } + + if ( vpmu_features & (XENPMU_FEATURE_IPC_ONLY | + XENPMU_FEATURE_ARCH_ONLY) ) { + unsigned limit =3D ( vpmu_features & XENPMU_FEATURE_ARCH_O= NLY ) ? 7 : 3; + if (limit < u.arch_nr) { + gdprintk(XENLOG_WARNING, "Limiting architectural PMU e= vents to %d (actual %d)", limit, u.arch_nr); + u.arch_nr =3D limit; + } + } + + res->a =3D u.eax; + + /* We only implement 3 fixed function counters */ + if ( (res->d & 0x1f) > fixed_pmc_cnt ) + res->d =3D (res->d & ~0x1f) | fixed_pmc_cnt; } break; =20 diff --git a/xen/arch/x86/include/asm/vpmu.h b/xen/arch/x86/include/asm/vpm= u.h index b165acc6c2..1ef6089ccb 100644 --- a/xen/arch/x86/include/asm/vpmu.h +++ b/xen/arch/x86/include/asm/vpmu.h @@ -74,6 +74,8 @@ struct vpmu_struct { #define VPMU_CPU_HAS_DS 0x1000 /* Has Debug Store */ #define VPMU_CPU_HAS_BTS 0x2000 /* Has Branch Trace Sto= re */ =20 +#define VPMU_VERSION_MAX 0x3 + static inline void vpmu_set(struct vpmu_struct *vpmu, const u32 mask) { vpmu->flags |=3D mask; @@ -118,6 +120,8 @@ static inline int vpmu_do_rdmsr(unsigned int msr, uint6= 4_t *msr_content) =20 extern unsigned int vpmu_mode; extern unsigned int vpmu_features; +extern unsigned int arch_pmc_cnt; +extern unsigned int fixed_pmc_cnt; =20 /* Context switch */ static inline void vpmu_switch_from(struct vcpu *prev) --=20 2.41.0