From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.19]) (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 DFDF54E36D0 for ; Wed, 30 Sep 2026 17:16:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790788566; cv=none; b=Ix7SaEcO+vahgOzrluBJ7nUuGj/fIBM+Ax8EvRGV5M5X/JMimQ4nr39GgX0zvy/5ohcDY2wmedxcIcrjXryfRWdCcETBA1iXN3PjXa3jX3jnmb5bUUq2MlJjVGk3RPv5+UB/uIGNVDTajh7MIKfxLvy/nel+NVzYvvGOzmTPyfI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790788566; c=relaxed/simple; bh=iQqYg2gIWvObcNdXFph7DquCiNeK2cbICZQT746Ie48=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=oOH4N5qq7ZYycRIukd0wz914z6eAUxNz4VDAR+zQxi+Dseld4Cyd2cLkWaHyZlQUH5GtwmpemwA5VA2BiokZQ//ioLDQucT2Ijn6d5eZx864CI1SMaoLs+yzJZQcS28bgnRCOx7/NfM9J6i6eA7riMHZeNgmNI6MUg09YStRSw4= 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=SESMTMMW; arc=none smtp.client-ip=192.198.163.19 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="SESMTMMW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1790788563; x=1822324563; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=iQqYg2gIWvObcNdXFph7DquCiNeK2cbICZQT746Ie48=; b=SESMTMMWdwvvyDoPAXOI+ILggpEkYyVYTU3z5kLqDgBgRBGytkUTQ76L ijG3ZhGfxD2S/MhUzxAcVBQGkFTnyfJ9qjVL61cKGDkrUV/9nC9ro28a3 79fkUgy17Lr18EO6el3K8Z5kxqTLcr5qe+1OZ8BrjATMIDTS/SuT+KHFI aW8YS/kRSbKqmGrCl4O/H/xsHPwA6CTFkultzNPN/UlJiPToE6ihICXFW mMYhWD3XhaMFsh8AmvSfCCqa2vyi3HKbfjsVJIVPX0pbZPMwoDCPo+gZ9 6ZbkquZDMZ+/Po1yupvF94XufVQ/XWv9vXPiJ7uFJlmkmOJhS6fTdnpLH A==; X-CSE-ConnectionGUID: yE7nZIN0Q9aYPtHx3VF77w== X-CSE-MsgGUID: zy8hyecuTwmAfwNMY1pNzw== X-IronPort-AV: E=McAfee;i="6800,10657,11921"; a="90432412" X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="90432412" Received: from orviesa006.jf.intel.com ([10.64.159.146]) by fmvoesa113.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2026 10:16:02 -0700 X-CSE-ConnectionGUID: iNxvPVVeT3GTpaZ27jcuzQ== X-CSE-MsgGUID: Svv/LUQwSPqFGobbVW4B4w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.27,132,1787036400"; d="scan'208";a="273552701" Received: from lstrano-mobl6.amr.corp.intel.com (HELO agluck-desk3.home.arpa) ([10.124.223.50]) by orviesa006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Sep 2026 10:16:02 -0700 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 v4] x86,fs/resctrl: Add event group descriptions for Intel Diamond Rapids Date: Wed, 30 Sep 2026 10:15:54 -0700 Message-ID: <20260930171554.12794-1-tony.luck@intel.com> X-Mailer: git-send-email 2.55.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Intel Diamond Rapids exposes Application Energy Telemetry through two new PMT aggregator GUIDs: one covering the "energy" feature, and one covering the "perf" feature, both documented in the Intel-PMT XML repository [1]. The "perf" aggregator references two events not previously enumerated by resctrl: retired instructions (INST_RETIRED), and a count of unhalted core clock cycles perceived by hardware as contributing to instruction execution (PCNT). Add definitions for both aggregators, and add the two new events to the resctrl filesystem so they can be exposed to user space. Signed-off-by: Tony Luck Reviewed-by: Reinette Chatre Link: https://github.com/intel/Intel-PMT # [1] --- v4: Fix the place where I missed s/A/a/ Did a test build this time! --- include/linux/resctrl_types.h | 2 ++ arch/x86/kernel/cpu/resctrl/intel_aet.c | 34 +++++++++++++++++++++++++ fs/resctrl/monitor.c | 2 ++ 3 files changed, 38 insertions(+) diff --git a/include/linux/resctrl_types.h b/include/linux/resctrl_types.h index a5f56faa18d2..e2e2cf3d9ff6 100644 --- a/include/linux/resctrl_types.h +++ b/include/linux/resctrl_types.h @@ -60,6 +60,8 @@ enum resctrl_event_id { PMT_EVENT_AUTO_C6_RES, PMT_EVENT_UNHALTED_REF_CYCLES, PMT_EVENT_UOPS_RETIRED, + PMT_EVENT_INST_RETIRED, + PMT_EVENT_PCNT, /* Must be the last */ QOS_NUM_EVENTS, diff --git a/arch/x86/kernel/cpu/resctrl/intel_aet.c b/arch/x86/kernel/cpu/resctrl/intel_aet.c index c22c3cf5167d..66cd8c2c7a51 100644 --- a/arch/x86/kernel/cpu/resctrl/intel_aet.c +++ b/arch/x86/kernel/cpu/resctrl/intel_aet.c @@ -125,9 +125,43 @@ static struct event_group perf_0x26557651 = { } }; +/* + * Link: https://github.com/intel/Intel-PMT/blob/main/xml/DMR/OOBMSM/RMID-ENERGY/dmr_aggregator.xml + */ +static struct event_group energy_0x47903099 = { + .pfname = "energy", + .guid = 0x47903099, + .num_rmid = 256, + .mmio_size = XML_MMIO_SIZE(256, 2, 3), + .num_events = 2, + .evts = { + EVT(PMT_EVENT_ENERGY, 0, 18), + EVT(PMT_EVENT_ACTIVITY, 1, 18), + } +}; + +/* + * Link: https://github.com/intel/Intel-PMT/blob/main/xml/DMR/OOBMSM/RMID-PERF/dmr_aggregator.xml + */ +static struct event_group perf_0x1415910a = { + .pfname = "perf", + .guid = 0x1415910a, + .num_rmid = 256, + .mmio_size = XML_MMIO_SIZE(256, 4, 3), + .num_events = 4, + .evts = { + EVT(PMT_EVENT_UNHALTED_REF_CYCLES, 0, 0), + EVT(PMT_EVENT_UNHALTED_CORE_CYCLES, 1, 0), + EVT(PMT_EVENT_INST_RETIRED, 2, 0), + EVT(PMT_EVENT_PCNT, 3, 0), + } +}; + static struct event_group *known_event_groups[] = { &energy_0x26696143, + &energy_0x47903099, &perf_0x26557651, + &perf_0x1415910a, }; #define for_each_event_group(_peg) \ diff --git a/fs/resctrl/monitor.c b/fs/resctrl/monitor.c index 73413cb128ea..04e4ea612b7c 100644 --- a/fs/resctrl/monitor.c +++ b/fs/resctrl/monitor.c @@ -1041,6 +1041,8 @@ struct mon_evt mon_event_all[QOS_NUM_EVENTS] = { MON_EVENT(PMT_EVENT_AUTO_C6_RES, "c6_res", RDT_RESOURCE_PERF_PKG, false), MON_EVENT(PMT_EVENT_UNHALTED_REF_CYCLES, "unhalted_ref_cycles", RDT_RESOURCE_PERF_PKG, false), MON_EVENT(PMT_EVENT_UOPS_RETIRED, "uops_retired", RDT_RESOURCE_PERF_PKG, false), + MON_EVENT(PMT_EVENT_INST_RETIRED, "inst_retired", RDT_RESOURCE_PERF_PKG, false), + MON_EVENT(PMT_EVENT_PCNT, "pcnt", RDT_RESOURCE_PERF_PKG, false), }; bool resctrl_enable_mon_event(enum resctrl_event_id eventid, bool any_cpu, -- 2.55.0