Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler changes from Ingo Molnar:
"Continued quest to clean up and enhance the cputime code by Frederic
Weisbecker, in preparation for future tickless kernel features.
Other than that, smallish changes."
Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits)
cputime: Make finegrained irqtime accounting generally available
cputime: Gather time/stats accounting config options into a single menu
ia64: Reuse system and user vtime accounting functions on task switch
ia64: Consolidate user vtime accounting
vtime: Consolidate system/idle context detection
cputime: Use a proper subsystem naming for vtime related APIs
sched: cpu_power: enable ARCH_POWER
sched/nohz: Clean up select_nohz_load_balancer()
sched: Fix load avg vs. cpu-hotplug
sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW
sched: Fix nohz_idle_balance()
sched: Remove useless code in yield_to()
sched: Add time unit suffix to sched sysctl knobs
sched/debug: Limit sd->*_idx range on sysctl
sched: Remove AFFINE_WAKEUPS feature flag
s390: Remove leftover account_tick_vtime() header
cputime: Consolidate vtime handling on context switch
sched: Move cputime code to its own file
cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING
tile: Remove SD_PREFER_LOCAL leftover
...
This commit is contained in:
Linus Torvalds
commit
0b981cb94b
32 changed files with 903 additions and 917 deletions
179
init/Kconfig
179
init/Kconfig
|
|
@ -267,31 +267,6 @@ config POSIX_MQUEUE_SYSCTL
|
|||
depends on SYSCTL
|
||||
default y
|
||||
|
||||
config BSD_PROCESS_ACCT
|
||||
bool "BSD Process Accounting"
|
||||
help
|
||||
If you say Y here, a user level program will be able to instruct the
|
||||
kernel (via a special system call) to write process accounting
|
||||
information to a file: whenever a process exits, information about
|
||||
that process will be appended to the file by the kernel. The
|
||||
information includes things such as creation time, owning user,
|
||||
command name, memory usage, controlling terminal etc. (the complete
|
||||
list is in the struct acct in <file:include/linux/acct.h>). It is
|
||||
up to the user level program to do useful things with this
|
||||
information. This is generally a good idea, so say Y.
|
||||
|
||||
config BSD_PROCESS_ACCT_V3
|
||||
bool "BSD Process Accounting version 3 file format"
|
||||
depends on BSD_PROCESS_ACCT
|
||||
default n
|
||||
help
|
||||
If you say Y here, the process accounting information is written
|
||||
in a new file format that also logs the process IDs of each
|
||||
process and it's parent. Note that this file format is incompatible
|
||||
with previous v0/v1/v2 file formats, so you will need updated tools
|
||||
for processing it. A preliminary version of these tools is available
|
||||
at <http://www.gnu.org/software/acct/>.
|
||||
|
||||
config FHANDLE
|
||||
bool "open by fhandle syscalls"
|
||||
select EXPORTFS
|
||||
|
|
@ -304,48 +279,6 @@ config FHANDLE
|
|||
get renamed. Enables open_by_handle_at(2) and name_to_handle_at(2)
|
||||
syscalls.
|
||||
|
||||
config TASKSTATS
|
||||
bool "Export task/process statistics through netlink (EXPERIMENTAL)"
|
||||
depends on NET
|
||||
default n
|
||||
help
|
||||
Export selected statistics for tasks/processes through the
|
||||
generic netlink interface. Unlike BSD process accounting, the
|
||||
statistics are available during the lifetime of tasks/processes as
|
||||
responses to commands. Like BSD accounting, they are sent to user
|
||||
space on task exit.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config TASK_DELAY_ACCT
|
||||
bool "Enable per-task delay accounting (EXPERIMENTAL)"
|
||||
depends on TASKSTATS
|
||||
help
|
||||
Collect information on time spent by a task waiting for system
|
||||
resources like cpu, synchronous block I/O completion and swapping
|
||||
in pages. Such statistics can help in setting a task's priorities
|
||||
relative to other tasks for cpu, io, rss limits etc.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config TASK_XACCT
|
||||
bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
|
||||
depends on TASKSTATS
|
||||
help
|
||||
Collect extended task accounting data and send the data
|
||||
to userland for processing over the taskstats interface.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config TASK_IO_ACCOUNTING
|
||||
bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
|
||||
depends on TASK_XACCT
|
||||
help
|
||||
Collect information on the number of bytes of storage I/O which this
|
||||
task has caused.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config AUDIT
|
||||
bool "Auditing support"
|
||||
depends on NET
|
||||
|
|
@ -391,6 +324,118 @@ config AUDIT_LOGINUID_IMMUTABLE
|
|||
source "kernel/irq/Kconfig"
|
||||
source "kernel/time/Kconfig"
|
||||
|
||||
menu "CPU/Task time and stats accounting"
|
||||
|
||||
choice
|
||||
prompt "Cputime accounting"
|
||||
default TICK_CPU_ACCOUNTING if !PPC64
|
||||
default VIRT_CPU_ACCOUNTING if PPC64
|
||||
|
||||
# Kind of a stub config for the pure tick based cputime accounting
|
||||
config TICK_CPU_ACCOUNTING
|
||||
bool "Simple tick based cputime accounting"
|
||||
depends on !S390
|
||||
help
|
||||
This is the basic tick based cputime accounting that maintains
|
||||
statistics about user, system and idle time spent on per jiffies
|
||||
granularity.
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
config VIRT_CPU_ACCOUNTING
|
||||
bool "Deterministic task and CPU time accounting"
|
||||
depends on HAVE_VIRT_CPU_ACCOUNTING
|
||||
help
|
||||
Select this option to enable more accurate task and CPU time
|
||||
accounting. This is done by reading a CPU counter on each
|
||||
kernel entry and exit and on transitions within the kernel
|
||||
between system, softirq and hardirq state, so there is a
|
||||
small performance impact. In the case of s390 or IBM POWER > 5,
|
||||
this also enables accounting of stolen time on logically-partitioned
|
||||
systems.
|
||||
|
||||
config IRQ_TIME_ACCOUNTING
|
||||
bool "Fine granularity task level IRQ time accounting"
|
||||
depends on HAVE_IRQ_TIME_ACCOUNTING
|
||||
help
|
||||
Select this option to enable fine granularity task irq time
|
||||
accounting. This is done by reading a timestamp on each
|
||||
transitions between softirq and hardirq state, so there can be a
|
||||
small performance impact.
|
||||
|
||||
If in doubt, say N here.
|
||||
|
||||
endchoice
|
||||
|
||||
config BSD_PROCESS_ACCT
|
||||
bool "BSD Process Accounting"
|
||||
help
|
||||
If you say Y here, a user level program will be able to instruct the
|
||||
kernel (via a special system call) to write process accounting
|
||||
information to a file: whenever a process exits, information about
|
||||
that process will be appended to the file by the kernel. The
|
||||
information includes things such as creation time, owning user,
|
||||
command name, memory usage, controlling terminal etc. (the complete
|
||||
list is in the struct acct in <file:include/linux/acct.h>). It is
|
||||
up to the user level program to do useful things with this
|
||||
information. This is generally a good idea, so say Y.
|
||||
|
||||
config BSD_PROCESS_ACCT_V3
|
||||
bool "BSD Process Accounting version 3 file format"
|
||||
depends on BSD_PROCESS_ACCT
|
||||
default n
|
||||
help
|
||||
If you say Y here, the process accounting information is written
|
||||
in a new file format that also logs the process IDs of each
|
||||
process and it's parent. Note that this file format is incompatible
|
||||
with previous v0/v1/v2 file formats, so you will need updated tools
|
||||
for processing it. A preliminary version of these tools is available
|
||||
at <http://www.gnu.org/software/acct/>.
|
||||
|
||||
config TASKSTATS
|
||||
bool "Export task/process statistics through netlink (EXPERIMENTAL)"
|
||||
depends on NET
|
||||
default n
|
||||
help
|
||||
Export selected statistics for tasks/processes through the
|
||||
generic netlink interface. Unlike BSD process accounting, the
|
||||
statistics are available during the lifetime of tasks/processes as
|
||||
responses to commands. Like BSD accounting, they are sent to user
|
||||
space on task exit.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config TASK_DELAY_ACCT
|
||||
bool "Enable per-task delay accounting (EXPERIMENTAL)"
|
||||
depends on TASKSTATS
|
||||
help
|
||||
Collect information on time spent by a task waiting for system
|
||||
resources like cpu, synchronous block I/O completion and swapping
|
||||
in pages. Such statistics can help in setting a task's priorities
|
||||
relative to other tasks for cpu, io, rss limits etc.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config TASK_XACCT
|
||||
bool "Enable extended accounting over taskstats (EXPERIMENTAL)"
|
||||
depends on TASKSTATS
|
||||
help
|
||||
Collect extended task accounting data and send the data
|
||||
to userland for processing over the taskstats interface.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
config TASK_IO_ACCOUNTING
|
||||
bool "Enable per-task storage I/O accounting (EXPERIMENTAL)"
|
||||
depends on TASK_XACCT
|
||||
help
|
||||
Collect information on the number of bytes of storage I/O which this
|
||||
task has caused.
|
||||
|
||||
Say N if unsure.
|
||||
|
||||
endmenu # "CPU/Task time and stats accounting"
|
||||
|
||||
menu "RCU Subsystem"
|
||||
|
||||
choice
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue