Commit e6d42931 authored Jan 29, 2019 by Johannes Weiner Committed by Borislav Petkov Feb 02, 2019

x86/resctrl: Avoid confusion over the new X86_RESCTRL config



"Resource Control" is a very broad term for this CPU feature, and a term
that is also associated with containers, cgroups etc. This can easily
cause confusion.

Make the user prompt more specific. Match the config symbol name.

 [ bp: In the future, the corresponding ARM arch-specific code will be
   under ARM_CPU_RESCTRL and the arch-agnostic bits will be carved out
   under the CPU_RESCTRL umbrella symbol. ]

Signed-off-by: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Cc: Babu Moger <Babu.Moger@amd.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Morse <james.morse@arm.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Cc: linux-doc@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Pu Wen <puwen@hygon.cn>
Cc: Reinette Chatre <reinette.chatre@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: x86-ml <x86@kernel.org>
Link: https://lkml.kernel.org/r/20190130195621.GA30653@cmpxchg.org

parent 2aa958c9

Documentation/x86/resctrl_ui.txt

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ Fenghua Yu <fenghua.yu@intel.com>
	Tony Luck <tony.luck@intel.com>		Tony Luck <tony.luck@intel.com>
	Vikas Shivappa <vikas.shivappa@intel.com>		Vikas Shivappa <vikas.shivappa@intel.com>

	This feature is enabled by the CONFIG_X86_RESCTRL and the x86 /proc/cpuinfo		This feature is enabled by the CONFIG_X86_CPU_RESCTRL and the x86 /proc/cpuinfo
	flag bits:		flag bits:
	RDT (Resource Director Technology) Allocation - "rdt_a"		RDT (Resource Director Technology) Allocation - "rdt_a"
	CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"		CAT (Cache Allocation Technology) - "cat_l3", "cat_l2"

arch/x86/Kconfig

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -446,12 +446,12 @@ config RETPOLINE
	branches. Requires a compiler with -mindirect-branch=thunk-extern		branches. Requires a compiler with -mindirect-branch=thunk-extern
	support for full protection. The kernel may run slower.		support for full protection. The kernel may run slower.

	config X86_RESCTRL		config X86_CPU_RESCTRL
	bool "Resource Control support"		bool "x86 CPU resource control support"
	depends on X86 && (CPU_SUP_INTEL \|\| CPU_SUP_AMD)		depends on X86 && (CPU_SUP_INTEL \|\| CPU_SUP_AMD)
	select KERNFS		select KERNFS
	help		help
	Enable Resource Control support.		Enable x86 CPU resource control support.

	Provide support for the allocation and monitoring of system resources		Provide support for the allocation and monitoring of system resources
	usage by the CPU.		usage by the CPU.

arch/x86/include/asm/resctrl_sched.h

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2,7 +2,7 @@
	#ifndef _ASM_X86_RESCTRL_SCHED_H		#ifndef _ASM_X86_RESCTRL_SCHED_H
	#define _ASM_X86_RESCTRL_SCHED_H		#define _ASM_X86_RESCTRL_SCHED_H

	#ifdef CONFIG_X86_RESCTRL		#ifdef CONFIG_X86_CPU_RESCTRL

	#include <linux/sched.h>		#include <linux/sched.h>
	#include <linux/jump_label.h>		#include <linux/jump_label.h>
	@@ -88,6 +88,6 @@ static inline void resctrl_sched_in(void)

	static inline void resctrl_sched_in(void) {}		static inline void resctrl_sched_in(void) {}

	#endif /* CONFIG_X86_RESCTRL */		#endif /* CONFIG_X86_CPU_RESCTRL */

	#endif /* _ASM_X86_RESCTRL_SCHED_H */		#endif /* _ASM_X86_RESCTRL_SCHED_H */

arch/x86/kernel/cpu/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -39,7 +39,7 @@ obj-$(CONFIG_CPU_SUP_UMC_32) += umc.o
	obj-$(CONFIG_X86_MCE) += mce/		obj-$(CONFIG_X86_MCE) += mce/
	obj-$(CONFIG_MTRR) += mtrr/		obj-$(CONFIG_MTRR) += mtrr/
	obj-$(CONFIG_MICROCODE) += microcode/		obj-$(CONFIG_MICROCODE) += microcode/
	obj-$(CONFIG_X86_RESCTRL) += resctrl/		obj-$(CONFIG_X86_CPU_RESCTRL) += resctrl/

	obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o		obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o

arch/x86/kernel/cpu/resctrl/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	# SPDX-License-Identifier: GPL-2.0		# SPDX-License-Identifier: GPL-2.0
	obj-$(CONFIG_X86_RESCTRL) += core.o rdtgroup.o monitor.o		obj-$(CONFIG_X86_CPU_RESCTRL) += core.o rdtgroup.o monitor.o
	obj-$(CONFIG_X86_RESCTRL) += ctrlmondata.o pseudo_lock.o		obj-$(CONFIG_X86_CPU_RESCTRL) += ctrlmondata.o pseudo_lock.o
	CFLAGS_pseudo_lock.o = -I$(src)		CFLAGS_pseudo_lock.o = -I$(src)