Commit 664a231d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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_"
  ...
parents b1456f6d 54d14f25

Documentation/arch/x86/index.rst

+0 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ x86-specific Documentation 
   pti

   mds

   microcode

   resctrl

   tsx_async_abort

   buslock

   usb-legacy-support

Documentation/filesystems/index.rst

+1 −0
Original line number Diff line number Diff line
@@ -113,6 +113,7 @@ Documentation for filesystem implementations. 
   qnx6

   ramfs-rootfs-initramfs

   relay

   resctrl

   romfs

   smb/index

   spufs/index

Documentation/arch/x86/resctrl.rst→Documentation/filesystems/resctrl.rst

+3 −3
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0

.. include:: <isonum.txt>



===========================================

User Interface for Resource Control feature

===========================================

=====================================================

User Interface for Resource Control feature (resctrl)

=====================================================



:Copyright: |copy| 2016 Intel Corporation

:Authors: - Fenghua Yu <fenghua.yu@intel.com>

MAINTAINERS

+4 −1
Original line number Diff line number Diff line
@@ -20501,11 +20501,14 @@ F: tools/testing/selftests/net/rds/ 
RDT - RESOURCE ALLOCATION

M:	Tony Luck <tony.luck@intel.com>

M:	Reinette Chatre <reinette.chatre@intel.com>

R:	Dave Martin <Dave.Martin@arm.com>

R:	James Morse <james.morse@arm.com>

L:	linux-kernel@vger.kernel.org

S:	Supported

F:	Documentation/arch/x86/resctrl*

F:	Documentation/filesystems/resctrl.rst

F:	arch/x86/include/asm/resctrl.h

F:	arch/x86/kernel/cpu/resctrl/

F:	fs/resctrl/

F:	include/linux/resctrl*.h

F:	tools/testing/selftests/resctrl/

























arch/Kconfig



+8
−0






























Original line number
Diff line number
Diff line







@@ -1518,6 +1518,14 @@ config STRICT_MODULE_RWX







config ARCH_HAS_PHYS_TO_DMA









	bool



















config ARCH_HAS_CPU_RESCTRL









	bool









	help









	  An architecture selects this option to indicate that the necessary









	  hooks are provided to support the common memory system usage









	  monitoring and control interfaces provided by the 'resctrl'









	  filesystem (see RESCTRL_FS).



















config HAVE_ARCH_COMPILER_H









	bool









	help