From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.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 7008C383300 for ; Sat, 25 Jul 2026 09:33:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.19 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784971994; cv=none; b=IwBbjgJ+hGJMMMnI00+kgWJB/Tn6gCkmCa/tK3/HrC5SZloej3uThjHgbKnc3EHbOrRVMxHyEUrqgJeyvWH8LuoETAo6PV1XS8qp89jbE24BM9lUux9ZTQvCWrqbB191AfFWr+RHJFPxL7mH8rnWLwhmeIBK/jjCNbgUAy9r9RI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784971994; c=relaxed/simple; bh=I+kWuPpJASMOmP89+NljK9y4N8w3gZUTm+qkwLLnrqs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=afUcM6XQvFp6JySgIJFjVEw7+ox5/eUaXzXMT1k2vHb3lSwEXWMF8fCw3nCnBAs1+elBGDMlqH9cAR1P/xGGR4BIc4FMChF+qCn3cAAMKwP8tXjS7xCiB1lpvQdLu0xqkCxJR1FG1fmOr9q9z0iQONrklEfIOy/+WlmhUnk0WdU= 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=SFVX1Sum; arc=none smtp.client-ip=198.175.65.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="SFVX1Sum" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1784971990; x=1816507990; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=I+kWuPpJASMOmP89+NljK9y4N8w3gZUTm+qkwLLnrqs=; b=SFVX1SumFZBOyDlp0IoFZQM1a6u9qGox4w/GwhHfwSpmMSgkqAKNgxVp UBI+QzwdyFchAP9BPsaL2Tmy7miSSGK+ZAT8F5jts51XV2Z4+4dUI6nGf APLleIDUaHIKMCxv0iZkmU79MjxEWpvENewvdWXfQlYc6jMxna2VKssUK IbixEKfuOOW11gjdQhPj4fZgAaUZSmuHbpUMgUVC+xasleTomjNAIsRnf pzYExXEJ66LvaKF35egZN0SPu/kmS19xMfbvaSUvo7gzksGRd0tF8l1M5 B1ccwfgFPUIFU2iYs6hVkH9JuwRX+ac9BZN//YSify5uqUplPt1FjI2H9 g==; X-CSE-ConnectionGUID: GTb5/QbcRMOHFfIfp0/g7g== X-CSE-MsgGUID: dk6kjBSIT62fUyEl8c97hQ== X-IronPort-AV: E=McAfee;i="6800,10657,11855"; a="85565417" X-IronPort-AV: E=Sophos;i="6.25,184,1779174000"; d="scan'208";a="85565417" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa111.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jul 2026 02:33:10 -0700 X-CSE-ConnectionGUID: aySV4MzpRe6ti9S6dT1DUA== X-CSE-MsgGUID: I+UvA/rmSDqhZwteKWUraQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,184,1779174000"; d="scan'208";a="258372055" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by orviesa008.jf.intel.com with ESMTP; 25 Jul 2026 02:33:07 -0700 From: Chen Yu To: tony.luck@intel.com, reinette.chatre@intel.com Cc: tglx@kernel.org, bp@alien8.de, mingo@redhat.com, dave.hansen@linux.intel.com, hpa@zytor.com, fenghuay@nvidia.com, babu.moger@amd.com, chen.yu@linux.dev, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v6 6/9] x86/resctrl: Refactor the monitor read function Date: Sat, 25 Jul 2026 17:23: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. No functional change. Signed-off-by: Chen Yu Tested-by: Hongyu Ning --- v5->v6: Drop "added in a later patch". (Reinette Chatre) --- 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 569894d6e5c8..786828a0a3c2 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; @@ -281,6 +276,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