From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.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 CD74836F916 for ; Sat, 13 Jun 2026 08:07:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.16 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781338037; cv=none; b=Mii9BNAxUeBOHtI90grHsTd72zhb3ExWTFWIB30q5BL8LkyGbsrDzS1EUcPu9i8JKGihhRICP+7F2MM8zORutlulUeZhhurHcdTTIZWJC7pAUnuJNFrX47234t7Gxkl/XldIvA6voN87jMDstdnSrR3OnlpXzJHshZdcVXvv2yA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781338037; c=relaxed/simple; bh=WosCotHbZDb9Tk/t2w/jISLiL/pMeIGrSOR5kk9uS9M=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a+FA5itxKe8pAEsrwQAfYedapZ8v4/eVaEGcwlBna6ZkIyl1UWr4/FefKy9faWyWO/JibkRaBgflAgNznGmjMD1YXsP9gYZo9A0kv2r4YrktA9RNwRo/QmJgjVKS2F69L9XgUJF0cG+6g0Gg2YCflQydHJSpH3NkgVkAmZWWzqA= 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=iQQ9nrzK; arc=none smtp.client-ip=198.175.65.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="iQQ9nrzK" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1781338036; x=1812874036; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=WosCotHbZDb9Tk/t2w/jISLiL/pMeIGrSOR5kk9uS9M=; b=iQQ9nrzKXi0ozfwTikAaq7crVc/fEZ8vRLiUByNx3ZxIUt/AIEnHpW5V ajqxJBM+G8lwiCRzHeqjB0ZCmUk7H1/zSga0owj1qw1+5vAxypWEAZdR2 0wJT/N9R2/8FfaWKOdYtNC7XH/WlGuC++qc/coAzOMYjnsls3XfH9PqVm +YYBh57P304y44mV7U6L3RqZ2WMB1zQ4Q0wahZQyFA/z52+jHIgLGKWti gAmEApnBxdVNMTCKK2YYjR37PX3mmz88lFlf8LUoL7Fw+ZhFSD+XNYpna ZTL99fNrj7SFNoNyXy/yfSMdrJDVj5plVnWjBsYJSVeTxUw+xAN1Boe9b w==; X-CSE-ConnectionGUID: q09j0UA6SU6OF7tGzrTr2A== X-CSE-MsgGUID: S4h5TTwNTF+M3BRx5dAdEg== X-IronPort-AV: E=McAfee;i="6800,10657,11815"; a="82351271" X-IronPort-AV: E=Sophos;i="6.24,202,1774335600"; d="scan'208";a="82351271" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa108.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Jun 2026 01:07:15 -0700 X-CSE-ConnectionGUID: AA7schC+RqCocHkCyOAuDg== X-CSE-MsgGUID: fNcS5ti+StCEF0qy1bflGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,202,1774335600"; d="scan'208";a="240665499" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by fmviesa009.fm.intel.com with ESMTP; 13 Jun 2026 01:07:11 -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, dave.martin@arm.com, james.morse@arm.com, fenghuay@nvidia.com, babu.moger@amd.com, anil.keshavamurthy@broadcom.com Subject: [PATCH v4 4/6] x86/resctrl: Refactor the monitor read function Date: Sat, 13 Jun 2026 15:57:23 +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 --- v3->v4: Add Hongyu's tag. --- 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 93c7fc936861..9209927f88a2 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