From nobody Fri Dec 19 19:01:34 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.13]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D8012325735 for ; Thu, 4 Dec 2025 20:54:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.13 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764881681; cv=none; b=BPQOQIlX4FoZjMC4U8n+IDmpMTKS2HD5rIK0tbZOugF2ZnuPxY0PfWUeeSWj6UpVC6OEYO23WAO4jsG183D+dITVLN9gvrGkylwKkaiA3WwTxn1IPXCXijBile8iP/W/8UJpZLs+YXxL3hC6ZPTZvcg7+Afh2eJW/JmDGotp+Qw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764881681; c=relaxed/simple; bh=b0DstXJmh/PBquGnFrytjf8CQVVS81XVAER4YDpRZ6M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kEf/CI3cOD2J1ak/Ncj2iuQMoSJmkVEazaPYUp9K/n0272XWqDRnK9mY8rOoGWFptYHSm81JOoIrL5EsY+wpfPkp5fTyg4jl2lVrs6M0KtubT+64iELC4WlWOh29yqpNqpNA4waEWRUNVKFvIdUhGVnDKIqnEGhMRZ2G1V/Pdgs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com; spf=pass smtp.mailfrom=intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=MWKiPtIC; arc=none smtp.client-ip=192.198.163.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="MWKiPtIC" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1764881679; x=1796417679; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=b0DstXJmh/PBquGnFrytjf8CQVVS81XVAER4YDpRZ6M=; b=MWKiPtIC1Y3MyJY58aW+y4c8gMgC33VUweiHECoZup2BCKt/zL8SkJDE BQA0MAHgjqc8/StogwkB4FNIDqLhxEyIp3y6rkzC+Rb5TI8Izwzt6MER4 KtHLYLTN4L6EnbVDdu2g2pn1UXJ/j0+lxS1kEwetZYHNa8ZaPKkZ6ZNRS A7mkRU8hb1fNRdmll7ijBo2aUHyYsK4d1hUqfcR5uIMxqSCkUp19aZAsZ PaMbX79n41T1O04J7A7+zgfNxaEBoxdqMEiJjdz8EeMq44hU7Ux6wzavp /b86aqej/CsNvXfGc5E7JxAMyTSjOv87ye0NOaqV182zdXpp2lwJvWW25 w==; X-CSE-ConnectionGUID: SvR+2oeqSZ2lPU9er9mQbQ== X-CSE-MsgGUID: DDFtmLXFTfqzVCRrXlmRFg== X-IronPort-AV: E=McAfee;i="6800,10657,11632"; a="69511052" X-IronPort-AV: E=Sophos;i="6.20,250,1758610800"; d="scan'208";a="69511052" Received: from orviesa002.jf.intel.com ([10.64.159.142]) by fmvoesa107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2025 12:54:29 -0800 X-CSE-ConnectionGUID: hmf6gR/RRPqtBzhPKCGA4w== X-CSE-MsgGUID: QBKjAOl2QtuKwOFscCiklg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.20,250,1758610800"; d="scan'208";a="225752852" Received: from mgerlach-mobl1.amr.corp.intel.com (HELO agluck-desk3.intel.com) ([10.124.220.165]) by orviesa002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Dec 2025 12:54:28 -0800 From: Tony Luck To: Fenghua Yu , Reinette Chatre , Maciej Wieczor-Retman , Peter Newman , James Morse , Babu Moger , Drew Fustini , Dave Martin , Chen Yu Cc: x86@kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Tony Luck Subject: [PATCH v15 24/32] x86/resctrl: Add energy/perf choices to rdt boot option Date: Thu, 4 Dec 2025 12:53:54 -0800 Message-ID: <20251204205404.12763-25-tony.luck@intel.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251204205404.12763-1-tony.luck@intel.com> References: <20251204205404.12763-1-tony.luck@intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Legacy resctrl features are enumerated by X86_FEATURE_* flags. These may be overridden by quirks to disable features in the case of errata. Users can use kernel command line options to either disable a feature, or to force enable a feature that was disabled by a quirk. A different approach is needed for hardware features that do not have an X86_FEATURE_* flag. Update the parse loop of the "rdt=3D" boot option with a call to intel_aet_= option() to handles "perf" and "energy" options. Prefixing an option with "!" force disables a feature. A ":guid" suffix allows for fine grain control per-guid. Signed-off-by: Tony Luck --- .../admin-guide/kernel-parameters.txt | 7 +++- arch/x86/kernel/cpu/resctrl/internal.h | 2 ++ arch/x86/kernel/cpu/resctrl/core.c | 2 ++ arch/x86/kernel/cpu/resctrl/intel_aet.c | 34 +++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 2b465eab41a1..cc9d2800abeb 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -6217,9 +6217,14 @@ rdt=3D [HW,X86,RDT] Turn on/off individual RDT features. List is: cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp, - mba, smba, bmec, abmc, sdciae. + mba, smba, bmec, abmc, sdciae, energy[:guid], + perf[:guid]. E.g. to turn on cmt and turn off mba use: rdt=3Dcmt,!mba + To turn off all energy telemetry monitoring and ensure that + perf telemetry monitoring associated with guid 0x12345 + is enabled use: + rdt=3D!energy,perf:0x12345 =20 reboot=3D [KNL] Format (x86 or x86_64): diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/r= esctrl/internal.h index 3b228b241fb2..df09091f7c6c 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -236,6 +236,7 @@ void __exit intel_aet_exit(void); int intel_aet_read_event(int domid, u32 rmid, void *arch_priv, u64 *val); void intel_aet_mon_domain_setup(int cpu, int id, struct rdt_resource *r, struct list_head *add_pos); +bool intel_aet_option(bool force_off, char *tok); #else static inline bool intel_aet_get_events(void) { return false; } static inline void __exit intel_aet_exit(void) { } @@ -246,6 +247,7 @@ static inline int intel_aet_read_event(int domid, u32 r= mid, void *arch_priv, u64 =20 static inline void intel_aet_mon_domain_setup(int cpu, int id, struct rdt_= resource *r, struct list_head *add_pos) { } +static inline bool intel_aet_option(bool force_off, char *tok) { return fa= lse; } #endif =20 #endif /* _ASM_X86_RESCTRL_INTERNAL_H */ diff --git a/arch/x86/kernel/cpu/resctrl/core.c b/arch/x86/kernel/cpu/resct= rl/core.c index 283d653002a2..960974ffa866 100644 --- a/arch/x86/kernel/cpu/resctrl/core.c +++ b/arch/x86/kernel/cpu/resctrl/core.c @@ -820,6 +820,8 @@ static int __init set_rdt_options(char *str) force_off =3D *tok =3D=3D '!'; if (force_off) tok++; + if (intel_aet_option(force_off, tok)) + continue; for (o =3D rdt_options; o < &rdt_options[NUM_RDT_OPTIONS]; o++) { if (strcmp(tok, o->name) =3D=3D 0) { if (force_off) diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/= resctrl/intel_aet.c index 8fcd72fca81f..fec4bb781f82 100644 --- a/arch/x86/kernel/cpu/resctrl/intel_aet.c +++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c @@ -59,6 +59,10 @@ struct pmt_event { * data for all telemetry regions of type @pfname. * Valid if the system supports the event group, * NULL otherwise. + * @force_off: True when "rdt" command line disables this @guid + * or architecture code disables this @guid. + * @force_on: True when "rdt" command line overrides disable of + * this @guid. * @guid: Unique number per XML description file. * @mmio_size: Number of bytes of MMIO registers for this group. * @num_events: Number of events in this group. @@ -68,6 +72,7 @@ struct event_group { /* Data fields for additional structures to manage this group. */ const char *pfname; struct pmt_feature_group *pfg; + bool force_off, force_on; =20 /* Remaining fields initialized from XML file. */ u32 guid; @@ -122,6 +127,32 @@ static struct event_group *known_event_groups[] =3D { _peg < &known_event_groups[ARRAY_SIZE(known_event_groups)]; \ _peg++) =20 +bool intel_aet_option(bool force_off, char *tok) +{ + struct event_group **peg; + bool ret =3D false; + u32 guid =3D 0; + char *name; + + name =3D strsep(&tok, ":"); + if (tok && kstrtou32(tok, 16, &guid)) + return false; + + for_each_event_group(peg) { + if (strcmp(name, (*peg)->pfname)) + continue; + if (guid && (*peg)->guid !=3D guid) + continue; + if (force_off) + (*peg)->force_off =3D true; + else + (*peg)->force_on =3D true; + ret =3D true; + } + + return ret; +} + /* * Clear the address field of regions that did not pass the checks in * skip_telem_region() so they will not be used by intel_aet_read_event(). @@ -173,6 +204,9 @@ static bool enable_events(struct event_group *e, struct= pmt_feature_group *p) struct rdt_resource *r =3D &rdt_resources_all[RDT_RESOURCE_PERF_PKG].r_re= sctrl; int skipped_events =3D 0; =20 + if (e->force_off) + return false; + if (!group_has_usable_regions(e, p)) return false; =20 --=20 2.51.1