From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.15]) (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 CFEFC27453 for ; Sat, 6 Jun 2026 02:47:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780714078; cv=none; b=EwlSOt4P6B2BSx4VThl6CqTb8Lq0JT8BijwpoIHccRhGJ8kQZzgZ1nQl4ojujzdk8bRzi1+sKM5h2lIVKnNSJfQFsTAT7P6+yFkD7SM+lMPbGfYSv3KGefGEyCt3e5r4ZvlE7WWoOjTsmd54NmlrOPigMzQJkBOByA45NnopoCo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780714078; c=relaxed/simple; bh=DXjWYUqL/p3I6jaimKyFhAfO3bSHjncfHRSrw5AoCpg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NjbC1NX8bQAqKN5/idlpQK7VAO8nlkzNBVPSQgKosaT0FgYj+vb/W9YJhkaCcw/p3bIzGPj6zJZs300o+g8z/rpSHLc2iGHeOGEzhHYsnbRYLhhBmccscC2OGtSEvqUcgpYkPNpyroGm+fzytcFugzC0Ouenm1/ZMZOJzz+pTmA= 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=VZf0BOtZ; arc=none smtp.client-ip=198.175.65.15 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="VZf0BOtZ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780714077; x=1812250077; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=DXjWYUqL/p3I6jaimKyFhAfO3bSHjncfHRSrw5AoCpg=; b=VZf0BOtZHiEjQWACpDHRfvdqFVvfck7dL788qy03QcMYdYeK97nDOj3J 60ThL82Xhg+tF3d9ZGsEyHp4jbatt5NdptapfB/PuRopgJmzfn5KQzGOr HA8WLh4bs6+8PSpUdyZWCa+5BSpnn+T38LiHtDiDiU8svH/zW5GUcRL7n 1xljrQaKKKXFhuwH4iTlctK0nJDFEOvIbZ5tH1T37U1NFIIroeYrqHSDJ WRnLbHl9ZPjsMSl59JWZJAjy6KuC03q+Bj3+cqjJ56yZB68lL3dg5Q3ca xiFwH7KU/ll4pSVVJhoBapxpdmGrNnZlB1I1qVDFU4Wru6EO1sHTArsFw Q==; X-CSE-ConnectionGUID: YMex1cTHTBqKR7vmgjbwbA== X-CSE-MsgGUID: 0E4P1w9TS1myto6C/PzwGg== X-IronPort-AV: E=McAfee;i="6800,10657,11808"; a="85167147" X-IronPort-AV: E=Sophos;i="6.24,189,1774335600"; d="scan'208";a="85167147" Received: from fmviesa002.fm.intel.com ([10.60.135.142]) by orvoesa107.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2026 19:47:56 -0700 X-CSE-ConnectionGUID: pB749uvTSg+IJFSd4SrukA== X-CSE-MsgGUID: m/Omie4RTbmxwfNm9J0+qQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,189,1774335600"; d="scan'208";a="268690916" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by fmviesa002.fm.intel.com with ESMTP; 05 Jun 2026 19:47:52 -0700 From: Chen Yu To: tony.luck@intel.com, reinette.chatre@intel.com Cc: x86@kernel.org, linux-kernel@vger.kernel.org, bp@alien8.de, tglx@kernel.org, mingo@redhat.com, dave.hansen@linux.intel.com, hpa@zytor.com, dave.martin@arm.com, james.morse@arm.com, fenghuay@nvidia.com, babu.moger@amd.com, anil.keshavamurthy@broadcom.com Subject: [PATCH v3 4/6] x86/resctrl: Refactor the monitor read function Date: Sat, 6 Jun 2026 10:38:03 +0800 Message-Id: <290192b9586f642a37618bb38fc055047d9dd688.1780710620.git.yu.c.chen@intel.com> 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. Signed-off-by: Chen Yu --- 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 991f0a796551..1e81b3c33843 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -238,9 +238,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; @@ -250,11 +250,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; @@ -275,6 +270,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.25.1