From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.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 B32D41F3D56 for ; Sun, 2 Aug 2026 16:16:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.15 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785687367; cv=none; b=R5JaOtYPmRn0XxYP7RlSu1aUg+oe6z37arPrbT/mPvsagBVJl3tMSbwchHnWQ5ea38Ka8M/vlCIRWsvAo4Dj8qZIcBY9OmamXDqVxHmD04emcc+jQL/9AJIeRybOdzOoZd0xm+Uzc3fCLGkL3kDuxfTdURqyEdW7o05DhA3SrV4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785687367; c=relaxed/simple; bh=f2QNpTLM6FXt7WciPDWn1BqH+KETpN85tS81kfRF3BY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u2ekaZXX+ssdKvHZHm9uppquWfYg3kHNGqUF9lh/ApkCmg9Ag+icKCwBrF5fDVoXl/zISOlPNW5cmLaj4U4AN2NkIJTKpSK7vTEZThi1cffRutW/s84b2m0AkoU39DCuSQlt3erBVUqbKYn0qC3r1bk2OT5OaxDmx2oDphh2WP8= 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=gJgDSQ1T; arc=none smtp.client-ip=192.198.163.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="gJgDSQ1T" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1785687366; x=1817223366; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=f2QNpTLM6FXt7WciPDWn1BqH+KETpN85tS81kfRF3BY=; b=gJgDSQ1T2w9Jv1hnPOONFEs5RUfc9cTqy1OUDwGM7XbVe33SJoPFau6s pNt3LEe8+nQCPuG5KVxLfzAsLLq5DOLDLyzhMGn9PUUpkrkkgxj/pVsR4 yJF5DB1PxDlZ+3uI39Z78varpSdTDtBVPLAkHeAyG7cZocNO1cBS8xgp/ 8xI3u+5CtfK/dSp5qktJ5N6yQwIbWL2loHSiow0DhTDOVe6mE5Bdm6YWE CTJ5VExokM2ULL62BBgPCEzwkYiJwUYlNCR5u8o0c0cGmYPngRDg+agN+ bmH03LE+fZzvFHZAV3PtOUIsNKH8Ew1kOGWppb2c3uK0OxRaBkYec8oI4 g==; X-CSE-ConnectionGUID: C16TNyZpQQq9oJFcfthULQ== X-CSE-MsgGUID: Gauk9VoAT3ezotluAt4EsA== X-IronPort-AV: E=McAfee;i="6800,10657,11863"; a="86361335" X-IronPort-AV: E=Sophos;i="6.25,200,1779174000"; d="scan'208";a="86361335" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Aug 2026 09:16:05 -0700 X-CSE-ConnectionGUID: Gx1LBlyoSTOkBft2QbPN7g== X-CSE-MsgGUID: akbOWFlCRw+mCJoLCvFbpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.25,200,1779174000"; d="scan'208";a="264484302" Received: from chenyu-dev.sh.intel.com ([10.239.62.107]) by orviesa003.jf.intel.com with ESMTP; 02 Aug 2026 09:16:02 -0700 From: Chen Yu To: Reinette Chatre , Tony Luck Cc: Ben Horgan , "James Morse" , Dave Martin , Babu Moger , Fenghua Yu , Borislav Petkov , Thomas Gleixner , "Dave Hansen" , Peter Newman , chen.yu@linux.dev, x86@kernel.org, linux-kernel@vger.kernel.org Subject: [RFC PATCH 16/31] x86/resctrl: Replace "msr" in monitoring data identifiers Date: Mon, 3 Aug 2026 00:06:20 +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 Monitoring counter values are currently obtained via MSR and many identifiers involved in processing these values contain "msr" as part of their names, for example "prev_msr" and "msr_val". The ERDT ACPI table describes MMIO registers for monitoring data access. Rename "msr"-based identifiers to be interface-agnostic to support their upcoming use for MMIO-read values. No functional change. Signed-off-by: Chen Yu --- arch/x86/kernel/cpu/resctrl/internal.h | 8 +++---- arch/x86/kernel/cpu/resctrl/monitor.c | 30 +++++++++++++------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/arch/x86/kernel/cpu/resctrl/internal.h b/arch/x86/kernel/cpu/resctrl/internal.h index 4bbe0c80c9e6..c337c4336789 100644 --- a/arch/x86/kernel/cpu/resctrl/internal.h +++ b/arch/x86/kernel/cpu/resctrl/internal.h @@ -66,13 +66,13 @@ struct erdt_domain_info { /** * struct arch_mbm_state - values used to compute resctrl_arch_rmid_read()s * return value. - * @chunks: Total data moved (multiply by rdt_group.mon_scale to get bytes) - * @prev_msr: Value of IA32_QM_CTR last time it was read for the RMID used to - * find this struct. + * @chunks: Total data moved (multiply by rdt_group.mon_scale to get bytes) + * @prev_mon_val: Previous monitor counter value for the RMID used to + * find this struct. */ struct arch_mbm_state { u64 chunks; - u64 prev_msr; + u64 prev_mon_val; }; /* Setting bit 0 in L3_QOS_EXT_CFG enables the ABMC feature. */ diff --git a/arch/x86/kernel/cpu/resctrl/monitor.c b/arch/x86/kernel/cpu/resctrl/monitor.c index 0e011b1f7fd2..ac5353fd0efd 100644 --- a/arch/x86/kernel/cpu/resctrl/monitor.c +++ b/arch/x86/kernel/cpu/resctrl/monitor.c @@ -186,7 +186,7 @@ void resctrl_arch_reset_rmid(struct rdt_resource *r, struct rdt_l3_mon_domain *d prmid = logical_rmid_to_physical_rmid(cpu, rmid); /* Record any initial, non-zero count value. */ - __rmid_read_phys(prmid, eventid, &am->prev_msr); + __rmid_read_phys(prmid, eventid, &am->prev_mon_val); } } @@ -209,16 +209,16 @@ void resctrl_arch_reset_rmid_all(struct rdt_resource *r, struct rdt_l3_mon_domai } } -static u64 mbm_overflow_count(u64 prev_msr, u64 cur_msr, unsigned int width) +static u64 mbm_overflow_count(u64 prev_val, u64 cur_val, unsigned int width) { u64 shift = 64 - width, chunks; - chunks = (cur_msr << shift) - (prev_msr << shift); + chunks = (cur_val << shift) - (prev_val << shift); return chunks >> shift; } static u64 get_corrected_val(struct rdt_resource *r, struct rdt_l3_mon_domain *d, - u32 rmid, enum resctrl_event_id eventid, u64 msr_val) + u32 rmid, enum resctrl_event_id eventid, u64 mon_val) { struct rdt_hw_l3_mon_domain *hw_dom = resctrl_to_arch_mon_dom(d); struct rdt_hw_resource *hw_res = resctrl_to_arch_res(r); @@ -227,12 +227,12 @@ static u64 get_corrected_val(struct rdt_resource *r, struct rdt_l3_mon_domain *d am = get_arch_mbm_state(hw_dom, rmid, eventid); if (am) { - am->chunks += mbm_overflow_count(am->prev_msr, msr_val, + am->chunks += mbm_overflow_count(am->prev_mon_val, mon_val, hw_res->mbm_width); chunks = get_corrected_mbm_count(rmid, am->chunks); - am->prev_msr = msr_val; + am->prev_mon_val = mon_val; } else { - chunks = msr_val; + chunks = mon_val; } return chunks * hw_res->mon_scale; @@ -245,7 +245,7 @@ static int arch_l3_read_event(struct rdt_domain_hdr *hdr, u32 rmid, struct rdt_hw_l3_mon_domain *hw_dom; struct rdt_l3_mon_domain *d; struct arch_mbm_state *am; - u64 msr_val; + u64 mon_val; u32 prmid; int cpu; int ret; @@ -257,14 +257,14 @@ static int arch_l3_read_event(struct rdt_domain_hdr *hdr, u32 rmid, hw_dom = resctrl_to_arch_mon_dom(d); cpu = cpumask_any(&hdr->cpu_mask); prmid = logical_rmid_to_physical_rmid(cpu, rmid); - ret = __rmid_read_phys(prmid, eventid, &msr_val); + ret = __rmid_read_phys(prmid, eventid, &mon_val); if (!ret) { - *val = get_corrected_val(r, d, rmid, eventid, msr_val); + *val = get_corrected_val(r, d, rmid, eventid, mon_val); } else if (ret == -EINVAL) { am = get_arch_mbm_state(hw_dom, rmid, eventid); if (am) - am->prev_msr = 0; + am->prev_mon_val = 0; } return ret; @@ -339,7 +339,7 @@ void resctrl_arch_reset_cntr(struct rdt_resource *r, struct rdt_l3_mon_domain *d memset(am, 0, sizeof(*am)); /* Record any initial, non-zero count value. */ - __cntr_id_read(cntr_id, &am->prev_msr); + __cntr_id_read(cntr_id, &am->prev_mon_val); } } @@ -347,14 +347,14 @@ int resctrl_arch_cntr_read(struct rdt_resource *r, struct rdt_l3_mon_domain *d, u32 unused, u32 rmid, int cntr_id, enum resctrl_event_id eventid, u64 *val) { - u64 msr_val; + u64 mon_val; int ret; - ret = __cntr_id_read(cntr_id, &msr_val); + ret = __cntr_id_read(cntr_id, &mon_val); if (ret) return ret; - *val = get_corrected_val(r, d, rmid, eventid, msr_val); + *val = get_corrected_val(r, d, rmid, eventid, mon_val); return 0; } -- 2.43.0