sched.h modernization -v2, phase #3: "Move definitions between headers"
Subsystems (7)
Ingo Molnar
maintainercover sched.h modernization -v2, phase #3: "Move definitions between headers"
This is phase #3 of the sched.h modernization series.
These patches are the meat of the code movement between headers, but they don't actually change the header dependency graph: all code movement is between pre-existing headers and all post-movement header dependencies were already established by the phase #2 preparatory series..
See the announcement for more details:
https://lkml.org/lkml/2017/2/8/564
The Git tree can be found at:
git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git WIP.sched/core
Thanks,
Ingo
Ingo Molnar (53):
sched/headers: Move scheduler topology interfaces to <linux/sched/topology.h>
sched/headers: Move the 'cpu_idle_type' enum from <linux/sched.h> to <linux/sched/idle.h> sched/headers: Move the wake_up_if_idle() prototype to <linux/sched/idle.h>
sched/headers: Move idle polling methods to <linux/sched/idle.h>
sched/headers: Move the wake-queue types and interfaces from sched.h into <linux/sched/wake_q.h> sched/headers: Move scheduler clock interfaces to <linux/sched/clock.h>
sched/headers, delayacct: Move the 'struct task_delay_info' definition from <linux/sched.h> to <linux/delayacct.h> sched/headers: Move various ABI definitions to <uapi/linux/sched/types.h>
sched/headers: Move loadavg related definitions from <linux/sched.h> to <linux/sched/loadavg.h> sched/headers: Move autogroup APIs into <linux/sched/autogroup.h>
sched/headers: Move task->mm handling methods to <linux/sched/mm.h>
sched/headers: Move task->mm coredumping related defines and methods from <linux/sched.h> to <linux/sched/coredump.h> sched/headers: Move task_struct::signal and task_struct::sighand types and accessors into <linux/sched/signal.h> sched/headers: Move 'struct user_struct' definition and APIs to the new <linux/sched/user.h> header sched/headers: Move softlockup detector watchdog methods to <linux/nmi.h>
sched/headers: Move 'struct pacct_struct' and 'struct cpu_itimer' form <linux/sched.h> to <linux/sched/signal.h> sched/headers: Move the cpufreq interfaces to <linux/sched/cpufreq.h>
sched/headers: Move more mm_struct related functionality from <linux/sched.h> to <linux/sched/mm.h> sched/headers: Move the 'init_mm' declaration from <linux/sched.h> to <linux/mm_types.h> sched/headers: Move in_vfork() from <linux/sched.h> to <linux/sched/mm.h>
sched/headers: Move the NUMA balancing interfaces from <linux/sched.h> to <linux/sched/numa_balancing.h> sched/headers: Move the JOBCTL_ defines and methods from <linux/sched.h> to <linux/sched/jobctl.h> sched/headers: Remove various unrelated headers from <linux/sched.h>
sched/headers: Move CONFIG_TASK_XACCT bits from <linux/sched.h> to <linux/sched/xacct.h> sched/headers: Move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h> sched/headers: Move the memalloc_noio_*() APIs to <linux/sched/mm.h>
sched/headers: Move task statistics APIs from <linux/sched.h> to <linux/sched/stat.h>
sched/headers: Move the NOHZ APIs from <linux/sched.h> to <linux/sched/nohz.h>
sched/headers: Move debugging functions from <linux/sched.h> to <linux/sched/debug.h>
sched/headers, time/timekeeping: Move the xtime_update() prototype from <linux/sched.h> to <linux/time.h> sched/headers: Move <asm/current.h> include from the middle of <linux/sched.h> to the header portion sched/headers: Split hotplug CPU interfaces out of <linux/sched.h> into <linux/sched/hotplug.h> sched/headers: Move task lifetime APIs from <linux/sched.h> to <linux/sched/task.h>
sched/headers, RCU: Move rcu_copy_process() from <linux/sched/task.h> to kernel/fork.c
sched/core: Move, sort and clean up <linux/sched.h> structure predeclarations
sched/headers: Move the PREEMPT_COUNT defines from <linux/sched.h> to <linux/preempt.h> sched/headers: Move task-stack related APIs from <linux/sched.h> to <linux/sched/task_stack.h> sched/headers: Move the 'root_task_group' declaration to <linux/sched/autogroup.h>
signals: Move signal data types from <linux/signal.h> to <linux/signal_types.h>
mm/headers, sched/headers: Move task related MM types from <linux/mm_types.> to <linux/mm_types_task.h> sched/headers: Remove the <linux/mm_types.h> dependency from <linux/sched.h>
sched/headers: Move 'init_task' and 'init_thread_union' from <linux/sched.h> to <linux/sched/task.h> sched/headers: Move the task_lock()/unlock() APIs to <linux/sched/task.h>
sched/headers: Move cputime functionality from <linux/sched.h> and <linux/cputime.h> into <linux/sched/cputime.h> sched/headers: Move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h> sched/headers, vfs/execve: Move the do_execve*() prototypes from <linux/sched.h> to <linux/binfmts.h> sched/headers: Move kstack_end() from <linux/sched.h> to <linux/sched/task_stack.h>
sched/headers: Move exit_files() and exit_itimers() from <linux/sched.h> to <linux/sched/task.h> sched/headers: Move _init() prototypes from <linux/sched.h> to <linux/sched/init.h>
sched/headers, timekeeping: Move the timer tick function prototypes to <linux/timekeeping.h> sched/headers, mm: Move 'struct tlbflush_unmap_batch' from <linux/sched.h> to <linux/mm_types_task.h> sched/headers: Move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h> sched/headers: Move the sched_exec() prototype to <linux/sched/task.h>
include/linux/binfmts.h | 10 + include/linux/cputime.h | 13 - include/linux/delayacct.h | 36 + include/linux/init_task.h | 2 - include/linux/mm_types.h | 51 +- include/linux/mm_types_task.h | 77 ++ include/linux/nmi.h | 37 + include/linux/preempt.h | 21 + include/linux/sched.h | 3903 +++++++++++++----------------------------------------- include/linux/sched/autogroup.h | 26 + include/linux/sched/clock.h | 98 ++ include/linux/sched/coredump.h | 69 + include/linux/sched/cpufreq.h | 21 + include/linux/sched/cputime.h | 182 ++- include/linux/sched/debug.h | 46 + include/linux/sched/hotplug.h | 20 + include/linux/sched/idle.h | 85 ++ include/linux/sched/init.h | 7 + include/linux/sched/jobctl.h | 32 + include/linux/sched/loadavg.h | 27 + include/linux/sched/mm.h | 121 ++ include/linux/sched/nohz.h | 39 + include/linux/sched/numa_balancing.h | 40 + include/linux/sched/signal.h | 601 ++++++++- include/linux/sched/stat.h | 34 + include/linux/sched/task.h | 133 ++ include/linux/sched/task_stack.h | 114 ++ include/linux/sched/topology.h | 213 +++ include/linux/sched/user.h | 58 + include/linux/sched/wake_q.h | 50 + include/linux/sched/xacct.h | 42 + include/linux/signal.h | 54 - include/linux/signal_types.h | 59 + include/linux/timekeeping.h | 4 + include/uapi/linux/sched/types.h | 68 + kernel/fork.c | 15 + kernel/sched/stats.h | 111 -- 37 files changed, 3289 insertions(+), 3230 deletions(-) delete mode 100644 include/linux/cputime.h
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 3/53 sched/headers: Move the wake_up_if_idle() prototype to <linux/sched/idle.h>
No need to clutter <linux/sched.h> with this rarely used prototype.
--- include/linux/sched.h | 2 -- include/linux/sched/idle.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/sched.h +0 -2
@@ -1007,8 +1007,6 @@ extern void wake_q_add(struct wake_q_head *head, struct task_struct *task);extern void wake_up_q (struct wake_q_head *head); -extern void wake_up_if_idle (int cpu); -struct io_context ;/* See blkdev.h */
include/linux/sched/idle.h +2 -0
@@ -10,4 +10,6 @@ enum cpu_idle_type {CPU_MAX_IDLE_TYPES }; +extern void wake_up_if_idle (int cpu); +#endif /* _LINUX_SCHED_IDLE_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 1/53 sched/headers: Move scheduler topology interfaces to <linux/sched/topology.h>
In reply to Ingo MolnarThe vast majority of sched.h users does not require the topology types and interfaces, so split them out into <linux/sched/topology.h>.
This reduces the size of linux/sched.h by ~6%.
--- include/linux/sched.h | 212 ------------------------------------------------------------ include/linux/sched/topology.h | 213 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 213 insertions(+), 212 deletions(-)
include/linux/sched.h +0 -212
@@ -965,12 +965,6 @@ enum cpu_idle_type {# define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT)/* -* Increase resolution of cpu_capacity calculations -*/ -#define SCHED_CAPACITY_SHIFT SCHED_FIXEDPOINT_SHIFT -#define SCHED_CAPACITY_SCALE (1L << SCHED_CAPACITY_SHIFT) - -/* * Wake-queues are lists of tasks with a pending wakeup, whose * callers have already marked the task as woken internally, * and can thus carry on. A common use case is being able to
@@ -1020,214 +1014,8 @@ extern void wake_q_add(struct wake_q_head *head, struct task_struct *task);extern void wake_up_q (struct wake_q_head *head); -/* -* sched-domains (multiprocessor balancing) declarations: -*/ -#ifdef CONFIG_SMP -#define SD_LOAD_BALANCE 0x0001/* Do load balancing on this domain. */ -#define SD_BALANCE_NEWIDLE 0x0002/* Balance when about to become idle */ -#define SD_BALANCE_EXEC 0x0004/* Balance on exec */ -#define SD_BALANCE_FORK 0x0008/* Balance on fork, clone */ -#define SD_BALANCE_WAKE 0x0010/* Balance on wakeup */ -#define SD_WAKE_AFFINE 0x0020/* Wake task to waking CPU */ -#define SD_ASYM_CPUCAPACITY 0x0040/* Groups have different max cpu capacities */ -#define SD_SHARE_CPUCAPACITY 0x0080/* Domain members share cpu capacity */ -#define SD_SHARE_POWERDOMAIN 0x0100/* Domain members share power domain */ -#define SD_SHARE_PKG_RESOURCES 0x0200/* Domain members share cpu pkg resources */ -#define SD_SERIALIZE 0x0400/* Only a single load balancing instance */ -#define SD_ASYM_PACKING 0x0800/* Place busy groups earlier in the domain */ -#define SD_PREFER_SIBLING 0x1000/* Prefer to place tasks in a sibling domain */ -#define SD_OVERLAP 0x2000/* sched_domains of this level overlap */ -#define SD_NUMA 0x4000/* cross-node balancing */ - -#ifdef CONFIG_SCHED_SMT -static inline int cpu_smt_flags (void ) -{ -return SD_SHARE_CPUCAPACITY |SD_SHARE_PKG_RESOURCES ; -} -#endif - -#ifdef CONFIG_SCHED_MC -static inline int cpu_core_flags (void ) -{ -return SD_SHARE_PKG_RESOURCES ; -} -#endif - -#ifdef CONFIG_NUMA -static inline int cpu_numa_flags (void ) -{ -return SD_NUMA ; -} -#endif - -extern int arch_asym_cpu_priority (int cpu); - -struct sched_domain_attr { -int relax_domain_level; -}; - -#define SD_ATTR_INIT (struct sched_domain_attr) { \ - .relax_domain_level = -1, \ -} - -extern int sched_domain_level_max; - -struct sched_group ; - -struct sched_domain_shared { -atomic_t ref; -atomic_t nr_busy_cpus; -int has_idle_cores; -}; - -struct sched_domain { -/* These fields must be setup */ -struct sched_domain *parent;/* top domain must be null terminated */ -struct sched_domain *child;/* bottom domain must be null terminated */ -struct sched_group *groups;/* the balancing groups of the domain */ -unsigned long min_interval;/* Minimum balance interval ms */ -unsigned long max_interval;/* Maximum balance interval ms */ -unsigned int busy_factor;/* less balancing by factor if busy */ -unsigned int imbalance_pct;/* No balance until over watermark */ -unsigned int cache_nice_tries;/* Leave cache hot tasks for # tries */ -unsigned int busy_idx; -unsigned int idle_idx; -unsigned int newidle_idx; -unsigned int wake_idx; -unsigned int forkexec_idx; -unsigned int smt_gain; - -int nohz_idle;/* NOHZ IDLE status */ -int flags;/* See SD_* */ -int level; - -/* Runtime fields. */ -unsigned long last_balance;/* init to jiffies. units in jiffies */ -unsigned int balance_interval;/* initialise to 1. units in ms. */ -unsigned int nr_balance_failed;/* initialise to 0 */ - -/* idle_balance() stats */ -u64 max_newidle_lb_cost; -unsigned long next_decay_max_lb_cost; - -u64 avg_scan_cost;/* select_idle_sibling */ - -#ifdef CONFIG_SCHEDSTATS -/* load_balance() stats */ -unsigned int lb_count[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_failed[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_balanced[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_imbalance[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_gained[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_hot_gained[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_nobusyg[CPU_MAX_IDLE_TYPES ]; -unsigned int lb_nobusyq[CPU_MAX_IDLE_TYPES ]; - -/* Active load balancing */ -unsigned int alb_count; -unsigned int alb_failed; -unsigned int alb_pushed; - -/* SD_BALANCE_EXEC stats */ -unsigned int sbe_count; -unsigned int sbe_balanced; -unsigned int sbe_pushed; - -/* SD_BALANCE_FORK stats */ -unsigned int sbf_count; -unsigned int sbf_balanced; -unsigned int sbf_pushed; - -/* try_to_wake_up() stats */ -unsigned int ttwu_wake_remote; -unsigned int ttwu_move_affine; -unsigned int ttwu_move_balance; -#endif -#ifdef CONFIG_SCHED_DEBUG -char *name; -#endif -union { -void *private;/* used during construction */ -struct rcu_head rcu;/* used during destruction */ - }; -struct sched_domain_shared *shared; - -unsigned int span_weight; -/* -* Span of all CPUs in this domain. -* -* NOTE: this field is variable length. (Allocated dynamically -* by attaching extra space to the end of the structure, -* depending on how many CPUs the kernel has booted up with) -*/ -unsigned long span[0 ]; -}; - -static inline struct cpumask *sched_domain_span (struct sched_domain *sd) -{ -return to_cpumask (sd->span); -} - -extern void partition_sched_domains (int ndoms_new,cpumask_var_t doms_new[], -struct sched_domain_attr *dattr_new); - -/* Allocate an array of sched domains, for partition_sched_domains(). */ -cpumask_var_t *alloc_sched_domains (unsigned int ndoms); -void free_sched_domains (cpumask_var_t doms[],unsigned int ndoms); - -bool cpus_share_cache (int this_cpu,int that_cpu); - -typedef const struct cpumask *(*sched_domain_mask_f )(int cpu); -typedef int (*sched_domain_flags_f )(void ); - -#define SDTL_OVERLAP 0x01 - -struct sd_data { -struct sched_domain **__percpu sd; -struct sched_domain_shared **__percpu sds; -struct sched_group **__percpu sg; -struct sched_group_capacity **__percpu sgc; -}; - -struct sched_domain_topology_level { -sched_domain_mask_f mask; -sched_domain_flags_f sd_flags; -int flags; -int numa_level; -struct sd_data data; -#ifdef CONFIG_SCHED_DEBUG -char *name; -#endif -}; - -extern void set_sched_topology (struct sched_domain_topology_level *tl);extern void wake_up_if_idle (int cpu); -#ifdef CONFIG_SCHED_DEBUG -# define SD_INIT_NAME (type) .name = #type -#else -# define SD_INIT_NAME (type) -#endif - -#else /* CONFIG_SMP */ - -struct sched_domain_attr ; - -static inline void -partition_sched_domains (int ndoms_new,cpumask_var_t doms_new[], -struct sched_domain_attr *dattr_new) -{ -} - -static inline bool cpus_share_cache (int this_cpu,int that_cpu) -{ -return true; -} - -#endif /* !CONFIG_SMP */ - -struct io_context ;/* See blkdev.h */
include/linux/sched/topology.h +213 -0
217 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 2/53 sched/headers: Move the 'cpu_idle_type' enum from <linux/sched.h> to <linux/sched/idle.h>
In reply to Ingo Molnar--- include/linux/sched.h | 7 ------- include/linux/sched/idle.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
include/linux/sched.h +0 -7
@@ -947,13 +947,6 @@ static inline int sched_info_on(void)void force_schedstat_enabled (void );#endif -enum cpu_idle_type { -CPU_IDLE , -CPU_NOT_IDLE , -CPU_NEWLY_IDLE , -CPU_MAX_IDLE_TYPES -}; -/* * Integer metrics need fixed point arithmetic, e.g., sched/fair * has a few: load, load_avg, util_avg, freq, and capacity.
include/linux/sched/idle.h +7 -0
@@ -3,4 +3,11 @@#include <linux/sched.h> +enum cpu_idle_type { +CPU_IDLE , +CPU_NOT_IDLE , +CPU_NEWLY_IDLE , +CPU_MAX_IDLE_TYPES +}; +#endif /* _LINUX_SCHED_IDLE_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 4/53 sched/headers: Move idle polling methods to <linux/sched/idle.h>
In reply to Ingo MolnarFurther reduce the size of <linux/sched.h> by moving these APIs:
tsk_is_polling() __current_set_polling() current_set_polling_and_test() __current_clr_polling() current_clr_polling_and_test() current_clr_polling()
--- include/linux/sched.h | 76 ------------------------------------------------------------------ include/linux/sched/idle.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 76 deletions(-)
include/linux/sched.h +0 -76
@@ -3134,82 +3134,6 @@ static inline int spin_needbreak(spinlock_t *lock)#endif } -/* -* Idle thread specific functions to determine the need_resched -* polling state. -*/ -#ifdef TIF_POLLING_NRFLAG -static inline int tsk_is_polling (struct task_struct *p) -{ -return test_tsk_thread_flag (p,TIF_POLLING_NRFLAG ); -} - -static inline void __current_set_polling (void ) -{ -set_thread_flag (TIF_POLLING_NRFLAG ); -} - -static inline bool __must_check current_set_polling_and_test (void ) -{ -__current_set_polling (); - -/* -* Polling state must be visible before we test NEED_RESCHED, -* paired by resched_curr() -*/ -smp_mb__after_atomic (); - -return unlikely (tif_need_resched ()); -} - -static inline void __current_clr_polling (void ) -{ -clear_thread_flag (TIF_POLLING_NRFLAG ); -} - -static inline bool __must_check current_clr_polling_and_test (void ) -{ -__current_clr_polling (); - -/* -* Polling state must be visible before we test NEED_RESCHED, -* paired by resched_curr() -*/ -smp_mb__after_atomic (); - -return unlikely (tif_need_resched ()); -} - -#else -static inline int tsk_is_polling (struct task_struct *p) {return 0 ; } -static inline void __current_set_polling (void ) { } -static inline void __current_clr_polling (void ) { } - -static inline bool __must_check current_set_polling_and_test (void ) -{ -return unlikely (tif_need_resched ()); -} -static inline bool __must_check current_clr_polling_and_test (void ) -{ -return unlikely (tif_need_resched ()); -} -#endif - -static inline void current_clr_polling (void ) -{ -__current_clr_polling (); - -/* -* Ensure we check TIF_NEED_RESCHED after we clear the polling bit. -* Once the bit is cleared, we'll get IPIs with every new -* TIF_NEED_RESCHED and the IPI handler, scheduler_ipi(), will also -* fold. -*/ -smp_mb ();/* paired with resched_curr() */ - -preempt_fold_need_resched (); -} - static __always_inline bool need_resched(void) {return unlikely (tif_need_resched ());
include/linux/sched/idle.h +76 -0
80 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 7/53 sched/headers, delayacct: Move the 'struct task_delay_info' definition from <linux/sched.h> to <linux/delayacct.h>
In reply to Ingo MolnarThe 'struct task_delay_info' definition does not have to be in sched.h, because task_struct only has a pointer to it.
So move it to <linux/delayacct.h> to reduce the size of <linux/sched.h>.
--- include/linux/delayacct.h | 36 ++++++++++++++++++++++++++++++++++++ include/linux/sched.h | 39 ++++----------------------------------- 2 files changed, 40 insertions(+), 35 deletions(-)
include/linux/delayacct.h +36 -0
@@ -30,7 +30,43 @@#define DELAYACCT_PF_BLKIO 0x00000002/* I am waiting on IO */ #ifdef CONFIG_TASK_DELAY_ACCT +struct task_delay_info { +spinlock_t lock; +unsigned int flags;/* Private per-task flags */ + +/* For each stat XXX, add following, aligned appropriately +* +* struct timespec XXX_start, XXX_end; +* u64 XXX_delay; +* u32 XXX_count; +* +* Atomicity of updates to XXX_delay, XXX_count protected by +* single lock above (split into XXX_lock if contention is an issue). +*/ + +/* +* XXX_count is incremented on every XXX operation, the delay +* associated with the operation is added to XXX_delay. +* XXX_delay contains the accumulated delay time in nanoseconds. +*/ +u64 blkio_start;/* Shared by blkio, swapin */ +u64 blkio_delay;/* wait for sync block io completion */ +u64 swapin_delay;/* wait for swapin block io completion */ +u32 blkio_count;/* total count of the number of sync block */ +/* io operations performed */ +u32 swapin_count;/* total count of the number of swapin block */ +/* io operations performed */ + +u64 freepages_start; +u64 freepages_delay;/* wait for memory reclaim */ +u32 freepages_count;/* total count of memory reclaim */ +}; +#endif +#include <linux/sched.h> +#include <linux/slab.h> + +#ifdef CONFIG_TASK_DELAY_ACCT extern int delayacct_on;/* Delay accounting turned on/off */ extern struct kmem_cache *delayacct_cache;extern void delayacct_init (void );
include/linux/sched.h +4 -35
@@ -897,39 +897,7 @@ struct sched_info { };#endif /* CONFIG_SCHED_INFO */ -#ifdef CONFIG_TASK_DELAY_ACCT -struct task_delay_info { -spinlock_t lock; -unsigned int flags;/* Private per-task flags */ - -/* For each stat XXX, add following, aligned appropriately -* -* struct timespec XXX_start, XXX_end; -* u64 XXX_delay; -* u32 XXX_count; -* -* Atomicity of updates to XXX_delay, XXX_count protected by -* single lock above (split into XXX_lock if contention is an issue). -*/ - -/* -* XXX_count is incremented on every XXX operation, the delay -* associated with the operation is added to XXX_delay. -* XXX_delay contains the accumulated delay time in nanoseconds. -*/ -u64 blkio_start;/* Shared by blkio, swapin */ -u64 blkio_delay;/* wait for sync block io completion */ -u64 swapin_delay;/* wait for swapin block io completion */ -u32 blkio_count;/* total count of the number of sync block */ -/* io operations performed */ -u32 swapin_count;/* total count of the number of swapin block */ -/* io operations performed */ - -u64 freepages_start; -u64 freepages_delay;/* wait for memory reclaim */ -u32 freepages_count;/* total count of memory reclaim */ -}; -#endif /* CONFIG_TASK_DELAY_ACCT */ +struct task_delay_info ;static inline int sched_info_on (void ) {
@@ -1612,9 +1580,10 @@ struct task_struct {struct page_frag task_frag; -#ifdef CONFIG_TASK_DELAY_ACCT -struct task_delay_info *delays; +#ifdef CONFIG_TASK_DELAY_ACCT +struct task_delay_info *delays;#endif +#ifdef CONFIG_FAULT_INJECTION int make_it_fail;#endif
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 5/53 sched/headers: Move the wake-queue types and interfaces from sched.h into <linux/sched/wake_q.h>
In reply to Ingo Molnar--- include/linux/sched.h | 50 -------------------------------------------------- include/linux/sched/wake_q.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+), 50 deletions(-)
include/linux/sched.h +0 -50
@@ -957,56 +957,6 @@ void force_schedstat_enabled(void);# define SCHED_FIXEDPOINT_SHIFT 10# define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT) -/* -* Wake-queues are lists of tasks with a pending wakeup, whose -* callers have already marked the task as woken internally, -* and can thus carry on. A common use case is being able to -* do the wakeups once the corresponding user lock as been -* released. -* -* We hold reference to each task in the list across the wakeup, -* thus guaranteeing that the memory is still valid by the time -* the actual wakeups are performed in wake_up_q(). -* -* One per task suffices, because there's never a need for a task to be -* in two wake queues simultaneously; it is forbidden to abandon a task -* in a wake queue (a call to wake_up_q() _must_ follow), so if a task is -* already in a wake queue, the wakeup will happen soon and the second -* waker can just skip it. -* -* The DEFINE_WAKE_Q macro declares and initializes the list head. -* wake_up_q() does NOT reinitialize the list; it's expected to be -* called near the end of a function. Otherwise, the list can be -* re-initialized for later re-use by wake_q_init(). -* -* Note that this can cause spurious wakeups. schedule() callers -* must ensure the call is done inside a loop, confirming that the -* wakeup condition has in fact occurred. -*/ -struct wake_q_node { -struct wake_q_node *next; -}; - -struct wake_q_head { -struct wake_q_node *first; -struct wake_q_node **lastp; -}; - -#define WAKE_Q_TAIL ((struct wake_q_node *) 0x01) - -#define DEFINE_WAKE_Q (name) \ - struct wake_q_head name = { WAKE_Q_TAIL, &name.first } - -static inline void wake_q_init (struct wake_q_head *head) -{ - head->first =WAKE_Q_TAIL ; - head->lastp = &head->first; -} - -extern void wake_q_add (struct wake_q_head *head, -struct task_struct *task); -extern void wake_up_q (struct wake_q_head *head); -struct io_context ;/* See blkdev.h */
include/linux/sched/wake_q.h +50 -0
54 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 9/53 sched/headers: Move loadavg related definitions from <linux/sched.h> to <linux/sched/loadavg.h>
In reply to Ingo MolnarMove these bits to <linux/sched/loadavg.h>, to reduce the size and complexity of <linux/sched.h>.
--- include/linux/sched.h | 27 --------------------------- include/linux/sched/loadavg.h | 27 +++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 27 deletions(-)
include/linux/sched.h +0 -27
@@ -71,31 +71,6 @@ struct blk_plug;struct filename ;struct nameidata ; -/* -* These are the constant used to fake the fixed-point load-average -* counting. Some notes: -* - 11 bit fractions expand to 22 bits by the multiplies: this gives -* a load-average precision of 10 bits integer + 11 bits fractional -* - if you want to count load-averages more often, you need more -* precision, or rounding will get you. With 2-second counting freq, -* the EXP_n values would be 1981, 2034 and 2043 if still using only -* 11 bit fractions. -*/ -extern unsigned long avenrun[];/* Load averages */ -extern void get_avenrun (unsigned long *loads,unsigned long offset,int shift); - -#define FSHIFT 11/* nr of bits of precision */ -#define FIXED_1 (1<<FSHIFT)/* 1.0 as fixed-point */ -#define LOAD_FREQ (5*HZ+1)/* 5 sec intervals */ -#define EXP_1 1884/* 1/exp(5sec/1min) as fixed-point */ -#define EXP_5 2014/* 1/exp(5sec/5min) */ -#define EXP_15 2037/* 1/exp(5sec/15min) */ - -#define CALC_LOAD (load,exp,n) \ - load *= exp; \ - load += n*(FIXED_1-exp); \ - load >>= FSHIFT; -extern unsigned long total_forks;extern int nr_threads; DECLARE_PER_CPU(unsigned long, process_counts);
@@ -106,8 +81,6 @@ extern unsigned long nr_iowait(void);extern unsigned long nr_iowait_cpu (int cpu);extern void get_iowait_load (unsigned long *nr_waiters,unsigned long *load); -extern void calc_global_load (unsigned long ticks); -#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON )extern void cpu_load_update_nohz_start (void );extern void cpu_load_update_nohz_stop (void );
include/linux/sched/loadavg.h +27 -0
@@ -3,4 +3,31 @@#include <linux/sched.h> +/* +* These are the constant used to fake the fixed-point load-average +* counting. Some notes: +* - 11 bit fractions expand to 22 bits by the multiplies: this gives +* a load-average precision of 10 bits integer + 11 bits fractional +* - if you want to count load-averages more often, you need more +* precision, or rounding will get you. With 2-second counting freq, +* the EXP_n values would be 1981, 2034 and 2043 if still using only +* 11 bit fractions. +*/ +extern unsigned long avenrun[];/* Load averages */ +extern void get_avenrun (unsigned long *loads,unsigned long offset,int shift); + +#define FSHIFT 11/* nr of bits of precision */ +#define FIXED_1 (1<<FSHIFT)/* 1.0 as fixed-point */ +#define LOAD_FREQ (5*HZ+1)/* 5 sec intervals */ +#define EXP_1 1884/* 1/exp(5sec/1min) as fixed-point */ +#define EXP_5 2014/* 1/exp(5sec/5min) */ +#define EXP_15 2037/* 1/exp(5sec/15min) */ + +#define CALC_LOAD (load,exp,n) \ + load *= exp; \ + load += n*(FIXED_1-exp); \ + load >>= FSHIFT; + +extern void calc_global_load (unsigned long ticks); +#endif /* _LINUX_SCHED_LOADAVG_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 6/53 sched/headers: Move scheduler clock interfaces to <linux/sched/clock.h>
In reply to Ingo MolnarMove the sched_clock interfaces into a separate header file, to reduce the size of sched.h.
Include <linux/sched/clock.h> in all files that made use of one of the
--- include/linux/sched.h | 100 ---------------------------------------------------------------- include/linux/sched/clock.h | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+), 100 deletions(-)
include/linux/sched.h +0 -100
@@ -2190,103 +2190,6 @@ static inline void calc_load_exit_idle(void) { }#define cpu_relax_yield () cpu_relax()#endif -/* -* Do not use outside of architecture code which knows its limitations. -* -* sched_clock() has no promise of monotonicity or bounded drift between -* CPUs, use (which you should not) requires disabling IRQs. -* -* Please use one of the three interfaces below. -*/ -extern unsigned long long notrace sched_clock (void ); -/* -* See the comment in kernel/sched/clock.c -*/ -extern u64 running_clock (void ); -extern u64 sched_clock_cpu (int cpu); - - -extern void sched_clock_init (void ); - -#ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK -static inline void sched_clock_init_late (void ) -{ -} - -static inline void sched_clock_tick (void ) -{ -} - -static inline void clear_sched_clock_stable (void ) -{ -} - -static inline void sched_clock_idle_sleep_event (void ) -{ -} - -static inline void sched_clock_idle_wakeup_event (u64 delta_ns) -{ -} - -static inline u64 cpu_clock (int cpu) -{ -return sched_clock (); -} - -static inline u64 local_clock (void ) -{ -return sched_clock (); -} -#else -extern void sched_clock_init_late (void ); -/* -* Architectures can set this to 1 if they have specified -* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK in their arch Kconfig, -* but then during bootup it turns out that sched_clock() -* is reliable after all: -*/ -extern int sched_clock_stable (void ); -extern void clear_sched_clock_stable (void ); - -extern void sched_clock_tick (void ); -extern void sched_clock_idle_sleep_event (void ); -extern void sched_clock_idle_wakeup_event (u64 delta_ns); - -/* -* As outlined in clock.c, provides a fast, high resolution, nanosecond -* time source that is monotonic per cpu argument and has bounded drift -* between cpus. -* -* ######################### BIG FAT WARNING ########################## -* # when comparing cpu_clock(i) to cpu_clock(j) for i != j, time can # -* # go backwards !! # -* #################################################################### -*/ -static inline u64 cpu_clock (int cpu) -{ -return sched_clock_cpu (cpu); -} - -static inline u64 local_clock (void ) -{ -return sched_clock_cpu (raw_smp_processor_id ()); -} -#endif - -#ifdef CONFIG_IRQ_TIME_ACCOUNTING -/* -* An i/f to runtime opt-in for irq time accounting based off of sched_clock. -* The reason for this explicit opt-in is not to have perf penalty with -* slow sched_clocks. -*/ -extern void enable_sched_clock_irqtime (void ); -extern void disable_sched_clock_irqtime (void ); -#else -static inline void enable_sched_clock_irqtime (void ) {} -static inline void disable_sched_clock_irqtime (void ) {} -#endif -extern unsigned long long task_sched_runtime (struct task_struct *task);
@@ -2297,9 +2200,6 @@ extern void sched_exec(void);#define sched_exec () {}#endif -extern void sched_clock_idle_sleep_event (void ); -extern void sched_clock_idle_wakeup_event (u64 delta_ns); -#ifdef CONFIG_HOTPLUG_CPU extern void idle_task_exit (void );#else
include/linux/sched/clock.h +98 -0
102 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 10/53 sched/headers: Move autogroup APIs into <linux/sched/autogroup.h>
In reply to Ingo MolnarFurther reduce the size of sched.h.
--- include/linux/sched.h | 18 ------------------ include/linux/sched/autogroup.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 18 deletions(-)
include/linux/sched.h +0 -18
@@ -2092,24 +2092,6 @@ static inline void wake_up_nohz_cpu(int cpu) { }extern u64 scheduler_tick_max_deferment (void );#endif -#ifdef CONFIG_SCHED_AUTOGROUP -extern void sched_autogroup_create_attach (struct task_struct *p); -extern void sched_autogroup_detach (struct task_struct *p); -extern void sched_autogroup_fork (struct signal_struct *sig); -extern void sched_autogroup_exit (struct signal_struct *sig); -extern void sched_autogroup_exit_task (struct task_struct *p); -#ifdef CONFIG_PROC_FS -extern void proc_sched_autogroup_show_task (struct task_struct *p,struct seq_file *m); -extern int proc_sched_autogroup_set_nice (struct task_struct *p,int nice); -#endif -#else -static inline void sched_autogroup_create_attach (struct task_struct *p) { } -static inline void sched_autogroup_detach (struct task_struct *p) { } -static inline void sched_autogroup_fork (struct signal_struct *sig) { } -static inline void sched_autogroup_exit (struct signal_struct *sig) { } -static inline void sched_autogroup_exit_task (struct task_struct *p) { } -#endif -extern int yield_to (struct task_struct *p,bool preempt);extern void set_user_nice (struct task_struct *p,long nice);extern int task_prio (const struct task_struct *p);
include/linux/sched/autogroup.h +21 -0
@@ -3,4 +3,25 @@#include <linux/sched.h> +struct signal_struct ; +struct seq_file ; + +#ifdef CONFIG_SCHED_AUTOGROUP +extern void sched_autogroup_create_attach (struct task_struct *p); +extern void sched_autogroup_detach (struct task_struct *p); +extern void sched_autogroup_fork (struct signal_struct *sig); +extern void sched_autogroup_exit (struct signal_struct *sig); +extern void sched_autogroup_exit_task (struct task_struct *p); +#ifdef CONFIG_PROC_FS +extern void proc_sched_autogroup_show_task (struct task_struct *p,struct seq_file *m); +extern int proc_sched_autogroup_set_nice (struct task_struct *p,int nice); +#endif +#else +static inline void sched_autogroup_create_attach (struct task_struct *p) { } +static inline void sched_autogroup_detach (struct task_struct *p) { } +static inline void sched_autogroup_fork (struct signal_struct *sig) { } +static inline void sched_autogroup_exit (struct signal_struct *sig) { } +static inline void sched_autogroup_exit_task (struct task_struct *p) { } +#endif +#endif /* _LINUX_SCHED_AUTOGROUP_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 12/53 sched/headers: Move task->mm coredumping related defines and methods from <linux/sched.h> to <linux/sched/coredump.h>
In reply to Ingo MolnarThis further reduces the size and complexity of <linux/sched.h>.
These are the definitions and APIs that are moved:
# MMF_*:
fs/binfmt_elf.c
fs/binfmt_elf_fdpic.c
fs/exec.c
fs/proc/base.c
include/linux/khugepaged.h
include/linux/ksm.h
include/linux/sched/coredump.h
kernel/events/uprobes.c
kernel/fork.c
mm/huge_memory.c
mm/khugepaged.c
mm/ksm.c
mm/memory.c
mm/oom_kill.c
# SUID_DUMP_*:
arch/ia64/include/asm/processor.h
fs/coredump.c
fs/exec.c
fs/proc/internal.h
include/linux/sched/coredump.h
kernel/ptrace.c
kernel/sys.c
kernel/sysctl.c
# get_dumpable():
arch/ia64/include/asm/processor.h
fs/coredump.c
fs/exec.c
fs/proc/internal.h
include/linux/sched/coredump.h
kernel/ptrace.c
kernel/sys.c
# set_dumpable():
fs/exec.c
include/linux/sched/coredump.h
kernel/cred.c
kernel/sys.c
--- include/linux/sched.h | 68 ------------------------------------------------------------- include/linux/sched/coredump.h | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 68 deletions(-)
include/linux/sched.h +0 -68
@@ -361,74 +361,6 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,static inline void arch_pick_mmap_layout (struct mm_struct *mm) {}#endif -#define SUID_DUMP_DISABLE 0/* No setuid dumping */ -#define SUID_DUMP_USER 1/* Dump as user of process */ -#define SUID_DUMP_ROOT 2/* Dump as root */ - -/* mm flags */ - -/* for SUID_DUMP_* above */ -#define MMF_DUMPABLE_BITS 2 -#define MMF_DUMPABLE_MASK ((1 << MMF_DUMPABLE_BITS) - 1) - -extern void set_dumpable (struct mm_struct *mm,int value); -/* -* This returns the actual value of the suid_dumpable flag. For things -* that are using this for checking for privilege transitions, it must -* test against SUID_DUMP_USER rather than treating it as a boolean -* value. -*/ -static inline int __get_dumpable (unsigned long mm_flags) -{ -return mm_flags &MMF_DUMPABLE_MASK ; -} - -static inline int get_dumpable (struct mm_struct *mm) -{ -return __get_dumpable (mm->flags); -} - -/* coredump filter bits */ -#define MMF_DUMP_ANON_PRIVATE 2 -#define MMF_DUMP_ANON_SHARED 3 -#define MMF_DUMP_MAPPED_PRIVATE 4 -#define MMF_DUMP_MAPPED_SHARED 5 -#define MMF_DUMP_ELF_HEADERS 6 -#define MMF_DUMP_HUGETLB_PRIVATE 7 -#define MMF_DUMP_HUGETLB_SHARED 8 -#define MMF_DUMP_DAX_PRIVATE 9 -#define MMF_DUMP_DAX_SHARED 10 - -#define MMF_DUMP_FILTER_SHIFT MMF_DUMPABLE_BITS -#define MMF_DUMP_FILTER_BITS 9 -#define MMF_DUMP_FILTER_MASK \ - (((1 << MMF_DUMP_FILTER_BITS) - 1) << MMF_DUMP_FILTER_SHIFT) -#define MMF_DUMP_FILTER_DEFAULT \ - ((1 << MMF_DUMP_ANON_PRIVATE) | (1 << MMF_DUMP_ANON_SHARED) |\ - (1 << MMF_DUMP_HUGETLB_PRIVATE) | MMF_DUMP_MASK_DEFAULT_ELF) - -#ifdef CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS -# define MMF_DUMP_MASK_DEFAULT_ELF (1 << MMF_DUMP_ELF_HEADERS) -#else -# define MMF_DUMP_MASK_DEFAULT_ELF 0 -#endif -/* leave room for more dump flags */ -#define MMF_VM_MERGEABLE 16/* KSM may merge identical pages */ -#define MMF_VM_HUGEPAGE 17/* set when VM_HUGEPAGE is set on vma */ -/* -* This one-shot flag is dropped due to necessity of changing exe once again -* on NFS restore -*/ -//#define MMF_EXE_FILE_CHANGED 18 /* see prctl_set_mm_exe_file() */ - -#define MMF_HAS_UPROBES 19/* has uprobes */ -#define MMF_RECALC_UPROBES 20/* MMF_HAS_UPROBES can be wrong */ -#define MMF_OOM_SKIP 21/* mm is of no interest for the OOM killer */ -#define MMF_UNSTABLE 22/* mm is unstable for copy_from_user */ -#define MMF_HUGE_ZERO_PAGE 23/* mm has ever used the global huge zero page */ - -#define MMF_INIT_MASK (MMF_DUMPABLE_MASK | MMF_DUMP_FILTER_MASK) -struct sighand_struct {atomic_t count;struct k_sigaction action[_NSIG];
include/linux/sched/coredump.h +69 -0
74 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 14/53 sched/headers: Move 'struct user_struct' definition and APIs to the new <linux/sched/user.h> header
In reply to Ingo Molnar'struct user_struct' was added to sched.h historically, but it's actually entirely independent of task_struct and of scheduler details, so move it to its own header.
Fix up .c files using those facilities.
--- include/linux/sched.h | 57 --------------------------------------------------------- include/linux/sched/user.h | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 57 deletions(-)
include/linux/sched.h +0 -57
@@ -349,7 +349,6 @@ extern void io_schedule(void);void __noreturn do_task_dead (void );struct nsproxy ; -struct user_namespace ;#ifdef CONFIG_MMU extern void arch_pick_mmap_layout (struct mm_struct *mm);
@@ -481,53 +480,6 @@ struct thread_group_cputimer {#include <linux/rwsem.h> struct autogroup ; -/* -* Some day this will be a full-fledged user tracking system.. -*/ -struct user_struct { -atomic_t __count;/* reference count */ -atomic_t processes;/* How many processes does this user have? */ -atomic_t sigpending;/* How many pending signals does this user have? */ -#ifdef CONFIG_INOTIFY_USER -atomic_t inotify_watches;/* How many inotify watches does this user have? */ -atomic_t inotify_devs;/* How many inotify devs does this user have opened? */ -#endif -#ifdef CONFIG_FANOTIFY -atomic_t fanotify_listeners; -#endif -#ifdef CONFIG_EPOLL -atomic_long_t epoll_watches;/* The number of file descriptors currently watched */ -#endif -#ifdef CONFIG_POSIX_MQUEUE -/* protected by mq_lock */ -unsigned long mq_bytes;/* How many bytes can be allocated to mqueue? */ -#endif -unsigned long locked_shm;/* How many pages of mlocked shm ? */ -unsigned long unix_inflight;/* How many files in flight in unix sockets */ -atomic_long_t pipe_bufs;/* how many pages are allocated in pipe buffers */ - -#ifdef CONFIG_KEYS -struct key *uid_keyring;/* UID specific keyring */ -struct key *session_keyring;/* UID's default session keyring */ -#endif - -/* Hash table maintenance information */ -struct hlist_node uidhash_node; -kuid_t uid; - -#if defined(CONFIG_PERF_EVENTS ) || defined(CONFIG_BPF_SYSCALL ) -atomic_long_t locked_vm; -#endif -}; - -extern int uids_sysfs_init (void ); - -extern struct user_struct *find_user (kuid_t ); - -extern struct user_struct root_user; -#define INIT_USER (&root_user) - -struct backing_dev_info ;struct reclaim_state ;
@@ -1908,15 +1860,6 @@ extern struct task_struct *find_task_by_vpid(pid_t nr);extern struct task_struct *find_task_by_pid_ns (pid_t nr,struct pid_namespace *ns); -/* per-UID process charging. */ -extern struct user_struct *alloc_uid (kuid_t ); -static inline struct user_struct *get_uid (struct user_struct *u) -{ -atomic_inc (&u->__count); -return u; -} -extern void free_uid (struct user_struct *); -#include <asm/current.h> extern void xtime_update (unsigned long ticks);
include/linux/sched/user.h +58 -0
62 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 16/53 sched/headers: Move 'struct pacct_struct' and 'struct cpu_itimer' form <linux/sched.h> to <linux/sched/signal.h>
In reply to Ingo MolnarThese structures are actually part of 'struct signal', so move them to <linux/sched/signal.h> where they belong.
This further decreases the size and complexity of <linux/sched.h>.
--- include/linux/sched.h | 13 ------------- include/linux/sched/signal.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 13 deletions(-)
include/linux/sched.h +0 -13
@@ -326,19 +326,6 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,static inline void arch_pick_mmap_layout (struct mm_struct *mm) {}#endif -struct pacct_struct { -int ac_flag; -long ac_exitcode; -unsigned long ac_mem; -u64 ac_utime, ac_stime; -unsigned long ac_minflt, ac_majflt; -}; - -struct cpu_itimer { -u64 expires; -u64 incr; -}; -/** * struct prev_cputime - snaphsot of system and user cputime * @utime: time spent in user mode
include/linux/sched/signal.h +16 -0
@@ -20,6 +20,22 @@ struct sighand_struct { };/* +* Per-process accounting stats: +*/ +struct pacct_struct { +int ac_flag; +long ac_exitcode; +unsigned long ac_mem; +u64 ac_utime, ac_stime; +unsigned long ac_minflt, ac_majflt; +}; + +struct cpu_itimer { +u64 expires; +u64 incr; +}; + +/* * NOTE! "signal_struct" does not have its own * locking, because a shared signal_struct always * implies a shared sighand_struct, so locking
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 20/53 sched/headers: Move in_vfork() from <linux/sched.h> to <linux/sched/mm.h>
In reply to Ingo MolnarThe in_vfork() function deals with task->mm, so it better belongs into <linux/sched/mm.h>.
--- include/linux/sched.h | 26 -------------------------- include/linux/sched/mm.h | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 26 deletions(-)
include/linux/sched.h +0 -26
@@ -1238,32 +1238,6 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t)#define TNF_FAULT_LOCAL 0x08#define TNF_MIGRATE_FAIL 0x10 -static inline bool in_vfork (struct task_struct *tsk) -{ -bool ret; - -/* -* need RCU to access ->real_parent if CLONE_VM was used along with -* CLONE_PARENT. -* -* We check real_parent->mm == tsk->mm because CLONE_VFORK does not -* imply CLONE_VM -* -* CLONE_VFORK can be used with CLONE_PARENT/CLONE_THREAD and thus -* ->real_parent is not necessarily the task doing vfork(), so in -* theory we can't rely on task_lock() if we want to dereference it. -* -* And in this case we can't trust the real_parent->mm == tsk->mm -* check, it can be false negative. But we do not care, if init or -* another oom-unkillable task does this it should blame itself. -*/ -rcu_read_lock (); - ret = tsk->vfork_done && tsk->real_parent->mm == tsk->mm; -rcu_read_unlock (); - -return ret; -} -#ifdef CONFIG_NUMA_BALANCING extern void task_numa_fault (int last_node,int node,int pages,int flags);extern pid_t task_numa_group_id (struct task_struct *p);
include/linux/sched/mm.h +26 -0
@@ -78,4 +78,30 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,static inline void arch_pick_mmap_layout (struct mm_struct *mm) {}#endif +static inline bool in_vfork (struct task_struct *tsk) +{ +bool ret; + +/* +* need RCU to access ->real_parent if CLONE_VM was used along with +* CLONE_PARENT. +* +* We check real_parent->mm == tsk->mm because CLONE_VFORK does not +* imply CLONE_VM +* +* CLONE_VFORK can be used with CLONE_PARENT/CLONE_THREAD and thus +* ->real_parent is not necessarily the task doing vfork(), so in +* theory we can't rely on task_lock() if we want to dereference it. +* +* And in this case we can't trust the real_parent->mm == tsk->mm +* check, it can be false negative. But we do not care, if init or +* another oom-unkillable task does this it should blame itself. +*/ +rcu_read_lock (); + ret = tsk->vfork_done && tsk->real_parent->mm == tsk->mm; +rcu_read_unlock (); + +return ret; +} +#endif /* _LINUX_SCHED_MM_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 22/53 sched/headers: Move the JOBCTL_ defines and methods from <linux/sched.h> to <linux/sched/jobctl.h>
In reply to Ingo MolnarOnly a small fraction of sched.h users actually utilizes these defines, and they are not scheduler functionality in any case, so move them into their separate header.
(Also make <linux/sched/jobctl.h> a self-contained header.)
--- include/linux/sched.h | 30 ------------------------------ include/linux/sched/jobctl.h | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 30 deletions(-)
include/linux/sched.h +0 -30
@@ -1545,36 +1545,6 @@ TASK_PFA_CLEAR(SPREAD_SLAB, spread_slab) TASK_PFA_TEST(LMK_WAITING, lmk_waiting) TASK_PFA_SET(LMK_WAITING, lmk_waiting) -/* -* task->jobctl flags - */ -#define JOBCTL_STOP_SIGMASK 0xffff/* signr of the last group stop */ - -#define JOBCTL_STOP_DEQUEUED_BIT 16/* stop signal dequeued */ -#define JOBCTL_STOP_PENDING_BIT 17/* task should stop for group stop */ -#define JOBCTL_STOP_CONSUME_BIT 18/* consume group stop count */ -#define JOBCTL_TRAP_STOP_BIT 19/* trap for STOP */ -#define JOBCTL_TRAP_NOTIFY_BIT 20/* trap for NOTIFY */ -#define JOBCTL_TRAPPING_BIT 21/* switching to TRACED */ -#define JOBCTL_LISTENING_BIT 22/* ptracer is listening for events */ - -#define JOBCTL_STOP_DEQUEUED (1UL << JOBCTL_STOP_DEQUEUED_BIT) -#define JOBCTL_STOP_PENDING (1UL << JOBCTL_STOP_PENDING_BIT) -#define JOBCTL_STOP_CONSUME (1UL << JOBCTL_STOP_CONSUME_BIT) -#define JOBCTL_TRAP_STOP (1UL << JOBCTL_TRAP_STOP_BIT) -#define JOBCTL_TRAP_NOTIFY (1UL << JOBCTL_TRAP_NOTIFY_BIT) -#define JOBCTL_TRAPPING (1UL << JOBCTL_TRAPPING_BIT) -#define JOBCTL_LISTENING (1UL << JOBCTL_LISTENING_BIT) - -#define JOBCTL_TRAP_MASK (JOBCTL_TRAP_STOP | JOBCTL_TRAP_NOTIFY) -#define JOBCTL_PENDING_MASK (JOBCTL_STOP_PENDING | JOBCTL_TRAP_MASK) - -extern bool task_set_jobctl_pending (struct task_struct *task, -unsigned long mask); -extern void task_clear_jobctl_trapping (struct task_struct *task); -extern void task_clear_jobctl_pending (struct task_struct *task, -unsigned long mask); -static inline void rcu_copy_process (struct task_struct *p) {#ifdef CONFIG_PREEMPT_RCU
include/linux/sched/jobctl.h +32 -0
@@ -1,4 +1,36 @@#ifndef _LINUX_SCHED_JOBCTL_H#define _LINUX_SCHED_JOBCTL_H +#include <linux/types.h> + +struct task_struct ; + +/* +* task->jobctl flags +*/ +#define JOBCTL_STOP_SIGMASK 0xffff/* signr of the last group stop */ + +#define JOBCTL_STOP_DEQUEUED_BIT 16/* stop signal dequeued */ +#define JOBCTL_STOP_PENDING_BIT 17/* task should stop for group stop */ +#define JOBCTL_STOP_CONSUME_BIT 18/* consume group stop count */ +#define JOBCTL_TRAP_STOP_BIT 19/* trap for STOP */ +#define JOBCTL_TRAP_NOTIFY_BIT 20/* trap for NOTIFY */ +#define JOBCTL_TRAPPING_BIT 21/* switching to TRACED */ +#define JOBCTL_LISTENING_BIT 22/* ptracer is listening for events */ + +#define JOBCTL_STOP_DEQUEUED (1UL << JOBCTL_STOP_DEQUEUED_BIT) +#define JOBCTL_STOP_PENDING (1UL << JOBCTL_STOP_PENDING_BIT) +#define JOBCTL_STOP_CONSUME (1UL << JOBCTL_STOP_CONSUME_BIT) +#define JOBCTL_TRAP_STOP (1UL << JOBCTL_TRAP_STOP_BIT) +#define JOBCTL_TRAP_NOTIFY (1UL << JOBCTL_TRAP_NOTIFY_BIT) +#define JOBCTL_TRAPPING (1UL << JOBCTL_TRAPPING_BIT) +#define JOBCTL_LISTENING (1UL << JOBCTL_LISTENING_BIT) + +#define JOBCTL_TRAP_MASK (JOBCTL_TRAP_STOP | JOBCTL_TRAP_NOTIFY) +#define JOBCTL_PENDING_MASK (JOBCTL_STOP_PENDING | JOBCTL_TRAP_MASK) + +extern bool task_set_jobctl_pending (struct task_struct *task,unsigned long mask); +extern void task_clear_jobctl_trapping (struct task_struct *task); +extern void task_clear_jobctl_pending (struct task_struct *task,unsigned long mask); +#endif /* _LINUX_SCHED_JOBCTL_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 24/53 sched/headers: Move CONFIG_TASK_XACCT bits from <linux/sched.h> to <linux/sched/xacct.h>
In reply to Ingo MolnarThe CONFIG_TASK_XACCT=y accounting inline functions are only used by fs/read_write.c, so move them into their separate header.
--- include/linux/sched.h | 38 -------------------------------------- include/linux/sched/xacct.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 38 deletions(-)
include/linux/sched.h +0 -38
@@ -2100,44 +2100,6 @@ extern struct task_group root_task_group;extern int task_can_switch_user (struct user_struct *up,struct task_struct *tsk); -#ifdef CONFIG_TASK_XACCT -static inline void add_rchar (struct task_struct *tsk,ssize_t amt) -{ - tsk->ioac.rchar += amt; -} - -static inline void add_wchar (struct task_struct *tsk,ssize_t amt) -{ - tsk->ioac.wchar += amt; -} - -static inline void inc_syscr (struct task_struct *tsk) -{ - tsk->ioac.syscr++; -} - -static inline void inc_syscw (struct task_struct *tsk) -{ - tsk->ioac.syscw++; -} -#else -static inline void add_rchar (struct task_struct *tsk,ssize_t amt) -{ -} - -static inline void add_wchar (struct task_struct *tsk,ssize_t amt) -{ -} - -static inline void inc_syscr (struct task_struct *tsk) -{ -} - -static inline void inc_syscw (struct task_struct *tsk) -{ -} -#endif -#ifndef TASK_SIZE_OF #define TASK_SIZE_OF (tsk) TASK_SIZE#endif
include/linux/sched/xacct.h +42 -0
48 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 26/53 sched/headers: Move the memalloc_noio_*() APIs to <linux/sched/mm.h>
In reply to Ingo MolnarIn preparation to remove the <linux/gfp.h> include from <linux/sched.h>.
--- include/linux/sched.h | 22 ---------------------- include/linux/sched/mm.h | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 22 deletions(-)
include/linux/sched.h +0 -22
@@ -1464,28 +1464,6 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *s#define tsk_used_math (p) ((p)->flags & PF_USED_MATH)#define used_math () tsk_used_math(current) -/* __GFP_IO isn't allowed if PF_MEMALLOC_NOIO is set in current->flags -* __GFP_FS is also cleared as it implies __GFP_IO. -*/ -static inline gfp_t memalloc_noio_flags (gfp_t flags) -{ -if (unlikely (current->flags &PF_MEMALLOC_NOIO )) - flags &= ~(__GFP_IO | __GFP_FS); -return flags; -} - -static inline unsigned int memalloc_noio_save (void ) -{ -unsigned int flags = current->flags &PF_MEMALLOC_NOIO ; - current->flags |=PF_MEMALLOC_NOIO ; -return flags; -} - -static inline void memalloc_noio_restore (unsigned int flags) -{ - current->flags = (current->flags & ~PF_MEMALLOC_NOIO ) | flags; -} -/* Per-process atomic flags. */ #define PFA_NO_NEW_PRIVS 0/* May not gain new privileges. */ #define PFA_SPREAD_PAGE 1/* Spread page cache over cpuset */
include/linux/sched/mm.h +22 -0
@@ -104,4 +104,26 @@ static inline bool in_vfork(struct task_struct *tsk) return ret; } +/* __GFP_IO isn't allowed if PF_MEMALLOC_NOIO is set in current->flags +* __GFP_FS is also cleared as it implies __GFP_IO. +*/ +static inline gfp_t memalloc_noio_flags (gfp_t flags) +{ +if (unlikely (current->flags &PF_MEMALLOC_NOIO )) + flags &= ~(__GFP_IO | __GFP_FS); +return flags; +} + +static inline unsigned int memalloc_noio_save (void ) +{ +unsigned int flags = current->flags &PF_MEMALLOC_NOIO ; + current->flags |=PF_MEMALLOC_NOIO ; +return flags; +} + +static inline void memalloc_noio_restore (unsigned int flags) +{ + current->flags = (current->flags & ~PF_MEMALLOC_NOIO ) | flags; +} +#endif /* _LINUX_SCHED_MM_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 28/53 sched/headers: Move the NOHZ APIs from <linux/sched.h> to <linux/sched/nohz.h>
In reply to Ingo MolnarThere's a number of NOHZ/dyntics related functionality in <linux/sched.h>, but only a handful of timer files are making use of them.
Move them into their own header. This better documents these APIs and unclutters <linux/sched.h>.
--- include/linux/sched.h | 35 ----------------------------------- include/linux/sched/nohz.h | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 35 deletions(-)
include/linux/sched.h +0 -35
@@ -46,14 +46,6 @@ struct nameidata;struct signal_struct ;struct sighand_struct ; -#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON ) -extern void cpu_load_update_nohz_start (void ); -extern void cpu_load_update_nohz_stop (void ); -#else -static inline void cpu_load_update_nohz_start (void ) { } -static inline void cpu_load_update_nohz_stop (void ) { } -#endif -extern void dump_cpu_task (int cpu);struct seq_file ;
@@ -204,15 +196,6 @@ extern cpumask_var_t cpu_isolated_map;extern int runqueue_is_locked (int cpu); -#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON ) -extern void nohz_balance_enter_idle (int cpu); -extern void set_cpu_sd_state_idle (void ); -extern int get_nohz_timer_target (void ); -#else -static inline void nohz_balance_enter_idle (int cpu) { } -static inline void set_cpu_sd_state_idle (void ) { } -#endif -/* * Only dump TASK_* tasks. (0 for all tasks) */
@@ -1531,14 +1514,6 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p, }#endif -#ifdef CONFIG_NO_HZ_COMMON -void calc_load_enter_idle (void ); -void calc_load_exit_idle (void ); -#else -static inline void calc_load_enter_idle (void ) { } -static inline void calc_load_exit_idle (void ) { } -#endif /* CONFIG_NO_HZ_COMMON */ -#ifndef cpu_relax_yield#define cpu_relax_yield () cpu_relax()#endif
@@ -1559,16 +1534,6 @@ extern void idle_task_exit(void);static inline void idle_task_exit (void ) {}#endif -#if defined(CONFIG_NO_HZ_COMMON ) && defined(CONFIG_SMP ) -extern void wake_up_nohz_cpu (int cpu); -#else -static inline void wake_up_nohz_cpu (int cpu) { } -#endif - -#ifdef CONFIG_NO_HZ_FULL -extern u64 scheduler_tick_max_deferment (void ); -#endif -extern int yield_to (struct task_struct *p,bool preempt);extern void set_user_nice (struct task_struct *p,long nice);extern int task_prio (const struct task_struct *p);
include/linux/sched/nohz.h +39 -0
@@ -3,4 +3,43 @@#include <linux/sched.h> +/* +* This is the interface between the scheduler and nohz/dyntics: +*/ + +#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON ) +extern void cpu_load_update_nohz_start (void ); +extern void cpu_load_update_nohz_stop (void ); +#else +static inline void cpu_load_update_nohz_start (void ) { } +static inline void cpu_load_update_nohz_stop (void ) { } +#endif + +#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON ) +extern void nohz_balance_enter_idle (int cpu); +extern void set_cpu_sd_state_idle (void ); +extern int get_nohz_timer_target (void ); +#else +static inline void nohz_balance_enter_idle (int cpu) { } +static inline void set_cpu_sd_state_idle (void ) { } +#endif + +#ifdef CONFIG_NO_HZ_COMMON +void calc_load_enter_idle (void ); +void calc_load_exit_idle (void ); +#else +static inline void calc_load_enter_idle (void ) { } +static inline void calc_load_exit_idle (void ) { } +#endif /* CONFIG_NO_HZ_COMMON */ + +#if defined(CONFIG_NO_HZ_COMMON ) && defined(CONFIG_SMP ) +extern void wake_up_nohz_cpu (int cpu); +#else +static inline void wake_up_nohz_cpu (int cpu) { } +#endif + +#ifdef CONFIG_NO_HZ_FULL +extern u64 scheduler_tick_max_deferment (void ); +#endif +#endif /* _LINUX_SCHED_NOHZ_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 30/53 sched/headers, time/timekeeping: Move the xtime_update() prototype from <linux/sched.h> to <linux/time.h>
In reply to Ingo MolnarThis was in <linux/sched.h> only for hysterical raisins.
--- include/linux/sched.h | 2 -- include/linux/time.h | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/sched.h +0 -2
@@ -1575,8 +1575,6 @@ extern struct task_struct *find_task_by_pid_ns(pid_t nr,#include <asm/current.h> -extern void xtime_update (unsigned long ticks); -extern int wake_up_state (struct task_struct *tsk,unsigned int state);extern int wake_up_process (struct task_struct *tsk);extern void wake_up_new_task (struct task_struct *tsk);
include/linux/time.h +2 -0
@@ -167,6 +167,8 @@ static inline bool timespec_inject_offset_valid(const struct timespec *ts)extern u32 (*arch_gettimeoffset)(void );#endif +extern void xtime_update (unsigned long ticks); +struct itimerval ;extern int do_setitimer (int which,struct itimerval *value,struct itimerval *ovalue);
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 32/53 sched/headers: Split hotplug CPU interfaces out of <linux/sched.h> into <linux/sched/hotplug.h>
In reply to Ingo MolnarSplit the CPU hotplug scheduler APIs out of the common header.
--- include/linux/sched.h | 15 --------------- include/linux/sched/hotplug.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 15 deletions(-)
include/linux/sched.h +0 -15
@@ -196,15 +196,6 @@ extern void cpu_init (void);extern void trap_init (void );extern void update_process_times (int user);extern void scheduler_tick (void ); -extern int sched_cpu_starting (unsigned int cpu); -extern int sched_cpu_activate (unsigned int cpu); -extern int sched_cpu_deactivate (unsigned int cpu); - -#ifdef CONFIG_HOTPLUG_CPU -extern int sched_cpu_dying (unsigned int cpu); -#else -# define sched_cpu_dying NULL -#endif #define MAX_SCHEDULE_TIMEOUT LONG_MAXextern signed long schedule_timeout (signed long timeout);
@@ -1494,12 +1485,6 @@ extern void sched_exec(void);#define sched_exec () {}#endif -#ifdef CONFIG_HOTPLUG_CPU -extern void idle_task_exit (void ); -#else -static inline void idle_task_exit (void ) {} -#endif -extern int yield_to (struct task_struct *p,bool preempt);extern void set_user_nice (struct task_struct *p,long nice);extern int task_prio (const struct task_struct *p);
include/linux/sched/hotplug.h +20 -0
@@ -3,4 +3,24 @@#include <linux/sched.h> +/* +* Scheduler interfaces for hotplug CPU support: +*/ + +extern int sched_cpu_starting (unsigned int cpu); +extern int sched_cpu_activate (unsigned int cpu); +extern int sched_cpu_deactivate (unsigned int cpu); + +#ifdef CONFIG_HOTPLUG_CPU +extern int sched_cpu_dying (unsigned int cpu); +#else +# define sched_cpu_dying NULL +#endif + +#ifdef CONFIG_HOTPLUG_CPU +extern void idle_task_exit (void ); +#else +static inline void idle_task_exit (void ) {} +#endif +#endif /* _LINUX_SCHED_HOTPLUG_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 34/53 sched/headers, RCU: Move rcu_copy_process() from <linux/sched/task.h> to kernel/fork.c
In reply to Ingo MolnarMove rcu_copy_process() into kernel/fork.c, which is the only user of this inline function.
This simplifies <linux/sched/task.h> to the level that <linux/sched.h> does not have to be included in it anymore - which change is done in a subsequent patch.
--- include/linux/sched/task.h | 15 --------------- kernel/fork.c | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 15 deletions(-)
include/linux/sched/task.h +0 -15
@@ -25,21 +25,6 @@ extern asmlinkage void schedule_tail(struct task_struct *prev);extern void init_idle (struct task_struct *idle,int cpu);extern void init_idle_bootup_task (struct task_struct *idle); -static inline void rcu_copy_process (struct task_struct *p) -{ -#ifdef CONFIG_PREEMPT_RCU - p->rcu_read_lock_nesting =0 ; - p->rcu_read_unlock_special.s =0 ; - p->rcu_blocked_node =NULL ; -INIT_LIST_HEAD (&p->rcu_node_entry); -#endif /* #ifdef CONFIG_PREEMPT_RCU */ -#ifdef CONFIG_TASKS_RCU - p->rcu_tasks_holdout = false; -INIT_LIST_HEAD (&p->rcu_tasks_holdout_list); - p->rcu_tasks_idle_cpu =-1 ; -#endif /* #ifdef CONFIG_TASKS_RCU */ -} -extern int sched_fork (unsigned long clone_flags,struct task_struct *p);extern void sched_dead (struct task_struct *p);
kernel/fork.c +15 -0
@@ -1464,6 +1464,21 @@ init_task_pid(struct task_struct *task, enum pid_type type, struct pid *pid) task->pids[type].pid = pid; } +static inline void rcu_copy_process (struct task_struct *p) +{ +#ifdef CONFIG_PREEMPT_RCU + p->rcu_read_lock_nesting =0 ; + p->rcu_read_unlock_special.s =0 ; + p->rcu_blocked_node =NULL ; +INIT_LIST_HEAD (&p->rcu_node_entry); +#endif /* #ifdef CONFIG_PREEMPT_RCU */ +#ifdef CONFIG_TASKS_RCU + p->rcu_tasks_holdout = false; +INIT_LIST_HEAD (&p->rcu_tasks_holdout_list); + p->rcu_tasks_idle_cpu =-1 ; +#endif /* #ifdef CONFIG_TASKS_RCU */ +} +/* * This creates a new process as a copy of the old one, * but does not actually start it yet.
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 38/53 sched/headers: Move the 'root_task_group' declaration to <linux/sched/autogroup.h>
In reply to Ingo MolnarAlso remove the duplicate declaration from <linux/init_task.h>.
( That declaration was originally duplicated for dependency hell reasons,
but there's no problem including the much smaller <linux/sched/autogroup.h> header now, to pick up the right prototype. )
--- include/linux/init_task.h | 2 -- include/linux/sched.h | 4 ---- include/linux/sched/autogroup.h | 5 +++++ 3 files changed, 5 insertions(+), 6 deletions(-)
include/linux/init_task.h +0 -2
@@ -151,8 +151,6 @@ extern struct group_info init_groups;extern struct cred init_cred; -extern struct task_group root_task_group; -#ifdef CONFIG_CGROUP_SCHED # define INIT_CGROUP_SCHED (tsk) \ .sched_task_group = &root_task_group,
include/linux/sched.h +0 -4
@@ -1703,10 +1703,6 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)extern long sched_setaffinity (pid_t pid,const struct cpumask *new_mask);extern long sched_getaffinity (pid_t pid,struct cpumask *mask); -#ifdef CONFIG_CGROUP_SCHED -extern struct task_group root_task_group; -#endif /* CONFIG_CGROUP_SCHED */ -extern int task_can_switch_user (struct user_struct *up,struct task_struct *tsk);
include/linux/sched/autogroup.h +5 -0
@@ -4,6 +4,7 @@#include <linux/sched.h> struct signal_struct ; +struct task_group ;struct seq_file ;#ifdef CONFIG_SCHED_AUTOGROUP
@@ -24,4 +25,8 @@ static inline void sched_autogroup_exit(struct signal_struct *sig) { }static inline void sched_autogroup_exit_task (struct task_struct *p) { }#endif +#ifdef CONFIG_CGROUP_SCHED +extern struct task_group root_task_group; +#endif /* CONFIG_CGROUP_SCHED */ +#endif /* _LINUX_SCHED_AUTOGROUP_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 39/53 signals: Move signal data types from <linux/signal.h> to <linux/signal_types.h>
In reply to Ingo MolnarSeparate out just the pure data types - sched.h will be able to use this reduced size header.
--- include/linux/signal.h | 54 ------------------------------------------------------ include/linux/signal_types.h | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 54 deletions(-)
include/linux/signal.h +0 -54
@@ -8,24 +8,6 @@ struct task_struct;/* for sysctl */ extern int print_fatal_signals; -/* -* Real Time signals may be queued. -*/ - -struct sigqueue { -struct list_head list; -int flags; -siginfo_t info; -struct user_struct *user; -}; - -/* flags values. */ -#define SIGQUEUE_PREALLOC 1 - -struct sigpending { -struct list_head list; -sigset_t signal; -};#ifndef HAVE_ARCH_COPY_SIGINFO
@@ -271,42 +253,6 @@ extern void set_current_blocked(sigset_t *);extern void __set_current_blocked (const sigset_t *);extern int show_unhandled_signals; -struct sigaction { -#ifndef __ARCH_HAS_IRIX_SIGACTION -__sighandler_t sa_handler; -unsigned long sa_flags; -#else -unsigned int sa_flags; -__sighandler_t sa_handler; -#endif -#ifdef __ARCH_HAS_SA_RESTORER -__sigrestore_t sa_restorer; -#endif -sigset_t sa_mask;/* mask last for extensibility */ -}; - -struct k_sigaction { -struct sigaction sa; -#ifdef __ARCH_HAS_KA_RESTORER -__sigrestore_t ka_restorer; -#endif -}; - -#ifdef CONFIG_OLD_SIGACTION -struct old_sigaction { -__sighandler_t sa_handler; -old_sigset_t sa_mask; -unsigned long sa_flags; -__sigrestore_t sa_restorer; -}; -#endif - -struct ksignal { -struct k_sigaction ka; -siginfo_t info; -int sig; -}; -extern int get_signal (struct ksignal *ksig);extern void signal_setup_done (int failed,struct ksignal *ksig,int stepping);extern void exit_signals (struct task_struct *tsk);
include/linux/signal_types.h +59 -0
66 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 36/53 sched/headers: Move the PREEMPT_COUNT defines from <linux/sched.h> to <linux/preempt.h>
In reply to Ingo MolnarThese defines are not really part of the scheduler's driver API, but are related to the preempt count - so move them to <linux/preempt.h>.
--- include/linux/preempt.h | 21 +++++++++++++++++++++ include/linux/sched.h | 21 --------------------- 2 files changed, 21 insertions(+), 21 deletions(-)
include/linux/preempt.h +21 -0
@@ -55,6 +55,27 @@/* We use the MSB mostly because its available */ #define PREEMPT_NEED_RESCHED 0x80000000 +#define PREEMPT_DISABLED (PREEMPT_DISABLE_OFFSET + PREEMPT_ENABLED) + +/* +* Disable preemption until the scheduler is running -- use an unconditional +* value so that it also works on !PREEMPT_COUNT kernels. +* +* Reset by start_kernel()->sched_init()->init_idle()->init_idle_preempt_count(). +*/ +#define INIT_PREEMPT_COUNT PREEMPT_OFFSET + +/* +* Initial preempt_count value; reflects the preempt_count schedule invariant +* which states that during context switches: +* +* preempt_count() == 2*PREEMPT_DISABLE_OFFSET +* +* Note: PREEMPT_DISABLE_OFFSET is 0 for !PREEMPT_COUNT kernels. +* Note: See finish_task_switch(). +*/ +#define FORK_PREEMPT_COUNT (2*PREEMPT_DISABLE_OFFSET + PREEMPT_ENABLED) +/* preempt_count() and related functions, depends on PREEMPT_NEED_RESCHED */ #include <asm/preempt.h>
include/linux/sched.h +0 -21
@@ -265,27 +265,6 @@ struct task_cputime_atomic { .sum_exec_runtime = ATOMIC64_INIT(0), \ } -#define PREEMPT_DISABLED (PREEMPT_DISABLE_OFFSET + PREEMPT_ENABLED) - -/* -* Disable preemption until the scheduler is running -- use an unconditional -* value so that it also works on !PREEMPT_COUNT kernels. -* -* Reset by start_kernel()->sched_init()->init_idle()->init_idle_preempt_count(). -*/ -#define INIT_PREEMPT_COUNT PREEMPT_OFFSET - -/* -* Initial preempt_count value; reflects the preempt_count schedule invariant -* which states that during context switches: -* -* preempt_count() == 2*PREEMPT_DISABLE_OFFSET -* -* Note: PREEMPT_DISABLE_OFFSET is 0 for !PREEMPT_COUNT kernels. -* Note: See finish_task_switch(). -*/ -#define FORK_PREEMPT_COUNT (2*PREEMPT_DISABLE_OFFSET + PREEMPT_ENABLED) -/** * struct thread_group_cputimer - thread group interval timer counts * @cputime_atomic: atomic thread group interval timers.
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 35/53 sched/core: Move, sort and clean up <linux/sched.h> structure predeclarations
In reply to Ingo MolnarMost of the structure predeclarations were at the head of sched.h, but not all of them - there were a number of lines spread around sched.h, in random places.
Move them to the head, and also sort them alphabetically.
Remove unused entries.
--- include/linux/sched.h | 56 +++++++++++++++++++++++--------------------------------- 1 file changed, 23 insertions(+), 33 deletions(-)
include/linux/sched.h +23 -33
@@ -33,24 +33,35 @@#include <asm/current.h> -struct sched_attr ; -struct sched_param ; - -struct futex_pi_state ; -struct robust_list_head ; +/* task_struct member predeclarations: */ +struct audit_context ; +struct autogroup ; +struct backing_dev_info ;struct bio_list ; -struct fs_struct ; -struct perf_event_context ;struct blk_plug ; +struct cfs_rq ;struct filename ; +struct fs_struct ; +struct futex_pi_state ; +struct io_context ; +struct mempolicy ;struct nameidata ; - -struct signal_struct ; -struct sighand_struct ; - +struct nsproxy ; +struct perf_event_context ; +struct pid_namespace ; +struct pipe_inode_info ; +struct rcu_node ; +struct reclaim_state ; +struct robust_list_head ; +struct sched_attr ; +struct sched_param ;struct seq_file ; -struct cfs_rq ; +struct sighand_struct ; +struct signal_struct ; +struct task_delay_info ;struct task_group ; +struct task_struct ; +struct uts_namespace ;/* * Task state bitmask. NOTE! These bits are also
@@ -165,8 +176,6 @@ struct task_group;/* Task command name length */ #define TASK_COMM_LEN 16 -struct task_struct ; -extern void sched_init (void );extern void sched_init_smp (void );
@@ -193,8 +202,6 @@ extern void io_schedule_finish(int token);extern long io_schedule_timeout (long timeout);extern void io_schedule (void ); -struct nsproxy ; -/** * struct prev_cputime - snaphsot of system and user cputime * @utime: time spent in user mode
@@ -297,10 +304,6 @@ struct thread_group_cputimer { };#include <linux/rwsem.h> -struct autogroup ; - -struct backing_dev_info ; -struct reclaim_state ;#ifdef CONFIG_SCHED_INFO struct sched_info {
@@ -314,8 +317,6 @@ struct sched_info { };#endif /* CONFIG_SCHED_INFO */ -struct task_delay_info ; -static inline int sched_info_on (void ) {#ifdef CONFIG_SCHEDSTATS
@@ -342,20 +343,12 @@ void force_schedstat_enabled(void);# define SCHED_FIXEDPOINT_SHIFT 10# define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT) -struct io_context ;/* See blkdev.h */ - -#ifdef ARCH_HAS_PREFETCH_SWITCH_STACK extern void prefetch_stack (struct task_struct *t);#else static inline void prefetch_stack (struct task_struct *t) { }#endif -struct audit_context ;/* See audit.c */ -struct mempolicy ; -struct pipe_inode_info ; -struct uts_namespace ; -struct load_weight {unsigned long weight;u32 inv_weight;
@@ -564,7 +557,6 @@ union rcu_special { } b;/* Bits. */ u32 s;/* Set of bits. */ }; -struct rcu_node ;enum perf_event_task_context { perf_invalid_context =-1 ,
@@ -1121,8 +1113,6 @@ static inline struct pid *task_session(struct task_struct *task)return task->group_leader->pids[PIDTYPE_SID ].pid; } -struct pid_namespace ; -/* * the helpers to get the task's different pids as they are seen * from various namespaces
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 33/53 sched/headers: Move task lifetime APIs from <linux/sched.h> to <linux/sched/task.h>
In reply to Ingo MolnarThere's a fair amount of task lifetime management (a.k.a fork()/exit()) related APIs in <linux/sched.h>, but only a small fraction of the users of the generic sched.h header make use of them.
Move these functions to the <linux/sched/task.h> header.
--- include/linux/sched.h | 91 ------------------------------------------------------------- include/linux/sched/task.h | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 91 deletions(-)
include/linux/sched.h +0 -91
@@ -165,28 +165,10 @@ struct task_group;/* Task command name length */ #define TASK_COMM_LEN 16 -#include <linux/spinlock.h> - -/* -* This serializes "schedule()" and also protects -* the run-queue from deletions/modifications (but -* _adding_ to the beginning of the run-queue has -* a separate lock). -*/ -extern rwlock_t tasklist_lock; -extern spinlock_t mmlist_lock; -struct task_struct ; -#ifdef CONFIG_PROVE_RCU -extern int lockdep_tasklist_lock_is_held (void ); -#endif /* #ifdef CONFIG_PROVE_RCU */ -extern void sched_init (void );extern void sched_init_smp (void ); -extern asmlinkage void schedule_tail(struct task_struct *prev); -extern void init_idle (struct task_struct *idle,int cpu); -extern void init_idle_bootup_task (struct task_struct *idle);extern cpumask_var_t cpu_isolated_map;
@@ -211,8 +193,6 @@ extern void io_schedule_finish(int token);extern long io_schedule_timeout (long timeout);extern void io_schedule (void ); -void __noreturn do_task_dead (void ); -struct nsproxy ;/**
@@ -1116,24 +1096,6 @@ struct task_struct {*/ }; -#ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT -extern int arch_task_struct_size__read_mostly ; -#else -# define arch_task_struct_size (sizeof(struct task_struct)) -#endif - -#ifdef CONFIG_VMAP_STACK -static inline struct vm_struct *task_stack_vm_area (const struct task_struct *t) -{ -return t->stack_vm_area; -} -#else -static inline struct vm_struct *task_stack_vm_area (const struct task_struct *t) -{ -return NULL ; -} -#endif -static inline struct pid *task_pid (struct task_struct *task) {return task->pids[PIDTYPE_PID ].pid;
@@ -1425,21 +1387,6 @@ TASK_PFA_CLEAR(SPREAD_SLAB, spread_slab) TASK_PFA_TEST(LMK_WAITING, lmk_waiting) TASK_PFA_SET(LMK_WAITING, lmk_waiting) -static inline void rcu_copy_process (struct task_struct *p) -{ -#ifdef CONFIG_PREEMPT_RCU - p->rcu_read_lock_nesting =0 ; - p->rcu_read_unlock_special.s =0 ; - p->rcu_blocked_node =NULL ; -INIT_LIST_HEAD (&p->rcu_node_entry); -#endif /* #ifdef CONFIG_PREEMPT_RCU */ -#ifdef CONFIG_TASKS_RCU - p->rcu_tasks_holdout = false; -INIT_LIST_HEAD (&p->rcu_tasks_holdout_list); - p->rcu_tasks_idle_cpu =-1 ; -#endif /* #ifdef CONFIG_TASKS_RCU */ -} -static inline void tsk_restore_flags (struct task_struct *task,unsigned long orig_flags,unsigned long flags) {
@@ -1568,45 +1515,11 @@ extern void wake_up_new_task(struct task_struct *tsk);#else static inline void kick_process (struct task_struct *tsk) { }#endif -extern int sched_fork (unsigned long clone_flags,struct task_struct *p); -extern void sched_dead (struct task_struct *p); - -extern void proc_caches_init (void ); - -extern void release_task (struct task_struct * p); - -#ifdef CONFIG_HAVE_COPY_THREAD_TLS -extern int copy_thread_tls (unsigned long ,unsigned long ,unsigned long , -struct task_struct *,unsigned long ); -#else -extern int copy_thread (unsigned long ,unsigned long ,unsigned long , -struct task_struct *); - -/* Architectures that haven't opted into copy_thread_tls get the tls argument -* via pt_regs, so ignore the tls argument passed via C. */ -static inline int copy_thread_tls ( -unsigned long clone_flags,unsigned long sp,unsigned long arg, -struct task_struct *p,unsigned long tls) -{ -return copy_thread (clone_flags, sp, arg, p); -} -#endif -extern void flush_thread (void ); - -#ifdef CONFIG_HAVE_EXIT_THREAD -extern void exit_thread (struct task_struct *tsk); -#else -static inline void exit_thread (struct task_struct *tsk) -{ -} -#endif extern void exit_files (struct task_struct *);extern void exit_itimers (struct signal_struct *); -extern void do_group_exit (int ); -extern int do_execve (struct filename *,const char __user *const __user *,const char __user *const __user *);
@@ -1614,10 +1527,6 @@ extern int do_execveat(int, struct filename *, const char __user * const __user *, const char __user * const __user *, int); -extern long _do_fork (unsigned long ,unsigned long ,unsigned long ,int __user *,int __user *,unsigned long ); -extern long do_fork (unsigned long ,unsigned long ,unsigned long ,int __user *,int __user *); -struct task_struct *fork_idle (int ); -extern pid_t kernel_thread (int (*fn)(void *),void *arg,unsigned long flags);extern void __set_task_comm (struct task_struct *tsk,const char *from,bool exec);static inline void set_task_comm (struct task_struct *tsk,const char *from)
include/linux/sched/task.h +97 -0
103 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 31/53 sched/headers: Move <asm/current.h> include from the middle of <linux/sched.h> to the header portion
In reply to Ingo MolnarLinux-0.01 already defined 'current' in the middle of sched.h, so this is an ancient historical precedent - but still in a modern kernel it looks a bit weird that we have:
#include <asm/current.h>
in the middle of the header.
Move it further up. If this was done for some obscure dependency reasons then we'll trigger and document it.
--- include/linux/sched.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/sched.h +2 -2
@@ -31,6 +31,8 @@#include <linux/magic.h> #include <linux/cgroup-defs.h> +#include <asm/current.h> +struct sched_attr ;struct sched_param ;
@@ -1573,8 +1575,6 @@ extern struct task_struct *find_task_by_vpid(pid_t nr);extern struct task_struct *find_task_by_pid_ns (pid_t nr,struct pid_namespace *ns); -#include <asm/current.h> -extern int wake_up_state (struct task_struct *tsk,unsigned int state);extern int wake_up_process (struct task_struct *tsk);extern void wake_up_new_task (struct task_struct *tsk);
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 29/53 sched/headers: Move debugging functions from <linux/sched.h> to <linux/sched/debug.h>
In reply to Ingo MolnarCollect the various scheduler and task state debugging APIs scattered around <linux/sched.h> into the new <linux/sched/debug.h> header.
In particular the show_regs() and show_stack() prototype affects many files, update them.
--- include/linux/sched.h | 36 ------------------------------------ include/linux/sched/debug.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 36 deletions(-)
include/linux/sched.h +0 -36
@@ -46,15 +46,9 @@ struct nameidata;struct signal_struct ;struct sighand_struct ; -extern void dump_cpu_task (int cpu); -struct seq_file ;struct cfs_rq ;struct task_group ; -#ifdef CONFIG_SCHED_DEBUG -extern void proc_sched_show_task (struct task_struct *p,struct seq_file *m); -extern void proc_sched_set_task (struct task_struct *p); -#endif /* * Task state bitmask. NOTE! These bits are also
@@ -196,25 +190,6 @@ extern cpumask_var_t cpu_isolated_map;extern int runqueue_is_locked (int cpu); -/* -* Only dump TASK_* tasks. (0 for all tasks) -*/ -extern void show_state_filter (unsigned long state_filter); - -static inline void show_state (void ) -{ -show_state_filter (0 ); -} - -extern void show_regs (struct pt_regs *); - -/* -* TASK is a pointer to the task whose backtrace we want to see (or NULL for current -* task), SP is the stack pointer of the first frame that should be shown in the back -* trace (or NULL if the entire call-chain of the task should be shown). -*/ -extern void show_stack (struct task_struct *task,unsigned long *sp); -extern void cpu_init (void );extern void trap_init (void );extern void update_process_times (int user);
@@ -229,17 +204,6 @@ extern int sched_cpu_dying(unsigned int cpu);# define sched_cpu_dying NULL#endif -extern void sched_show_task (struct task_struct *p); - -/* Attach to any functions which should be ignored in wchan output. */ -#define __sched __attribute__((__section__(".sched.text"))) - -/* Linker adds these: start and end of __sched functions */ -extern char __sched_text_start[], __sched_text_end[]; - -/* Is this address in the __sched functions? */ -extern int in_sched_functions (unsigned long addr); -#define MAX_SCHEDULE_TIMEOUT LONG_MAXextern signed long schedule_timeout (signed long timeout);extern signed long schedule_timeout_interruptible (signed long timeout);
include/linux/sched/debug.h +46 -0
50 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 27/53 sched/headers: Move task statistics APIs from <linux/sched.h> to <linux/sched/stat.h>
In reply to Ingo MolnarThere are a number of task statistics related variables and methods exported via sched.h - collect them into <linux/sched/stat.h> and include it from their usage sites.
--- include/linux/sched.h | 10 ---------- include/linux/sched/stat.h | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 10 deletions(-)
include/linux/sched.h +0 -10
@@ -46,16 +46,6 @@ struct nameidata;struct signal_struct ;struct sighand_struct ; -extern unsigned long total_forks; -extern int nr_threads; -DECLARE_PER_CPU(unsigned long, process_counts); -extern int nr_processes (void ); -extern unsigned long nr_running (void ); -extern bool single_task_running (void ); -extern unsigned long nr_iowait (void ); -extern unsigned long nr_iowait_cpu (int cpu); -extern void get_iowait_load (unsigned long *nr_waiters,unsigned long *load); -#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON )extern void cpu_load_update_nohz_start (void );extern void cpu_load_update_nohz_stop (void );
include/linux/sched/stat.h +18 -0
@@ -3,4 +3,22 @@#include <linux/sched.h> +/* +* Various counters maintained by the scheduler and fork(), +* exposed via /proc, sys.c or used by drivers via these APIs. +* +* ( Note that all these values are aquired without locking, +* so they can only be relied on in narrow circumstances. ) +*/ + +extern unsigned long total_forks; +extern int nr_threads; +DECLARE_PER_CPU(unsigned long, process_counts); +extern int nr_processes (void ); +extern unsigned long nr_running (void ); +extern bool single_task_running (void ); +extern unsigned long nr_iowait (void ); +extern unsigned long nr_iowait_cpu (int cpu); +extern void get_iowait_load (unsigned long *nr_waiters,unsigned long *load); +#endif /* _LINUX_SCHED_STAT_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 25/53 sched/headers: Move signal wakeup & sigpending methods from <linux/sched.h> into <linux/sched/signal.h>
In reply to Ingo MolnarThis reduces the size of <linux/sched.h>.
--- include/linux/sched.h | 51 --------------------------------------------------- include/linux/sched/signal.h | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 52 insertions(+), 52 deletions(-)
include/linux/sched.h +0 -51
@@ -1927,37 +1927,6 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)return unlikely (test_tsk_thread_flag (tsk,TIF_NEED_RESCHED )); } -static inline int restart_syscall (void ) -{ -set_tsk_thread_flag (current,TIF_SIGPENDING ); -return -ERESTARTNOINTR ; -} - -static inline int signal_pending (struct task_struct *p) -{ -return unlikely (test_tsk_thread_flag (p,TIF_SIGPENDING )); -} - -static inline int __fatal_signal_pending (struct task_struct *p) -{ -return unlikely (sigismember (&p->pending.signal,SIGKILL )); -} - -static inline int fatal_signal_pending (struct task_struct *p) -{ -return signal_pending (p) &&__fatal_signal_pending (p); -} - -static inline int signal_pending_state (long state,struct task_struct *p) -{ -if (!(state & (TASK_INTERRUPTIBLE |TASK_WAKEKILL ))) -return 0 ; -if (!signal_pending (p)) -return 0 ; - -return (state &TASK_INTERRUPTIBLE ) ||__fatal_signal_pending (p); -} -/* * cond_resched() and cond_resched_lock(): latency reduction via * explicit rescheduling in places that are safe. The return
@@ -2025,26 +1994,6 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times);void thread_group_cputimer (struct task_struct *tsk,struct task_cputime *times);/* -* Reevaluate whether the task has signals pending delivery. -* Wake the task if so. -* This is required every time the blocked sigset_t changes. -* callers must hold sighand->siglock. -*/ -extern void recalc_sigpending_and_wake (struct task_struct *t); -extern void recalc_sigpending (void ); - -extern void signal_wake_up_state (struct task_struct *t,unsigned int state); - -static inline void signal_wake_up (struct task_struct *t,bool resume) -{ -signal_wake_up_state (t, resume ?TASK_WAKEKILL :0 ); -} -static inline void ptrace_signal_wake_up (struct task_struct *t,bool resume) -{ -signal_wake_up_state (t, resume ? __TASK_TRACED :0 ); -} - -/* * Wrappers for p->thread_info->cpu access. No-op on UP. */ #ifdef CONFIG_SMP
include/linux/sched/signal.h +52 -1
68 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 21/53 sched/headers: Move the NUMA balancing interfaces from <linux/sched.h> to <linux/sched/numa_balancing.h>
In reply to Ingo MolnarSplit out the interface between the scheduler and the MM which deals with page fault driven NUMA balancing, into the new <linux/sched/numa_balancing.h> header.
--- include/linux/sched.h | 35 ----------------------------------- include/linux/sched/numa_balancing.h | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 35 deletions(-)
include/linux/sched.h +0 -35
@@ -1232,41 +1232,6 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t) }#endif -#define TNF_MIGRATED 0x01 -#define TNF_NO_GROUP 0x02 -#define TNF_SHARED 0x04 -#define TNF_FAULT_LOCAL 0x08 -#define TNF_MIGRATE_FAIL 0x10 - -#ifdef CONFIG_NUMA_BALANCING -extern void task_numa_fault (int last_node,int node,int pages,int flags); -extern pid_t task_numa_group_id (struct task_struct *p); -extern void set_numabalancing_state (bool enabled); -extern void task_numa_free (struct task_struct *p); -extern bool should_numa_migrate_memory (struct task_struct *p,struct page *page, -int src_nid,int dst_cpu); -#else -static inline void task_numa_fault (int last_node,int node,int pages, -int flags) -{ -} -static inline pid_t task_numa_group_id (struct task_struct *p) -{ -return 0 ; -} -static inline void set_numabalancing_state (bool enabled) -{ -} -static inline void task_numa_free (struct task_struct *p) -{ -} -static inline bool should_numa_migrate_memory (struct task_struct *p, -struct page *page,int src_nid,int dst_cpu) -{ -return true; -} -#endif -static inline struct pid *task_pid (struct task_struct *task) {return task->pids[PIDTYPE_PID ].pid;
include/linux/sched/numa_balancing.h +40 -0
@@ -1,6 +1,46 @@#ifndef _LINUX_SCHED_NUMA_BALANCING_H#define _LINUX_SCHED_NUMA_BALANCING_H +/* +* This is the interface between the scheduler and the MM that +* implements memory access pattern based NUMA-balancing: +*/ +#include <linux/sched.h> +#define TNF_MIGRATED 0x01 +#define TNF_NO_GROUP 0x02 +#define TNF_SHARED 0x04 +#define TNF_FAULT_LOCAL 0x08 +#define TNF_MIGRATE_FAIL 0x10 + +#ifdef CONFIG_NUMA_BALANCING +extern void task_numa_fault (int last_node,int node,int pages,int flags); +extern pid_t task_numa_group_id (struct task_struct *p); +extern void set_numabalancing_state (bool enabled); +extern void task_numa_free (struct task_struct *p); +extern bool should_numa_migrate_memory (struct task_struct *p,struct page *page, +int src_nid,int dst_cpu); +#else +static inline void task_numa_fault (int last_node,int node,int pages, +int flags) +{ +} +static inline pid_t task_numa_group_id (struct task_struct *p) +{ +return 0 ; +} +static inline void set_numabalancing_state (bool enabled) +{ +} +static inline void task_numa_free (struct task_struct *p) +{ +} +static inline bool should_numa_migrate_memory (struct task_struct *p, +struct page *page,int src_nid,int dst_cpu) +{ +return true; +} +#endif +#endif /* _LINUX_SCHED_NUMA_BALANCING_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 23/53 sched/headers: Remove various unrelated headers from <linux/sched.h>
In reply to Ingo MolnarRemove the following header inclusions from <linux/sched.h>:
#include <asm/param.h> #include <linux/threads.h> #include <linux/kernel.h> #include <linux/types.h> #include <linux/timex.h> #include <linux/jiffies.h> #include <linux/rbtree.h> #include <linux/thread_info.h> #include <linux/cpumask.h> #include <linux/errno.h> #include <linux/nodemask.h> #include <linux/preempt.h> #include <asm/page.h> #include <linux/smp.h> #include <linux/compiler.h> #include <linux/completion.h> #include <linux/percpu.h> #include <linux/topology.h> #include <linux/rcupdate.h> #include <linux/time.h> #include <linux/timer.h> #include <linux/llist.h> #include <linux/uidgid.h> #include <asm/processor.h>
because they are either not required, or are already included naturally as part of the remaining headers.
--- include/linux/sched.h | 28 ---------------------------- 1 file changed, 28 deletions(-)
include/linux/sched.h +0 -28
@@ -5,60 +5,32 @@#include <linux/sched/prio.h> -#include <asm/param.h> /* for HZ */ -#include <linux/capability.h> -#include <linux/threads.h> -#include <linux/kernel.h> -#include <linux/types.h> -#include <linux/timex.h> -#include <linux/jiffies.h> #include <linux/mutex.h> #include <linux/plist.h> -#include <linux/rbtree.h> -#include <linux/thread_info.h> -#include <linux/cpumask.h> -#include <linux/errno.h> -#include <linux/nodemask.h> #include <linux/mm_types.h> -#include <linux/preempt.h> - -#include <asm/page.h> #include <asm/ptrace.h> -#include <linux/smp.h> #include <linux/sem.h> #include <linux/shm.h> #include <linux/signal.h> -#include <linux/compiler.h> -#include <linux/completion.h> #include <linux/signal_types.h> #include <linux/pid.h> -#include <linux/percpu.h> -#include <linux/topology.h> #include <linux/seccomp.h> -#include <linux/rcupdate.h> #include <linux/rculist.h> #include <linux/rtmutex.h> -#include <linux/time.h> -#include <linux/param.h> #include <linux/resource.h> -#include <linux/timer.h> #include <linux/hrtimer.h> #include <linux/kcov.h> #include <linux/task_io_accounting.h> #include <linux/latencytop.h> #include <linux/cred.h> -#include <linux/llist.h> -#include <linux/uidgid.h> #include <linux/gfp.h> #include <linux/topology.h> #include <linux/magic.h> #include <linux/cgroup-defs.h> -#include <asm/processor.h> -struct sched_attr ;struct sched_param ;
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 19/53 sched/headers: Move the 'init_mm' declaration from <linux/sched.h> to <linux/mm_types.h>
In reply to Ingo Molnar--- include/linux/mm_types.h | 2 ++ include/linux/sched.h | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-)
include/linux/mm_types.h +2 -0
@@ -527,6 +527,8 @@ struct mm_struct {struct work_struct async_put_work; }; +extern struct mm_struct init_mm; +static inline void mm_init_cpumask (struct mm_struct *mm) {#ifdef CONFIG_CPUMASK_OFFSTACK
include/linux/sched.h +0 -2
@@ -1778,8 +1778,6 @@ static inline int kstack_end(void *addr)extern union thread_union init_thread_union;extern struct task_struct init_task; -extern struct mm_struct init_mm; -extern struct pid_namespace init_pid_ns;/*
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 17/53 sched/headers: Move the cpufreq interfaces to <linux/sched/cpufreq.h>
In reply to Ingo MolnarNo need to have this in the generic <linux/sched.h> header.
--- include/linux/sched.h | 17 ----------------- include/linux/sched/cpufreq.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 17 deletions(-)
include/linux/sched.h +0 -17
@@ -2284,21 +2284,4 @@ static inline void mm_update_next_owner(struct mm_struct *mm) }#endif /* CONFIG_MEMCG */ -#define SCHED_CPUFREQ_RT (1U << 0) -#define SCHED_CPUFREQ_DL (1U << 1) -#define SCHED_CPUFREQ_IOWAIT (1U << 2) - -#define SCHED_CPUFREQ_RT_DL (SCHED_CPUFREQ_RT | SCHED_CPUFREQ_DL) - -#ifdef CONFIG_CPU_FREQ -struct update_util_data { -void (*func)(struct update_util_data *data,u64 time,unsigned int flags); -}; - -void cpufreq_add_update_util_hook (int cpu,struct update_util_data *data, -void (*func)(struct update_util_data *data,u64 time, -unsigned int flags)); -void cpufreq_remove_update_util_hook (int cpu); -#endif /* CONFIG_CPU_FREQ */ -#endif
include/linux/sched/cpufreq.h +21 -0
@@ -3,4 +3,25 @@#include <linux/sched.h> +/* +* Interface between cpufreq drivers and the scheduler: +*/ + +#define SCHED_CPUFREQ_RT (1U << 0) +#define SCHED_CPUFREQ_DL (1U << 1) +#define SCHED_CPUFREQ_IOWAIT (1U << 2) + +#define SCHED_CPUFREQ_RT_DL (SCHED_CPUFREQ_RT | SCHED_CPUFREQ_DL) + +#ifdef CONFIG_CPU_FREQ +struct update_util_data { +void (*func)(struct update_util_data *data,u64 time,unsigned int flags); +}; + +void cpufreq_add_update_util_hook (int cpu,struct update_util_data *data, +void (*func)(struct update_util_data *data,u64 time, +unsigned int flags)); +void cpufreq_remove_update_util_hook (int cpu); +#endif /* CONFIG_CPU_FREQ */ +#endif /* _LINUX_SCHED_CPUFREQ_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 18/53 sched/headers: Move more mm_struct related functionality from <linux/sched.h> to <linux/sched/mm.h>
In reply to Ingo MolnarNeither the mmap_layout nor the mm_update_next_owner() methods need to be in <linux/sched.h> - move them to the more appropriate <linux/sched/mm.h> header.
--- include/linux/sched.h | 21 --------------------- include/linux/sched/mm.h | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-)
include/linux/sched.h +0 -21
@@ -313,19 +313,6 @@ void __noreturn do_task_dead(void);struct nsproxy ; -#ifdef CONFIG_MMU -extern void arch_pick_mmap_layout (struct mm_struct *mm); -extern unsigned long -arch_get_unmapped_area (struct file *,unsigned long ,unsigned long , -unsigned long ,unsigned long ); -extern unsigned long -arch_get_unmapped_area_topdown (struct file *filp,unsigned long addr, -unsigned long len,unsigned long pgoff, -unsigned long flags); -#else -static inline void arch_pick_mmap_layout (struct mm_struct *mm) {} -#endif -/** * struct prev_cputime - snaphsot of system and user cputime * @utime: time spent in user mode
@@ -2276,12 +2263,4 @@ static inline void inc_syscw(struct task_struct *tsk)#define TASK_SIZE_OF (tsk) TASK_SIZE#endif -#ifdef CONFIG_MEMCG -extern void mm_update_next_owner (struct mm_struct *mm); -#else -static inline void mm_update_next_owner (struct mm_struct *mm) -{ -} -#endif /* CONFIG_MEMCG */ -#endif
include/linux/sched/mm.h +21 -0
@@ -57,4 +57,25 @@ extern struct mm_struct *mm_access(struct task_struct *task, unsigned int mode);/* Remove the current tasks stale references to the old mm_struct */ extern void mm_release (struct task_struct *,struct mm_struct *); +#ifdef CONFIG_MEMCG +extern void mm_update_next_owner (struct mm_struct *mm); +#else +static inline void mm_update_next_owner (struct mm_struct *mm) +{ +} +#endif /* CONFIG_MEMCG */ + +#ifdef CONFIG_MMU +extern void arch_pick_mmap_layout (struct mm_struct *mm); +extern unsigned long +arch_get_unmapped_area (struct file *,unsigned long ,unsigned long , +unsigned long ,unsigned long ); +extern unsigned long +arch_get_unmapped_area_topdown (struct file *filp,unsigned long addr, +unsigned long len,unsigned long pgoff, +unsigned long flags); +#else +static inline void arch_pick_mmap_layout (struct mm_struct *mm) {} +#endif +#endif /* _LINUX_SCHED_MM_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 15/53 sched/headers: Move softlockup detector watchdog methods to <linux/nmi.h>
In reply to Ingo MolnarThese methods don't belong into <linux/sched.h>, they are neither directly related to task_struct or are scheduler functionality.
Put them next to the other watchdog methods in <linux/nmi.h>.
( Arguably that header's name is a misnomer, and this patch makes it
more so - but it should be renamed in another patch. )
--- include/linux/nmi.h | 37 +++++++++++++++++++++++++++++++++++++ include/linux/sched.h | 37 ------------------------------------- 2 files changed, 37 insertions(+), 37 deletions(-)
include/linux/nmi.h +37 -0
@@ -7,6 +7,43 @@#include <linux/sched.h> #include <asm/irq.h> +#ifdef CONFIG_LOCKUP_DETECTOR +extern void touch_softlockup_watchdog_sched (void ); +extern void touch_softlockup_watchdog (void ); +extern void touch_softlockup_watchdog_sync (void ); +extern void touch_all_softlockup_watchdogs (void ); +extern int proc_dowatchdog_thresh (struct ctl_table *table,int write, +void __user *buffer, +size_t *lenp,loff_t *ppos); +extern unsigned int softlockup_panic; +extern unsigned int hardlockup_panic; +void lockup_detector_init (void ); +#else +static inline void touch_softlockup_watchdog_sched (void ) +{ +} +static inline void touch_softlockup_watchdog (void ) +{ +} +static inline void touch_softlockup_watchdog_sync (void ) +{ +} +static inline void touch_all_softlockup_watchdogs (void ) +{ +} +static inline void lockup_detector_init (void ) +{ +} +#endif + +#ifdef CONFIG_DETECT_HUNG_TASK +void reset_hung_task_detector (void ); +#else +static inline void reset_hung_task_detector (void ) +{ +} +#endif +/* * The run state of the lockup detectors is controlled by the content of the * 'watchdog_enabled' variable. Each lockup detector has its dedicated bit -
include/linux/sched.h +0 -37
@@ -286,43 +286,6 @@ extern int sched_cpu_dying(unsigned int cpu);extern void sched_show_task (struct task_struct *p); -#ifdef CONFIG_LOCKUP_DETECTOR -extern void touch_softlockup_watchdog_sched (void ); -extern void touch_softlockup_watchdog (void ); -extern void touch_softlockup_watchdog_sync (void ); -extern void touch_all_softlockup_watchdogs (void ); -extern int proc_dowatchdog_thresh (struct ctl_table *table,int write, -void __user *buffer, -size_t *lenp,loff_t *ppos); -extern unsigned int softlockup_panic; -extern unsigned int hardlockup_panic; -void lockup_detector_init (void ); -#else -static inline void touch_softlockup_watchdog_sched (void ) -{ -} -static inline void touch_softlockup_watchdog (void ) -{ -} -static inline void touch_softlockup_watchdog_sync (void ) -{ -} -static inline void touch_all_softlockup_watchdogs (void ) -{ -} -static inline void lockup_detector_init (void ) -{ -} -#endif - -#ifdef CONFIG_DETECT_HUNG_TASK -void reset_hung_task_detector (void ); -#else -static inline void reset_hung_task_detector (void ) -{ -} -#endif -/* Attach to any functions which should be ignored in wchan output. */ #define __sched __attribute__((__section__(".sched.text")))
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 11/53 sched/headers: Move task->mm handling methods to <linux/sched/mm.h>
In reply to Ingo MolnarMove the following task->mm helper APIs into a new header file, <linux/sched/mm.h>, to further reduce the size and complexity of <linux/sched.h>.
Here are how the APIs are used in various kernel files:
# mm_alloc():
arch/arm/mach-rpc/ecard.c
fs/exec.c
include/linux/sched/mm.h
kernel/fork.c
# __mmdrop():
arch/arc/include/asm/mmu_context.h
include/linux/sched/mm.h
kernel/fork.c
# mmdrop():
arch/arm/mach-rpc/ecard.c arch/m68k/sun3/mmu_emu.c arch/x86/mm/tlb.c drivers/gpu/drm/amd/amdkfd/kfd_process.c drivers/gpu/drm/i915/i915_gem_userptr.c drivers/infiniband/hw/hfi1/file_ops.c drivers/vfio/vfio_iommu_spapr_tce.c fs/exec.c
fs/proc/base.c
fs/proc/task_mmu.c
fs/proc/task_nommu.c
fs/userfaultfd.c include/linux/mmu_notifier.h include/linux/sched/mm.h
kernel/fork.c
kernel/futex.c
kernel/sched/core.c
mm/khugepaged.c
mm/ksm.c
mm/mmu_context.c
mm/mmu_notifier.c
mm/oom_kill.c
virt/kvm/kvm_main.c
# mmdrop_async_fn():
include/linux/sched/mm.h
# mmdrop_async():
include/linux/sched/mm.h
kernel/fork.c
# mmget_not_zero():
fs/userfaultfd.c
include/linux/sched/mm.h
mm/oom_kill.c
# mmput():
arch/arc/include/asm/mmu_context.h arch/arc/kernel/troubleshoot.c arch/frv/mm/mmu-context.c arch/powerpc/platforms/cell/spufs/context.c arch/sparc/include/asm/mmu_context_32.h drivers/android/binder.c drivers/gpu/drm/etnaviv/etnaviv_gem.c drivers/gpu/drm/i915/i915_gem_userptr.c drivers/infiniband/core/umem.c drivers/infiniband/core/umem_odp.c drivers/infiniband/core/uverbs_main.c drivers/infiniband/hw/mlx4/main.c drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/usnic/usnic_uiom.c drivers/iommu/amd_iommu_v2.c drivers/iommu/intel-svm.c drivers/lguest/lguest_user.c drivers/misc/cxl/fault.c drivers/misc/mic/scif/scif_rma.c drivers/oprofile/buffer_sync.c drivers/vfio/vfio_iommu_type1.c drivers/vhost/vhost.c drivers/xen/gntdev.c
fs/exec.c
fs/proc/array.c
fs/proc/base.c
fs/proc/task_mmu.c
fs/proc/task_nommu.c
fs/userfaultfd.c include/linux/sched/mm.h
kernel/cpuset.c
kernel/events/core.c kernel/events/uprobes.c
kernel/exit.c
kernel/fork.c
kernel/ptrace.c
kernel/sys.c
kernel/trace/trace_output.c kernel/tsacct.c
mm/memcontrol.c
mm/memory.c
mm/mempolicy.c
mm/migrate.c
mm/mmu_notifier.c
mm/nommu.c
mm/oom_kill.c
mm/process_vm_access.c
mm/rmap.c
mm/swapfile.c
mm/util.c
virt/kvm/async_pf.c
# mmput_async():
include/linux/sched/mm.h
kernel/fork.c
mm/oom_kill.c
# get_task_mm():
arch/arc/kernel/troubleshoot.c arch/powerpc/platforms/cell/spufs/context.c drivers/android/binder.c drivers/gpu/drm/etnaviv/etnaviv_gem.c drivers/infiniband/core/umem.c drivers/infiniband/core/umem_odp.c drivers/infiniband/hw/mlx4/main.c drivers/infiniband/hw/mlx5/main.c drivers/infiniband/hw/usnic/usnic_uiom.c drivers/iommu/amd_iommu_v2.c drivers/iommu/intel-svm.c drivers/lguest/lguest_user.c drivers/misc/cxl/fault.c drivers/misc/mic/scif/scif_rma.c drivers/oprofile/buffer_sync.c drivers/vfio/vfio_iommu_type1.c drivers/vhost/vhost.c drivers/xen/gntdev.c
fs/proc/array.c
fs/proc/base.c
fs/proc/task_mmu.c include/linux/sched/mm.h
kernel/cpuset.c
kernel/events/core.c
kernel/exit.c
kernel/fork.c
kernel/ptrace.c
kernel/sys.c
kernel/trace/trace_output.c kernel/tsacct.c
mm/memcontrol.c
mm/memory.c
mm/mempolicy.c
mm/migrate.c
mm/mmu_notifier.c
mm/nommu.c
mm/util.c
# mm_access():
fs/proc/base.c
include/linux/sched/mm.h
kernel/fork.c
mm/process_vm_access.c
# mm_release():
arch/arc/include/asm/mmu_context.h
fs/exec.c
include/linux/sched/mm.h
include/uapi/linux/sched.h
kernel/exit.c
kernel/fork.c
--- include/linux/sched.h | 52 ---------------------------------------------------- include/linux/sched/mm.h | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+), 52 deletions(-)
include/linux/sched.h +0 -52
@@ -2379,58 +2379,6 @@ static inline unsigned long sigsp(unsigned long sp, struct ksignal *ksig)return sp; } -/* -* Routines for handling mm_structs -*/ -extern struct mm_struct *mm_alloc (void ); - -/* mmdrop drops the mm and the page tables */ -extern void __mmdrop (struct mm_struct *); -static inline void mmdrop (struct mm_struct *mm) -{ -if (unlikely (atomic_dec_and_test (&mm->mm_count))) -__mmdrop (mm); -} - -static inline void mmdrop_async_fn (struct work_struct *work) -{ - struct mm_struct *mm = container_of(work, struct mm_struct, async_put_work); -__mmdrop (mm); -} - -static inline void mmdrop_async (struct mm_struct *mm) -{ -if (unlikely (atomic_dec_and_test (&mm->mm_count))) { -INIT_WORK (&mm->async_put_work, mmdrop_async_fn); -schedule_work (&mm->async_put_work); - } -} - -static inline bool mmget_not_zero (struct mm_struct *mm) -{ -return atomic_inc_not_zero (&mm->mm_users); -} - -/* mmput gets rid of the mappings and all user-space */ -extern void mmput (struct mm_struct *); -#ifdef CONFIG_MMU -/* same as above but performs the slow path from the async context. Can -* be called from the atomic context as well -*/ -extern void mmput_async (struct mm_struct *); -#endif - -/* Grab a reference to a task's mm, if it is not already going away */ -extern struct mm_struct *get_task_mm (struct task_struct *task); -/* -* Grab a reference to a task's mm, if it is not already going away -* and ptrace_may_access with the mode parameter passed to it -* succeeds. -*/ -extern struct mm_struct *mm_access (struct task_struct *task,unsigned int mode); -/* Remove the current tasks stale references to the old mm_struct */ -extern void mm_release (struct task_struct *,struct mm_struct *); -#ifdef CONFIG_HAVE_COPY_THREAD_TLS extern int copy_thread_tls (unsigned long ,unsigned long ,unsigned long ,struct task_struct *,unsigned long );
include/linux/sched/mm.h +52 -0
56 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 13/53 sched/headers: Move task_struct::signal and task_struct::sighand types and accessors into <linux/sched/signal.h>
In reply to Ingo Molnartask_struct::signal and task_struct::sighand are pointers, which would normally make it straightforward to not define those types in sched.h.
That is not so, because the types are accompanied by a myriad of APIs (macros and inline functions) that dereference them.
Split the types and the APIs out of sched.h and move them into a new header, <linux/sched/signal.h>.
With this change sched.h does not know about 'struct signal' and 'struct sighand' anymore, trying to put accessors into sched.h as a test fails the following way:
./include/linux/sched.h: In function ‘test_signal_types’:
./include/linux/sched.h:2461:18: error: dereferencing pointer to incomplete type ‘struct signal_struct’
^
This reduces the size and complexity of sched.h significantly.
Update all headers and .c code that relied on getting the signal handling functionality from <linux/sched.h> to include <linux/sched/signal.h>.
The list of affected files in the preparatory patch was partly generated by grepping for the APIs, and partly by doing coverage build testing, both all[yes|mod|def|no]config builds on 64-bit and 32-bit x86, and an array of cross-architecture builds.
Nevertheless some (trivial) build breakage is still expected related to rare Kconfig combinations and in-flight patches to various kernel code, but most of it should be handled by this patch.
--- include/linux/sched.h | 496 +------------------------------------------------------------- include/linux/sched/signal.h | 499 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 502 insertions(+), 493 deletions(-)
include/linux/sched.h +3 -493
@@ -71,6 +71,9 @@ struct blk_plug;struct filename ;struct nameidata ; +struct signal_struct ; +struct sighand_struct ; +extern unsigned long total_forks;extern int nr_threads; DECLARE_PER_CPU(unsigned long, process_counts);
@@ -361,13 +364,6 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,static inline void arch_pick_mmap_layout (struct mm_struct *mm) {}#endif -struct sighand_struct { -atomic_t count; -struct k_sigaction action[_NSIG]; -spinlock_t siglock; -wait_queue_head_t signalfd_wqh; -}; -struct pacct_struct {int ac_flag;long ac_exitcode;
@@ -486,195 +482,6 @@ struct thread_group_cputimer {struct autogroup ;/* -* NOTE! "signal_struct" does not have its own -* locking, because a shared signal_struct always -* implies a shared sighand_struct, so locking -* sighand_struct is always a proper superset of -* the locking of signal_struct. -*/ -struct signal_struct { -atomic_t sigcnt; -atomic_t live; -int nr_threads; -struct list_head thread_head; - -wait_queue_head_t wait_chldexit;/* for wait4() */ - -/* current thread group signal load-balancing target: */ -struct task_struct *curr_target; - -/* shared signal handling: */ -struct sigpending shared_pending; - -/* thread group exit support */ -int group_exit_code; -/* overloaded: -* - notify group_exit_task when ->count is equal to notify_count -* - everyone except group_exit_task is stopped during signal delivery -* of fatal signals, group_exit_task processes the signal. -*/ -int notify_count; -struct task_struct *group_exit_task; - -/* thread group stop support, overloads group_exit_code too */ -int group_stop_count; -unsigned int flags;/* see SIGNAL_* flags below */ - -/* -* PR_SET_CHILD_SUBREAPER marks a process, like a service -* manager, to re-parent orphan (double-forking) child processes -* to this process instead of 'init'. The service manager is -* able to receive SIGCHLD signals and is able to investigate -* the process until it calls wait(). All children of this -* process will inherit a flag if they should look for a -* child_subreaper process at exit. -*/ -unsigned int is_child_subreaper:1 ; -unsigned int has_child_subreaper:1 ; - -#ifdef CONFIG_POSIX_TIMERS - -/* POSIX.1b Interval Timers */ -int posix_timer_id; -struct list_head posix_timers; - -/* ITIMER_REAL timer for the process */ -struct hrtimer real_timer; -ktime_t it_real_incr; - -/* -* ITIMER_PROF and ITIMER_VIRTUAL timers for the process, we use -* CPUCLOCK_PROF and CPUCLOCK_VIRT for indexing array as these -* values are defined to 0 and 1 respectively -*/ -struct cpu_itimer it[2 ]; - -/* -* Thread group totals for process CPU timers. -* See thread_group_cputimer(), et al, for details. -*/ -struct thread_group_cputimer cputimer; - -/* Earliest-expiration cache. */ -struct task_cputime cputime_expires; - -struct list_head cpu_timers[3 ]; - -#endif - -struct pid *leader_pid; - -#ifdef CONFIG_NO_HZ_FULL -atomic_t tick_dep_mask; -#endif - -struct pid *tty_old_pgrp; - -/* boolean value for session group leader */ -int leader; - -struct tty_struct *tty;/* NULL if no tty */ - -#ifdef CONFIG_SCHED_AUTOGROUP -struct autogroup *autogroup; -#endif -/* -* Cumulative resource counters for dead threads in the group, -* and for reaped dead child processes forked by this group. -* Live threads maintain their own counters and add to these -* in __exit_signal, except for the group leader. -*/ -seqlock_t stats_lock; -u64 utime, stime, cutime, cstime; -u64 gtime; -u64 cgtime; -struct prev_cputime prev_cputime; -unsigned long nvcsw, nivcsw, cnvcsw, cnivcsw; -unsigned long min_flt, maj_flt, cmin_flt, cmaj_flt; -unsigned long inblock, oublock, cinblock, coublock; -unsigned long maxrss, cmaxrss; -struct task_io_accounting ioac; - -/* -* Cumulative ns of schedule CPU time fo dead threads in the -* group, not including a zombie group leader, (This only differs -* from jiffies_to_ns(utime + stime) if sched_clock uses something -* other than jiffies.) -*/ -unsigned long long sum_sched_runtime; - -/* -* We don't bother to synchronize most readers of this at all, -* because there is no reader checking a limit that actually needs -* to get both rlim_cur and rlim_max atomically, and either one -* alone is a single word that can safely be read normally. -* getrlimit/setrlimit use task_lock(current->group_leader) to -* protect this instead of the siglock, because they really -* have no need to disable irqs. -*/ -struct rlimit rlim[RLIM_NLIMITS ]; - -#ifdef CONFIG_BSD_PROCESS_ACCT -struct pacct_struct pacct;/* per-process accounting information */ -#endif -#ifdef CONFIG_TASKSTATS -struct taskstats *stats; -#endif -#ifdef CONFIG_AUDIT -unsigned audit_tty; -struct tty_audit_buf *tty_audit_buf; -#endif - -/* -* Thread is the potential origin of an oom condition; kill first on -* oom -*/ -bool oom_flag_origin; -short oom_score_adj;/* OOM kill score adjustment */ -short oom_score_adj_min;/* OOM kill score adjustment min value. -* Only settable by CAP_SYS_RESOURCE. */ -struct mm_struct *oom_mm;/* recorded mm when the thread group got -* killed by the oom killer */ - -struct mutex cred_guard_mutex;/* guard against foreign influences on -* credential calculations -* (notably. ptrace) */ -}; - -/* -* Bits in flags field of signal_struct. -*/ -#define SIGNAL_STOP_STOPPED 0x00000001/* job control stop in effect */ -#define SIGNAL_STOP_CONTINUED 0x00000002/* SIGCONT since WCONTINUED reap */ -#define SIGNAL_GROUP_EXIT 0x00000004/* group exit in progress */ -#define SIGNAL_GROUP_COREDUMP 0x00000008/* coredump in progress */ -/* -* Pending notifications to parent. -*/ -#define SIGNAL_CLD_STOPPED 0x00000010 -#define SIGNAL_CLD_CONTINUED 0x00000020 -#define SIGNAL_CLD_MASK (SIGNAL_CLD_STOPPED|SIGNAL_CLD_CONTINUED) - -#define SIGNAL_UNKILLABLE 0x00000040/* for init: ignore fatal signals */ - -#define SIGNAL_STOP_MASK (SIGNAL_CLD_MASK | SIGNAL_STOP_STOPPED | \ - SIGNAL_STOP_CONTINUED) - -static inline void signal_set_stop_flags (struct signal_struct *sig, -unsigned int flags) -{ -WARN_ON (sig->flags & (SIGNAL_GROUP_EXIT |SIGNAL_GROUP_COREDUMP )); - sig->flags = (sig->flags & ~SIGNAL_STOP_MASK ) | flags; -} - -/* If true, all threads except ->group_exit_task have pending SIGKILL */ -static inline int signal_group_exit (const struct signal_struct *sig) -{ -return (sig->flags &SIGNAL_GROUP_EXIT ) || - (sig->group_exit_task !=NULL ); -} - -/* * Some day this will be a full-fledged user tracking system.. */ struct user_struct {
@@ -2126,190 +1933,8 @@ extern int sched_fork(unsigned long clone_flags, struct task_struct *p);extern void sched_dead (struct task_struct *p);extern void proc_caches_init (void ); -extern void flush_signals (struct task_struct *); -extern void ignore_signals (struct task_struct *); -extern void flush_signal_handlers (struct task_struct *,int force_default); -extern int dequeue_signal (struct task_struct *tsk,sigset_t *mask,siginfo_t *info); - -static inline int kernel_dequeue_signal (siginfo_t *info) -{ -struct task_struct *tsk = current; -siginfo_t __info; -int ret; - -spin_lock_irq (&tsk->sighand->siglock); - ret =dequeue_signal (tsk, &tsk->blocked, info ?: &__info); -spin_unlock_irq (&tsk->sighand->siglock); - -return ret; -} - -static inline void kernel_signal_stop (void ) -{ -spin_lock_irq (¤t->sighand->siglock); -if (current->jobctl &JOBCTL_STOP_DEQUEUED ) -__set_current_state (TASK_STOPPED ); -spin_unlock_irq (¤t->sighand->siglock); - -schedule (); -}extern void release_task (struct task_struct * p); -extern int send_sig_info (int ,struct siginfo *,struct task_struct *); -extern int force_sigsegv (int ,struct task_struct *); -extern int force_sig_info (int ,struct siginfo *,struct task_struct *); -extern int __kill_pgrp_info (int sig,struct siginfo *info,struct pid *pgrp); -extern int kill_pid_info (int sig,struct siginfo *info,struct pid *pid); -extern int kill_pid_info_as_cred (int ,struct siginfo *,struct pid *, -const struct cred *,u32 ); -extern int kill_pgrp (struct pid *pid,int sig,int priv); -extern int kill_pid (struct pid *pid,int sig,int priv); -extern int kill_proc_info (int ,struct siginfo *,pid_t ); -extern __must_check bool do_notify_parent (struct task_struct *,int ); -extern void __wake_up_parent (struct task_struct *p,struct task_struct *parent); -extern void force_sig (int ,struct task_struct *); -extern int send_sig (int ,struct task_struct *,int ); -extern int zap_other_threads (struct task_struct *p); -extern struct sigqueue *sigqueue_alloc (void ); -extern void sigqueue_free (struct sigqueue *); -extern int send_sigqueue (struct sigqueue *,struct task_struct *,int group); -extern int do_sigaction (int ,struct k_sigaction *,struct k_sigaction *); - -#ifdef TIF_RESTORE_SIGMASK -/* -* Legacy restore_sigmask accessors. These are inefficient on -* SMP architectures because they require atomic operations. -*/ - -/** -* set_restore_sigmask() - make sure saved_sigmask processing gets done -* -* This sets TIF_RESTORE_SIGMASK and ensures that the arch signal code -* will run before returning to user mode, to process the flag. For -* all callers, TIF_SIGPENDING is already set or it's no harm to set -* it. TIF_RESTORE_SIGMASK need not be in the set of bits that the -* arch code will notice on return to user mode, in case those bits -* are scarce. We set TIF_SIGPENDING here to ensure that the arch -* signal code always gets run when TIF_RESTORE_SIGMASK is set. -*/ -static inline void set_restore_sigmask (void ) -{ -set_thread_flag (TIF_RESTORE_SIGMASK ); -WARN_ON (!test_thread_flag (TIF_SIGPENDING )); -} -static inline void clear_restore_sigmask (void ) -{ -clear_thread_flag (TIF_RESTORE_SIGMASK ); -} -static inline bool test_restore_sigmask (void ) -{ -return test_thread_flag (TIF_RESTORE_SIGMASK ); -} -static inline bool test_and_clear_restore_sigmask (void ) -{ -return test_and_clear_thread_flag (TIF_RESTORE_SIGMASK ); -} - -#else /* TIF_RESTORE_SIGMASK */ - -/* Higher-quality implementation, used if TIF_RESTORE_SIGMASK doesn't exist. */ -static inline void set_restore_sigmask (void ) -{ - current->restore_sigmask = true; -WARN_ON (!test_thread_flag (TIF_SIGPENDING )); -} -static inline void clear_restore_sigmask (void ) -{ - current->restore_sigmask = false; -} -static inline bool test_restore_sigmask (void ) -{ -return current->restore_sigmask; -} -static inline bool test_and_clear_restore_sigmask (void ) -{ -if (!current->restore_sigmask) -return false; - current->restore_sigmask = false; -return true; -} -#endif - -static inline void restore_saved_sigmask (void ) -{ -if (test_and_clear_restore_sigmask ()) -__set_current_blocked (¤t->saved_sigmask); -} - -static inline sigset_t *sigmask_to_save (void ) -{ -sigset_t *res = ¤t->blocked; -if (unlikely (test_restore_sigmask ())) - res = ¤t->saved_sigmask; -return res; -} - -static inline int kill_cad_pid (int sig,int priv) -{ -return kill_pid (cad_pid, sig, priv); -} - -/* These can be the second arg to send_sig_info/send_group_sig_info. */ -#define SEND_SIG_NOINFO ((struct siginfo *) 0) -#define SEND_SIG_PRIV ((struct siginfo *) 1) -#define SEND_SIG_FORCED ((struct siginfo *) 2) - -/* -* True if we are on the alternate signal stack. -*/ -static inline int on_sig_stack (unsigned long sp) -{ -/* -* If the signal stack is SS_AUTODISARM then, by construction, we -* can't be on the signal stack unless user code deliberately set -* SS_AUTODISARM when we were already on it. -* -* This improves reliability: if user state gets corrupted such that -* the stack pointer points very close to the end of the signal stack, -* then this check will enable the signal to be handled anyway. -*/ -if (current->sas_ss_flags &SS_AUTODISARM ) -return 0 ; - -#ifdef CONFIG_STACK_GROWSUP -return sp >= current->sas_ss_sp && - sp - current->sas_ss_sp < current->sas_ss_size; -#else -return sp > current->sas_ss_sp && - sp - current->sas_ss_sp <= current->sas_ss_size; -#endif -} - -static inline int sas_ss_flags (unsigned long sp) -{ -if (!current->sas_ss_size) -return SS_DISABLE ; - -return on_sig_stack (sp) ?SS_ONSTACK :0 ; -} - -static inline void sas_ss_reset (struct task_struct *p) -{ - p->sas_ss_sp =0 ; - p->sas_ss_size =0 ; - p->sas_ss_flags =SS_DISABLE ; -} - -static inline unsigned long sigsp (unsigned long sp,struct ksignal *ksig) -{ - if (unlikely((ksig->ka.sa.sa_flags & SA_ONSTACK)) && ! sas_ss_flags(sp)) -#ifdef CONFIG_STACK_GROWSUP -return current->sas_ss_sp; -#else -return current->sas_ss_sp + current->sas_ss_size; -#endif -return sp; -}#ifdef CONFIG_HAVE_COPY_THREAD_TLS extern int copy_thread_tls(unsigned long, unsigned long, unsigned long,
@@ -2338,10 +1963,8 @@ static inline void exit_thread(struct task_struct *tsk)#endif extern void exit_files (struct task_struct *); -extern void __cleanup_sighand (struct sighand_struct *);extern void exit_itimers (struct signal_struct *); -extern void flush_itimer_signals (void );extern void do_group_exit (int );
@@ -2376,78 +1999,6 @@ static inline unsigned long wait_task_inactive(struct task_struct *p, }#endif -#define tasklist_empty () \ - list_empty(&init_task.tasks) - -#define next_task (p) \ - list_entry_rcu((p)->tasks.next, struct task_struct, tasks) - -#define for_each_process (p) \ - for (p = &init_task ; (p = next_task(p)) != &init_task ; ) - -extern bool current_is_single_threaded (void ); - -/* -* Careful: do_each_thread/while_each_thread is a double loop so -* 'break' will not work as expected - use goto instead. -*/ -#define do_each_thread (g, t) \ - for (g = t = &init_task ; (g = t = next_task(g)) != &init_task ; ) do - -#define while_each_thread (g, t) \ - while ((t = next_thread(t)) != g) - -#define __for_each_thread (signal, t) \ - list_for_each_entry_rcu(t, &(signal)->thread_head, thread_node) - -#define for_each_thread (p, t) \ - __for_each_thread((p)->signal, t) - -/* Careful: this is a double loop, 'break' won't work as expected. */ -#define for_each_process_thread (p, t) \ - for_each_process(p) for_each_thread(p, t) - -static inline int get_nr_threads (struct task_struct *tsk) -{ -return tsk->signal->nr_threads; -} - -static inline bool thread_group_leader (struct task_struct *p) -{ -return p->exit_signal >=0 ; -} - -/* Do to the insanities of de_thread it is possible for a process -* to have the pid of the thread group leader without actually being -* the thread group leader. For iteration through the pids in proc -* all we care about is that we have a task with the appropriate -* pid, we don't actually care if we have the right task. -*/ -static inline bool has_group_leader_pid (struct task_struct *p) -{ -return task_pid (p) == p->signal->leader_pid; -} - -static inline -bool same_thread_group (struct task_struct *p1,struct task_struct *p2) -{ -return p1->signal == p2->signal; -} - -static inline struct task_struct *next_thread (const struct task_struct *p) -{ -return list_entry_rcu (p->thread_group.next, - struct task_struct, thread_group); -} - -static inline int thread_group_empty (struct task_struct *p) -{ -return list_empty (&p->thread_group); -} - -#define delay_group_leader (p) \ - (thread_group_leader(p) && !thread_group_empty(p)) -/* * Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring * subscriptions and synchronises with wait4(). Also used in procfs. Also
@@ -2468,25 +2019,6 @@ static inline void task_unlock(struct task_struct *p)spin_unlock (&p->alloc_lock); } -extern struct sighand_struct *__lock_task_sighand (struct task_struct *tsk, -unsigned long *flags); - -static inline struct sighand_struct *lock_task_sighand (struct task_struct *tsk, -unsigned long *flags) -{ -struct sighand_struct *ret; - - ret =__lock_task_sighand (tsk, flags); - (void )__cond_lock (&tsk->sighand->siglock, ret); -return ret; -} - -static inline void unlock_task_sighand (struct task_struct *tsk, -unsigned long *flags) -{ -spin_unlock_irqrestore (&tsk->sighand->siglock, *flags); -} -#ifdef CONFIG_THREAD_INFO_IN_TASK static inline struct thread_info *task_thread_info (struct task_struct *task)
@@ -2859,28 +2391,6 @@ static inline void mm_update_next_owner(struct mm_struct *mm) }#endif /* CONFIG_MEMCG */ -static inline unsigned long task_rlimit (const struct task_struct *tsk, -unsigned int limit) -{ -return READ_ONCE (tsk->signal->rlim[limit].rlim_cur); -} - -static inline unsigned long task_rlimit_max (const struct task_struct *tsk, -unsigned int limit) -{ -return READ_ONCE (tsk->signal->rlim[limit].rlim_max); -} - -static inline unsigned long rlimit (unsigned int limit) -{ -return task_rlimit (current, limit); -} - -static inline unsigned long rlimit_max (unsigned int limit) -{ -return task_rlimit_max (current, limit); -} -#define SCHED_CPUFREQ_RT (1U << 0)#define SCHED_CPUFREQ_DL (1U << 1)#define SCHED_CPUFREQ_IOWAIT (1U << 2)
include/linux/sched/signal.h +499 -0
503 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 8/53 sched/headers: Move various ABI definitions to <uapi/linux/sched/types.h>
In reply to Ingo MolnarMove scheduler ABI types (struct sched_attr, struct sched_param, etc.) into the new UAPI header.
This further reduces the size and complexity of <linux/sched.h>.
--- include/linux/sched.h | 70 ++---------------------------------------------------------- include/uapi/linux/sched/types.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 68 deletions(-)
include/linux/sched.h +2 -68
@@ -5,11 +5,6 @@#include <linux/sched/prio.h> - -struct sched_param { -int sched_priority; -}; -#include <asm/param.h> /* for HZ */ #include <linux/capability.h>
@@ -64,69 +59,8 @@ struct sched_param {#include <asm/processor.h> -#define SCHED_ATTR_SIZE_VER0 48/* sizeof first published struct */ - -/* -* Extended scheduling parameters data structure. -* -* This is needed because the original struct sched_param can not be -* altered without introducing ABI issues with legacy applications -* (e.g., in sched_getparam()). -* -* However, the possibility of specifying more than just a priority for -* the tasks may be useful for a wide variety of application fields, e.g., -* multimedia, streaming, automation and control, and many others. -* -* This variant (sched_attr) is meant at describing a so-called -* sporadic time-constrained task. In such model a task is specified by: -* - the activation period or minimum instance inter-arrival time; -* - the maximum (or average, depending on the actual scheduling -* discipline) computation time of all instances, a.k.a. runtime; -* - the deadline (relative to the actual activation time) of each -* instance. -* Very briefly, a periodic (sporadic) task asks for the execution of -* some specific computation --which is typically called an instance-- -* (at most) every period. Moreover, each instance typically lasts no more -* than the runtime and must be completed by time instant t equal to -* the instance activation time + the deadline. -* -* This is reflected by the actual fields of the sched_attr structure: -* -* @size size of the structure, for fwd/bwd compat. -* -* @sched_policy task's scheduling policy -* @sched_flags for customizing the scheduler behaviour -* @sched_nice task's nice value (SCHED_NORMAL/BATCH) -* @sched_priority task's static priority (SCHED_FIFO/RR) -* @sched_deadline representative of the task's deadline -* @sched_runtime representative of the task's runtime -* @sched_period representative of the task's period -* -* Given this task model, there are a multiplicity of scheduling algorithms -* and policies, that can be used to ensure all the tasks will make their -* timing constraints. -* -* As of now, the SCHED_DEADLINE policy (sched_dl scheduling class) is the -* only user of this new interface. More information about the algorithm -* available in the scheduling class file or in Documentation/. -*/ -struct sched_attr { -u32 size; - -u32 sched_policy; -u64 sched_flags; - -/* SCHED_NORMAL, SCHED_BATCH */ -s32 sched_nice; - -/* SCHED_FIFO, SCHED_RR */ -u32 sched_priority; - -/* SCHED_DEADLINE */ -u64 sched_runtime; -u64 sched_deadline; -u64 sched_period; -}; +struct sched_attr ; +struct sched_param ;struct futex_pi_state ;struct robust_list_head ;
include/uapi/linux/sched/types.h +68 -0
72 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 48/53 sched/headers: Move exit_files() and exit_itimers() from <linux/sched.h> to <linux/sched/task.h>
In reply to Ingo MolnarThese two functions are task management related, not core scheduler APIs.
--- include/linux/sched.h | 4 ---- include/linux/sched/task.h | 3 +++ 2 files changed, 3 insertions(+), 4 deletions(-)
include/linux/sched.h +0 -4
@@ -1382,10 +1382,6 @@ extern void wake_up_new_task(struct task_struct *tsk);static inline void kick_process (struct task_struct *tsk) { }#endif -extern void exit_files (struct task_struct *); - -extern void exit_itimers (struct signal_struct *); -extern void __set_task_comm (struct task_struct *tsk,const char *from,bool exec);static inline void set_task_comm (struct task_struct *tsk,const char *from) {
include/linux/sched/task.h +3 -0
@@ -67,6 +67,9 @@ static inline void exit_thread(struct task_struct *tsk)#endif extern void do_group_exit (int ); +extern void exit_files (struct task_struct *); +extern void exit_itimers (struct signal_struct *); +extern long _do_fork (unsigned long ,unsigned long ,unsigned long ,int __user *,int __user *,unsigned long );extern long do_fork (unsigned long ,unsigned long ,unsigned long ,int __user *,int __user *);struct task_struct *fork_idle (int );
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 50/53 sched/headers, timekeeping: Move the timer tick function prototypes to <linux/timekeeping.h>
In reply to Ingo MolnarMove the update_process_times() and xtime_update() prototypes to <linux/timekeeping.h>.
--- include/linux/sched.h | 1 - include/linux/time.h | 2 -- include/linux/timekeeping.h | 4 ++++ 3 files changed, 4 insertions(+), 3 deletions(-)
include/linux/sched.h +0 -1
@@ -180,7 +180,6 @@ extern cpumask_var_t cpu_isolated_map;extern int runqueue_is_locked (int cpu); -extern void update_process_times (int user);extern void scheduler_tick (void );#define MAX_SCHEDULE_TIMEOUT LONG_MAX
include/linux/time.h +0 -2
@@ -167,8 +167,6 @@ static inline bool timespec_inject_offset_valid(const struct timespec *ts)extern u32 (*arch_gettimeoffset)(void );#endif -extern void xtime_update (unsigned long ticks); -struct itimerval ;extern int do_setitimer (int which,struct itimerval *value,struct itimerval *ovalue);
include/linux/timekeeping.h +4 -0
@@ -8,6 +8,10 @@void timekeeping_init (void );extern int timekeeping_suspended; +/* Architecture timer tick functions: */ +extern void update_process_times (int user); +extern void xtime_update (unsigned long ticks); +/* * Get and set timeofday */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 42/53 sched/headers: Move 'init_task' and 'init_thread_union' from <linux/sched.h> to <linux/sched/task.h>
In reply to Ingo Molnar'init_task' is really not part of core scheduler APIs but part of the fork() interface between the scheduler and process management.
So move the declarations.
--- include/linux/sched.h | 3 --- include/linux/sched/task.h | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-)
include/linux/sched.h +0 -3
@@ -1465,9 +1465,6 @@ static inline int kstack_end(void *addr) }#endif -extern union thread_union init_thread_union; -extern struct task_struct init_task; -extern struct pid_namespace init_pid_ns;/*
include/linux/sched/task.h +6 -0
@@ -8,6 +8,9 @@#include <linux/sched.h> +struct task_struct ; +union thread_union ; +/* * This serializes "schedule()" and also protects * the run-queue from deletions/modifications (but
@@ -17,6 +20,9 @@extern rwlock_t tasklist_lock;extern spinlock_t mmlist_lock; +extern union thread_union init_thread_union; +extern struct task_struct init_task; +#ifdef CONFIG_PROVE_RCU extern int lockdep_tasklist_lock_is_held (void );#endif /* #ifdef CONFIG_PROVE_RCU */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 40/53 mm/headers, sched/headers: Move task related MM types from <linux/mm_types.> to <linux/mm_types_task.h>
In reply to Ingo MolnarSeparate all the MM types that are embedded directly in 'struct task_struct' into the <linux/mm_types_task.h> header.
The goal is to include this header in <linux/sched.h>, not the full <linux/mm_types.h> header, to reduce the size, complexity and coupling of <linux/sched.h>.
(This patch does not change <linux/sched.h> yet.)
--- include/linux/mm_types.h | 49 ------------------------------------------------- include/linux/mm_types_task.h | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 49 deletions(-)
include/linux/mm_types.h +0 -49
@@ -24,11 +24,6 @@struct address_space ;struct mem_cgroup ; -#define USE_SPLIT_PTE_PTLOCKS (NR_CPUS >= CONFIG_SPLIT_PTLOCK_CPUS) -#define USE_SPLIT_PMD_PTLOCKS (USE_SPLIT_PTE_PTLOCKS && \ - IS_ENABLED(CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK)) -#define ALLOC_SPLIT_PTLOCKS (SPINLOCK_SIZE > BITS_PER_LONG/8) -/* * Each physical page in the system has a struct page associated with * it to keep track of whatever it is we are using the page for at the
@@ -231,17 +226,6 @@ struct page {#endif ; -struct page_frag { -struct page *page; -#if (BITS_PER_LONG >32 ) || (PAGE_SIZE >=65536 ) -__u32 offset; -__u32 size; -#else -__u16 offset; -__u16 size; -#endif -}; -#define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK)#define PAGE_FRAG_CACHE_MAX_ORDER get_order(PAGE_FRAG_CACHE_MAX_SIZE)
@@ -360,18 +344,6 @@ struct vm_area_struct {struct vm_userfaultfd_ctx vm_userfaultfd_ctx; }; -/* -* The per task VMA cache array: -*/ -#define VMACACHE_BITS 2 -#define VMACACHE_SIZE (1U << VMACACHE_BITS) -#define VMACACHE_MASK (VMACACHE_SIZE - 1) - -struct vmacache { -u32 seqnum; -struct vm_area_struct *vmas[VMACACHE_SIZE ]; -}; -struct core_thread {struct task_struct *task;struct core_thread *next;
@@ -383,27 +355,6 @@ struct core_state {struct completion startup; }; -enum { -MM_FILEPAGES ,/* Resident file mapping pages */ -MM_ANONPAGES ,/* Resident anonymous pages */ -MM_SWAPENTS ,/* Anonymous swap entries */ -MM_SHMEMPAGES ,/* Resident shared memory pages */ -NR_MM_COUNTERS -}; - -#if USE_SPLIT_PTE_PTLOCKS && defined(CONFIG_MMU ) -#define SPLIT_RSS_COUNTING -/* per-thread cached information, */ -struct task_rss_stat { -int events;/* for synchronization threshold */ -int count[NR_MM_COUNTERS ]; -}; -#endif /* USE_SPLIT_PTE_PTLOCKS */ - -struct mm_rss_stat { -atomic_long_t count[NR_MM_COUNTERS ]; -}; -struct kioctx_table ;struct mm_struct {struct vm_area_struct *mmap;/* list of VMAs */
include/linux/mm_types_task.h +55 -0
65 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 41/53 sched/headers: Remove the <linux/mm_types.h> dependency from <linux/sched.h>
In reply to Ingo MolnarUse the freshly introduced, reduced size <linux/mm_types_task.h> header instead.
--- include/linux/sched.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/sched.h +1 -1
@@ -8,7 +8,7 @@#include <linux/capability.h> #include <linux/mutex.h> #include <linux/plist.h> -#include <linux/mm_types.h> +#include <linux/mm_types_task.h> #include <asm/ptrace.h> #include <linux/sem.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 49/53 sched/headers: Move _init() prototypes from <linux/sched.h> to <linux/sched/init.h>
In reply to Ingo Molnartrap_init() and cpu_init() belong into <linux/cpu.h>, sched_init*() into <linux/sched/init.h>.
--- include/linux/sched.h | 5 ----- include/linux/sched/init.h | 7 +++++++ 2 files changed, 7 insertions(+), 5 deletions(-)
include/linux/sched.h +0 -5
@@ -176,15 +176,10 @@ struct uts_namespace;/* Task command name length */ #define TASK_COMM_LEN 16 -extern void sched_init (void ); -extern void sched_init_smp (void ); -extern cpumask_var_t cpu_isolated_map;extern int runqueue_is_locked (int cpu); -extern void cpu_init (void ); -extern void trap_init (void );extern void update_process_times (int user);extern void scheduler_tick (void );
include/linux/sched/init.h +7 -0
@@ -3,4 +3,11 @@#include <linux/sched.h> +/* +* Scheduler init related prototypes: +*/ + +extern void sched_init (void ); +extern void sched_init_smp (void ); +#endif /* _LINUX_SCHED_INIT_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 43/53 sched/headers: Move the task_lock()/unlock() APIs to <linux/sched/task.h>
In reply to Ingo MolnarThe task_lock()/task_unlock() APIs are not realated to core scheduling, they are task lifetime APIs, i.e. they belong into <linux/sched/task.h>.
Move them.
--- include/linux/sched.h | 20 -------------------- include/linux/sched/task.h | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 20 deletions(-)
include/linux/sched.h +0 -20
@@ -1522,26 +1522,6 @@ static inline unsigned long wait_task_inactive(struct task_struct *p, }#endif -/* -* Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring -* subscriptions and synchronises with wait4(). Also used in procfs. Also -* pins the final release of task.io_context. Also protects ->cpuset and -* ->cgroup.subsys[]. And ->vfork_done. -* -* Nests both inside and outside of read_lock(&tasklist_lock). -* It must not be nested with write_lock_irq(&tasklist_lock), -* neither inside nor outside. -*/ -static inline void task_lock (struct task_struct *p) -{ -spin_lock (&p->alloc_lock); -} - -static inline void task_unlock (struct task_struct *p) -{ -spin_unlock (&p->alloc_lock); -} -/* set thread flags in other task's structures * - see asm/thread_info.h for TIF_xxxx flags available */
include/linux/sched/task.h +20 -0
@@ -91,4 +91,24 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t) }#endif +/* +* Protects ->fs, ->files, ->mm, ->group_info, ->comm, keyring +* subscriptions and synchronises with wait4(). Also used in procfs. Also +* pins the final release of task.io_context. Also protects ->cpuset and +* ->cgroup.subsys[]. And ->vfork_done. +* +* Nests both inside and outside of read_lock(&tasklist_lock). +* It must not be nested with write_lock_irq(&tasklist_lock), +* neither inside nor outside. +*/ +static inline void task_lock (struct task_struct *p) +{ +spin_lock (&p->alloc_lock); +} + +static inline void task_unlock (struct task_struct *p) +{ +spin_unlock (&p->alloc_lock); +} +#endif /* _LINUX_SCHED_TASK_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 44/53 sched/headers: Move cputime functionality from <linux/sched.h> and <linux/cputime.h> into <linux/sched/cputime.h>
In reply to Ingo MolnarMove cputime related functionality out of <linux/sched.h>, as most code that includes <linux/sched.h> does not use that functionality.
Move data types that are not included in task_struct directly to the signal definitions, into <linux/sched/signal.h>.
Also merge the (small) existing <linux/cputime.h> header into <linux/sched/cputime.h>.
--- include/linux/cputime.h | 13 ----- include/linux/sched.h | 89 ------------------------------ include/linux/sched/cputime.h | 182 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- include/linux/sched/signal.h | 33 ++++++++++++ kernel/sched/stats.h | 111 -------------------------------------- 5 files changed, 214 insertions(+), 214 deletions(-)
include/linux/cputime.h deleted +0 -13
@@ -1,13 +0,0 @@ -#ifndef __LINUX_CPUTIME_H -#define __LINUX_CPUTIME_H - -#ifdef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE -#include <asm/cputime.h> - -#ifndef cputime_to_nsecs -# define cputime_to_nsecs (__ct) \ - (cputime_to_usecs(__ct) * NSEC_PER_USEC) -#endif - -#endif /* CONFIG_VIRT_CPU_ACCOUNTING_NATIVE */ -#endif /* __LINUX_CPUTIME_H */
include/linux/sched.h +0 -89
119 lines not on this page · raw message
include/linux/sched/cputime.h +181 -1
187 lines not on this page · raw message
include/linux/sched/signal.h +33 -0
@@ -36,6 +36,39 @@ struct cpu_itimer { };/* +* This is the atomic variant of task_cputime, which can be used for +* storing and updating task_cputime statistics without locking. +*/ +struct task_cputime_atomic { +atomic64_t utime; +atomic64_t stime; +atomic64_t sum_exec_runtime; +}; + +#define INIT_CPUTIME_ATOMIC \ + (struct task_cputime_atomic) { \ + .utime = ATOMIC64_INIT(0), \ + .stime = ATOMIC64_INIT(0), \ + .sum_exec_runtime = ATOMIC64_INIT(0), \ + } +/** +* struct thread_group_cputimer - thread group interval timer counts +* @cputime_atomic: atomic thread group interval timers. +* @running: true when there are timers running and +* @cputime_atomic receives updates. +* @checking_timer: true when a thread in the group is in the +* process of checking for thread group timers. +* +* This structure contains the version of task_cputime, above, that is +* used for thread group CPU timer calculations. +*/ +struct thread_group_cputimer { +struct task_cputime_atomic cputime_atomic; +bool running; +bool checking_timer; +}; + +/* * NOTE! "signal_struct" does not have its own * locking, because a shared signal_struct always * implies a shared sighand_struct, so locking
kernel/sched/stats.h +0 -111
114 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 53/53 sched/headers: Move the sched_exec() prototype to <linux/sched/task.h>
In reply to Ingo Molnarsched_exec() better fits into the task lifetime APIs than into the core scheduler APIs.
This reduces the size of <linux/sched.h> a bit.
--- include/linux/sched.h | 7 ------- include/linux/sched/task.h | 7 +++++++ 2 files changed, 7 insertions(+), 7 deletions(-)
include/linux/sched.h +0 -7
@@ -1254,13 +1254,6 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,#define cpu_relax_yield () cpu_relax()#endif -/* sched_exec is called by processes performing an exec */ -#ifdef CONFIG_SMP -extern void sched_exec (void ); -#else -#define sched_exec () {} -#endif -extern int yield_to (struct task_struct *p,bool preempt);extern void set_user_nice (struct task_struct *p,long nice);extern int task_prio (const struct task_struct *p);
include/linux/sched/task.h +7 -0
@@ -77,6 +77,13 @@ extern pid_t kernel_thread(int (*fn)(void *), void *arg, unsigned long flags);extern void free_task (struct task_struct *tsk); +/* sched_exec is called by processes performing an exec */ +#ifdef CONFIG_SMP +extern void sched_exec (void ); +#else +#define sched_exec () {} +#endif +#define get_task_struct (tsk) do { atomic_inc(&(tsk)->usage); } while(0)extern void __put_task_struct (struct task_struct *t);
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 46/53 sched/headers, vfs/execve: Move the do_execve*() prototypes from <linux/sched.h> to <linux/binfmts.h>
In reply to Ingo MolnarThese are not scheduler related.
--- include/linux/binfmts.h | 10 ++++++++++ include/linux/sched.h | 8 -------- 2 files changed, 10 insertions(+), 8 deletions(-)
include/linux/binfmts.h +10 -0
@@ -6,6 +6,8 @@#include <asm/exec.h> #include <uapi/linux/binfmts.h> +struct filename ; +#define CORENAME_MAX_SIZE 128/*
@@ -123,4 +125,12 @@ extern void install_exec_creds(struct linux_binprm *bprm);extern void set_binfmt (struct linux_binfmt *new);extern ssize_t read_code (struct file *,unsigned long ,loff_t ,size_t ); +extern int do_execve (struct filename *, +const char __user *const __user *, +const char __user *const __user *); +extern int do_execveat (int ,struct filename *, +const char __user *const __user *, +const char __user *const __user *, +int ); +#endif /* _LINUX_BINFMTS_H */
include/linux/sched.h +0 -8
@@ -1396,14 +1396,6 @@ extern void exit_files(struct task_struct *);extern void exit_itimers (struct signal_struct *); -extern int do_execve (struct filename *, -const char __user *const __user *, -const char __user *const __user *); -extern int do_execveat (int ,struct filename *, -const char __user *const __user *, -const char __user *const __user *, -int ); -extern void __set_task_comm (struct task_struct *tsk,const char *from,bool exec);static inline void set_task_comm (struct task_struct *tsk,const char *from) {
Signature · 1 line
2.7.4
Re: [PATCH 14/53] sched/headers: Move 'struct user_struct' definition and APIs to the new <linux/sched/user.h> header
In reply to Ingo MolnarQuoted 3 lines · Ingo Molnar
'struct
user_struct' was added tosched.hhistorically, but it's actually entirely independent oftask_structand of scheduler details, so move it to its own header.
Hmm. I wonder if this would make more sense not even under the "<linux/sched/xyz>" hierarchy. It has nothing to do with the scheduling at all, really.
Small nit and can be left for later.
Linus
Ingo Molnar
maintainerPATCH 51/53 sched/headers, mm: Move 'struct tlbflush_unmap_batch' from <linux/sched.h> to <linux/mm_types_task.h>
In reply to Ingo MolnarUnclutter <linux/sched.h> some more.
Also move the CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH condition inside the structure body definition, to remove a pair of #ifdefs from sched.h.
--- include/linux/mm_types_task.h | 22 ++++++++++++++++++++++ include/linux/sched.h | 21 --------------------- 2 files changed, 22 insertions(+), 21 deletions(-)
include/linux/mm_types_task.h +22 -0
@@ -10,6 +10,7 @@#include <linux/types.h> #include <linux/threads.h> #include <linux/atomic.h> +#include <linux/cpumask.h> #include <asm/page.h>
@@ -62,4 +63,25 @@ struct page_frag { #endif }; +/* Track pages that require TLB flushes */ +struct tlbflush_unmap_batch { +#ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH +/* +* Each bit set is a CPU that potentially has a TLB entry for one of +* the PFNs being flushed. See set_tlb_ubc_flush_pending(). +*/ +struct cpumask cpumask; + +/* True if any bit in cpumask is set */ +bool flush_required; + +/* +* If true then the PTE was dirty when unmapped. The entry must be +* flushed before IO is initiated or a stale TLB entry potentially +* allows an update without redirtying the page. +*/ +bool writable; +#endif +}; +#endif /* _LINUX_MM_TYPES_TASK_H */
include/linux/sched.h +0 -21
@@ -480,25 +480,6 @@ enum perf_event_task_context { perf_nr_task_contexts, }; -/* Track pages that require TLB flushes */ -struct tlbflush_unmap_batch { -/* -* Each bit set is a CPU that potentially has a TLB entry for one of -* the PFNs being flushed. See set_tlb_ubc_flush_pending(). -*/ -struct cpumask cpumask; - -/* True if any bit in cpumask is set */ -bool flush_required; - -/* -* If true then the PTE was dirty when unmapped. The entry must be -* flushed before IO is initiated or a stale TLB entry potentially -* allows an update without redirtying the page. -*/ -bool writable; -}; -struct task_struct {#ifdef CONFIG_THREAD_INFO_IN_TASK /*
@@ -891,9 +872,7 @@ struct task_struct {unsigned long numa_pages_migrated;#endif /* CONFIG_NUMA_BALANCING */ -#ifdef CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH struct tlbflush_unmap_batch tlb_ubc; -#endif struct rcu_head rcu;
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 45/53 sched/headers: Move sched_info_on() and force_schedstat_enabled() from <linux/sched.h> to <linux/sched/stat.h>
In reply to Ingo MolnarThese APIs are not core scheduler but scheduler statistics related.
--- include/linux/sched.h | 16 ---------------- include/linux/sched/stat.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-)
include/linux/sched.h +0 -16
@@ -254,22 +254,6 @@ struct sched_info { };#endif /* CONFIG_SCHED_INFO */ -static inline int sched_info_on (void ) -{ -#ifdef CONFIG_SCHEDSTATS -return 1 ; -#elif defined(CONFIG_TASK_DELAY_ACCT ) -extern int delayacct_on; -return delayacct_on; -#else -return 0 ; -#endif -} - -#ifdef CONFIG_SCHEDSTATS -void force_schedstat_enabled (void ); -#endif -/* * Integer metrics need fixed point arithmetic, e.g., sched/fair * has a few: load, load_avg, util_avg, freq, and capacity.
include/linux/sched/stat.h +16 -0
@@ -21,4 +21,20 @@ extern unsigned long nr_iowait(void);extern unsigned long nr_iowait_cpu (int cpu);extern void get_iowait_load (unsigned long *nr_waiters,unsigned long *load); +static inline int sched_info_on (void ) +{ +#ifdef CONFIG_SCHEDSTATS +return 1 ; +#elif defined(CONFIG_TASK_DELAY_ACCT ) +extern int delayacct_on; +return delayacct_on; +#else +return 0 ; +#endif +} + +#ifdef CONFIG_SCHEDSTATS +void force_schedstat_enabled (void ); +#endif +#endif /* _LINUX_SCHED_STAT_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 37/53 sched/headers: Move task-stack related APIs from <linux/sched.h> to <linux/sched/task_stack.h>
In reply to Ingo MolnarSplit out the task->stack related functionality, which is not really part of the core scheduler APIs.
Only keep task_thread_info() because it's used by sched.h.
Update the code that uses those facilities.
--- include/linux/sched.h | 115 +++++------------------------------------------------------ include/linux/sched/task_stack.h | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 113 insertions(+), 106 deletions(-)
include/linux/sched.h +9 -106
@@ -1446,6 +1446,15 @@ union thread_union {unsigned long stack[THREAD_SIZE /sizeof (long )]; }; +#ifdef CONFIG_THREAD_INFO_IN_TASK +static inline struct thread_info *task_thread_info (struct task_struct *task) +{ +return &task->thread_info; +} +#elif !defined(__HAVE_THREAD_FUNCTIONS) +# define task_thread_info (task) ((struct thread_info *)(task)->stack) +#endif +#ifndef __HAVE_ARCH_KSTACK_ENDstatic inline int kstack_end (void *addr) {
@@ -1536,112 +1545,6 @@ static inline void task_unlock(struct task_struct *p)spin_unlock (&p->alloc_lock); } -#ifdef CONFIG_THREAD_INFO_IN_TASK - -static inline struct thread_info *task_thread_info (struct task_struct *task) -{ -return &task->thread_info; -} - -/* -* When accessing the stack of a non-current task that might exit, use -* try_get_task_stack() instead. task_stack_page will return a pointer -* that could get freed out from under you. -*/ -static inline void *task_stack_page (const struct task_struct *task) -{ -return task->stack; -} - -#define setup_thread_stack (new,old) do { } while(0) - -static inline unsigned long *end_of_stack (const struct task_struct *task) -{ -return task->stack; -} - -#elif !defined(__HAVE_THREAD_FUNCTIONS) - -#define task_thread_info (task) ((struct thread_info *)(task)->stack) -#define task_stack_page (task) ((void *)(task)->stack) - -static inline void setup_thread_stack (struct task_struct *p,struct task_struct *org) -{ - *task_thread_info (p) = *task_thread_info (org); -task_thread_info (p)->task = p; -} - -/* -* Return the address of the last usable long on the stack. -* -* When the stack grows down, this is just above the thread -* info struct. Going any lower will corrupt the threadinfo. -* -* When the stack grows up, this is the highest address. -* Beyond that position, we corrupt data on the next page. -*/ -static inline unsigned long *end_of_stack (struct task_struct *p) -{ -#ifdef CONFIG_STACK_GROWSUP -return (unsigned long *)((unsigned long )task_thread_info (p) +THREAD_SIZE ) -1 ; -#else -return (unsigned long *)(task_thread_info (p) +1 ); -#endif -} - -#endif - -#ifdef CONFIG_THREAD_INFO_IN_TASK -static inline void *try_get_task_stack (struct task_struct *tsk) -{ -return atomic_inc_not_zero (&tsk->stack_refcount) ? -task_stack_page (tsk) :NULL ; -} - -extern void put_task_stack (struct task_struct *tsk); -#else -static inline void *try_get_task_stack (struct task_struct *tsk) -{ -return task_stack_page (tsk); -} - -static inline void put_task_stack (struct task_struct *tsk) {} -#endif - -#define task_stack_end_corrupted (task) \ - (*(end_of_stack(task)) != STACK_END_MAGIC) - -static inline int object_is_on_stack (void *obj) -{ -void *stack =task_stack_page (current); - -return (obj >= stack) && (obj < (stack +THREAD_SIZE )); -} - -extern void thread_stack_cache_init (void ); - -#ifdef CONFIG_DEBUG_STACK_USAGE -static inline unsigned long stack_not_used (struct task_struct *p) -{ -unsigned long *n =end_of_stack (p); - -do {/* Skip over canary */ -# ifdef CONFIG_STACK_GROWSUP - n--; -# else - n++; -# endif - }while (!*n); - -# ifdef CONFIG_STACK_GROWSUP -return (unsigned long )end_of_stack (p) - (unsigned long )n; -# else -return (unsigned long )n - (unsigned long )end_of_stack (p); -# endif -} -#endif -extern void set_task_stack_end_magic (struct task_struct *tsk); -/* set thread flags in other task's structures * - see asm/thread_info.h for TIF_xxxx flags available */
include/linux/sched/task_stack.h +104 -0
111 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerRe: [PATCH 14/53] sched/headers: Move 'struct user_struct' definition and APIs to the new <linux/sched/user.h> header
In reply to Linus TorvaldsQuoted 10 lines · Linus Torvalds
Quoted 3 lines · Ingo Molnar
'struct
user_struct' was added tosched.hhistorically, but it's actually entirely independent oftask_structand of scheduler details, so move it to its own header.Hmm. I wonder if this would make more sense not even under the "<linux/sched/xyz>" hierarchy. It has nothing to do with the scheduling at all, really.
Small nit and can be left for later.
Yeah. Some of the others could be moved to include/linux/ as well, such as:
<linux/sched/jobctl.h> => <linux/jobctl.h>
<linux/sched/xacct.h> => <linux/xacct.h>
<linux/sched/user.h> => <linux/user.h>
All of these are pretty unrelated to scheduling, they just happen to be about fields that are in task_struct.
<linux/user.h> already exists, it wraps asm/user.h - I suspect the <linux/sched/user.h> bits can just be appended to it, plus a header guard.
Thanks,
Ingo
Ingo Molnar
maintainerPATCH 47/53 sched/headers: Move kstack_end() from <linux/sched.h> to <linux/sched/task_stack.h>
In reply to Ingo MolnarThis is a task-stack related API, not core scheduler functionality.
--- include/linux/sched.h | 10 ---------- include/linux/sched/task_stack.h | 10 ++++++++++ 2 files changed, 10 insertions(+), 10 deletions(-)
include/linux/sched.h +0 -10
@@ -1356,16 +1356,6 @@ static inline struct thread_info *task_thread_info(struct task_struct *task)# define task_thread_info (task) ((struct thread_info *)(task)->stack)#endif -#ifndef __HAVE_ARCH_KSTACK_END -static inline int kstack_end (void *addr) -{ -/* Reliable end of stack detection: -* Some APM bios versions misalign the stack -*/ -return !(((unsigned long )addr+sizeof (void *)-1 ) & (THREAD_SIZE -sizeof (void *))); -} -#endif -extern struct pid_namespace init_pid_ns;/*
include/linux/sched/task_stack.h +10 -0
@@ -108,4 +108,14 @@ static inline unsigned long stack_not_used(struct task_struct *p)#endif extern void set_task_stack_end_magic (struct task_struct *tsk); +#ifndef __HAVE_ARCH_KSTACK_END +static inline int kstack_end (void *addr) +{ +/* Reliable end of stack detection: +* Some APM bios versions misalign the stack +*/ +return !(((unsigned long )addr+sizeof (void *)-1 ) & (THREAD_SIZE -sizeof (void *))); +} +#endif +#endif /* _LINUX_SCHED_TASK_STACK_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 52/53 sched/headers: Move the get_task_struct()/put_task_struct() and related APIs from <linux/sched.h> to <linux/sched/task.h>
In reply to Ingo MolnarThese belong into the task lifetime API header.
--- include/linux/sched.h | 14 -------------- include/linux/sched/task.h | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 14 deletions(-)
include/linux/sched.h +0 -14
@@ -1131,20 +1131,6 @@ static inline int is_global_init(struct task_struct *tsk)extern struct pid *cad_pid; -extern void free_task (struct task_struct *tsk); -#define get_task_struct (tsk) do { atomic_inc(&(tsk)->usage); } while(0) - -extern void __put_task_struct (struct task_struct *t); - -static inline void put_task_struct (struct task_struct *t) -{ -if (atomic_dec_and_test (&t->usage)) -__put_task_struct (t); -} - -struct task_struct *task_rcu_dereference (struct task_struct **ptask); -struct task_struct *try_get_task_struct (struct task_struct **ptask); -/* * Per process flags */
include/linux/sched/task.h +15 -0
@@ -75,6 +75,21 @@ extern long do_fork(unsigned long, unsigned long, unsigned long, int __user *, istruct task_struct *fork_idle (int );extern pid_t kernel_thread (int (*fn)(void *),void *arg,unsigned long flags); +extern void free_task (struct task_struct *tsk); + +#define get_task_struct (tsk) do { atomic_inc(&(tsk)->usage); } while(0) + +extern void __put_task_struct (struct task_struct *t); + +static inline void put_task_struct (struct task_struct *t) +{ +if (atomic_dec_and_test (&t->usage)) +__put_task_struct (t); +} + +struct task_struct *task_rcu_dereference (struct task_struct **ptask); +struct task_struct *try_get_task_struct (struct task_struct **ptask); +#ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT extern int arch_task_struct_size__read_mostly ;
Signature · 1 line
2.7.4