Build GENERIC with RACCT/RCTL support by default. Note that it still
needs to be enabled by adding "kern.racct.enable=1" to /boot/loader.conf. Differential Revision: https://reviews.freebsd.org/D2407 Reviewed by: emaste@, wblock@ MFC after: 1 month Relnotes: yes Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
b2b5a4c060
commit
ba8f0eb8fc
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=282901
@ -73,6 +73,9 @@ options KDTRACE_FRAME # Ensure frames are compiled in
|
|||||||
options KDTRACE_HOOKS # Kernel DTrace hooks
|
options KDTRACE_HOOKS # Kernel DTrace hooks
|
||||||
options DDB_CTF # Kernel ELF linker loads CTF data
|
options DDB_CTF # Kernel ELF linker loads CTF data
|
||||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||||
|
options RACCT # Resource accounting framework
|
||||||
|
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
|
||||||
|
options RCTL # Resource limits
|
||||||
|
|
||||||
# Debugging support. Always need this:
|
# Debugging support. Always need this:
|
||||||
options KDB # Enable kernel debugger support.
|
options KDB # Enable kernel debugger support.
|
||||||
|
@ -65,6 +65,9 @@ options MAC # TrustedBSD MAC Framework
|
|||||||
options KDTRACE_FRAME # Ensure frames are compiled in
|
options KDTRACE_FRAME # Ensure frames are compiled in
|
||||||
options KDTRACE_HOOKS # Kernel DTrace hooks
|
options KDTRACE_HOOKS # Kernel DTrace hooks
|
||||||
options VFP # Floating-point support
|
options VFP # Floating-point support
|
||||||
|
options RACCT # Resource accounting framework
|
||||||
|
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
|
||||||
|
options RCTL # Resource limits
|
||||||
|
|
||||||
device virtio
|
device virtio
|
||||||
device virtio_mmio
|
device virtio_mmio
|
||||||
|
@ -931,7 +931,7 @@ IPOIB_CM opt_ofed.h
|
|||||||
|
|
||||||
# Resource Accounting
|
# Resource Accounting
|
||||||
RACCT opt_global.h
|
RACCT opt_global.h
|
||||||
RACCT_DISABLED opt_global.h
|
RACCT_DEFAULT_TO_DISABLED opt_global.h
|
||||||
|
|
||||||
# Resource Limits
|
# Resource Limits
|
||||||
RCTL opt_global.h
|
RCTL opt_global.h
|
||||||
|
@ -73,6 +73,9 @@ options MAC # TrustedBSD MAC Framework
|
|||||||
options KDTRACE_HOOKS # Kernel DTrace hooks
|
options KDTRACE_HOOKS # Kernel DTrace hooks
|
||||||
options DDB_CTF # Kernel ELF linker loads CTF data
|
options DDB_CTF # Kernel ELF linker loads CTF data
|
||||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||||
|
options RACCT # Resource accounting framework
|
||||||
|
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
|
||||||
|
options RCTL # Resource limits
|
||||||
|
|
||||||
# Debugging support. Always need this:
|
# Debugging support. Always need this:
|
||||||
options KDB # Enable kernel debugger support.
|
options KDB # Enable kernel debugger support.
|
||||||
|
@ -70,7 +70,7 @@ FEATURE(racct, "Resource Accounting");
|
|||||||
* Do not block processes that have their %cpu usage <= pcpu_threshold.
|
* Do not block processes that have their %cpu usage <= pcpu_threshold.
|
||||||
*/
|
*/
|
||||||
static int pcpu_threshold = 1;
|
static int pcpu_threshold = 1;
|
||||||
#ifdef RACCT_DISABLED
|
#ifdef RACCT_DEFAULT_TO_DISABLED
|
||||||
int racct_enable = 0;
|
int racct_enable = 0;
|
||||||
#else
|
#else
|
||||||
int racct_enable = 1;
|
int racct_enable = 1;
|
||||||
|
@ -71,6 +71,9 @@ options CAPABILITY_MODE # Capsicum capability mode
|
|||||||
options CAPABILITIES # Capsicum capabilities
|
options CAPABILITIES # Capsicum capabilities
|
||||||
options MAC # TrustedBSD MAC Framework
|
options MAC # TrustedBSD MAC Framework
|
||||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||||
|
options RACCT # Resource accounting framework
|
||||||
|
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
|
||||||
|
options RCTL # Resource limits
|
||||||
|
|
||||||
# Debugging support. Always need this:
|
# Debugging support. Always need this:
|
||||||
options KDB # Enable kernel debugger support.
|
options KDB # Enable kernel debugger support.
|
||||||
|
@ -77,6 +77,9 @@ options MAC # TrustedBSD MAC Framework
|
|||||||
options KDTRACE_HOOKS # Kernel DTrace hooks
|
options KDTRACE_HOOKS # Kernel DTrace hooks
|
||||||
options DDB_CTF # Kernel ELF linker loads CTF data
|
options DDB_CTF # Kernel ELF linker loads CTF data
|
||||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||||
|
options RACCT # Resource accounting framework
|
||||||
|
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
|
||||||
|
options RCTL # Resource limits
|
||||||
|
|
||||||
# Debugging support. Always need this:
|
# Debugging support. Always need this:
|
||||||
options KDB # Enable kernel debugger support.
|
options KDB # Enable kernel debugger support.
|
||||||
|
@ -67,6 +67,9 @@ options CAPABILITY_MODE # Capsicum capability mode
|
|||||||
options CAPABILITIES # Capsicum capabilities
|
options CAPABILITIES # Capsicum capabilities
|
||||||
options MAC # TrustedBSD MAC Framework
|
options MAC # TrustedBSD MAC Framework
|
||||||
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
options INCLUDE_CONFIG_FILE # Include this file in kernel
|
||||||
|
options RACCT # Resource accounting framework
|
||||||
|
options RACCT_DEFAULT_TO_DISABLED # Set kern.racct.enable=0 by default
|
||||||
|
options RCTL # Resource limits
|
||||||
|
|
||||||
# Debugging support. Always need this:
|
# Debugging support. Always need this:
|
||||||
options KDB # Enable kernel debugger support.
|
options KDB # Enable kernel debugger support.
|
||||||
|
@ -233,6 +233,18 @@ for a list of supported signals
|
|||||||
Not all actions are supported for all resources.
|
Not all actions are supported for all resources.
|
||||||
Attempting to add a rule with an action not supported by a given resource will
|
Attempting to add a rule with an action not supported by a given resource will
|
||||||
result in error.
|
result in error.
|
||||||
|
.Sh LOADER TUNABLES
|
||||||
|
Tunables can be set at the
|
||||||
|
.Xr loader 8
|
||||||
|
prompt, or
|
||||||
|
.Xr loader.conf 5 .
|
||||||
|
.Bl -tag -width indent
|
||||||
|
.It Va kern.racct.enable: No 1
|
||||||
|
Enable
|
||||||
|
.Nm .
|
||||||
|
This defaults to 1, unless
|
||||||
|
.Cd "options RACCT_DEFAULT_TO_DISABLED"
|
||||||
|
is set in the kernel configuration file.
|
||||||
.Sh EXIT STATUS
|
.Sh EXIT STATUS
|
||||||
.Ex -std
|
.Ex -std
|
||||||
.Sh EXAMPLES
|
.Sh EXAMPLES
|
||||||
|
Loading…
Reference in New Issue
Block a user