From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (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 62FA82C15BB for ; Wed, 1 Jul 2026 13:57:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782914272; cv=none; b=L3n8lz1l4H3z1r1ibNs2t/5sHCE/hItOUqW/4kIjHI8h5VzmXl3KOJwta/zAcH49U+wwvHfn2q4anDEQbLx+7Rz1aPJAF+nzwuqCwcgUGC/NG2Ex5uczMMR62FEg4nSL5aE0p1LZwowKw6yBV3zh7YVdp79LDS+a1iiKkKg43Og= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782914272; c=relaxed/simple; bh=pRx7+dxo2UVJYFcjO9TRcrIQ6gChJ8k/JYikeVAy/ug=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=rJtN0RCtr6LHlchmvD6F5RoTfcaOKhoqwGFNdyMXj7h/qruwtK+8hm3UsmOoB195ImS6vrGTcm+lLTy6uM9WiRzZ/p0nfZrXaaivZIe5nl8FrRFZxLJHF1cxc4gpcwFWqKKPe+FnXyUGoBpx+G9GYfBh4s2lZUDkX3Nammy/CeQ= 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=WmoUXa69; arc=none smtp.client-ip=192.198.163.16 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="WmoUXa69" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1782914272; x=1814450272; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=pRx7+dxo2UVJYFcjO9TRcrIQ6gChJ8k/JYikeVAy/ug=; b=WmoUXa6921TXAqEwRu53Kgw2lcQXh3zlxnipVVqUle3NswDEMe2amZOS NtQ63yr/AQqiWJAUSy/EqbNVwqAQVHtw/6g53JFBeSmv1nGSWd5K9s09M NyHrzwAVJOFAfbF3eVBH34SDZle12Tvglw6ei0Mj5gxJR1zhSzhFJ6kmf np1sW9PUUi6phsXlXULrBOCBzEecck580r5Dt2mJ9acmAG4nju/rfnWXX 9ujobUSa0R5JZhh7VuaxKdUnWoDNeSjLvglvdZR7ZrwOjm+/cmXz44q1n ARjT2x3I/QDqvrYyRE6ovfHOlew41B9LfdByfQp6QgKMcYAMoOUh/mkZw w==; X-CSE-ConnectionGUID: y8GQe3NFRA2p1afeeLhSdQ== X-CSE-MsgGUID: Fc5VwjmyTSugb4EVSfRnrg== X-IronPort-AV: E=McAfee;i="6800,10657,11833"; a="71172464" X-IronPort-AV: E=Sophos;i="6.25,141,1779174000"; d="scan'208";a="71172464" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jul 2026 06:57:51 -0700 X-CSE-ConnectionGUID: wxgGF81xR3KkzZe2/gXktA== X-CSE-MsgGUID: qP2ryqznTMOKmqsLXR2rvg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,141,1779174000"; d="scan'208";a="256153204" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by orviesa003.jf.intel.com with ESMTP; 01 Jul 2026 06:56:47 -0700 From: Chen Yu To: tony.luck@intel.com, reinette.chatre@intel.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, tglx@kernel.org, bp@alien8.de, mingo@redhat.com, dave.hansen@linux.intel.com, hpa@zytor.com, fenghuay@nvidia.com, babu.moger@amd.com, anil.keshavamurthy@broadcom.com, chen.yu@linux.dev, Chen Yu , Hongyu Ning Subject: [PATCH v5 07/10] x86/resctrl: Refactor the monitor read function Date: Wed, 1 Jul 2026 21:46:51 +0800 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Split the monitor read helper into an L3 read path and an AET (Intel Application Energy Telemetry) read path. This makes the two distinct monitoring sources easier to extend independently and prepares the L3 path for ERDT-based MMIO reads added in a later patch. No functional change. Tested-by: Hongyu Ning Signed-off-by: Chen Yu --- v4->v5: No change. --- arch/x86/kernel/cpu/resctrl/monitor.c | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 893080e6fb9e..f4f4c9015ceb 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -239,9 +239,9 @@ static u64 get_corrected_val(struct rdt_resource *r, struct rdt_l3_mon_domain *d return chunks * hw_res->mon_scale; } -int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr, - u32 unused, u32 rmid, enum resctrl_event_id eventid, - void *arch_priv, u64 *val, void *ignored) +static int arch_l3_read_event(struct rdt_domain_hdr *hdr, u32 rmid, + enum resctrl_event_id eventid, u64 *val, + struct rdt_resource *r) { struct rdt_hw_l3_mon_domain *hw_dom; struct rdt_l3_mon_domain *d; @@ -251,11 +251,6 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr, int cpu; int ret; - resctrl_arch_rmid_read_context_check(); - - if (r->rid == RDT_RESOURCE_PERF_PKG) - return intel_aet_read_event(hdr->id, rmid, arch_priv, val); - if (!domain_header_is_valid(hdr, RESCTRL_MON_DOMAIN, RDT_RESOURCE_L3)) return -EINVAL; @@ -276,6 +271,22 @@ int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr, return ret; } +int resctrl_arch_rmid_read(struct rdt_resource *r, struct rdt_domain_hdr *hdr, + u32 unused, u32 rmid, enum resctrl_event_id eventid, + void *arch_priv, u64 *val, void *ignored) +{ + resctrl_arch_rmid_read_context_check(); + + switch (r->rid) { + case RDT_RESOURCE_L3: + return arch_l3_read_event(hdr, rmid, eventid, val, r); + case RDT_RESOURCE_PERF_PKG: + return intel_aet_read_event(hdr->id, rmid, arch_priv, val); + default: + return -EINVAL; + } +} + static int __cntr_id_read(u32 cntr_id, u64 *val) { u64 msr_val; -- 2.45.2