linux-toradex.git/arch/x86/kernel/cpu/resctrl/monitor.c, branch v6.16

Merge tag 'x86_cache_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2025-05-27T16:53:02+00:00

Pull x86 resource control updates from Borislav Petkov:
 "Carve out the resctrl filesystem-related code into fs/resctrl/ so that
  multiple architectures can share the fs API for manipulating their
  respective hw resource control implementation.

  This is the second step in the work towards sharing the resctrl
  filesystem interface, the next one being plugging ARM's MPAM into the
  aforementioned fs API"

* tag 'x86_cache_for_v6.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (25 commits)
  MAINTAINERS: Add reviewers for fs/resctrl
  x86,fs/resctrl: Move the resctrl filesystem code to live in /fs/resctrl
  x86/resctrl: Always initialise rid field in rdt_resources_all[]
  x86/resctrl: Relax some asm #includes
  x86/resctrl: Prefer alloc(sizeof(*foo)) idiom in rdt_init_fs_context()
  x86/resctrl: Squelch whitespace anomalies in resctrl core code
  x86/resctrl: Move pseudo lock prototypes to include/linux/resctrl.h
  x86/resctrl: Fix types in resctrl_arch_mon_ctx_{alloc,free}() stubs
  x86/resctrl: Move enum resctrl_event_id to resctrl.h
  x86/resctrl: Move the filesystem bits to headers visible to fs/resctrl
  fs/resctrl: Add boiler plate for external resctrl code
  x86/resctrl: Add 'resctrl' to the title of the resctrl documentation
  x86/resctrl: Split trace.h
  x86/resctrl: Expand the width of domid by replacing mon_data_bits
  x86/resctrl: Add end-marker to the resctrl_event_id enum
  x86/resctrl: Move is_mba_sc() out of core.c
  x86/resctrl: Drop __init/__exit on assorted symbols
  x86/resctrl: Resctrl_exit() teardown resctrl but leave the mount point
  x86/resctrl: Check all domains are offline in resctrl_exit()
  x86/resctrl: Rename resctrl_sched_in() to begin with "resctrl_arch_"
  ...

x86,fs/resctrl: Move the resctrl filesystem code to live in /fs/resctrl

2025-05-16T12:36:09+00:00

Resctrl is a filesystem interface to hardware that provides cache
allocation policy and bandwidth control for groups of tasks or CPUs.

To support more than one architecture, resctrl needs to live in /fs/.

Move the code that is concerned with the filesystem interface to
/fs/resctrl.

Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Reinette Chatre 
Reviewed-by: Fenghua Yu 
Tested-by: Fenghua Yu 
Tested-by: Tony Luck 
Link: https://lore.kernel.org/20250515165855.31452-25-james.morse@arm.com

fs/resctrl: Add boiler plate for external resctrl code

2025-05-16T09:05:40+00:00

Add Makefile and Kconfig for fs/resctrl. Add ARCH_HAS_CPU_RESCTRL
for the common parts of the resctrl interface and make X86_CPU_RESCTRL
select this.

Adding an include of asm/resctrl.h to linux/resctrl.h allows the
/fs/resctrl files to switch over to using this header instead.

Co-developed-by: Dave Martin 
Signed-off-by: Dave Martin 
Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Shaopeng Tan 
Reviewed-by: Tony Luck 
Reviewed-by: Fenghua Yu 
Reviewed-by: Reinette Chatre 
Tested-by: Fenghua Yu 
Tested-by: Carl Worth  # arm64
Tested-by: Shaopeng Tan 
Tested-by: Peter Newman 
Tested-by: Amit Singh Tomar  # arm64
Tested-by: Shanker Donthineni  # arm64
Tested-by: Babu Moger 
Tested-by: Tony Luck 
Link: https://lore.kernel.org/20250515165855.31452-16-james.morse@arm.com

x86/resctrl: Split trace.h

2025-05-16T08:47:49+00:00

trace.h contains all the tracepoints. After the move to /fs/resctrl, some
of these will be left behind. All the pseudo_lock tracepoints remain part
of the architecture. The lone tracepoint in monitor.c moves to /fs/resctrl.

Split trace.h so that each C file includes a different trace header file.
This means the trace header files are not modified when they are moved.

Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Shaopeng Tan 
Reviewed-by: Tony Luck 
Reviewed-by: Fenghua Yu 
Reviewed-by: Reinette Chatre 
Tested-by: Fenghua Yu 
Tested-by: Shaopeng Tan 
Tested-by: Peter Newman 
Tested-by: Amit Singh Tomar  # arm64
Tested-by: Shanker Donthineni  # arm64
Tested-by: Babu Moger 
Tested-by: Tony Luck 
Link: https://lore.kernel.org/20250515165855.31452-14-james.morse@arm.com

x86/resctrl: Add end-marker to the resctrl_event_id enum

2025-05-16T08:44:36+00:00

The resctrl_event_id enum gives names to the counter event numbers on x86.
These are used directly by resctrl.

To allow the MPAM driver to keep an array of these the size of the enum
needs to be known.

Add a 'num_events' enum entry which can be used to size an array.  This is
added to the enum to reduce conflicts with another series, which in turn
requires get_arch_mbm_state() to have a default case.

Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Reinette Chatre 
Reviewed-by: Fenghua Yu 
Tested-by: Fenghua Yu 
Tested-by: Babu Moger 
Tested-by: Shaopeng Tan 
Tested-by: Tony Luck 
Link: https://lore.kernel.org/20250515165855.31452-12-james.morse@arm.com

x86/resctrl: Drop init/exit on assorted symbols

2025-05-15T19:06:02+00:00

Because ARM's MPAM controls are probed using MMIO, resctrl can't be
initialised until enough CPUs are online to have determined the system-wide
supported num_closid. Arm64 also supports 'late onlined secondaries', where
only a subset of CPUs are online during boot.

These two combine to mean the MPAM driver may not be able to initialise
resctrl until user-space has brought 'enough' CPUs online.

To allow MPAM to initialise resctrl after __init text has been free'd, remove
all the __init markings from resctrl.

The existing __exit markings cause these functions to be removed by the linker
as it has never been possible to build resctrl as a module. MPAM has an error
interrupt which causes the driver to reset and disable itself. Remove the
__exit markings to allow the MPAM driver to tear down resctrl when an error
occurs.

Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Shaopeng Tan 
Reviewed-by: Tony Luck 
Reviewed-by: Reinette Chatre 
Reviewed-by: Fenghua Yu 
Tested-by: Fenghua Yu 
Tested-by: Carl Worth  # arm64
Tested-by: Shaopeng Tan 
Tested-by: Peter Newman 
Tested-by: Amit Singh Tomar  # arm64
Tested-by: Shanker Donthineni  # arm64
Tested-by: Babu Moger 
Tested-by: Tony Luck 
Link: https://lore.kernel.org/20250515165855.31452-10-james.morse@arm.com

x86/msr: Add explicit includes of

2025-05-02T08:23:47+00:00

For historic reasons there are some TSC-related functions in the
 header, even though there's an  header.

To facilitate the relocation of rdtsc{,_ordered}() from 
to  and to eventually eliminate the inclusion of
 in , add an explicit  dependency
to the source files that reference definitions from .

[ mingo: Clarified the changelog. ]

Signed-off-by: Xin Li (Intel) 
Signed-off-by: Ingo Molnar 
Acked-by: Dave Hansen 
Acked-by: Peter Zijlstra (Intel) 
Acked-by: Ilpo Järvinen 
Cc: Andy Lutomirski 
Cc: Brian Gerst 
Cc: Juergen Gross 
Cc: H. Peter Anvin 
Cc: Linus Torvalds 
Cc: Kees Cook 
Cc: Peter Zijlstra 
Cc: Borislav Petkov 
Cc: Thomas Gleixner 
Cc: Josh Poimboeuf 
Cc: Uros Bizjak 
Link: https://lore.kernel.org/r/20250501054241.1245648-1-xin@zytor.com

x86/msr: Rename 'rdmsrl()' to 'rdmsrq()'

2025-04-10T09:58:27+00:00

Suggested-by: "H. Peter Anvin" 
Signed-off-by: Ingo Molnar 
Acked-by: Peter Zijlstra (Intel) 
Cc: Juergen Gross 
Cc: Dave Hansen 
Cc: Xin Li 
Cc: Linus Torvalds

x86/resctrl: Move get_{mon,ctrl}_domain_from_cpu() to live with their callers

2025-03-12T11:24:58+00:00

Each of get_{mon,ctrl}_domain_from_cpu() only has one caller.

Once the filesystem code is moved to /fs/, there is no equivalent to
core.c.

Move these functions to each live next to their caller. This allows
them to be made static and the header file entries to be removed.

Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Fenghua Yu 
Reviewed-by: Reinette Chatre 
Reviewed-by: Babu Moger 
Reviewed-by: Shaopeng Tan 
Tested-by: Peter Newman 
Tested-by: Shaopeng Tan 
Tested-by: Amit Singh Tomar  # arm64
Tested-by: Shanker Donthineni  # arm64
Tested-by: Babu Moger 
Link: https://lore.kernel.org/r/20250311183715.16445-31-james.morse@arm.com

x86/resctrl: Move mbm_cfg_mask to struct rdt_resource

2025-03-12T11:24:09+00:00

The mbm_cfg_mask field lists the bits that user-space can set when configuring
an event. This value is output via the last_cmd_status file.

Once the filesystem parts of resctrl are moved to live in /fs/, the struct
rdt_hw_resource is inaccessible to the filesystem code. Because this value is
output to user-space, it has to be accessible to the filesystem code.

Move it to struct rdt_resource.

Signed-off-by: James Morse 
Signed-off-by: Borislav Petkov (AMD) 
Reviewed-by: Shaopeng Tan 
Reviewed-by: Tony Luck 
Reviewed-by: Reinette Chatre 
Reviewed-by: Fenghua Yu 
Reviewed-by: Babu Moger 
Tested-by: Carl Worth  # arm64
Tested-by: Shaopeng Tan 
Tested-by: Peter Newman 
Tested-by: Amit Singh Tomar  # arm64
Tested-by: Shanker Donthineni  # arm64
Tested-by: Babu Moger 
Link: https://lore.kernel.org/r/20250311183715.16445-23-james.morse@arm.com