Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

x86/resctrl: Fix memory bandwidth counter width for Hygon

The memory bandwidth calculation relies on reading the hardware counter
and measuring the delta between samples. To ensure accurate measurement,
the software reads the counter frequently enough to prevent it from
rolling over twice between reads.

The default Memory Bandwidth Monitoring (MBM) counter width is 24 bits.
Hygon CPUs provide a 32-bit width counter, but they do not support the
MBM capability CPUID leaf (0xF.[ECX=1]:EAX) to report the width offset
(from 24 bits).

Consequently, the kernel falls back to the 24-bit default counter width,
which causes incorrect overflow handling on Hygon CPUs.

Fix this by explicitly setting the counter width offset to 8 bits (resulting
in a 32-bit total counter width) for Hygon CPUs.

Fixes: d8df126349da ("x86/cpu/hygon: Add missing resctrl_cpu_detect() in bsp_init helper")
Signed-off-by: Xiaochen Shen <shenxiaochen@open-hieco.net>
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: Tony Luck <tony.luck@intel.com>
Reviewed-by: Reinette Chatre <reinette.chatre@intel.com>
Cc: stable@vger.kernel.org
Link: https://patch.msgid.link/20251209062650.1536952-3-shenxiaochen@open-hieco.net

authored by

Xiaochen Shen and committed by
Borislav Petkov (AMD)
7517e899 6ee98aab

+16 -2
+13 -2
arch/x86/kernel/cpu/resctrl/core.c
··· 1021 1021 c->x86_cache_occ_scale = ebx; 1022 1022 c->x86_cache_mbm_width_offset = eax & 0xff; 1023 1023 1024 - if (c->x86_vendor == X86_VENDOR_AMD && !c->x86_cache_mbm_width_offset) 1025 - c->x86_cache_mbm_width_offset = MBM_CNTR_WIDTH_OFFSET_AMD; 1024 + if (!c->x86_cache_mbm_width_offset) { 1025 + switch (c->x86_vendor) { 1026 + case X86_VENDOR_AMD: 1027 + c->x86_cache_mbm_width_offset = MBM_CNTR_WIDTH_OFFSET_AMD; 1028 + break; 1029 + case X86_VENDOR_HYGON: 1030 + c->x86_cache_mbm_width_offset = MBM_CNTR_WIDTH_OFFSET_HYGON; 1031 + break; 1032 + default: 1033 + /* Leave c->x86_cache_mbm_width_offset as 0 */ 1034 + break; 1035 + } 1036 + } 1026 1037 } 1027 1038 } 1028 1039
+3
arch/x86/kernel/cpu/resctrl/internal.h
··· 14 14 15 15 #define MBM_CNTR_WIDTH_OFFSET_AMD 20 16 16 17 + /* Hygon MBM counter width as an offset from MBM_CNTR_WIDTH_BASE */ 18 + #define MBM_CNTR_WIDTH_OFFSET_HYGON 8 19 + 17 20 #define RMID_VAL_ERROR BIT_ULL(63) 18 21 19 22 #define RMID_VAL_UNAVAIL BIT_ULL(62)