svn commit: r282901 - in head: sys/amd64/conf sys/arm64/conf sys/conf sys/i386/conf sys/kern sys/pc98/conf sys/powerpc/conf sys/sparc64/conf usr.bin/rctl
Edward Tomasz Napierala
trasz at FreeBSD.org
Thu May 14 14:03:59 UTC 2015
Author: trasz
Date: Thu May 14 14:03:55 2015
New Revision: 282901
URL: https://svnweb.freebsd.org/changeset/base/282901
Log:
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
Modified:
head/sys/amd64/conf/GENERIC
head/sys/arm64/conf/GENERIC
head/sys/conf/options
head/sys/i386/conf/GENERIC
head/sys/kern/kern_racct.c
head/sys/pc98/conf/GENERIC
head/sys/powerpc/conf/GENERIC
head/sys/sparc64/conf/GENERIC
head/usr.bin/rctl/rctl.8
Modified: head/sys/amd64/conf/GENERIC
==============================================================================
--- head/sys/amd64/conf/GENERIC Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/amd64/conf/GENERIC Thu May 14 14:03:55 2015 (r282901)
@@ -73,6 +73,9 @@ options KDTRACE_FRAME # Ensure frames
options KDTRACE_HOOKS # Kernel DTrace hooks
options DDB_CTF # Kernel ELF linker loads CTF data
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:
options KDB # Enable kernel debugger support.
Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/arm64/conf/GENERIC Thu May 14 14:03:55 2015 (r282901)
@@ -65,6 +65,9 @@ options MAC # TrustedBSD MAC Framewor
options KDTRACE_FRAME # Ensure frames are compiled in
options KDTRACE_HOOKS # Kernel DTrace hooks
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_mmio
Modified: head/sys/conf/options
==============================================================================
--- head/sys/conf/options Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/conf/options Thu May 14 14:03:55 2015 (r282901)
@@ -931,7 +931,7 @@ IPOIB_CM opt_ofed.h
# Resource Accounting
RACCT opt_global.h
-RACCT_DISABLED opt_global.h
+RACCT_DEFAULT_TO_DISABLED opt_global.h
# Resource Limits
RCTL opt_global.h
Modified: head/sys/i386/conf/GENERIC
==============================================================================
--- head/sys/i386/conf/GENERIC Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/i386/conf/GENERIC Thu May 14 14:03:55 2015 (r282901)
@@ -73,6 +73,9 @@ options MAC # TrustedBSD MAC Framewor
options KDTRACE_HOOKS # Kernel DTrace hooks
options DDB_CTF # Kernel ELF linker loads CTF data
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:
options KDB # Enable kernel debugger support.
Modified: head/sys/kern/kern_racct.c
==============================================================================
--- head/sys/kern/kern_racct.c Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/kern/kern_racct.c Thu May 14 14:03:55 2015 (r282901)
@@ -70,7 +70,7 @@ FEATURE(racct, "Resource Accounting");
* Do not block processes that have their %cpu usage <= pcpu_threshold.
*/
static int pcpu_threshold = 1;
-#ifdef RACCT_DISABLED
+#ifdef RACCT_DEFAULT_TO_DISABLED
int racct_enable = 0;
#else
int racct_enable = 1;
Modified: head/sys/pc98/conf/GENERIC
==============================================================================
--- head/sys/pc98/conf/GENERIC Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/pc98/conf/GENERIC Thu May 14 14:03:55 2015 (r282901)
@@ -71,6 +71,9 @@ options CAPABILITY_MODE # Capsicum cap
options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
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:
options KDB # Enable kernel debugger support.
Modified: head/sys/powerpc/conf/GENERIC
==============================================================================
--- head/sys/powerpc/conf/GENERIC Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/powerpc/conf/GENERIC Thu May 14 14:03:55 2015 (r282901)
@@ -77,6 +77,9 @@ options MAC # TrustedBSD MAC Framewor
options KDTRACE_HOOKS # Kernel DTrace hooks
options DDB_CTF # Kernel ELF linker loads CTF data
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:
options KDB # Enable kernel debugger support.
Modified: head/sys/sparc64/conf/GENERIC
==============================================================================
--- head/sys/sparc64/conf/GENERIC Thu May 14 13:49:00 2015 (r282900)
+++ head/sys/sparc64/conf/GENERIC Thu May 14 14:03:55 2015 (r282901)
@@ -67,6 +67,9 @@ options CAPABILITY_MODE # Capsicum cap
options CAPABILITIES # Capsicum capabilities
options MAC # TrustedBSD MAC Framework
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:
options KDB # Enable kernel debugger support.
Modified: head/usr.bin/rctl/rctl.8
==============================================================================
--- head/usr.bin/rctl/rctl.8 Thu May 14 13:49:00 2015 (r282900)
+++ head/usr.bin/rctl/rctl.8 Thu May 14 14:03:55 2015 (r282901)
@@ -233,6 +233,18 @@ for a list of supported signals
Not all actions are supported for all resources.
Attempting to add a rule with an action not supported by a given resource will
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
.Ex -std
.Sh EXAMPLES
More information about the svn-src-all
mailing list