Major reorganization of <linux/sched.h>
Subsystems (316)
Ingo Molnar
maintainerPATCH 59/89 sched/core: Move the get_preempt_disable_ip() inline to sched/core.c
In reply to Ingo MolnarIt's defined in <linux/sched.h>, but nothing outside the scheduler uses it - so move it to the sched/core.c usage site.
--- include/linux/sched.h | 9 --------- kernel/sched/core.c | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-)
include/linux/sched.h +0 -9
@@ -1623,15 +1623,6 @@ static inline void cond_resched_rcu(void)#endif } -static inline unsigned long get_preempt_disable_ip (struct task_struct *p) -{ -#ifdef CONFIG_DEBUG_PREEMPT -return p->preempt_disable_ip; -#else -return 0 ; -#endif -} -/* * Does a critical section need to be broken due to another * task waiting?: (technically does not depend on CONFIG_PREEMPT,
kernel/sched/core.c +9 -0
@@ -3212,6 +3212,15 @@ static inline void preempt_latency_start(int val) { }static inline void preempt_latency_stop (int val) { }#endif +static inline unsigned long get_preempt_disable_ip (struct task_struct *p) +{ +#ifdef CONFIG_DEBUG_PREEMPT +return p->preempt_disable_ip; +#else +return 0 ; +#endif +} +/* * Print scheduling while atomic bug: */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 60/89 signals: Split out <linux/signal_types.h> from <linux/signal.h>
In reply to Ingo MolnarSeparate out just the pure data types - sched.h will be able to use this reduced size header.
--- arch/mips/include/asm/abi.h | 2 ++ include/linux/signal.h | 57 +------------------------------------------------------ include/linux/signal_types.h | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 56 deletions(-)
arch/mips/include/asm/abi.h +2 -0
@@ -9,6 +9,8 @@#ifndef _ASM_ABI_H#define _ASM_ABI_H +#include <linux/signal_types.h> +#include <asm/signal.h> #include <asm/siginfo.h> #include <asm/vdso.h>
include/linux/signal.h +1 -56
75 lines not on this page · raw message
include/linux/signal_types.h new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 61/89 sched/headers: Reduce <linux/sched.h> signal API dependency
In reply to Ingo MolnarInstead of including the full <linux/signal.h>, only include the types-only <linux/signal_types.h> header in <linux/sched.h>, to further decouple the scheduler header from the signal headers.
Also update <linux/sched/signal.h> which now needs the additional header.
Update the code that relied on sched.h's inclusion of the signal.h header.
--- arch/arm64/kernel/sys_compat.c | 1 + drivers/gpu/drm/i915/i915_gem_request.c | 1 + drivers/isdn/mISDN/stack.c | 2 ++ fs/btrfs/extent-tree.c | 1 + fs/btrfs/free-space-cache.c | 1 + fs/buffer.c | 1 + fs/ceph/addr.c | 1 + fs/dax.c | 1 + fs/ioctl.c | 2 ++ fs/iomap.c | 2 ++ fs/ocfs2/super.c | 1 + include/linux/sched.h | 2 +- include/linux/sched/signal.h | 1 + kernel/pid_namespace.c | 1 + mm/page-writeback.c | 1 + 15 files changed, 18 insertions(+), 1 deletion(-)
arch/arm64/kernel/sys_compat.c +1 -0
@@ -21,6 +21,7 @@#include <linux/compat.h> #include <linux/personality.h> #include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/slab.h> #include <linux/syscalls.h> #include <linux/uaccess.h>
drivers/gpu/drm/i915/i915_gem_request.c +1 -0
@@ -26,6 +26,7 @@#include <linux/dma-fence-array.h> #include <linux/sched.h> #include <linux/sched/clock.h> +#include <linux/sched/signal.h> #include "i915_drv.h"
drivers/isdn/mISDN/stack.c +2 -0
@@ -19,6 +19,8 @@#include <linux/mISDNif.h> #include <linux/kthread.h> #include <linux/sched.h> +#include <linux/signal.h> +#include "core.h" static u_int *debug;
fs/btrfs/extent-tree.c +1 -0
@@ -16,6 +16,7 @@* Boston, MA 021110-1307, USA. */ #include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/pagemap.h> #include <linux/writeback.h> #include <linux/blkdev.h>
fs/btrfs/free-space-cache.c +1 -0
@@ -18,6 +18,7 @@#include <linux/pagemap.h> #include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/slab.h> #include <linux/math64.h> #include <linux/ratelimit.h>
fs/buffer.c +1 -0
@@ -19,6 +19,7 @@*/ #include <linux/kernel.h> +#include <linux/sched/signal.h> #include <linux/syscalls.h> #include <linux/fs.h> #include <linux/iomap.h>
fs/ceph/addr.c +1 -0
@@ -8,6 +8,7 @@#include <linux/slab.h> #include <linux/pagevec.h> #include <linux/task_io_accounting_ops.h> +#include <linux/signal.h> #include "super.h" #include "mds_client.h"
fs/dax.c +1 -0
@@ -27,6 +27,7 @@#include <linux/pagevec.h> #include <linux/pmem.h> #include <linux/sched.h> +#include <linux/sched/signal.h> #include <linux/uio.h> #include <linux/vmstat.h> #include <linux/pfn_t.h>
fs/ioctl.c +2 -0
@@ -15,6 +15,8 @@#include <linux/writeback.h> #include <linux/buffer_head.h> #include <linux/falloc.h> +#include <linux/sched/signal.h> +#include "internal.h" #include <asm/ioctls.h>
fs/iomap.c +2 -0
@@ -26,6 +26,8 @@#include <linux/buffer_head.h> #include <linux/task_io_accounting_ops.h> #include <linux/dax.h> +#include <linux/sched/signal.h> +#include "internal.h" /*
fs/ocfs2/super.c +1 -0
@@ -42,6 +42,7 @@#include <linux/seq_file.h> #include <linux/quotaops.h> #include <linux/cleancache.h> +#include <linux/signal.h> #define CREATE_TRACE_POINTS #include "ocfs2_trace.h"
include/linux/sched.h +1 -1
@@ -10,7 +10,7 @@#include <linux/sem.h> #include <linux/shm.h> -#include <linux/signal.h> +#include <linux/signal_types.h> #include <linux/pid.h> #include <linux/seccomp.h> #include <linux/rculist.h>
include/linux/sched/signal.h +1 -0
@@ -1,6 +1,7 @@#ifndef _LINUX_SCHED_SIGNAL_H#define _LINUX_SCHED_SIGNAL_H +#include <linux/signal.h> #include <linux/sched.h> #include <linux/sched/jobctl.h> #include <linux/cred.h>
kernel/pid_namespace.c +1 -0
@@ -20,6 +20,7 @@#include <linux/reboot.h> #include <linux/export.h> #include <linux/sched/task.h> +#include <linux/sched/signal.h> struct pid_cache {int nr_ids;
mm/page-writeback.c +1 -0
@@ -36,6 +36,7 @@#include <linux/pagevec.h> #include <linux/timer.h> #include <linux/sched/rt.h> +#include <linux/sched/signal.h> #include <linux/mm_inline.h> #include <trace/events/writeback.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 62/89 mm/headers, sched/headers: Split <linux/mm_types_task.h> out of <linux/mm_types.h>
In reply to Ingo MolnarSeparate all the MM types that are embedded directly in 'struct task_struct' into the new <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 | 55 +++-------------------------------------------------- include/linux/mm_types_task.h | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 52 deletions(-)
include/linux/mm_types.h +3 -52
@@ -1,9 +1,9 @@#ifndef _LINUX_MM_TYPES_H#define _LINUX_MM_TYPES_H +#include <linux/mm_types_task.h> +#include <linux/auxvec.h> -#include <linux/types.h> -#include <linux/threads.h> #include <linux/list.h> #include <linux/spinlock.h> #include <linux/rbtree.h>
@@ -13,7 +13,7 @@#include <linux/uprobes.h> #include <linux/page-flags-layout.h> #include <linux/workqueue.h> -#include <asm/page.h> +#include <asm/mmu.h> #ifndef AT_VECTOR_SIZE_ARCH
@@ -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 new file +65 -0
65 lines not on this page · raw message
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 63/89 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.
Update the code that relied on sched.h including the MM types for them.
--- arch/alpha/include/asm/a.out-core.h | 1 + arch/alpha/include/asm/mmu_context.h | 2 ++ arch/arc/mm/tlb.c | 2 ++ arch/arm/include/asm/mmu_context.h | 2 ++ arch/arm/include/asm/tlbflush.h | 7 ++++--- arch/arm/kernel/suspend.c | 1 + arch/arm/kernel/swp_emulate.c | 1 + arch/arm/mm/idmap.c | 1 + arch/arm64/include/asm/mmu_context.h | 1 + arch/arm64/kernel/traps.c | 1 + arch/avr32/include/asm/mmu_context.h | 2 ++ arch/blackfin/include/asm/mmu_context.h | 2 ++ arch/blackfin/kernel/flat.c | 1 + arch/blackfin/kernel/process.c | 1 + arch/blackfin/mm/sram-alloc.c | 2 ++ arch/cris/arch-v10/mm/tlb.c | 2 ++ arch/cris/arch-v32/mm/tlb.c | 1 + arch/cris/include/asm/pgtable.h | 2 +- arch/cris/mm/tlb.c | 2 ++ arch/h8300/kernel/traps.c | 1 + arch/hexagon/include/asm/mmu_context.h | 2 ++ arch/hexagon/kernel/smp.c | 1 + arch/ia64/include/asm/mmu_context.h | 1 + arch/ia64/include/asm/pgtable.h | 2 +- arch/ia64/sn/kernel/sn2/sn2_smp.c | 1 + arch/m32r/include/asm/mmu_context.h | 2 ++ arch/m68k/include/asm/a.out-core.h | 1 + arch/m68k/include/asm/mmu_context.h | 1 + arch/metag/include/asm/mmu_context.h | 1 + arch/microblaze/include/asm/mmu_context_mm.h | 2 ++ arch/microblaze/mm/pgtable.c | 1 + arch/mips/include/asm/elf.h | 2 ++ arch/mips/include/asm/mmu_context.h | 2 ++ arch/mips/kernel/smp.c | 2 +- arch/mips/math-emu/dsemul.c | 1 + arch/mips/mm/ioremap.c | 1 + arch/mn10300/include/asm/mmu_context.h | 2 ++ arch/mn10300/kernel/smp.c | 2 +- arch/mn10300/mm/tlb-smp.c | 2 +- arch/nios2/include/asm/mmu_context.h | 2 ++ arch/nios2/kernel/process.c | 1 + arch/powerpc/kernel/io-workarounds.c | 2 +- arch/powerpc/kvm/e500_mmu_host.c | 2 +- arch/powerpc/lib/feature-fixups.c | 1 + arch/powerpc/mm/hash_utils_64.c | 2 +- arch/powerpc/mm/pgtable-book3s64.c | 2 ++ arch/powerpc/mm/pgtable-hash64.c | 2 ++ arch/powerpc/mm/pgtable-radix.c | 2 +- arch/powerpc/mm/slb.c | 2 ++ arch/s390/include/asm/elf.h | 2 +- arch/s390/include/asm/mmu_context.h | 1 + arch/s390/kernel/processor.c | 1 + arch/s390/kvm/gaccess.c | 2 ++ arch/s390/kvm/priv.c | 2 ++ arch/score/include/asm/mmu_context.h | 2 ++ arch/score/kernel/traps.c | 1 + arch/sh/include/asm/mmu_context.h | 2 ++ arch/sparc/include/asm/mmu_context_64.h | 2 ++ arch/sparc/include/asm/pgtable_64.h | 3 +++ arch/sparc/kernel/asm-offsets.c | 1 + arch/sparc/kernel/traps_32.c | 1 + arch/sparc/mm/tsb.c | 2 ++ arch/tile/include/asm/mmu_context.h | 2 ++ arch/um/include/asm/mmu_context.h | 2 ++ arch/um/kernel/exec.c | 2 +- arch/um/kernel/reboot.c | 1 + arch/um/kernel/skas/process.c | 3 ++- arch/x86/entry/vsyscall/vsyscall_64.c | 1 + arch/x86/events/core.c | 2 +- arch/x86/include/asm/a.out-core.h | 2 ++ arch/x86/include/asm/mpx.h | 2 ++ arch/x86/mm/mpx.c | 1 + arch/x86/um/syscalls_64.c | 1 + arch/x86/xen/mmu.c | 2 +- arch/xtensa/include/asm/mmu_context.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 2 ++ drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 2 ++ drivers/infiniband/hw/cxgb3/iwch_provider.c | 2 +- drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 +- drivers/media/v4l2-core/videobuf-dma-sg.c | 2 +- fs/binfmt_misc.c | 2 +- fs/kernfs/file.c | 2 +- include/drm/drm_mm.h | 1 + include/linux/init_task.h | 1 + include/linux/sched.h | 2 +- include/linux/sched/mm.h | 1 + kernel/sched/debug.c | 2 +- kernel/sched/fair.c | 2 +- kernel/signal.c | 2 +- lib/is_single_threaded.c | 1 + 90 files changed, 126 insertions(+), 26 deletions(-)
arch/alpha/include/asm/a.out-core.h +1 -0
@@ -15,6 +15,7 @@#ifdef __KERNEL__#include <linux/user.h> +#include <linux/mm_types.h> /* * Fill in the user structure for an ECOFF core dump.
arch/alpha/include/asm/mmu_context.h +2 -0
@@ -7,6 +7,8 @@* Copyright (C) 1996, Linus Torvalds */ +#include <linux/mm_types.h> +#include <asm/machvec.h> #include <asm/compiler.h> #include <asm-generic/mm_hooks.h>
arch/arc/mm/tlb.c +2 -0
@@ -53,6 +53,8 @@#include <linux/module.h> #include <linux/bug.h> +#include <linux/mm_types.h> +#include <asm/arcregs.h> #include <asm/setup.h> #include <asm/mmu_context.h>
arch/arm/include/asm/mmu_context.h +2 -0
@@ -15,7 +15,9 @@#include <linux/compiler.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/preempt.h> +#include <asm/cacheflush.h> #include <asm/cachetype.h> #include <asm/proc-fns.h>
arch/arm/include/asm/tlbflush.h +4 -3
@@ -10,6 +10,10 @@#ifndef _ASMARM_TLBFLUSH_H#define _ASMARM_TLBFLUSH_H +#ifndef __ASSEMBLY__ +# include <linux/mm_types.h> +#endif +#ifdef CONFIG_MMU #include <asm/glue.h>
@@ -644,9 +648,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,#elif defined(CONFIG_SMP )/* !CONFIG_MMU */ #ifndef __ASSEMBLY__ - -#include <linux/mm_types.h> -static inline void local_flush_tlb_all (void ) { }static inline void local_flush_tlb_mm (struct mm_struct *mm) { }static inline void local_flush_tlb_page (struct vm_area_struct *vma,unsigned long uaddr) { }
arch/arm/kernel/suspend.c +1 -0
@@ -1,5 +1,6 @@#include <linux/init.h> #include <linux/slab.h> +#include <linux/mm_types.h> #include <asm/cacheflush.h> #include <asm/idmap.h>
arch/arm/kernel/swp_emulate.c +1 -0
@@ -23,6 +23,7 @@#include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/syscalls.h> #include <linux/perf_event.h>
arch/arm/mm/idmap.c +1 -0
@@ -1,6 +1,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/mm_types.h> #include <asm/cputype.h> #include <asm/idmap.h>
arch/arm64/include/asm/mmu_context.h +1 -0
@@ -22,6 +22,7 @@#include <linux/compiler.h> #include <linux/sched.h> #include <linux/sched/hotplug.h> +#include <linux/mm_types.h> #include <asm/cacheflush.h> #include <asm/cpufeature.h>
arch/arm64/kernel/traps.c +1 -0
@@ -33,6 +33,7 @@#include <linux/sched/debug.h> #include <linux/sched/task_stack.h> #include <linux/syscalls.h> +#include <linux/mm_types.h> #include <asm/atomic.h> #include <asm/bug.h>
arch/avr32/include/asm/mmu_context.h +2 -0
@@ -12,6 +12,8 @@#ifndef __ASM_AVR32_MMU_CONTEXT_H#define __ASM_AVR32_MMU_CONTEXT_H +#include <linux/mm_types.h> +#include <asm/tlbflush.h> #include <asm/sysreg.h> #include <asm-generic/mm_hooks.h>
arch/blackfin/include/asm/mmu_context.h +2 -0
@@ -9,6 +9,8 @@#include <linux/slab.h> #include <linux/sched.h> +#include <linux/mm_types.h> +#include <asm/setup.h> #include <asm/page.h> #include <asm/pgalloc.h>
arch/blackfin/kernel/flat.c +1 -0
@@ -6,6 +6,7 @@#include <linux/module.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/flat.h> #define FLAT_BFIN_RELOC_TYPE_16_BIT 0
arch/blackfin/kernel/process.c +1 -0
@@ -15,6 +15,7 @@#include <linux/sched/debug.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> +#include <linux/mm_types.h> #include <linux/tick.h> #include <linux/fs.h> #include <linux/err.h>
arch/blackfin/mm/sram-alloc.c +2 -0
@@ -19,6 +19,8 @@#include <linux/spinlock.h> #include <linux/rtc.h> #include <linux/slab.h> +#include <linux/mm_types.h> +#include <asm/blackfin.h> #include <asm/mem_map.h> #include "blackfin_sram.h"
arch/cris/arch-v10/mm/tlb.c +2 -0
@@ -10,6 +10,8 @@* */ +#include <linux/mm_types.h> +#include <asm/tlb.h> #include <asm/mmu_context.h> #include <arch/svinto.h>
arch/cris/arch-v32/mm/tlb.c +1 -0
@@ -6,6 +6,7 @@* Authors: Bjorn Wesen <[email protected]> * Tobias Anderberg <[email protected]>, CRISv32 port. */ +#include <linux/mm_types.h> #include <asm/tlb.h> #include <asm/mmu_context.h>
arch/cris/include/asm/pgtable.h +1 -1
@@ -9,7 +9,7 @@#include <asm-generic/pgtable-nopmd.h> #ifndef __ASSEMBLY__ -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <asm/mmu.h> #endif #include <arch/pgtable.h>
arch/cris/mm/tlb.c +2 -0
@@ -9,6 +9,8 @@#include <linux/init.h> #include <linux/kernel.h> +#include <linux/mm_types.h> +#include <asm/tlb.h> #define D (x)
arch/h8300/kernel/traps.c +1 -0
@@ -17,6 +17,7 @@#include <linux/types.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/mm_types.h> #include <linux/kernel.h> #include <linux/errno.h> #include <linux/init.h>
arch/hexagon/include/asm/mmu_context.h +2 -0
@@ -21,6 +21,8 @@#ifndef _ASM_MMU_CONTEXT_H#define _ASM_MMU_CONTEXT_H +#include <linux/mm_types.h> +#include <asm/setup.h> #include <asm/page.h> #include <asm/pgalloc.h>
arch/hexagon/kernel/smp.c +1 -0
@@ -29,6 +29,7 @@#include <linux/smp.h> #include <linux/spinlock.h> #include <linux/cpu.h> +#include <linux/mm_types.h> #include <asm/time.h> /* timer_interrupt */ #include <asm/hexagon_vm.h>
arch/ia64/include/asm/mmu_context.h +1 -0
@@ -26,6 +26,7 @@#include <linux/compiler.h> #include <linux/percpu.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/spinlock.h> #include <asm/processor.h>
arch/ia64/include/asm/pgtable.h +1 -1
@@ -147,7 +147,7 @@# ifndef __ASSEMBLY__ -#include <linux/sched.h> /* for mm_struct */ +#include <linux/sched/mm.h> /* for mm_struct */ #include <linux/bitops.h> #include <asm/cacheflush.h> #include <asm/mmu_context.h>
arch/ia64/sn/kernel/sn2/sn2_smp.c +1 -0
@@ -13,6 +13,7 @@#include <linux/spinlock.h> #include <linux/threads.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/smp.h> #include <linux/interrupt.h> #include <linux/irq.h>
arch/m32r/include/asm/mmu_context.h +2 -0
@@ -12,6 +12,8 @@#ifndef __ASSEMBLY__#include <linux/atomic.h> +#include <linux/mm_types.h> +#include <asm/pgalloc.h> #include <asm/mmu.h> #include <asm/tlbflush.h>
arch/m68k/include/asm/a.out-core.h +1 -0
@@ -16,6 +16,7 @@#include <linux/user.h> #include <linux/elfcore.h> +#include <linux/mm_types.h> /* * fill in the user structure for an a.out core dump
arch/m68k/include/asm/mmu_context.h +1 -0
@@ -2,6 +2,7 @@#define __M68K_MMU_CONTEXT_H#include <asm-generic/mm_hooks.h> +#include <linux/mm_types.h> static inline void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk) {
arch/metag/include/asm/mmu_context.h +1 -0
@@ -9,6 +9,7 @@#include <asm/cacheflush.h> #include <linux/io.h> +#include <linux/mm_types.h> static inline void enter_lazy_tlb (struct mm_struct *mm,struct task_struct *tsk)
arch/microblaze/include/asm/mmu_context_mm.h +2 -0
@@ -12,6 +12,8 @@#define _ASM_MICROBLAZE_MMU_CONTEXT_H#include <linux/atomic.h> +#include <linux/mm_types.h> +#include <asm/bitops.h> #include <asm/mmu.h> #include <asm-generic/mm_hooks.h>
arch/microblaze/mm/pgtable.c +1 -0
@@ -31,6 +31,7 @@#include <linux/types.h> #include <linux/vmalloc.h> #include <linux/init.h> +#include <linux/mm_types.h> #include <asm/pgtable.h> #include <asm/pgalloc.h>
arch/mips/include/asm/elf.h +2 -0
@@ -10,6 +10,8 @@#include <linux/auxvec.h> #include <linux/fs.h> +#include <linux/mm_types.h> +#include <uapi/linux/elf.h> #include <asm/current.h>
arch/mips/include/asm/mmu_context.h +2 -0
@@ -13,8 +13,10 @@#include <linux/errno.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/smp.h> #include <linux/slab.h> +#include <asm/cacheflush.h> #include <asm/dsemul.h> #include <asm/hazards.h>
arch/mips/kernel/smp.c +1 -1
@@ -28,7 +28,7 @@#include <linux/export.h> #include <linux/time.h> #include <linux/timex.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/cpumask.h> #include <linux/cpu.h> #include <linux/err.h>
arch/mips/math-emu/dsemul.c +1 -0
@@ -1,5 +1,6 @@#include <linux/err.h> #include <linux/slab.h> +#include <linux/mm_types.h> #include <asm/branch.h> #include <asm/cacheflush.h>
arch/mips/mm/ioremap.c +1 -0
@@ -12,6 +12,7 @@#include <linux/sched.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/mm_types.h> #include <asm/cacheflush.h> #include <asm/io.h> #include <asm/tlbflush.h>
arch/mn10300/include/asm/mmu_context.h +2 -0
@@ -23,6 +23,8 @@#define _ASM_MMU_CONTEXT_H#include <linux/atomic.h> +#include <linux/mm_types.h> +#include <asm/pgalloc.h> #include <asm/tlbflush.h> #include <asm-generic/mm_hooks.h>
arch/mn10300/kernel/smp.c +1 -1
@@ -21,7 +21,7 @@#include <linux/err.h> #include <linux/kernel.h> #include <linux/delay.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/sched/task.h> #include <linux/profile.h> #include <linux/smp.h>
arch/mn10300/mm/tlb-smp.c +1 -1
@@ -20,7 +20,7 @@#include <linux/err.h> #include <linux/kernel.h> #include <linux/delay.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/profile.h> #include <linux/smp.h> #include <asm/tlbflush.h>
arch/nios2/include/asm/mmu_context.h +2 -0
@@ -13,6 +13,8 @@#ifndef _ASM_NIOS2_MMU_CONTEXT_H#define _ASM_NIOS2_MMU_CONTEXT_H +#include <linux/mm_types.h> +#include <asm-generic/mm_hooks.h> extern void mmu_context_init (void );
arch/nios2/kernel/process.c +1 -0
@@ -17,6 +17,7 @@#include <linux/sched/debug.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> +#include <linux/mm_types.h> #include <linux/tick.h> #include <linux/uaccess.h>
arch/powerpc/kernel/io-workarounds.c +1 -1
@@ -12,7 +12,7 @@#undef DEBUG#include <linux/kernel.h> -#include <linux/sched.h> /* for init_mm */ +#include <linux/sched/mm.h> /* for init_mm */ #include <asm/io.h> #include <asm/machdep.h>
arch/powerpc/kvm/e500_mmu_host.c +1 -1
@@ -25,7 +25,7 @@#include <linux/highmem.h> #include <linux/log2.h> #include <linux/uaccess.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/rwsem.h> #include <linux/vmalloc.h> #include <linux/hugetlb.h>
arch/powerpc/lib/feature-fixups.c +1 -0
@@ -17,6 +17,7 @@#include <linux/kernel.h> #include <linux/string.h> #include <linux/init.h> +#include <linux/sched/mm.h> #include <asm/cputable.h> #include <asm/code-patching.h> #include <asm/page.h>
arch/powerpc/mm/hash_utils_64.c +1 -1
@@ -23,7 +23,7 @@#include <linux/spinlock.h> #include <linux/errno.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/proc_fs.h> #include <linux/stat.h> #include <linux/sysctl.h>
arch/powerpc/mm/pgtable-book3s64.c +2 -0
@@ -8,6 +8,8 @@*/ #include <linux/sched.h> +#include <linux/mm_types.h> +#include <asm/pgalloc.h> #include <asm/tlb.h>
arch/powerpc/mm/pgtable-hash64.c +2 -0
@@ -10,6 +10,8 @@*/ #include <linux/sched.h> +#include <linux/mm_types.h> +#include <asm/pgalloc.h> #include <asm/tlb.h>
arch/powerpc/mm/pgtable-radix.c +1 -1
@@ -8,7 +8,7 @@* as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. */ -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/memblock.h> #include <linux/of_fdt.h>
arch/powerpc/mm/slb.c +2 -0
@@ -22,6 +22,8 @@#include <asm/cacheflush.h> #include <asm/smp.h> #include <linux/compiler.h> +#include <linux/mm_types.h> +#include <asm/udbg.h> #include <asm/code-patching.h>
arch/s390/include/asm/elf.h +1 -1
@@ -130,7 +130,7 @@ typedef s390_fp_regs compat_elf_fpregset_t;typedef s390_compat_regs compat_elf_gregset_t ;#include <linux/compat.h> -#include <linux/sched.h> /* for task_struct */ +#include <linux/sched/mm.h> /* for task_struct */ #include <asm/mmu_context.h> #include <asm/vdso.h>
arch/s390/include/asm/mmu_context.h +1 -0
@@ -9,6 +9,7 @@#include <asm/pgalloc.h> #include <linux/uaccess.h> +#include <linux/mm_types.h> #include <asm/tlbflush.h> #include <asm/ctl_reg.h>
arch/s390/kernel/processor.c +1 -0
@@ -10,6 +10,7 @@#include <linux/kernel.h> #include <linux/init.h> #include <linux/seq_file.h> +#include <linux/mm_types.h> #include <linux/delay.h> #include <linux/cpu.h> #include <asm/diag.h>
arch/s390/kvm/gaccess.c +2 -0
@@ -6,7 +6,9 @@*/ #include <linux/vmalloc.h> +#include <linux/mm_types.h> #include <linux/err.h> +#include <asm/pgtable.h> #include <asm/gmap.h> #include "kvm-s390.h"
arch/s390/kvm/priv.c +2 -0
@@ -15,6 +15,8 @@#include <linux/gfp.h> #include <linux/errno.h> #include <linux/compat.h> +#include <linux/mm_types.h> +#include <asm/asm-offsets.h> #include <asm/facility.h> #include <asm/current.h>
arch/score/include/asm/mmu_context.h +2 -0
@@ -3,7 +3,9 @@#include <linux/errno.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/slab.h> +#include <asm-generic/mm_hooks.h> #include <asm/cacheflush.h>
arch/score/kernel/traps.c +1 -0
@@ -26,6 +26,7 @@#include <linux/module.h> #include <linux/sched/signal.h> #include <linux/sched/debug.h> +#include <linux/mm_types.h> #include <asm/cacheflush.h> #include <asm/irq.h>
arch/sh/include/asm/mmu_context.h +2 -0
@@ -11,6 +11,8 @@#include <cpu/mmu_context.h> #include <asm/tlbflush.h> #include <linux/uaccess.h> +#include <linux/mm_types.h> +#include <asm/io.h> #include <asm-generic/mm_hooks.h>
arch/sparc/include/asm/mmu_context_64.h +2 -0
@@ -6,6 +6,8 @@#ifndef __ASSEMBLY__#include <linux/spinlock.h> +#include <linux/mm_types.h> +#include <asm/spitfire.h> #include <asm-generic/mm_hooks.h>
arch/sparc/include/asm/pgtable_64.h +3 -0
@@ -873,6 +873,9 @@ static inline unsigned long pud_pfn(pud_t pud)#define pte_offset_map pte_index#define pte_unmap (pte) do { } while (0) +/* We cannot include <linux/mm_types.h> at this point yet: */ +extern struct mm_struct init_mm; +/* Actual page table PTE updates. */ void tlb_batch_add (struct mm_struct *mm,unsigned long vaddr,pte_t *ptep,pte_t orig,int fullmm);
arch/sparc/kernel/asm-offsets.c +1 -0
@@ -11,6 +11,7 @@*/ #include <linux/sched.h> +#include <linux/mm_types.h> // #include <linux/mm.h> #include <linux/kbuild.h>
arch/sparc/kernel/traps_32.c +1 -0
@@ -11,6 +11,7 @@#include <linux/sched.h> /* for jiffies */ #include <linux/sched/debug.h> +#include <linux/mm_types.h> #include <linux/kernel.h> #include <linux/signal.h> #include <linux/smp.h>
arch/sparc/mm/tsb.c +2 -0
@@ -6,6 +6,8 @@#include <linux/kernel.h> #include <linux/preempt.h> #include <linux/slab.h> +#include <linux/mm_types.h> +#include <asm/page.h> #include <asm/pgtable.h> #include <asm/mmu_context.h>
arch/tile/include/asm/mmu_context.h +2 -0
@@ -16,6 +16,8 @@#define _ASM_TILE_MMU_CONTEXT_H#include <linux/smp.h> +#include <linux/mm_types.h> +#include <asm/setup.h> #include <asm/page.h> #include <asm/pgalloc.h>
arch/um/include/asm/mmu_context.h +2 -0
@@ -7,6 +7,8 @@#define __UM_MMU_CONTEXT_H#include <linux/sched.h> +#include <linux/mm_types.h> +#include <asm/mmu.h> extern void uml_setup_stubs (struct mm_struct *mm);
arch/um/kernel/exec.c +1 -1
@@ -7,7 +7,7 @@#include <linux/module.h> #include <linux/fs.h> #include <linux/ptrace.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> #include <linux/slab.h>
arch/um/kernel/reboot.c +1 -0
@@ -5,6 +5,7 @@#include <linux/sched/signal.h> #include <linux/sched/task.h> +#include <linux/sched/mm.h> #include <linux/spinlock.h> #include <linux/slab.h> #include <linux/oom.h>
arch/um/kernel/skas/process.c +2 -1
@@ -4,8 +4,9 @@*/ #include <linux/init.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/sched/task_stack.h> +#include <as-layout.h> #include <kern.h> #include <os.h>
arch/x86/entry/vsyscall/vsyscall_64.c +1 -0
@@ -28,6 +28,7 @@#include <linux/kernel.h> #include <linux/timer.h> #include <linux/sched/signal.h> +#include <linux/mm_types.h> #include <linux/syscalls.h> #include <linux/ratelimit.h>
arch/x86/events/core.c +1 -1
@@ -20,7 +20,7 @@#include <linux/export.h> #include <linux/init.h> #include <linux/kdebug.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/sched/clock.h> #include <linux/uaccess.h> #include <linux/slab.h>
arch/x86/include/asm/a.out-core.h +2 -0
@@ -17,6 +17,8 @@#include <linux/user.h> #include <linux/elfcore.h> +#include <linux/mm_types.h> +#include <asm/debugreg.h> /*
arch/x86/include/asm/mpx.h +2 -0
@@ -2,6 +2,8 @@#define _ASM_X86_MPX_H#include <linux/types.h> +#include <linux/mm_types.h> +#include <asm/ptrace.h> #include <asm/insn.h>
arch/x86/mm/mpx.c +1 -0
@@ -7,6 +7,7 @@*/ #include <linux/kernel.h> #include <linux/slab.h> +#include <linux/mm_types.h> #include <linux/syscalls.h> #include <linux/sched/sysctl.h>
arch/x86/um/syscalls_64.c +1 -0
@@ -6,6 +6,7 @@*/ #include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/uaccess.h> #include <asm/prctl.h> /* XXX This should get the constants from libc */ #include <os.h>
arch/x86/xen/mmu.c +1 -1
@@ -38,7 +38,7 @@* * Jeremy Fitzhardinge <[email protected]>, XenSource Inc, 2007 */ -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/highmem.h> #include <linux/debugfs.h> #include <linux/bug.h>
arch/xtensa/include/asm/mmu_context.h +1 -0
@@ -17,6 +17,7 @@#include <linux/stringify.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <asm/vectors.h>
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c +2 -0
@@ -23,6 +23,8 @@#include <linux/printk.h> #include <linux/slab.h> +#include <linux/mm_types.h> +#include "kfd_priv.h" #include "kfd_mqd_manager.h" #include "cik_regs.h"
drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c +2 -0
@@ -23,6 +23,8 @@#include <linux/printk.h> #include <linux/slab.h> +#include <linux/mm_types.h> +#include "kfd_priv.h" #include "kfd_mqd_manager.h" #include "vi_structs.h"
drivers/infiniband/hw/cxgb3/iwch_provider.c +1 -1
@@ -37,7 +37,7 @@#include <linux/delay.h> #include <linux/errno.h> #include <linux/list.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/spinlock.h> #include <linux/ethtool.h> #include <linux/rtnetlink.h>
drivers/infiniband/hw/cxgb4/iw_cxgb4.h +1 -1
@@ -37,7 +37,7 @@#include <linux/idr.h> #include <linux/completion.h> #include <linux/netdevice.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/pci.h> #include <linux/dma-mapping.h> #include <linux/inet.h>
drivers/media/v4l2-core/videobuf-dma-sg.c +1 -1
@@ -21,7 +21,7 @@#include <linux/init.h> #include <linux/module.h> #include <linux/moduleparam.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/slab.h> #include <linux/interrupt.h>
fs/binfmt_misc.c +1 -1
@@ -12,7 +12,7 @@#include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/magic.h> #include <linux/binfmts.h> #include <linux/slab.h>
fs/kernfs/file.c +1 -1
@@ -13,7 +13,7 @@#include <linux/slab.h> #include <linux/poll.h> #include <linux/pagemap.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/fsnotify.h> #include "kernfs-internal.h"
include/drm/drm_mm.h +1 -0
@@ -39,6 +39,7 @@#include <linux/bug.h> #include <linux/rbtree.h> #include <linux/kernel.h> +#include <linux/mm_types.h> #include <linux/list.h> #include <linux/spinlock.h> #ifdef CONFIG_DEBUG_FS
include/linux/init_task.h +1 -0
@@ -15,6 +15,7 @@#include <linux/sched/autogroup.h> #include <net/net_namespace.h> #include <linux/sched/rt.h> +#include <linux/mm_types.h> #include <asm/thread_info.h>
include/linux/sched.h +1 -1
@@ -6,7 +6,7 @@#include <linux/sched/prio.h> #include <linux/plist.h> -#include <linux/mm_types.h> +#include <linux/mm_types_task.h> #include <linux/sem.h> #include <linux/shm.h>
include/linux/sched/mm.h +1 -0
@@ -4,6 +4,7 @@#include <linux/kernel.h> #include <linux/atomic.h> #include <linux/sched.h> +#include <linux/mm_types.h> #include <linux/gfp.h> /*
kernel/sched/debug.c +1 -1
@@ -11,7 +11,7 @@*/ #include <linux/proc_fs.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h>
kernel/sched/fair.c +1 -1
@@ -20,7 +20,7 @@* Copyright (C) 2007 Red Hat, Inc., Peter Zijlstra */ -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/sched/topology.h> #include <linux/latencytop.h>
kernel/signal.c +1 -1
@@ -13,7 +13,7 @@#include <linux/slab.h> #include <linux/export.h> #include <linux/init.h> -#include <linux/sched.h> +#include <linux/sched/mm.h> #include <linux/sched/user.h> #include <linux/sched/debug.h> #include <linux/sched/task.h>
lib/is_single_threaded.c +1 -0
@@ -10,6 +10,7 @@* 2 of the Licence, or (at your option) any later version. */ #include <linux/sched/signal.h> +#include <linux/sched/mm.h> /* * Returns true if the task does not share ->mm with another thread/process.
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 64/89 sched/headers: Remove 'init_pid_ns' prototype from <linux/sched.h>
In reply to Ingo Molnarpid.h already defines it.
--- include/linux/sched.h | 2 -- 1 file changed, 2 deletions(-)
include/linux/sched.h +0 -2
@@ -1462,8 +1462,6 @@ static inline int kstack_end(void *addr)extern union thread_union init_thread_union;extern struct task_struct init_task; -extern struct pid_namespace init_pid_ns; -/* * find a task by one of its numerical ids *
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 65/89 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 - and update affected code.
--- arch/arm64/kernel/setup.c | 1 + arch/arm64/mm/kasan_init.c | 1 + arch/frv/mm/init.c | 1 + arch/metag/mm/init.c | 1 + arch/nios2/kernel/setup.c | 1 + arch/powerpc/kernel/paca.c | 1 + arch/um/kernel/skas/process.c | 1 + arch/um/kernel/um_arch.c | 2 ++ arch/x86/kernel/cpu/common.c | 1 + arch/x86/mm/kasan_init_64.c | 1 + fs/namespace.c | 2 ++ include/linux/sched.h | 3 --- include/linux/sched/signal.h | 1 + include/linux/sched/task.h | 8 ++++++-- init/init_task.c | 1 + kernel/delayacct.c | 1 + lib/is_single_threaded.c | 1 + mm/vmacache.c | 1 + 18 files changed, 24 insertions(+), 5 deletions(-)
arch/arm64/kernel/setup.c +1 -0
@@ -42,6 +42,7 @@#include <linux/of_fdt.h> #include <linux/efi.h> #include <linux/psci.h> +#include <linux/sched/task.h> #include <asm/acpi.h> #include <asm/fixmap.h>
arch/arm64/mm/kasan_init.c +1 -0
@@ -13,6 +13,7 @@#define pr_fmt (fmt) "kasan: " fmt#include <linux/kasan.h> #include <linux/kernel.h> +#include <linux/sched/task.h> #include <linux/memblock.h> #include <linux/start_kernel.h>
arch/frv/mm/init.c +1 -0
@@ -18,6 +18,7 @@#include <linux/signal.h> #include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/pagemap.h> #include <linux/gfp.h> #include <linux/swap.h>
arch/metag/mm/init.c +1 -0
@@ -12,6 +12,7 @@#include <linux/percpu.h> #include <linux/memblock.h> #include <linux/initrd.h> +#include <linux/sched/task.h> #include <asm/setup.h> #include <asm/page.h>
arch/nios2/kernel/setup.c +1 -0
@@ -14,6 +14,7 @@#include <linux/kernel.h> #include <linux/mm.h> #include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/console.h> #include <linux/bootmem.h> #include <linux/initrd.h>
arch/powerpc/kernel/paca.c +1 -0
@@ -10,6 +10,7 @@#include <linux/smp.h> #include <linux/export.h> #include <linux/memblock.h> +#include <linux/sched/task.h> #include <asm/lppaca.h> #include <asm/paca.h>
arch/um/kernel/skas/process.c +1 -0
@@ -6,6 +6,7 @@#include <linux/init.h> #include <linux/sched/mm.h> #include <linux/sched/task_stack.h> +#include <linux/sched/task.h> #include <as-layout.h> #include <kern.h>
arch/um/kernel/um_arch.c +2 -0
@@ -11,7 +11,9 @@#include <linux/string.h> #include <linux/utsname.h> #include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/kmsg_dump.h> +#include <asm/pgtable.h> #include <asm/processor.h> #include <asm/sections.h>
arch/x86/kernel/cpu/common.c +1 -0
@@ -9,6 +9,7 @@#include <linux/delay.h> #include <linux/sched.h> #include <linux/sched/clock.h> +#include <linux/sched/task.h> #include <linux/init.h> #include <linux/kprobes.h> #include <linux/kgdb.h>
arch/x86/mm/kasan_init_64.c +1 -0
@@ -4,6 +4,7 @@#include <linux/kdebug.h> #include <linux/mm.h> #include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/vmalloc.h> #include <asm/tlbflush.h>
fs/namespace.c +2 -0
@@ -25,6 +25,8 @@#include <linux/magic.h> #include <linux/bootmem.h> #include <linux/task_work.h> +#include <linux/sched/task.h> +#include "pnode.h" #include "internal.h"
include/linux/sched.h +0 -3
@@ -1459,9 +1459,6 @@ static inline int kstack_end(void *addr) }#endif -extern union thread_union init_thread_union; -extern struct task_struct init_task; -/* * find a task by one of its numerical ids *
include/linux/sched/signal.h +1 -0
@@ -4,6 +4,7 @@#include <linux/signal.h> #include <linux/sched.h> #include <linux/sched/jobctl.h> +#include <linux/sched/task.h> #include <linux/cred.h> /*
include/linux/sched/task.h +6 -2
@@ -3,13 +3,14 @@#include <linux/spinlock.h> -struct task_struct ; -/* * Interface between the scheduler and various task lifetime (fork()/exit()) * functionality: */ +struct task_struct ; +union thread_union ; +/* * This serializes "schedule()" and also protects * the run-queue from deletions/modifications (but
@@ -19,6 +20,9 @@ struct task_struct;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 */
init/init_task.c +1 -0
@@ -4,6 +4,7 @@#include <linux/sched.h> #include <linux/sched/sysctl.h> #include <linux/sched/rt.h> +#include <linux/sched/task.h> #include <linux/init.h> #include <linux/fs.h> #include <linux/mm.h>
kernel/delayacct.c +1 -0
@@ -14,6 +14,7 @@*/ #include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/slab.h> #include <linux/taskstats.h> #include <linux/time.h>
lib/is_single_threaded.c +1 -0
@@ -10,6 +10,7 @@* 2 of the Licence, or (at your option) any later version. */ #include <linux/sched/signal.h> +#include <linux/sched/task.h> #include <linux/sched/mm.h> /*
mm/vmacache.c +1 -0
@@ -2,6 +2,7 @@* Copyright (C) 2014 Davidlohr Bueso. */ #include <linux/sched/signal.h> +#include <linux/sched/task.h> #include <linux/mm.h> #include <linux/vmacache.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 66/89 sched/headers: Use <linux/rcuupdate.h> instead of <linux/rculist.h> in <linux/sched.h>
In reply to Ingo MolnarWe don't actually need the full rculist.h header anymore, include the smaller rcupdate.h header instead.
Update code that relied on the implicit header inclusion.
--- arch/powerpc/kvm/book3s_mmu_hpte.c | 1 + arch/x86/kvm/irq_comm.c | 2 ++ arch/x86/kvm/page_track.c | 2 ++ drivers/md/bcache/btree.c | 2 ++ drivers/misc/vmw_vmci/vmci_event.c | 1 + drivers/nvme/target/admin-cmd.c | 2 ++ drivers/nvme/target/core.c | 2 ++ drivers/s390/cio/qdio_thinint.c | 2 ++ drivers/scsi/libfc/fc_disc.c | 2 ++ drivers/scsi/libfc/fc_rport.c | 2 ++ include/linux/dmar.h | 2 +- include/linux/pid.h | 2 +- include/linux/rhashtable.h | 2 +- include/linux/sched.h | 2 +- include/linux/sched/signal.h | 1 + include/net/bluetooth/hci_core.h | 2 ++ kernel/trace/trace_events_hist.c | 1 + kernel/trace/trace_events_trigger.c | 1 + kernel/trace/trace_kprobe.c | 1 + kernel/trace/trace_uprobe.c | 1 + lib/bug.c | 1 + lib/rhashtable.c | 1 + net/mac80211/mesh_plink.c | 2 ++ net/mac802154/llsec.c | 2 ++ security/apparmor/policy.c | 1 + security/tomoyo/domain.c | 2 ++ security/tomoyo/group.c | 2 ++ security/tomoyo/util.c | 2 ++ 28 files changed, 42 insertions(+), 4 deletions(-)
arch/powerpc/kvm/book3s_mmu_hpte.c +1 -0
@@ -21,6 +21,7 @@#include <linux/kvm_host.h> #include <linux/hash.h> #include <linux/slab.h> +#include <linux/rculist.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h>
arch/x86/kvm/irq_comm.c +2 -0
@@ -23,6 +23,8 @@#include <linux/kvm_host.h> #include <linux/slab.h> #include <linux/export.h> +#include <linux/rculist.h> +#include <trace/events/kvm.h> #include <asm/msidef.h>
arch/x86/kvm/page_track.c +2 -0
@@ -14,6 +14,8 @@*/ #include <linux/kvm_host.h> +#include <linux/rculist.h> +#include <asm/kvm_host.h> #include <asm/kvm_page_track.h>
drivers/md/bcache/btree.c +2 -0
@@ -33,6 +33,8 @@#include <linux/random.h> #include <linux/rcupdate.h> #include <linux/sched/clock.h> +#include <linux/rculist.h> +#include <trace/events/bcache.h> /*
drivers/misc/vmw_vmci/vmci_event.c +1 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/slab.h> +#include <linux/rculist.h> #include "vmci_driver.h" #include "vmci_event.h"
drivers/nvme/target/admin-cmd.c +2 -0
@@ -13,6 +13,8 @@*/ #define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/module.h> +#include <linux/rculist.h> +#include <generated/utsrelease.h> #include <asm/unaligned.h> #include "nvmet.h"
drivers/nvme/target/core.c +2 -0
@@ -14,6 +14,8 @@#define pr_fmt (fmt) KBUILD_MODNAME ": " fmt#include <linux/module.h> #include <linux/random.h> +#include <linux/rculist.h> +#include "nvmet.h" static struct nvmet_fabrics_ops *nvmet_transports[NVMF_TRTYPE_MAX ];
drivers/s390/cio/qdio_thinint.c +2 -0
@@ -8,6 +8,8 @@#include <linux/slab.h> #include <linux/kernel_stat.h> #include <linux/atomic.h> +#include <linux/rculist.h> +#include <asm/debug.h> #include <asm/qdio.h> #include <asm/airq.h>
drivers/scsi/libfc/fc_disc.c +2 -0
@@ -36,6 +36,8 @@#include <linux/slab.h> #include <linux/err.h> #include <linux/export.h> +#include <linux/rculist.h> +#include <asm/unaligned.h> #include <scsi/fc/fc_gs.h>
drivers/scsi/libfc/fc_rport.c +2 -0
@@ -65,6 +65,8 @@#include <linux/timer.h> #include <linux/workqueue.h> #include <linux/export.h> +#include <linux/rculist.h> +#include <asm/unaligned.h> #include <scsi/libfc.h>
include/linux/dmar.h +1 -1
@@ -26,7 +26,7 @@#include <linux/msi.h> #include <linux/irqreturn.h> #include <linux/rwsem.h> -#include <linux/rcupdate.h> +#include <linux/rculist.h> struct acpi_dmar_header ;
include/linux/pid.h +1 -1
@@ -1,7 +1,7 @@#ifndef _LINUX_PID_H#define _LINUX_PID_H -#include <linux/rcupdate.h> +#include <linux/rculist.h> enum pid_type {
include/linux/rhashtable.h +1 -1
@@ -25,7 +25,7 @@#include <linux/list_nulls.h> #include <linux/workqueue.h> #include <linux/mutex.h> -#include <linux/rcupdate.h> +#include <linux/rculist.h> /* * The end of the chain is marked with a special nulls marks which has
include/linux/sched.h +1 -1
@@ -13,7 +13,7 @@#include <linux/signal_types.h> #include <linux/pid.h> #include <linux/seccomp.h> -#include <linux/rculist.h> +#include <linux/rcupdate.h> #include <linux/resource.h> #include <linux/hrtimer.h>
include/linux/sched/signal.h +1 -0
@@ -1,6 +1,7 @@#ifndef _LINUX_SCHED_SIGNAL_H#define _LINUX_SCHED_SIGNAL_H +#include <linux/rculist.h> #include <linux/signal.h> #include <linux/sched.h> #include <linux/sched/jobctl.h>
include/net/bluetooth/hci_core.h +2 -0
@@ -26,6 +26,8 @@#define __HCI_CORE_H#include <linux/leds.h> +#include <linux/rculist.h> +#include <net/bluetooth/hci.h> #include <net/bluetooth/hci_sock.h>
kernel/trace/trace_events_hist.c +1 -0
@@ -19,6 +19,7 @@#include <linux/mutex.h> #include <linux/slab.h> #include <linux/stacktrace.h> +#include <linux/rculist.h> #include "tracing_map.h" #include "trace.h"
kernel/trace/trace_events_trigger.c +1 -0
@@ -22,6 +22,7 @@#include <linux/ctype.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/rculist.h> #include "trace.h"
kernel/trace/trace_kprobe.c +1 -0
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/uaccess.h> +#include <linux/rculist.h> #include "trace_probe.h"
kernel/trace/trace_uprobe.c +1 -0
@@ -23,6 +23,7 @@#include <linux/uprobes.h> #include <linux/namei.h> #include <linux/string.h> +#include <linux/rculist.h> #include "trace_probe.h"
lib/bug.c +1 -0
@@ -45,6 +45,7 @@#include <linux/kernel.h> #include <linux/bug.h> #include <linux/sched.h> +#include <linux/rculist.h> extern const struct bug_entry __start___bug_table[], __stop___bug_table[];
lib/rhashtable.c +1 -0
@@ -19,6 +19,7 @@#include <linux/init.h> #include <linux/log2.h> #include <linux/sched.h> +#include <linux/rculist.h> #include <linux/slab.h> #include <linux/vmalloc.h> #include <linux/mm.h>
net/mac80211/mesh_plink.c +2 -0
@@ -9,6 +9,8 @@#include <linux/gfp.h> #include <linux/kernel.h> #include <linux/random.h> +#include <linux/rculist.h> +#include "ieee80211_i.h" #include "rate.h" #include "mesh.h"
net/mac802154/llsec.c +2 -0
@@ -18,6 +18,8 @@#include <linux/bug.h> #include <linux/completion.h> #include <linux/ieee802154.h> +#include <linux/rculist.h> +#include <crypto/aead.h> #include <crypto/skcipher.h>
security/apparmor/policy.c +1 -0
@@ -77,6 +77,7 @@#include <linux/spinlock.h> #include <linux/string.h> #include <linux/cred.h> +#include <linux/rculist.h> #include "include/apparmor.h" #include "include/capability.h"
security/tomoyo/domain.c +2 -0
@@ -5,8 +5,10 @@*/ #include "common.h" +#include <linux/binfmts.h> #include <linux/slab.h> +#include <linux/rculist.h> /* Variables definitions.*/
security/tomoyo/group.c +2 -0
@@ -5,6 +5,8 @@*/ #include <linux/slab.h> +#include <linux/rculist.h> +#include "common.h" /**
security/tomoyo/util.c +2 -0
@@ -5,6 +5,8 @@*/ #include <linux/slab.h> +#include <linux/rculist.h> +#include "common.h" /* Lock for protecting policy. */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 67/89 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 and update the code that uses these facilities.
--- arch/mips/math-emu/dsemul.c | 1 + block/blk-ioc.c | 1 + block/ioprio.c | 1 + drivers/staging/android/ion/ion.c | 1 + drivers/staging/lustre/lustre/ptlrpc/sec.c | 1 + fs/proc/internal.h | 1 + fs/proc/proc_net.c | 1 + fs/proc_namespace.c | 2 ++ include/linux/cpuset.h | 1 + include/linux/sched.h | 20 -------------------- include/linux/sched/task.h | 22 +++++++++++++++++++++- ipc/namespace.c | 1 + kernel/cpuset.c | 1 + kernel/sched/debug.c | 1 + kernel/utsname.c | 1 + mm/mempolicy.c | 1 + mm/mmu_context.c | 1 + net/core/net_namespace.c | 2 ++ net/core/netclassid_cgroup.c | 2 ++ net/core/netprio_cgroup.c | 2 ++ 20 files changed, 43 insertions(+), 21 deletions(-)
arch/mips/math-emu/dsemul.c +1 -0
@@ -1,6 +1,7 @@#include <linux/err.h> #include <linux/slab.h> #include <linux/mm_types.h> +#include <linux/sched/task.h> #include <asm/branch.h> #include <asm/cacheflush.h>
block/blk-ioc.c +1 -0
@@ -7,6 +7,7 @@#include <linux/bio.h> #include <linux/blkdev.h> #include <linux/slab.h> +#include <linux/sched/task.h> #include "blk.h"
block/ioprio.c +1 -0
@@ -27,6 +27,7 @@#include <linux/blkdev.h> #include <linux/capability.h> #include <linux/sched/user.h> +#include <linux/sched/task.h> #include <linux/syscalls.h> #include <linux/security.h> #include <linux/pid_namespace.h>
drivers/staging/android/ion/ion.c +1 -0
@@ -36,6 +36,7 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> #include <linux/idr.h> +#include <linux/sched/task.h> #include "ion.h" #include "ion_priv.h"
drivers/staging/lustre/lustre/ptlrpc/sec.c +1 -0
@@ -40,6 +40,7 @@#include <linux/crypto.h> #include <linux/cred.h> #include <linux/key.h> +#include <linux/sched/task.h> #include "../include/obd.h" #include "../include/obd_class.h"
fs/proc/internal.h +1 -0
@@ -15,6 +15,7 @@#include <linux/atomic.h> #include <linux/binfmts.h> #include <linux/sched/coredump.h> +#include <linux/sched/task.h> struct ctl_table_header ;struct mempolicy ;
fs/proc/proc_net.c +1 -0
@@ -17,6 +17,7 @@#include <linux/slab.h> #include <linux/init.h> #include <linux/sched.h> +#include <linux/sched/task.h> #include <linux/module.h> #include <linux/bitops.h> #include <linux/mount.h>
fs/proc_namespace.c +2 -0
@@ -10,6 +10,8 @@#include <linux/nsproxy.h> #include <linux/security.h> #include <linux/fs_struct.h> +#include <linux/sched/task.h> +#include "proc/internal.h" /* only for get_proc_task() in ->open() */ #include "pnode.h"
include/linux/cpuset.h +1 -0
@@ -10,6 +10,7 @@#include <linux/sched.h> #include <linux/sched/topology.h> +#include <linux/sched/task.h> #include <linux/cpumask.h> #include <linux/nodemask.h> #include <linux/mm.h>
include/linux/sched.h +0 -20
@@ -1514,26 +1514,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 +21 -1
@@ -1,7 +1,7 @@#ifndef _LINUX_SCHED_TASK_H#define _LINUX_SCHED_TASK_H -#include <linux/spinlock.h> +#include <linux/sched.h> /* * Interface between the scheduler and various task lifetime (fork()/exit())
@@ -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 */
ipc/namespace.c +1 -0
@@ -14,6 +14,7 @@#include <linux/mount.h> #include <linux/user_namespace.h> #include <linux/proc_ns.h> +#include <linux/sched/task.h> #include "util.h"
kernel/cpuset.c +1 -0
@@ -45,6 +45,7 @@#include <linux/rcupdate.h> #include <linux/sched.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <linux/seq_file.h> #include <linux/security.h> #include <linux/slab.h>
kernel/sched/debug.c +1 -0
@@ -12,6 +12,7 @@#include <linux/proc_fs.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <linux/seq_file.h> #include <linux/kallsyms.h> #include <linux/utsname.h>
kernel/utsname.c +1 -0
@@ -17,6 +17,7 @@#include <linux/cred.h> #include <linux/user_namespace.h> #include <linux/proc_ns.h> +#include <linux/sched/task.h> static struct ucounts *inc_uts_namespaces (struct user_namespace *ns) {
mm/mempolicy.c +1 -0
@@ -75,6 +75,7 @@#include <linux/sched.h> #include <linux/sched/mm.h> #include <linux/sched/numa_balancing.h> +#include <linux/sched/task.h> #include <linux/nodemask.h> #include <linux/cpuset.h> #include <linux/slab.h>
mm/mmu_context.c +1 -0
@@ -6,6 +6,7 @@#include <linux/mm.h> #include <linux/sched.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <linux/mmu_context.h> #include <linux/export.h>
net/core/net_namespace.c +2 -0
@@ -16,6 +16,8 @@#include <linux/export.h> #include <linux/user_namespace.h> #include <linux/net_namespace.h> +#include <linux/sched/task.h> +#include <net/sock.h> #include <net/netlink.h> #include <net/net_namespace.h>
net/core/netclassid_cgroup.c +2 -0
@@ -12,6 +12,8 @@#include <linux/slab.h> #include <linux/cgroup.h> #include <linux/fdtable.h> +#include <linux/sched/task.h> +#include <net/cls_cgroup.h> #include <net/sock.h>
net/core/netprio_cgroup.c +2 -0
@@ -19,6 +19,8 @@#include <linux/cgroup.h> #include <linux/rcupdate.h> #include <linux/atomic.h> +#include <linux/sched/task.h> +#include <net/rtnetlink.h> #include <net/pkt_cls.h> #include <net/sock.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 68/89 sched/headers: Split cputime functionality out of <linux/sched.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>.
Update all code that relies on these facilities.
--- arch/alpha/kernel/osf_sys.c | 1 + arch/ia64/kernel/time.c | 2 +- arch/powerpc/kernel/time.c | 2 +- arch/s390/kernel/idle.c | 2 +- arch/s390/kernel/vtime.c | 2 +- arch/x86/kernel/apm_32.c | 1 + arch/x86/kvm/hyperv.c | 2 + drivers/isdn/mISDN/stack.c | 1 + drivers/s390/cio/cio.c | 2 +- fs/binfmt_elf.c | 1 + fs/binfmt_elf_fdpic.c | 1 + fs/proc/array.c | 1 + fs/proc/stat.c | 2 +- include/linux/cputime.h | 13 ----- include/linux/sched.h | 89 ----------------------------- include/linux/sched/cputime.h | 187 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/sched/signal.h | 33 +++++++++++ kernel/acct.c | 2 + kernel/delayacct.c | 1 + kernel/exit.c | 1 + kernel/fork.c | 1 + kernel/sched/cputime.c | 2 +- kernel/sched/sched.h | 1 + kernel/sched/stats.h | 111 ------------------------------------ kernel/signal.c | 1 + kernel/sys.c | 1 + kernel/time/itimer.c | 1 + kernel/time/posix-cpu-timers.c | 1 + kernel/tsacct.c | 1 + 29 files changed, 246 insertions(+), 220 deletions(-)
arch/alpha/kernel/osf_sys.c +1 -0
@@ -14,6 +14,7 @@#include <linux/sched/signal.h> #include <linux/sched/mm.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/kernel.h> #include <linux/mm.h> #include <linux/smp.h>
arch/ia64/kernel/time.c +1 -1
@@ -22,7 +22,7 @@#include <linux/timex.h> #include <linux/timekeeper_internal.h> #include <linux/platform_device.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include <asm/machvec.h> #include <asm/delay.h>
arch/powerpc/kernel/time.c +1 -1
@@ -58,7 +58,7 @@#include <linux/clk-provider.h> #include <linux/suspend.h> #include <linux/rtc.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include <asm/trace.h> #include <asm/io.h>
arch/s390/kernel/idle.c +1 -1
@@ -12,7 +12,7 @@#include <linux/notifier.h> #include <linux/init.h> #include <linux/cpu.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include <asm/nmi.h> #include <asm/smp.h> #include "entry.h"
arch/s390/kernel/vtime.c +1 -1
@@ -6,7 +6,7 @@*/ #include <linux/kernel_stat.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include <linux/export.h> #include <linux/kernel.h> #include <linux/timex.h>
arch/x86/kernel/apm_32.c +1 -0
@@ -219,6 +219,7 @@#include <linux/init.h> #include <linux/time.h> #include <linux/sched/signal.h> +#include <linux/sched/cputime.h> #include <linux/pm.h> #include <linux/capability.h> #include <linux/device.h>
arch/x86/kvm/hyperv.c +2 -0
@@ -28,6 +28,8 @@#include <linux/kvm_host.h> #include <linux/highmem.h> +#include <linux/sched/cputime.h> +#include <asm/apicdef.h> #include <trace/events/kvm.h>
drivers/isdn/mISDN/stack.c +1 -0
@@ -19,6 +19,7 @@#include <linux/mISDNif.h> #include <linux/kthread.h> #include <linux/sched.h> +#include <linux/sched/cputime.h> #include <linux/signal.h> #include "core.h"
drivers/s390/cio/cio.c +1 -1
@@ -29,7 +29,7 @@#include <asm/chpid.h> #include <asm/airq.h> #include <asm/isc.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include <asm/fcx.h> #include <asm/nmi.h> #include <asm/crw.h>
fs/binfmt_elf.c +1 -0
@@ -37,6 +37,7 @@#include <linux/sched.h> #include <linux/sched/coredump.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/cred.h> #include <linux/dax.h> #include <linux/uaccess.h>
fs/binfmt_elf_fdpic.c +1 -0
@@ -17,6 +17,7 @@#include <linux/sched.h> #include <linux/sched/coredump.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/mm.h> #include <linux/mman.h> #include <linux/errno.h>
fs/proc/array.c +1 -0
@@ -63,6 +63,7 @@#include <linux/sched/mm.h> #include <linux/sched/numa_balancing.h> #include <linux/sched/task.h> +#include <linux/sched/cputime.h> #include <linux/proc_fs.h> #include <linux/ioport.h> #include <linux/uaccess.h>
fs/proc/stat.c +1 -1
@@ -10,7 +10,7 @@#include <linux/slab.h> #include <linux/time.h> #include <linux/irqnr.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include <linux/tick.h> #ifndef arch_irq_stat_cpu
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 new file +187 -0
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/acct.c +2 -0
@@ -56,6 +56,8 @@#include <linux/syscalls.h> #include <linux/mount.h> #include <linux/uaccess.h> +#include <linux/sched/cputime.h> +#include <asm/div64.h> #include <linux/blkdev.h> /* sector_div */ #include <linux/pid_namespace.h>
kernel/delayacct.c +1 -0
@@ -15,6 +15,7 @@#include <linux/sched.h> #include <linux/sched/task.h> +#include <linux/sched/cputime.h> #include <linux/slab.h> #include <linux/taskstats.h> #include <linux/time.h>
kernel/exit.c +1 -0
@@ -11,6 +11,7 @@#include <linux/sched/stat.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/interrupt.h> #include <linux/module.h> #include <linux/capability.h>
kernel/fork.c +1 -0
@@ -20,6 +20,7 @@#include <linux/sched/stat.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/rtmutex.h> #include <linux/init.h> #include <linux/unistd.h>
kernel/sched/cputime.c +1 -1
@@ -4,7 +4,7 @@#include <linux/kernel_stat.h> #include <linux/static_key.h> #include <linux/context_tracking.h> -#include <linux/cputime.h> +#include <linux/sched/cputime.h> #include "sched.h" #ifdef CONFIG_IRQ_TIME_ACCOUNTING
kernel/sched/sched.h +1 -0
@@ -17,6 +17,7 @@#include <linux/sched/hotplug.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/u64_stats_sync.h> #include <linux/kernel_stat.h>
kernel/sched/stats.h +0 -111
114 lines not on this page · raw message
kernel/signal.c +1 -0
@@ -18,6 +18,7 @@#include <linux/sched/debug.h> #include <linux/sched/task.h> #include <linux/sched/task_stack.h> +#include <linux/sched/cputime.h> #include <linux/fs.h> #include <linux/tty.h> #include <linux/binfmts.h>
kernel/sys.c +1 -0
@@ -55,6 +55,7 @@#include <linux/sched/mm.h> #include <linux/sched/coredump.h> #include <linux/sched/task.h> +#include <linux/sched/cputime.h> #include <linux/rcupdate.h> #include <linux/uidgid.h> #include <linux/cred.h>
kernel/time/itimer.c +1 -0
@@ -11,6 +11,7 @@#include <linux/syscalls.h> #include <linux/time.h> #include <linux/sched/signal.h> +#include <linux/sched/cputime.h> #include <linux/posix-timers.h> #include <linux/hrtimer.h> #include <trace/events/timer.h>
kernel/time/posix-cpu-timers.c +1 -0
@@ -3,6 +3,7 @@*/ #include <linux/sched/signal.h> +#include <linux/sched/cputime.h> #include <linux/posix-timers.h> #include <linux/errno.h> #include <linux/math64.h>
kernel/tsacct.c +1 -0
@@ -19,6 +19,7 @@#include <linux/kernel.h> #include <linux/sched/signal.h> #include <linux/sched/mm.h> +#include <linux/sched/cputime.h> #include <linux/tsacct_kern.h> #include <linux/acct.h> #include <linux/jiffies.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 69/89 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 statistics related.
Update usage sites.
--- arch/x86/kvm/cpuid.c | 2 ++ arch/x86/kvm/x86.c | 2 ++ fs/proc/base.c | 1 + include/linux/sched.h | 16 ---------------- include/linux/sched/stat.h | 16 ++++++++++++++++ kernel/latencytop.c | 1 + kernel/profile.c | 2 ++ 7 files changed, 24 insertions(+), 16 deletions(-)
arch/x86/kvm/cpuid.c +2 -0
@@ -16,6 +16,8 @@#include <linux/export.h> #include <linux/vmalloc.h> #include <linux/uaccess.h> +#include <linux/sched/stat.h> +#include <asm/processor.h> #include <asm/user.h> #include <asm/fpu/xstate.h>
arch/x86/kvm/x86.c +2 -0
@@ -54,6 +54,8 @@#include <linux/pvclock_gtod.h> #include <linux/kvm_irqfd.h> #include <linux/irqbypass.h> +#include <linux/sched/stat.h> +#include <trace/events/kvm.h> #include <asm/debugreg.h>
fs/proc/base.c +1 -0
@@ -89,6 +89,7 @@#include <linux/sched/mm.h> #include <linux/sched/coredump.h> #include <linux/sched/debug.h> +#include <linux/sched/stat.h> #include <linux/flex_array.h> #include <linux/posix-timers.h> #ifdef CONFIG_HARDWALL
include/linux/sched.h +0 -16
@@ -242,22 +242,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 */
kernel/latencytop.c +1 -0
@@ -56,6 +56,7 @@#include <linux/export.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/stat.h> #include <linux/list.h> #include <linux/stacktrace.h>
kernel/profile.c +2 -0
@@ -25,6 +25,8 @@#include <linux/mutex.h> #include <linux/slab.h> #include <linux/vmalloc.h> +#include <linux/sched/stat.h> +#include <asm/sections.h> #include <asm/irq_regs.h> #include <asm/ptrace.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 70/89 sched/core: Remove unused prefetch_stack()
In reply to Ingo Molnarprefetch_stack() is defined by IA64, but not actually used anywhere anymore.
Remove it.
--- arch/ia64/include/asm/processor.h | 2 -- arch/ia64/kernel/entry.S | 23 ----------------------- include/linux/sched.h | 6 ------ 3 files changed, 31 deletions(-)
arch/ia64/include/asm/processor.h +0 -2
@@ -19,8 +19,6 @@#include <asm/ptrace.h> #include <asm/ustack.h> -#define ARCH_HAS_PREFETCH_SWITCH_STACK -#define IA64_NUM_PHYS_STACK_REG 96#define IA64_NUM_DBG_REGS 8
arch/ia64/kernel/entry.S +0 -23
@@ -455,29 +455,6 @@ GLOBAL_ENTRY(load_switch_stack) br.cond.sptk.many b7 END(load_switch_stack) -GLOBAL_ENTRY(prefetch_stack) - add r14 = -IA64_SWITCH_STACK_SIZE, sp - add r15 = IA64_TASK_THREAD_KSP_OFFSET, in0 - ;; - ld8 r16 = [r15] // load next's stack pointer - lfetch.fault.excl [r14], 128 - ;; - lfetch.fault.excl [r14], 128 - lfetch.fault [r16], 128 - ;; - lfetch.fault.excl [r14], 128 - lfetch.fault [r16], 128 - ;; - lfetch.fault.excl [r14], 128 - lfetch.fault [r16], 128 - ;; - lfetch.fault.excl [r14], 128 - lfetch.fault [r16], 128 - ;; - lfetch.fault [r16], 128 - br.ret.sptk.many rp -END(prefetch_stack) - /* * Invoke a system call, but do some tracing before and after the call. * We MUST preserve the current register frame throughout this routine
include/linux/sched.h +0 -6
@@ -252,12 +252,6 @@ struct sched_info {# define SCHED_FIXEDPOINT_SHIFT 10# define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT) -#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 load_weight {unsigned long weight;u32 inv_weight;
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 71/89 sched/headers, vfs/execve: Move the do_execve*() prototypes from <linux/sched.h> to <linux/binfmts.h>
In reply to Ingo Molnar... and update the usage sites where necessary.
--- include/linux/binfmts.h | 10 ++++++++++ include/linux/sched.h | 8 -------- init/main.c | 1 + kernel/kmod.c | 1 + 4 files changed, 12 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
@@ -1382,14 +1382,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) {
init/main.c +1 -0
@@ -14,6 +14,7 @@#include <linux/types.h> #include <linux/module.h> #include <linux/proc_fs.h> +#include <linux/binfmts.h> #include <linux/kernel.h> #include <linux/syscalls.h> #include <linux/stackprotector.h>
kernel/kmod.c +1 -0
@@ -21,6 +21,7 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/sched/task.h> +#include <linux/binfmts.h> #include <linux/syscalls.h> #include <linux/unistd.h> #include <linux/kmod.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 72/89 sched/headers: Move kstack_end() from <linux/sched.h> to <linux/sched/task_stack.h>
In reply to Ingo Molnar... and update usage sites, where necessary.
--- arch/m32r/kernel/traps.c | 2 ++ arch/metag/kernel/stacktrace.c | 1 + arch/openrisc/kernel/traps.c | 1 + arch/um/kernel/sysrq.c | 1 + arch/xtensa/kernel/traps.c | 1 + include/linux/sched.h | 10 ---------- include/linux/sched/task_stack.h | 10 ++++++++++ mm/slab.c | 1 + 8 files changed, 17 insertions(+), 10 deletions(-)
arch/m32r/kernel/traps.c +2 -0
@@ -15,7 +15,9 @@#include <linux/stddef.h> #include <linux/ptrace.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <linux/mm.h> +#include <asm/page.h> #include <asm/processor.h>
arch/metag/kernel/stacktrace.c +1 -0
@@ -1,6 +1,7 @@#include <linux/export.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <linux/stacktrace.h> #include <asm/stacktrace.h>
arch/openrisc/kernel/traps.c +1 -0
@@ -23,6 +23,7 @@#include <linux/init.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/kmod.h>
arch/um/kernel/sysrq.c +1 -0
@@ -12,6 +12,7 @@#include <linux/module.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <asm/sysrq.h> #include <asm/stacktrace.h>
arch/xtensa/kernel/traps.c +1 -0
@@ -26,6 +26,7 @@#include <linux/kernel.h> #include <linux/sched/signal.h> #include <linux/sched/debug.h> +#include <linux/sched/task_stack.h> #include <linux/init.h> #include <linux/module.h> #include <linux/stringify.h>
include/linux/sched.h +0 -10
@@ -1344,16 +1344,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 -/* * find a task by one of its numerical ids *
include/linux/sched/task_stack.h +10 -0
@@ -107,4 +107,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 */
mm/slab.c +1 -0
@@ -116,6 +116,7 @@#include <linux/kmemcheck.h> #include <linux/memory.h> #include <linux/prefetch.h> +#include <linux/sched/task_stack.h> #include <net/sock.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 73/89 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 +++ kernel/time/posix-timers.c | 1 + 3 files changed, 4 insertions(+), 4 deletions(-)
include/linux/sched.h +0 -4
@@ -1368,10 +1368,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 );
kernel/time/posix-timers.c +1 -0
@@ -35,6 +35,7 @@#include <linux/slab.h> #include <linux/time.h> #include <linux/mutex.h> +#include <linux/sched/task.h> #include <linux/uaccess.h> #include <linux/list.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 74/89 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>.
... and update usage sites where necessary.
--- arch/ia64/kernel/setup.c | 1 + arch/m32r/kernel/traps.c | 1 + arch/s390/kernel/setup.c | 1 + include/linux/cpu.h | 2 ++ include/linux/sched.h | 5 ----- include/linux/sched/init.h | 11 +++++++++++ init/main.c | 1 + kernel/sched/sched.h | 1 + 8 files changed, 18 insertions(+), 5 deletions(-)
arch/ia64/kernel/setup.c +1 -0
@@ -29,6 +29,7 @@#include <linux/bootmem.h> #include <linux/console.h> #include <linux/delay.h> +#include <linux/cpu.h> #include <linux/kernel.h> #include <linux/reboot.h> #include <linux/sched.h>
arch/m32r/kernel/traps.c +1 -0
@@ -17,6 +17,7 @@#include <linux/sched/debug.h> #include <linux/sched/task_stack.h> #include <linux/mm.h> +#include <linux/cpu.h> #include <asm/page.h> #include <asm/processor.h>
arch/s390/kernel/setup.c +1 -0
@@ -19,6 +19,7 @@#include <linux/export.h> #include <linux/sched.h> #include <linux/sched/task.h> +#include <linux/cpu.h> #include <linux/kernel.h> #include <linux/memblock.h> #include <linux/mm.h>
include/linux/cpu.h +2 -0
@@ -30,6 +30,8 @@ struct cpu {extern void boot_cpu_init (void );extern void boot_cpu_state_init (void ); +extern void cpu_init (void ); +extern void trap_init (void );extern int register_cpu (struct cpu *cpu,int num);extern struct device *get_cpu_device (unsigned cpu);
include/linux/sched.h +0 -5
@@ -168,13 +168,8 @@ 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 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 new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef _LINUX_SCHED_INIT_H +#define _LINUX_SCHED_INIT_H + +/* +* Scheduler init related prototypes: +*/ + +extern void sched_init (void ); +extern void sched_init_smp (void ); + +#endif /* _LINUX_SCHED_INIT_H */
init/main.c +1 -0
@@ -62,6 +62,7 @@#include <linux/device.h> #include <linux/kthread.h> #include <linux/sched.h> +#include <linux/sched/init.h> #include <linux/signal.h> #include <linux/idr.h> #include <linux/kgdb.h>
kernel/sched/sched.h +1 -0
@@ -18,6 +18,7 @@#include <linux/sched/task.h> #include <linux/sched/task_stack.h> #include <linux/sched/cputime.h> +#include <linux/sched/init.h> #include <linux/u64_stats_sync.h> #include <linux/kernel_stat.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 75/89 sched/headers, timekeeping: Consolidate the timer tick function prototypes
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
@@ -170,7 +170,6 @@ struct uts_namespace;extern cpumask_var_t cpu_isolated_map; -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 76/89 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
@@ -462,25 +462,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 /*
@@ -873,9 +854,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 77/89 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 MolnarAlso update usage sites.
--- drivers/dma/dmatest.c | 1 + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 1 + drivers/infiniband/core/umem_odp.c | 1 + drivers/infiniband/hw/mlx4/main.c | 1 + drivers/infiniband/hw/mlx5/main.c | 1 + drivers/md/persistent-data/dm-block-manager.c | 1 + drivers/misc/cxl/main.c | 2 ++ drivers/net/xen-netback/interface.c | 1 + drivers/oprofile/buffer_sync.c | 1 + drivers/tty/tty_ldsem.c | 1 + drivers/usb/usbip/usbip_common.h | 1 + include/linux/sched.h | 14 -------------- include/linux/sched/task.h | 15 +++++++++++++++ kernel/irq/manage.c | 1 + 14 files changed, 28 insertions(+), 14 deletions(-)
drivers/dma/dmatest.c +1 -0
@@ -16,6 +16,7 @@#include <linux/freezer.h> #include <linux/init.h> #include <linux/kthread.h> +#include <linux/sched/task.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/random.h>
drivers/gpu/drm/etnaviv/etnaviv_gem.c +1 -0
@@ -17,6 +17,7 @@#include <linux/spinlock.h> #include <linux/shmem_fs.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include "etnaviv_drv.h" #include "etnaviv_gem.h"
drivers/infiniband/core/umem_odp.c +1 -0
@@ -33,6 +33,7 @@#include <linux/types.h> #include <linux/sched.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <linux/pid.h> #include <linux/slab.h> #include <linux/export.h>
drivers/infiniband/hw/mlx4/main.c +1 -0
@@ -40,6 +40,7 @@#include <linux/rtnetlink.h> #include <linux/if_vlan.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <net/ipv6.h> #include <net/addrconf.h>
drivers/infiniband/hw/mlx5/main.c +1 -0
@@ -42,6 +42,7 @@#endif #include <linux/sched.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <linux/delay.h> #include <rdma/ib_user_verbs.h> #include <rdma/ib_addr.h>
drivers/md/persistent-data/dm-block-manager.c +1 -0
@@ -13,6 +13,7 @@#include <linux/rwsem.h> #include <linux/device-mapper.h> #include <linux/stacktrace.h> +#include <linux/sched/task.h> #define DM_MSG_PREFIX "block manager"
drivers/misc/cxl/main.c +2 -0
@@ -19,6 +19,8 @@#include <linux/slab.h> #include <linux/idr.h> #include <linux/pci.h> +#include <linux/sched/task.h> +#include <asm/cputable.h> #include <misc/cxl-base.h>
drivers/net/xen-netback/interface.c +1 -0
@@ -31,6 +31,7 @@#include "common.h" #include <linux/kthread.h> +#include <linux/sched/task.h> #include <linux/ethtool.h> #include <linux/rtnetlink.h> #include <linux/if_vlan.h>
drivers/oprofile/buffer_sync.c +1 -0
@@ -32,6 +32,7 @@#include <linux/oprofile.h> #include <linux/sched.h> #include <linux/sched/mm.h> +#include <linux/sched/task.h> #include <linux/gfp.h> #include "oprofile_stats.h"
drivers/tty/tty_ldsem.c +1 -0
@@ -33,6 +33,7 @@#include <linux/tty.h> #include <linux/sched.h> #include <linux/sched/debug.h> +#include <linux/sched/task.h> #ifdef CONFIG_DEBUG_LOCK_ALLOC
drivers/usb/usbip/usbip_common.h +1 -0
@@ -31,6 +31,7 @@#include <linux/types.h> #include <linux/usb.h> #include <linux/wait.h> +#include <linux/sched/task.h> #include <uapi/linux/usbip.h> #define USBIP_VERSION "1.0.0"
include/linux/sched.h +0 -14
@@ -1119,20 +1119,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 ;
kernel/irq/manage.c +1 -0
@@ -17,6 +17,7 @@#include <linux/slab.h> #include <linux/sched.h> #include <linux/sched/rt.h> +#include <linux/sched/task.h> #include <uapi/linux/sched/types.h> #include <linux/task_work.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 78/89 sched/core: Remove the tsk_cpus_allowed() wrapper
In reply to Ingo MolnarSo the original intention of tsk_cpus_allowed() was to 'future-proof' the field - but it's pretty ineffectual at that, because half of the code uses ->cpus_allowed directly ...
Also, the wrapper makes the code longer than the original expression!
So just get rid of it. This also shrinks <linux/sched.h> a bit.
--- arch/powerpc/kernel/smp.c | 2 +- arch/powerpc/platforms/cell/spufs/sched.c | 2 +- arch/sparc/kernel/sysfs.c | 2 +- drivers/cpufreq/sparc-us2e-cpufreq.c | 4 ++-- drivers/cpufreq/sparc-us3-cpufreq.c | 4 ++-- drivers/infiniband/hw/hfi1/affinity.c | 2 +- drivers/infiniband/hw/hfi1/sdma.c | 2 +- include/linux/sched.h | 3 --- kernel/sched/core.c | 20 ++++++++++---------- kernel/sched/cpudeadline.c | 4 ++-- kernel/sched/cpupri.c | 4 ++-- kernel/sched/deadline.c | 7 +++---- kernel/sched/fair.c | 25 ++++++++++++------------- kernel/sched/rt.c | 5 ++--- lib/smp_processor_id.c | 2 +- samples/trace_events/trace-events-sample.c | 2 +- 16 files changed, 42 insertions(+), 48 deletions(-)
arch/powerpc/kernel/smp.c +1 -1
@@ -796,7 +796,7 @@ void __init smp_cpus_done(unsigned int max_cpus)* se we pin us down to CPU 0 for a short while */ alloc_cpumask_var (&old_mask,GFP_NOWAIT ); -cpumask_copy (old_mask,tsk_cpus_allowed (current)); +cpumask_copy (old_mask, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (boot_cpuid));if (smp_ops && smp_ops->setup_cpu)
arch/powerpc/platforms/cell/spufs/sched.c +1 -1
@@ -141,7 +141,7 @@ void __spu_update_sched_info(struct spu_context *ctx)* runqueue. The context will be rescheduled on the proper node * if it is timesliced or preempted. */ -cpumask_copy (&ctx->cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&ctx->cpus_allowed, ¤t->cpus_allowed);/* Save the current cpu id for spu interrupt routing. */ ctx->last_ran =raw_smp_processor_id ();
arch/sparc/kernel/sysfs.c +1 -1
@@ -106,7 +106,7 @@ static unsigned long run_on_cpu(unsigned long cpu,cpumask_t old_affinity;unsigned long ret; -cpumask_copy (&old_affinity,tsk_cpus_allowed (current)); +cpumask_copy (&old_affinity, ¤t->cpus_allowed);/* should return -EINVAL to userspace */ if (set_cpus_allowed_ptr (current,cpumask_of (cpu)))return 0 ;
drivers/cpufreq/sparc-us2e-cpufreq.c +2 -2
@@ -234,7 +234,7 @@ static unsigned int us2e_freq_get(unsigned int cpu)cpumask_t cpus_allowed;unsigned long clock_tick, estar; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); clock_tick =sparc64_get_clock_tick (cpu) /1000 ;
@@ -252,7 +252,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index)unsigned long clock_tick, divisor, old_divisor, estar;cpumask_t cpus_allowed; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); new_freq = clock_tick =sparc64_get_clock_tick (cpu) /1000 ;
drivers/cpufreq/sparc-us3-cpufreq.c +2 -2
@@ -82,7 +82,7 @@ static unsigned int us3_freq_get(unsigned int cpu)unsigned long reg;unsigned int ret; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); reg =read_safari_cfg ();
@@ -99,7 +99,7 @@ static int us3_freq_target(struct cpufreq_policy *policy, unsigned int index)unsigned long new_bits, new_freq, reg;cpumask_t cpus_allowed; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); new_freq =sparc64_get_clock_tick (cpu) /1000 ;
drivers/infiniband/hw/hfi1/affinity.c +1 -1
@@ -576,7 +576,7 @@ int hfi1_get_proc_affinity(int node)struct hfi1_affinity_node *entry;cpumask_var_t diff, hw_thread_mask, available_mask, intrs_mask;const struct cpumask *node_mask, - *proc_mask =tsk_cpus_allowed (current); + *proc_mask = ¤t->cpus_allowed;struct hfi1_affinity_node_list *affinity = &node_affinity;struct cpu_mask_set *set = &affinity->proc;
drivers/infiniband/hw/hfi1/sdma.c +1 -1
@@ -856,7 +856,7 @@ struct sdma_engine *sdma_select_user_engine(struct hfi1_devdata *dd, {struct sdma_rht_node *rht_node;struct sdma_engine *sde =NULL ; -const struct cpumask *current_mask =tsk_cpus_allowed (current); +const struct cpumask *current_mask = ¤t->cpus_allowed;unsigned long cpu_id;/*
include/linux/sched.h +0 -3
@@ -962,9 +962,6 @@ struct task_struct {*/ }; -/* Future-safe accessor for struct task_struct's cpus_allowed. */ -#define tsk_cpus_allowed (tsk) (&(tsk)->cpus_allowed) -static inline int tsk_nr_cpus_allowed (struct task_struct *p) {return p->nr_cpus_allowed;
kernel/sched/core.c +10 -10
@@ -983,7 +983,7 @@ static struct rq *__migrate_task(struct rq *rq, struct task_struct *p, int dest_return rq;/* Affinity changed (again). */ -if (!cpumask_test_cpu (dest_cpu,tsk_cpus_allowed (p))) +if (!cpumask_test_cpu (dest_cpu, &p->cpus_allowed))return rq; rq =move_queued_task (rq, p, dest_cpu);
@@ -1260,10 +1260,10 @@ static int migrate_swap_stop(void *data)if (task_cpu (arg->src_task) != arg->src_cpu) goto unlock; -if (!cpumask_test_cpu (arg->dst_cpu,tsk_cpus_allowed (arg->src_task))) +if (!cpumask_test_cpu (arg->dst_cpu, &arg->src_task->cpus_allowed)) goto unlock; -if (!cpumask_test_cpu (arg->src_cpu,tsk_cpus_allowed (arg->dst_task))) +if (!cpumask_test_cpu (arg->src_cpu, &arg->dst_task->cpus_allowed)) goto unlock;__migrate_swap_task (arg->src_task, arg->dst_cpu);
@@ -1304,10 +1304,10 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p)if (!cpu_active (arg.src_cpu) || !cpu_active (arg.dst_cpu)) goto out; -if (!cpumask_test_cpu (arg.dst_cpu,tsk_cpus_allowed (arg.src_task))) +if (!cpumask_test_cpu (arg.dst_cpu, &arg.src_task->cpus_allowed)) goto out; -if (!cpumask_test_cpu (arg.src_cpu,tsk_cpus_allowed (arg.dst_task))) +if (!cpumask_test_cpu (arg.src_cpu, &arg.dst_task->cpus_allowed)) goto out;trace_sched_swap_numa (cur, arg.src_cpu, p, arg.dst_cpu);
@@ -1491,14 +1491,14 @@ static int select_fallback_rq(int cpu, struct task_struct *p)for_each_cpu (dest_cpu, nodemask) {if (!cpu_active (dest_cpu))continue ; -if (cpumask_test_cpu (dest_cpu,tsk_cpus_allowed (p))) +if (cpumask_test_cpu (dest_cpu, &p->cpus_allowed))return dest_cpu; } }for (;;) {/* Any allowed, online CPU? */ -for_each_cpu (dest_cpu,tsk_cpus_allowed (p)) { +for_each_cpu (dest_cpu, &p->cpus_allowed) {if (!(p->flags &PF_KTHREAD ) && !cpu_active (dest_cpu))continue ;if (!cpu_online (dest_cpu))
@@ -1553,7 +1553,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)if (tsk_nr_cpus_allowed (p) >1 ) cpu = p->sched_class->select_task_rq (p, cpu, sd_flags, wake_flags);else - cpu =cpumask_any (tsk_cpus_allowed (p)); + cpu =cpumask_any (&p->cpus_allowed);/* * In order not to call set_task_cpu() on a blocking task we need
@@ -1565,7 +1565,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)* [ this allows ->select_task() to simply return task_cpu(p) and * not worry about this generic constraint ] */ -if (unlikely (!cpumask_test_cpu (cpu,tsk_cpus_allowed (p)) || +if (unlikely (!cpumask_test_cpu (cpu, &p->cpus_allowed) || !cpu_online (cpu))) cpu =select_fallback_rq (task_cpu (p), p);
@@ -5474,7 +5474,7 @@ int migrate_task_to(struct task_struct *p, int target_cpu)if (curr_cpu == target_cpu)return 0 ; -if (!cpumask_test_cpu (target_cpu,tsk_cpus_allowed (p))) +if (!cpumask_test_cpu (target_cpu, &p->cpus_allowed))return -EINVAL ;/* TODO: This is not properly updating schedstats */
kernel/sched/cpudeadline.c +2 -2
@@ -128,10 +128,10 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,const struct sched_dl_entity *dl_se = &p->dl;if (later_mask && -cpumask_and (later_mask, cp->free_cpus,tsk_cpus_allowed (p))) { +cpumask_and (later_mask, cp->free_cpus, &p->cpus_allowed)) { best_cpu =cpumask_any (later_mask); goto out; - }else if (cpumask_test_cpu (cpudl_maximum (cp),tsk_cpus_allowed (p)) && + }else if (cpumask_test_cpu (cpudl_maximum (cp), &p->cpus_allowed) &&dl_time_before (dl_se->deadline, cp->elements[0 ].dl)) { best_cpu =cpudl_maximum (cp);if (later_mask)
kernel/sched/cpupri.c +2 -2
@@ -103,11 +103,11 @@ int cpupri_find(struct cpupri *cp, struct task_struct *p,if (skip)continue ; -if (cpumask_any_and (tsk_cpus_allowed (p), vec->mask) >= nr_cpu_ids) +if (cpumask_any_and (&p->cpus_allowed, vec->mask) >= nr_cpu_ids)continue ;if (lowest_mask) { -cpumask_and (lowest_mask,tsk_cpus_allowed (p), vec->mask); +cpumask_and (lowest_mask, &p->cpus_allowed, vec->mask);/* * We have to ensure that we have at least one bit
kernel/sched/deadline.c +3 -4
@@ -252,7 +252,7 @@ static struct rq *dl_task_offline_migration(struct rq *rq, struct task_struct *p* If we cannot preempt any rq, fall back to pick any * online cpu. */ - cpu =cpumask_any_and (cpu_active_mask,tsk_cpus_allowed (p)); + cpu =cpumask_any_and (cpu_active_mask, &p->cpus_allowed);if (cpu >= nr_cpu_ids) {/* * Fail to find any suitable cpu.
@@ -1235,7 +1235,7 @@ static void set_curr_task_dl(struct rq *rq)static int pick_dl_task (struct rq *rq,struct task_struct *p,int cpu) {if (!task_running (rq, p) && -cpumask_test_cpu (cpu,tsk_cpus_allowed (p))) +cpumask_test_cpu (cpu, &p->cpus_allowed))return 1 ;return 0 ; }
@@ -1384,8 +1384,7 @@ static struct rq *find_lock_later_rq(struct task_struct *task, struct rq *rq)/* Retry if something changed. */ if (double_lock_balance (rq, later_rq)) {if (unlikely (task_rq (task) != rq || - !cpumask_test_cpu (later_rq->cpu, -tsk_cpus_allowed (task)) || + !cpumask_test_cpu (later_rq->cpu, &task->cpus_allowed) ||task_running (rq, task) || !dl_task (task) || !task_on_rq_queued (task))) {
kernel/sched/fair.c +12 -13
@@ -1553,7 +1553,7 @@ static void task_numa_compare(struct task_numa_env *env,*/ if (cur) {/* Skip this swap candidate if cannot move to the source cpu */ -if (!cpumask_test_cpu (env->src_cpu,tsk_cpus_allowed (cur))) +if (!cpumask_test_cpu (env->src_cpu, &cur->cpus_allowed)) goto unlock;/*
@@ -1663,7 +1663,7 @@ static void task_numa_find_cpu(struct task_numa_env *env,for_each_cpu (cpu,cpumask_of_node (env->dst_nid)) {/* Skip this CPU if the source task cannot migrate */ -if (!cpumask_test_cpu (cpu,tsk_cpus_allowed (env->p))) +if (!cpumask_test_cpu (cpu, &env->p->cpus_allowed))continue ; env->dst_cpu = cpu;
@@ -5460,7 +5460,7 @@ find_idlest_group(struct sched_domain *sd, struct task_struct *p,/* Skip over this group if it has no CPUs allowed */ if (!cpumask_intersects (sched_group_cpus (group), -tsk_cpus_allowed (p))) + &p->cpus_allowed))continue ; local_group = cpumask_test_cpu(this_cpu,
@@ -5580,7 +5580,7 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu)return cpumask_first (sched_group_cpus (group));/* Traverse only the allowed CPUs */ -for_each_cpu_and (i,sched_group_cpus (group),tsk_cpus_allowed (p)) { +for_each_cpu_and (i,sched_group_cpus (group), &p->cpus_allowed) {if (idle_cpu (i)) {struct rq *rq =cpu_rq (i);struct cpuidle_state *idle =idle_get_state (rq);
@@ -5719,7 +5719,7 @@ static int select_idle_core(struct task_struct *p, struct sched_domain *sd, intif (!test_idle_cores (target, false))return -1 ; -cpumask_and (cpus,sched_domain_span (sd),tsk_cpus_allowed (p)); +cpumask_and (cpus,sched_domain_span (sd), &p->cpus_allowed);for_each_cpu_wrap (core, cpus, target, wrap) {bool idle = true;
@@ -5753,7 +5753,7 @@ static int select_idle_smt(struct task_struct *p, struct sched_domain *sd, int treturn -1 ;for_each_cpu (cpu,cpu_smt_mask (target)) { -if (!cpumask_test_cpu (cpu,tsk_cpus_allowed (p))) +if (!cpumask_test_cpu (cpu, &p->cpus_allowed))continue ;if (idle_cpu (cpu))return cpu;
@@ -5805,7 +5805,7 @@ static int select_idle_cpu(struct task_struct *p, struct sched_domain *sd, int t time =local_clock ();for_each_cpu_wrap (cpu,sched_domain_span (sd), target, wrap) { -if (!cpumask_test_cpu (cpu,tsk_cpus_allowed (p))) +if (!cpumask_test_cpu (cpu, &p->cpus_allowed))continue ;if (idle_cpu (cpu))break ;
@@ -5960,7 +5960,7 @@ select_task_rq_fair(struct task_struct *p, int prev_cpu, int sd_flag, int wake_fif (sd_flag &SD_BALANCE_WAKE ) {record_wakee (p); want_affine = !wake_wide (p) && !wake_cap (p, cpu, prev_cpu) - &&cpumask_test_cpu (cpu,tsk_cpus_allowed (p)); + &&cpumask_test_cpu (cpu, &p->cpus_allowed); }rcu_read_lock ();
@@ -6700,7 +6700,7 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)if (throttled_lb_pair (task_group (p), env->src_cpu, env->dst_cpu))return 0 ; -if (!cpumask_test_cpu (env->dst_cpu,tsk_cpus_allowed (p))) { +if (!cpumask_test_cpu (env->dst_cpu, &p->cpus_allowed)) {int cpu;schedstat_inc (p->se.statistics.nr_failed_migrations_affine);
@@ -6720,7 +6720,7 @@ int can_migrate_task(struct task_struct *p, struct lb_env *env)/* Prevent to re-select dst_cpu via env's cpus */ for_each_cpu_and (cpu, env->dst_grpmask, env->cpus) { -if (cpumask_test_cpu (cpu,tsk_cpus_allowed (p))) { +if (cpumask_test_cpu (cpu, &p->cpus_allowed)) { env->flags |=LBF_DST_PINNED ; env->new_dst_cpu = cpu;break ;
@@ -7254,7 +7254,7 @@ check_cpu_capacity(struct rq *rq, struct sched_domain *sd)/* * Group imbalance indicates (and tries to solve) the problem where balancing -* groups is inadequate due to tsk_cpus_allowed() constraints. +* groups is inadequate due to ->cpus_allowed constraints. * * Imagine a situation of two groups of 4 cpus each and 4 tasks each with a * cpumask covering 1 cpu of the first group and 3 cpus of the second group.
@@ -8213,8 +8213,7 @@ static int load_balance(int this_cpu, struct rq *this_rq,* if the curr task on busiest cpu can't be * moved to this_cpu */ -if (!cpumask_test_cpu (this_cpu, -tsk_cpus_allowed (busiest->curr))) { +if (!cpumask_test_cpu (this_cpu, &busiest->curr->cpus_allowed)) {raw_spin_unlock_irqrestore (&busiest->lock, flags); env.flags |=LBF_ALL_PINNED ;
kernel/sched/rt.c +2 -3
@@ -1591,7 +1591,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p)static int pick_rt_task (struct rq *rq,struct task_struct *p,int cpu) {if (!task_running (rq, p) && -cpumask_test_cpu (cpu,tsk_cpus_allowed (p))) +cpumask_test_cpu (cpu, &p->cpus_allowed))return 1 ;return 0 ; }
@@ -1726,8 +1726,7 @@ static struct rq *find_lock_lowest_rq(struct task_struct *task, struct rq *rq)* Also make sure that it wasn't scheduled on its rq. */ if (unlikely (task_rq (task) != rq || - !cpumask_test_cpu (lowest_rq->cpu, -tsk_cpus_allowed (task)) || + !cpumask_test_cpu (lowest_rq->cpu, &task->cpus_allowed) ||task_running (rq, task) || !rt_task (task) || !task_on_rq_queued (task))) {
lib/smp_processor_id.c +1 -1
@@ -22,7 +22,7 @@ notrace static unsigned int check_preemption_disabled(const char *what1,* Kernel threads bound to a single CPU can safely use * smp_processor_id(): */ -if (cpumask_equal (tsk_cpus_allowed (current),cpumask_of (this_cpu))) +if (cpumask_equal (¤t->cpus_allowed,cpumask_of (this_cpu))) goto out;/*
samples/trace_events/trace-events-sample.c +1 -1
@@ -33,7 +33,7 @@ static void simple_thread_func(int cnt)/* Silly tracepoints */ trace_foo_bar ("hello" , cnt, array, random_strings[len], -tsk_cpus_allowed (current)); + ¤t->cpus_allowed);trace_foo_with_template_simple ("HELLO" , cnt);
Signature · 1 line
2.7.4
Peter Zijlstra
maintainerRe: [PATCH 78/89] sched/core: Remove the tsk_cpus_allowed() wrapper
Quoted 7 lines · Ingo Molnar
So the original intention of
tsk_cpus_allowed()was to 'future-proof' the field - but it's pretty ineffectual at that, because half of the code uses ->cpus_allowed directly ...Also, the wrapper makes the code longer than the original expression!
So just get rid of it. This also shrinks <
linux/sched.h> a bit.
Please keep this and the tsk_nr_cpus_allowed() thing. RT uses them.
Peter Zijlstra
maintainerRe: [PATCH 78/89] sched/core: Remove the tsk_cpus_allowed() wrapper
In reply to Ingo MolnarQuoted 63 lines · Ingo Molnar
arch/powerpc/kernel/smp.c +1
-1@@ -796,7 +796,7 @@ void __init smp_cpus_done(unsigned int max_cpus)* se we pin us down to CPU 0 for a short while */ alloc_cpumask_var (&old_mask,GFP_NOWAIT ); -cpumask_copy (old_mask,tsk_cpus_allowed (current)); +cpumask_copy (old_mask, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (boot_cpuid));if (smp_ops && smp_ops->setup_cpu)arch/sparc/kernel/sysfs.c +1
-1@@ -106,7 +106,7 @@ static unsigned long run_on_cpu(unsigned long cpu,cpumask_t old_affinity;unsigned long ret; -cpumask_copy (&old_affinity,tsk_cpus_allowed (current)); +cpumask_copy (&old_affinity, ¤t->cpus_allowed);/* should return -EINVAL to userspace */ if (set_cpus_allowed_ptr (current,cpumask_of (cpu)))return 0 ;drivers/cpufreq/sparc-us2e-cpufreq.c +2
-2@@ -234,7 +234,7 @@ static unsigned int us2e_freq_get(unsigned int cpu)cpumask_t cpus_allowed;unsigned long clock_tick, estar; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); clock_tick =sparc64_get_clock_tick (cpu) /1000 ;@@ -252,7 +252,7 @@ static int us2e_freq_target(struct cpufreq_policy *policy, unsigned int index)unsigned long clock_tick, divisor, old_divisor, estar;cpumask_t cpus_allowed; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); new_freq = clock_tick =sparc64_get_clock_tick (cpu) /1000 ;drivers/cpufreq/sparc-us3-cpufreq.c +1
-1@@ -82,7 +82,7 @@ static unsigned int us3_freq_get(unsigned int cpu)unsigned long reg;unsigned int ret; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); reg =read_safari_cfg ();
drivers/cpufreq/sparc-us3-cpufreq.c static int us3_freq_target(struct cpufreq_policy *policy, unsigned int index) · line 105
Quoted 8 lines
drivers/cpufreq/sparc-us3-cpufreq.c +1
-1@@ -99,7 +99,7 @@ static int us3_freq_target(struct cpufreq_policy *policy, unsigned int index)unsigned long new_bits, new_freq, reg;cpumask_t cpus_allowed; -cpumask_copy (&cpus_allowed,tsk_cpus_allowed (current)); +cpumask_copy (&cpus_allowed, ¤t->cpus_allowed);set_cpus_allowed_ptr (current,cpumask_of (cpu)); new_freq =sparc64_get_clock_tick (cpu) /1000 ;
Note that all those, and this is where I stopped looking, appear broken vs userspace changing the mask right after.
Ingo Molnar
maintainerRe: [PATCH 78/89] sched/core: Remove the tsk_cpus_allowed() wrapper
Quoted 10 lines · Peter Zijlstra
Review
Quoted 7 lines
+++
b/arch/powerpc/kernel/smp.c
+++b/arch/sparc/kernel/sysfs.c
+++b/drivers/cpufreq/sparc-us2e-cpufreq.c
+++b/drivers/cpufreq/sparc-us3-cpufreq.c(quoted diff) +1
-1- cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current)); + cpumask_copy(&cpus_allowed, ¤t->cpus_allowed);Note that all those, and this is where I stopped looking, appear broken vs userspace changing the mask right after.
But these are pre-existing bugs in code twidding ->cpus_allowed, not caused by my patch, right?
I.e. my changes made you notice pre-existing bugs.
Thanks,
Ingo
Peter Zijlstra
maintainerRe: [PATCH 78/89] sched/core: Remove the tsk_cpus_allowed() wrapper
Quoted 8 lines · Ingo Molnar
Quoted 4 lines · Peter Zijlstra
Quoted 4 lines
+++
b/arch/powerpc/kernel/smp.c
+++b/arch/sparc/kernel/sysfs.c
+++b/drivers/cpufreq/sparc-us2e-cpufreq.c
+++b/drivers/cpufreq/sparc-us3-cpufreq.c
Quoted 8 lines
Quoted 5 lines
Review
Quoted 2 lines
(quoted diff) +1
-1- cpumask_copy(&cpus_allowed, tsk_cpus_allowed(current)); + cpumask_copy(&cpus_allowed, ¤t->cpus_allowed);Note that all those, and this is where I stopped looking, appear broken vs userspace changing the mask right after.
But these are pre-existing bugs in code twidding ->cpus_allowed, not caused by my patch, right?
Yes..
Quoted 1 line
I.e. my changes made you notice pre-existing bugs.
I think I spotted them when I made the tsk_cpus_allowed() thing as well. Just wanted to call them out again.
Ingo Molnar
maintainerPATCH 79/89 sched/core: Remove the tsk_nr_cpus_allowed() wrapper
In reply to Ingo Molnartsk_nr_cpus_allowed() too is a pretty pointless wrapper that is not used consistently and which makes the code both harder to read and longer as well.
So remove it - this also shrinks <linux/sched.h> a bit.
--- include/linux/sched.h | 5 ----- kernel/sched/core.c | 2 +- kernel/sched/deadline.c | 28 ++++++++++++++-------------- kernel/sched/rt.c | 24 ++++++++++++------------ 4 files changed, 27 insertions(+), 32 deletions(-)
include/linux/sched.h +0 -5
@@ -962,11 +962,6 @@ struct task_struct {*/ }; -static inline int tsk_nr_cpus_allowed (struct task_struct *p) -{ -return p->nr_cpus_allowed; -} -static inline struct pid *task_pid (struct task_struct *task) {return task->pids[PIDTYPE_PID ].pid;
kernel/sched/core.c +1 -1
@@ -1550,7 +1550,7 @@ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags) {lockdep_assert_held (&p->pi_lock); -if (tsk_nr_cpus_allowed (p) >1 ) +if (p->nr_cpus_allowed >1 ) cpu = p->sched_class->select_task_rq (p, cpu, sd_flags, wake_flags);else cpu =cpumask_any (&p->cpus_allowed);
kernel/sched/deadline.c +14 -14
@@ -134,7 +134,7 @@ static void inc_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) {struct task_struct *p =dl_task_of (dl_se); -if (tsk_nr_cpus_allowed (p) >1 ) +if (p->nr_cpus_allowed >1 ) dl_rq->dl_nr_migratory++;update_dl_migration (dl_rq);
@@ -144,7 +144,7 @@ static void dec_dl_migration(struct sched_dl_entity *dl_se, struct dl_rq *dl_rq) {struct task_struct *p =dl_task_of (dl_se); -if (tsk_nr_cpus_allowed (p) >1 ) +if (p->nr_cpus_allowed >1 ) dl_rq->dl_nr_migratory--;update_dl_migration (dl_rq);
@@ -958,7 +958,7 @@ static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags)enqueue_dl_entity (&p->dl, pi_se, flags); -if (!task_current (rq, p) &&tsk_nr_cpus_allowed (p) >1 ) +if (!task_current (rq, p) && p->nr_cpus_allowed >1 )enqueue_pushable_dl_task (rq, p); }
@@ -1032,9 +1032,9 @@ select_task_rq_dl(struct task_struct *p, int cpu, int sd_flag, int flags)* try to make it stay here, it might be important. */ if (unlikely (dl_task (curr)) && - (tsk_nr_cpus_allowed (curr) <2 || + (curr->nr_cpus_allowed <2 || !dl_entity_preempt (&p->dl, &curr->dl)) && - (tsk_nr_cpus_allowed (p) >1 )) { + (p->nr_cpus_allowed >1 )) {int target =find_later_rq (p); if (target != -1 &&
@@ -1055,7 +1055,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p)* Current can't be migrated, useless to reschedule, * let's hope p can move out. */ -if (tsk_nr_cpus_allowed (rq->curr) ==1 || +if (rq->curr->nr_cpus_allowed ==1 ||cpudl_find (&rq->rd->cpudl, rq->curr,NULL ) ==-1 )return ;
@@ -1063,7 +1063,7 @@ static void check_preempt_equal_dl(struct rq *rq, struct task_struct *p)* p is migratable, so let's not schedule it and * see if it is pushed or pulled somewhere else. */ -if (tsk_nr_cpus_allowed (p) !=1 && +if (p->nr_cpus_allowed !=1 &&cpudl_find (&rq->rd->cpudl, p,NULL ) !=-1 )return ;
@@ -1178,7 +1178,7 @@ static void put_prev_task_dl(struct rq *rq, struct task_struct *p) {update_curr_dl (rq); -if (on_dl_rq (&p->dl) &&tsk_nr_cpus_allowed (p) >1 ) +if (on_dl_rq (&p->dl) && p->nr_cpus_allowed >1 )enqueue_pushable_dl_task (rq, p); }
@@ -1279,7 +1279,7 @@ static int find_later_rq(struct task_struct *task)if (unlikely (!later_mask))return -1 ; -if (tsk_nr_cpus_allowed (task) ==1 ) +if (task->nr_cpus_allowed ==1 )return -1 ;/*
@@ -1424,7 +1424,7 @@ static struct task_struct *pick_next_pushable_dl_task(struct rq *rq)BUG_ON (rq->cpu !=task_cpu (p));BUG_ON (task_current (rq, p)); -BUG_ON (tsk_nr_cpus_allowed (p) <=1 ); +BUG_ON (p->nr_cpus_allowed <=1 );BUG_ON (!task_on_rq_queued (p));BUG_ON (!dl_task (p));
@@ -1463,7 +1463,7 @@ static int push_dl_task(struct rq *rq)*/ if (dl_task (rq->curr) &&dl_time_before (next_task->dl.deadline, rq->curr->dl.deadline) && -tsk_nr_cpus_allowed (rq->curr) >1 ) { + rq->curr->nr_cpus_allowed >1 ) {resched_curr (rq);return 0 ; }
@@ -1610,9 +1610,9 @@ static void task_woken_dl(struct rq *rq, struct task_struct *p) {if (!task_running (rq, p) && !test_tsk_need_resched (rq->curr) && -tsk_nr_cpus_allowed (p) >1 && + p->nr_cpus_allowed >1 &&dl_task (rq->curr) && - (tsk_nr_cpus_allowed (rq->curr) <2 || + (rq->curr->nr_cpus_allowed <2 || !dl_entity_preempt (&p->dl, &rq->curr->dl))) {push_dl_tasks (rq); }
@@ -1726,7 +1726,7 @@ static void switched_to_dl(struct rq *rq, struct task_struct *p)if (rq->curr != p) {#ifdef CONFIG_SMP -if (tsk_nr_cpus_allowed (p) >1 && rq->dl.overloaded) +if (p->nr_cpus_allowed >1 && rq->dl.overloaded)queue_push_tasks (rq);#endif if (dl_task (rq->curr))
kernel/sched/rt.c +12 -12
@@ -335,7 +335,7 @@ static void inc_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) rt_rq = &rq_of_rt_rq (rt_rq)->rt; rt_rq->rt_nr_total++; -if (tsk_nr_cpus_allowed (p) >1 ) +if (p->nr_cpus_allowed >1 ) rt_rq->rt_nr_migratory++;update_rt_migration (rt_rq);
@@ -352,7 +352,7 @@ static void dec_rt_migration(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) rt_rq = &rq_of_rt_rq (rt_rq)->rt; rt_rq->rt_nr_total--; -if (tsk_nr_cpus_allowed (p) >1 ) +if (p->nr_cpus_allowed >1 ) rt_rq->rt_nr_migratory--;update_rt_migration (rt_rq);
@@ -1324,7 +1324,7 @@ enqueue_task_rt(struct rq *rq, struct task_struct *p, int flags)enqueue_rt_entity (rt_se, flags); -if (!task_current (rq, p) &&tsk_nr_cpus_allowed (p) >1 ) +if (!task_current (rq, p) && p->nr_cpus_allowed >1 )enqueue_pushable_task (rq, p); }
@@ -1413,7 +1413,7 @@ select_task_rq_rt(struct task_struct *p, int cpu, int sd_flag, int flags)* will have to sort it out. */ if (curr &&unlikely (rt_task (curr)) && - (tsk_nr_cpus_allowed (curr) <2 || + (curr->nr_cpus_allowed <2 || curr->prio <= p->prio)) {int target =find_lowest_rq (p);
@@ -1437,7 +1437,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)* Current can't be migrated, useless to reschedule, * let's hope p can move out. */ -if (tsk_nr_cpus_allowed (rq->curr) ==1 || +if (rq->curr->nr_cpus_allowed ==1 || !cpupri_find (&rq->rd->cpupri, rq->curr,NULL ))return ;
@@ -1445,7 +1445,7 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p)* p is migratable, so let's not schedule it and * see if it is pushed or pulled somewhere else. */ -if (tsk_nr_cpus_allowed (p) !=1 +if (p->nr_cpus_allowed !=1 &&cpupri_find (&rq->rd->cpupri, p,NULL ))return ;
@@ -1579,7 +1579,7 @@ static void put_prev_task_rt(struct rq *rq, struct task_struct *p)* The previous task needs to be made eligible for pushing * if it is still active */ -if (on_rt_rq (&p->rt) &&tsk_nr_cpus_allowed (p) >1 ) +if (on_rt_rq (&p->rt) && p->nr_cpus_allowed >1 )enqueue_pushable_task (rq, p); }
@@ -1629,7 +1629,7 @@ static int find_lowest_rq(struct task_struct *task)if (unlikely (!lowest_mask))return -1 ; -if (tsk_nr_cpus_allowed (task) ==1 ) +if (task->nr_cpus_allowed ==1 )return -1 ;/* No other targets possible */ if (!cpupri_find (&task_rq (task)->rd->cpupri, task, lowest_mask))
@@ -1761,7 +1761,7 @@ static struct task_struct *pick_next_pushable_task(struct rq *rq)BUG_ON (rq->cpu !=task_cpu (p));BUG_ON (task_current (rq, p)); -BUG_ON (tsk_nr_cpus_allowed (p) <=1 ); +BUG_ON (p->nr_cpus_allowed <=1 );BUG_ON (!task_on_rq_queued (p));BUG_ON (!rt_task (p));
@@ -2121,9 +2121,9 @@ static void task_woken_rt(struct rq *rq, struct task_struct *p) {if (!task_running (rq, p) && !test_tsk_need_resched (rq->curr) && -tsk_nr_cpus_allowed (p) >1 && + p->nr_cpus_allowed >1 && (dl_task (rq->curr) ||rt_task (rq->curr)) && - (tsk_nr_cpus_allowed (rq->curr) <2 || + (rq->curr->nr_cpus_allowed <2 || rq->curr->prio <= p->prio))push_rt_tasks (rq); }
@@ -2196,7 +2196,7 @@ static void switched_to_rt(struct rq *rq, struct task_struct *p)*/ if (task_on_rq_queued (p) && rq->curr != p) {#ifdef CONFIG_SMP -if (tsk_nr_cpus_allowed (p) >1 && rq->rt.overloaded) +if (p->nr_cpus_allowed >1 && rq->rt.overloaded)queue_push_tasks (rq);#endif /* CONFIG_SMP */ if (p->prio < rq->curr->prio)
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 80/89 sched/headers: Move the <linux/magic.h> include to <linux/sched/task_stack.h>
In reply to Ingo MolnarIt's not used by any of the scheduler methods, but <linux/sched/task_stack.h> needs it to pick up STACK_END_MAGIC.
Update files that depended on the magic.h inclusion.
--- drivers/dax/dax.c | 1 + drivers/virtio/virtio_balloon.c | 1 + include/linux/sched.h | 1 - include/linux/sched/task_stack.h | 1 + mm/zsmalloc.c | 1 + security/integrity/evm/evm_main.c | 2 ++ 6 files changed, 6 insertions(+), 1 deletion(-)
drivers/dax/dax.c +1 -0
@@ -13,6 +13,7 @@#include <linux/pagemap.h> #include <linux/module.h> #include <linux/device.h> +#include <linux/magic.h> #include <linux/mount.h> #include <linux/pfn_t.h> #include <linux/hash.h>
drivers/virtio/virtio_balloon.c +1 -0
@@ -31,6 +31,7 @@#include <linux/wait.h> #include <linux/mm.h> #include <linux/mount.h> +#include <linux/magic.h> /* * Balloon device works in 4K page units. So each page is pointed to by
include/linux/sched.h +0 -1
@@ -21,7 +21,6 @@#include <linux/task_io_accounting.h> #include <linux/latencytop.h> #include <linux/topology.h> -#include <linux/magic.h> #include <asm/current.h>
include/linux/sched/task_stack.h +1 -0
@@ -6,6 +6,7 @@*/ #include <linux/sched.h> +#include <linux/magic.h> #ifdef CONFIG_THREAD_INFO_IN_TASK
mm/zsmalloc.c +1 -0
@@ -34,6 +34,7 @@#include <linux/module.h> #include <linux/kernel.h> #include <linux/sched.h> +#include <linux/magic.h> #include <linux/bitops.h> #include <linux/errno.h> #include <linux/highmem.h>
security/integrity/evm/evm_main.c +2 -0
@@ -22,6 +22,8 @@#include <linux/xattr.h> #include <linux/integrity.h> #include <linux/evm.h> +#include <linux/magic.h> +#include <crypto/hash.h> #include <crypto/algapi.h> #include "evm.h"
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 81/89 sched/headers: Remove spurious <linux/sched.h> inclusion dependencies
In reply to Ingo MolnarIn the next couple of patches we are going to remove various headers from sched.h and other headers that sched.h includes.
To make those patches build cleanly prepare the scene by adding dependencies to various files that learned to rely on those to-be-removed dependencies.
These changes all make sense standalone: they add a header for a data type that a particular .c or .h file is using.
--- drivers/misc/vmw_vmci/vmci_resource.c | 1 + include/linux/sched.h | 1 + include/linux/user_namespace.h | 2 ++ include/sound/control.h | 1 + include/target/target_core_base.h | 1 + 5 files changed, 6 insertions(+)
drivers/misc/vmw_vmci/vmci_resource.c +1 -0
@@ -17,6 +17,7 @@#include <linux/hash.h> #include <linux/types.h> #include <linux/rculist.h> +#include <linux/completion.h> #include "vmci_resource.h" #include "vmci_driver.h"
include/linux/sched.h +1 -0
@@ -5,6 +5,7 @@#include <linux/sched/prio.h> +#include <linux/mutex.h> #include <linux/plist.h> #include <linux/mm_types_task.h>
include/linux/user_namespace.h +2 -0
@@ -5,6 +5,8 @@#include <linux/nsproxy.h> #include <linux/ns_common.h> #include <linux/sched.h> +#include <linux/workqueue.h> +#include <linux/rwsem.h> #include <linux/sysctl.h> #include <linux/err.h>
include/sound/control.h +1 -0
@@ -22,6 +22,7 @@* */ +#include <linux/wait.h> #include <sound/asound.h> #define snd_kcontrol_chip (kcontrol) ((kcontrol)->private_data)
include/target/target_core_base.h +1 -0
@@ -6,6 +6,7 @@#include <linux/percpu_ida.h> /* struct percpu_ida */ #include <linux/percpu-refcount.h> #include <linux/semaphore.h> /* struct semaphore */ +#include <linux/completion.h> #define TARGET_CORE_VERSION "v5.0"
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 82/89 rcu: Separate the rcu synchronization types and APIs into <linux/rcupdate_wait.h>
In reply to Ingo MolnarSo rcupdate.h is a pretty complex header, in particular it includes <linux/completion.h> which includes <linux/wait.h> - creating a dependency that includes <linux/wait.h> in <linux/sched.h>, which prevents the isolation of <linux/sched.h> from the derived <linux/wait.h> header.
Solve part of the problem by decoupling rcupdate.h from completions:
this can be done by separating out the rcu_synchronize types and APIs, and updating their usage sites.
Since this is a mostly RCU-internal types this will not just simplify <linux/sched.h>'s dependencies, but will make all the hundreds of .c files that include rcupdate.h but not completions or wait.h build faster.
( For rcutiny this means that two dependent APIs have to be uninlined,
but that shouldn't be much of a problem as they are rare variants. )
--- fs/autofs4/autofs_i.h | 1 + include/linux/dcache.h | 1 + include/linux/rcupdate.h | 40 ---------------------------------------- include/linux/rcupdate_wait.h | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ include/linux/rcutiny.h | 11 ++--------- kernel/rcu/srcu.c | 2 +- kernel/rcu/tiny.c | 14 +++++++++++++- kernel/rcu/tree.c | 2 +- kernel/rcu/update.c | 1 + kernel/sched/core.c | 1 + 10 files changed, 71 insertions(+), 52 deletions(-)
fs/autofs4/autofs_i.h +1 -0
@@ -14,6 +14,7 @@#include <linux/mutex.h> #include <linux/spinlock.h> #include <linux/list.h> +#include <linux/completion.h> /* This is the range of ioctl() numbers we claim as ours */ #define AUTOFS_IOC_FIRST AUTOFS_IOC_READY
include/linux/dcache.h +1 -0
@@ -11,6 +11,7 @@#include <linux/rcupdate.h> #include <linux/lockref.h> #include <linux/stringhash.h> +#include <linux/wait.h> struct path ;struct vfsmount ;
include/linux/rcupdate.h +0 -40
@@ -40,7 +40,6 @@#include <linux/cpumask.h> #include <linux/seqlock.h> #include <linux/lockdep.h> -#include <linux/completion.h> #include <linux/debugobjects.h> #include <linux/bug.h> #include <linux/compiler.h>
@@ -226,45 +225,6 @@ void call_rcu_sched(struct rcu_head *head,void synchronize_sched (void ); -/* -* Structure allowing asynchronous waiting on RCU. -*/ -struct rcu_synchronize { -struct rcu_head head; -struct completion completion; -}; -void wakeme_after_rcu (struct rcu_head *head); - -void __wait_rcu_gp (bool checktiny,int n,call_rcu_func_t *crcu_array, -struct rcu_synchronize *rs_array); - -#define _wait_rcu_gp (checktiny, ...) \ -do { \ - call_rcu_func_t __crcu_array[] = { __VA_ARGS__ }; \ - struct rcu_synchronize __rs_array[ARRAY_SIZE(__crcu_array)]; \ - __wait_rcu_gp(checktiny, ARRAY_SIZE(__crcu_array), \ - __crcu_array, __rs_array); \ -} while (0) - -#define wait_rcu_gp (...) _wait_rcu_gp(false, __VA_ARGS__) - -/** -* synchronize_rcu_mult - Wait concurrently for multiple grace periods -* @...: List of call_rcu() functions for the flavors to wait on. -* -* This macro waits concurrently for multiple flavors of RCU grace periods. -* For example, synchronize_rcu_mult(call_rcu, call_rcu_bh) would wait -* on concurrent RCU and RCU-bh grace periods. Waiting on a give SRCU -* domain requires you to write a wrapper function for that SRCU domain's -* call_srcu() function, supplying the corresponding srcu_struct. -* -* If Tiny RCU, tell _wait_rcu_gp() not to bother waiting for RCU -* or RCU-bh, given that anywhere synchronize_rcu_mult() can be called -* is automatically a grace period. -*/ -#define synchronize_rcu_mult (...) \ - _wait_rcu_gp(IS_ENABLED(CONFIG_TINY_RCU), __VA_ARGS__) -/** * call_rcu_tasks() - Queue an RCU for invocation task-based grace period * @head: structure to be used for queueing the RCU updates.
include/linux/rcupdate_wait.h new file +50 -0
50 lines not on this page · raw message
include/linux/rcutiny.h +2 -9
@@ -47,15 +47,8 @@ static inline void cond_synchronize_sched(unsigned long oldstate)might_sleep (); } -static inline void rcu_barrier_bh (void ) -{ -wait_rcu_gp (call_rcu_bh); -} - -static inline void rcu_barrier_sched (void ) -{ -wait_rcu_gp (call_rcu_sched); -} +extern void rcu_barrier_bh (void ); +extern void rcu_barrier_sched (void );static inline void synchronize_rcu_expedited (void ) {
kernel/rcu/srcu.c +1 -1
@@ -30,7 +30,7 @@#include <linux/mutex.h> #include <linux/percpu.h> #include <linux/preempt.h> -#include <linux/rcupdate.h> +#include <linux/rcupdate_wait.h> #include <linux/sched.h> #include <linux/smp.h> #include <linux/delay.h>
kernel/rcu/tiny.c +13 -1
@@ -25,7 +25,7 @@#include <linux/completion.h> #include <linux/interrupt.h> #include <linux/notifier.h> -#include <linux/rcupdate.h> +#include <linux/rcupdate_wait.h> #include <linux/kernel.h> #include <linux/export.h> #include <linux/mutex.h>
@@ -49,6 +49,18 @@ static void __call_rcu(struct rcu_head *head,#include "tiny_plugin.h" +void rcu_barrier_bh (void ) +{ +wait_rcu_gp (call_rcu_bh); +} +EXPORT_SYMBOL (rcu_barrier_bh); + +void rcu_barrier_sched (void ) +{ +wait_rcu_gp (call_rcu_sched); +} +EXPORT_SYMBOL (rcu_barrier_sched); +#if defined(CONFIG_DEBUG_LOCK_ALLOC ) || defined(CONFIG_RCU_TRACE )/*
kernel/rcu/tree.c +1 -1
@@ -32,7 +32,7 @@#include <linux/init.h> #include <linux/spinlock.h> #include <linux/smp.h> -#include <linux/rcupdate.h> +#include <linux/rcupdate_wait.h> #include <linux/interrupt.h> #include <linux/sched.h> #include <linux/sched/debug.h>
kernel/rcu/update.c +1 -0
@@ -50,6 +50,7 @@#include <linux/moduleparam.h> #include <linux/kthread.h> #include <linux/tick.h> +#include <linux/rcupdate_wait.h> #define CREATE_TRACE_POINTS
kernel/sched/core.c +1 -0
@@ -15,6 +15,7 @@#include <linux/delayacct.h> #include <linux/init_task.h> #include <linux/context_tracking.h> +#include <linux/rcupdate_wait.h> #include <linux/blkdev.h> #include <linux/kprobes.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 83/89 timers: Remove the <linux/sysctl.h> include from <linux/timer.h>
In reply to Ingo MolnarSo we want to simplify <linux/sched.h>'s header dependencies, but one roadblock of that is <linux/timer.h>'s inclusion of sysctl.h, which brings in other, problematic headers.
Note that timer.h's inclusion of sysctl.h can be avoided if we pre-declare ctl_table - so do that.
Also update usage sites that depended on the inclusion of sysctl.h (or one of the headers included by sysctl.h).
--- include/linux/timer.h | 2 +- kernel/utsname_sysctl.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-)
include/linux/timer.h +1 -1
@@ -255,7 +255,7 @@ struct hrtimer;extern enum hrtimer_restart it_real_fn (struct hrtimer *);#if defined(CONFIG_SMP ) && defined(CONFIG_NO_HZ_COMMON ) -#include <linux/sysctl.h> +struct ctl_table ;extern unsigned int sysctl_timer_migration; int timer_migration_handler(struct ctl_table *table, int write,
kernel/utsname_sysctl.c +1 -0
@@ -14,6 +14,7 @@#include <linux/utsname.h> #include <linux/sysctl.h> #include <linux/wait.h> +#include <linux/rwsem.h> #ifdef CONFIG_PROC_SYSCTL
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 84/89 x86/apic: Remove the <linux/pm.h> header inclusion from <asm/apic.h>
In reply to Ingo MolnarWe want to simplify <linux/sched.h>'s header dependencies, but one roadblock to that is <asm/apic.h>'s inclusion of pm.h, which brings in other, problematic headers.
Remove it, as it appears to be entirely spurious, apic.h does not actually make use of any PM facilities.
--- arch/x86/include/asm/apic.h | 1 - 1 file changed, 1 deletion(-)
arch/x86/include/asm/apic.h +0 -1
@@ -2,7 +2,6 @@#define _ASM_X86_APIC_H#include <linux/cpumask.h> -#include <linux/pm.h> #include <asm/alternative.h> #include <asm/cpufeature.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 85/89 hrtimer: Remove the <linux/wait.h> include from <linux/hrtimer.h>
In reply to Ingo MolnarIn our quest to simplify <linux/sched.h>'s header dependencies, remove the <linux/wait.h> inclusion from <linux/hrtimer.h> - which does not appear to be necessary, as hrtimer.h does not use waitqueues.
--- include/linux/hrtimer.h | 1 - 1 file changed, 1 deletion(-)
include/linux/hrtimer.h +0 -1
@@ -19,7 +19,6 @@#include <linux/ktime.h> #include <linux/init.h> #include <linux/list.h> -#include <linux/wait.h> #include <linux/percpu.h> #include <linux/timer.h> #include <linux/timerqueue.h>
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 86/89 sched/headers: Remove the <linux/topology.h> include from <linux/sched.h>
In reply to Ingo MolnarIt's used only by a single (rarely used) inline function (task_node(p)), which we can move to <linux/sched/topology.h>.
( Add <linux/nodemask.h>, because we rely on that. )
--- include/linux/sched.h | 7 +------ include/linux/sched/topology.h | 7 +++++++ 2 files changed, 8 insertions(+), 6 deletions(-)
include/linux/sched.h +1 -6
@@ -4,6 +4,7 @@#include <uapi/linux/sched.h> #include <linux/sched/prio.h> +#include <linux/nodemask.h> #include <linux/mutex.h> #include <linux/plist.h>
@@ -21,7 +22,6 @@#include <linux/kcov.h> #include <linux/task_io_accounting.h> #include <linux/latencytop.h> -#include <linux/topology.h> #include <asm/current.h>
@@ -1455,11 +1455,6 @@ static inline unsigned int task_cpu(const struct task_struct *p)#endif } -static inline int task_node (const struct task_struct *p) -{ -return cpu_to_node (task_cpu (p)); -} -extern void set_task_cpu (struct task_struct *p,unsigned int cpu);#else
include/linux/sched/topology.h +7 -0
@@ -1,6 +1,8 @@#ifndef _LINUX_SCHED_TOPOLOGY_H#define _LINUX_SCHED_TOPOLOGY_H +#include <linux/topology.h> +#include <linux/sched/idle.h> /*
@@ -216,4 +218,9 @@ static inline bool cpus_share_cache(int this_cpu, int that_cpu)#endif /* !CONFIG_SMP */ +static inline int task_node (const struct task_struct *p) +{ +return cpu_to_node (task_cpu (p)); +} +#endif /* _LINUX_SCHED_TOPOLOGY_H */
Signature · 1 line
2.7.4
Ingo Molnar
maintainerPATCH 87/89 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
@@ -1234,13 +1234,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 88/89 sched/headers: Remove #ifdefs from <linux/sched.h>
In reply to Ingo MolnarWe can remove two pairs of #ifdefs by defining structures in a smarter way.
--- include/linux/sched.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-)
include/linux/sched.h +4 -8
@@ -224,8 +224,8 @@ struct task_cputime {#define prof_exp stime#define sched_exp sum_exec_runtime -#ifdef CONFIG_SCHED_INFOstruct sched_info { +#ifdef CONFIG_SCHED_INFO /* cumulative counters */ unsigned long pcount;/* # of times run on this cpu */ unsigned long long run_delay;/* time spent waiting on a runqueue */
@@ -233,8 +233,8 @@ struct sched_info {/* timestamps */ unsigned long long last_arrival,/* when we last ran on a cpu */ last_queued;/* when we were last queued to run */ -};#endif /* CONFIG_SCHED_INFO */ +};/* * Integer metrics need fixed point arithmetic, e.g., sched/fair
@@ -309,8 +309,8 @@ struct sched_avg {unsigned long load_avg, util_avg; }; -#ifdef CONFIG_SCHEDSTATSstruct sched_statistics { +#ifdef CONFIG_SCHEDSTATS u64 wait_start;u64 wait_max;u64 wait_count;
@@ -342,8 +342,8 @@ struct sched_statistics {u64 nr_wakeups_affine_attempts;u64 nr_wakeups_passive;u64 nr_wakeups_idle; -};#endif +};struct sched_entity {struct load_weight load;/* for load-balancing */
@@ -358,9 +358,7 @@ struct sched_entity {u64 nr_migrations; -#ifdef CONFIG_SCHEDSTATS struct sched_statistics statistics; -#endif #ifdef CONFIG_FAIR_GROUP_SCHED int depth;
@@ -526,9 +524,7 @@ struct task_struct {int rcu_tasks_idle_cpu;#endif /* #ifdef CONFIG_TASKS_RCU */ -#ifdef CONFIG_SCHED_INFO struct sched_info sched_info; -#endif struct list_head tasks;#ifdef CONFIG_SMP
Signature · 1 line
2.7.4
Re: [PATCH 88/89] sched/headers: Remove #ifdefs from <linux/sched.h>
Quoted 1 line · Ingo Molnar
We can remove two pairs of #ifdefs by defining structures in a smarter way.
Ok, this time the zero-sized structure actually works and is fine.
Linus
Ingo Molnar
maintainerPATCH 89/89 sched/headers: Clean up <linux/sched.h>
In reply to Ingo MolnarNow that <linux/sched.h> dependencies have been sorted out, do various trivial cleanups:
- remove unnecessary structure predeclarations
- fix various typos
- update comments where necessary
- remove pointless comments
- use consistent types
- tabulate consistently
- use a consistent comment style
- clean up the header section a bit
- use a consistent style of a single field per line
- remove line-breaks where they make the code look worse
- etc ...
No change in functionality.
--- include/linux/sched.h | 1224 +++++++++++++++++++++++++++++++++++++-------------------------------- 1 file changed, 652 insertions(+), 572 deletions(-)
include/linux/sched.h +652 -572
@@ -1,38 +1,38 @@#ifndef _LINUX_SCHED_H#define _LINUX_SCHED_H -#include <uapi/linux/sched.h> +/* +* Define 'struct task_struct' and provide the main scheduler +* APIs (schedule(), wakeup variants, etc.) +*/ -#include <linux/sched/prio.h> -#include <linux/nodemask.h> +#include <uapi/linux/sched.h> -#include <linux/mutex.h> -#include <linux/plist.h> -#include <linux/mm_types_task.h> +#include <asm/current.h> +#include <linux/pid.h> #include <linux/sem.h> #include <linux/shm.h> -#include <linux/signal_types.h> -#include <linux/pid.h> +#include <linux/kcov.h> +#include <linux/mutex.h> +#include <linux/plist.h> +#include <linux/hrtimer.h> #include <linux/seccomp.h> +#include <linux/nodemask.h> #include <linux/rcupdate.h> -#include <linux/resource.h> -#include <linux/hrtimer.h> -#include <linux/kcov.h> -#include <linux/task_io_accounting.h> #include <linux/latencytop.h> +#include <linux/sched/prio.h> +#include <linux/signal_types.h> +#include <linux/mm_types_task.h> +#include <linux/task_io_accounting.h> -#include <asm/current.h> - -/* task_struct member predeclarations: */ +/* task_struct member predeclarations (sorted alphabetically): */ struct audit_context ; -struct autogroup ;struct backing_dev_info ;struct bio_list ;struct blk_plug ;struct cfs_rq ; -struct filename ;struct fs_struct ;struct futex_pi_state ;struct io_context ;
@@ -52,8 +52,6 @@ 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
@@ -65,50 +63,53 @@ struct uts_namespace;* modifying one set can't modify the other one by * mistake. */ -#define TASK_RUNNING 0 -#define TASK_INTERRUPTIBLE 1 -#define TASK_UNINTERRUPTIBLE 2 -#define __TASK_STOPPED 4 -#define __TASK_TRACED 8 -/* in tsk->exit_state */ -#define EXIT_DEAD 16 -#define EXIT_ZOMBIE 32 -#define EXIT_TRACE (EXIT_ZOMBIE | EXIT_DEAD) -/* in tsk->state again */ -#define TASK_DEAD 64 -#define TASK_WAKEKILL 128 -#define TASK_WAKING 256 -#define TASK_PARKED 512 -#define TASK_NOLOAD 1024 -#define TASK_NEW 2048 -#define TASK_STATE_MAX 4096 - -#define TASK_STATE_TO_CHAR_STR "RSDTtXZxKWPNn" - -/* Convenience macros for the sake of set_current_state */ -#define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE) -#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED) -#define TASK_TRACED (TASK_WAKEKILL | __TASK_TRACED) - -#define TASK_IDLE (TASK_UNINTERRUPTIBLE | TASK_NOLOAD) - -/* Convenience macros for the sake of wake_up */ -#define TASK_NORMAL (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE) -#define TASK_ALL (TASK_NORMAL | __TASK_STOPPED | __TASK_TRACED) - -/* get_task_state() */ -#define TASK_REPORT (TASK_RUNNING | TASK_INTERRUPTIBLE | \ - TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ - __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD) - -#define task_is_traced (task) ((task->state & __TASK_TRACED) != 0) -#define task_is_stopped (task) ((task->state & __TASK_STOPPED) != 0) -#define task_is_stopped_or_traced (task) \ - ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0) -#define task_contributes_to_load (task) \ - ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ - (task->flags & PF_FROZEN) == 0 && \ - (task->state & TASK_NOLOAD) == 0) + +/* Used in tsk->state: */ +#define TASK_RUNNING 0 +#define TASK_INTERRUPTIBLE 1 +#define TASK_UNINTERRUPTIBLE 2 +#define __TASK_STOPPED 4 +#define __TASK_TRACED 8 +/* Used in tsk->exit_state: */ +#define EXIT_DEAD 16 +#define EXIT_ZOMBIE 32 +#define EXIT_TRACE (EXIT_ZOMBIE | EXIT_DEAD) +/* Used in tsk->state again: */ +#define TASK_DEAD 64 +#define TASK_WAKEKILL 128 +#define TASK_WAKING 256 +#define TASK_PARKED 512 +#define TASK_NOLOAD 1024 +#define TASK_NEW 2048 +#define TASK_STATE_MAX 4096 + +#define TASK_STATE_TO_CHAR_STR "RSDTtXZxKWPNn" + +/* Convenience macros for the sake of set_current_state: */ +#define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE) +#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED) +#define TASK_TRACED (TASK_WAKEKILL | __TASK_TRACED) + +#define TASK_IDLE (TASK_UNINTERRUPTIBLE | TASK_NOLOAD) + +/* Convenience macros for the sake of wake_up(): */ +#define TASK_NORMAL (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE) +#define TASK_ALL (TASK_NORMAL | __TASK_STOPPED | __TASK_TRACED) + +/* get_task_state(): */ +#define TASK_REPORT (TASK_RUNNING | TASK_INTERRUPTIBLE | \ + TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \ + __TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD) + +#define task_is_traced (task) ((task->state & __TASK_TRACED) != 0) + +#define task_is_stopped (task) ((task->state & __TASK_STOPPED) != 0) + +#define task_is_stopped_or_traced (task) ((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0) + +#define task_contributes_to_load (task) ((task->state & TASK_UNINTERRUPTIBLE) != 0 && \ + (task->flags & PF_FROZEN) == 0 && \ + (task->state & TASK_NOLOAD) == 0)#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
@@ -158,26 +159,24 @@ struct uts_namespace;* * Also see the comments of try_to_wake_up(). */ -#define __set_current_state (state_value) \ - do { current->state = (state_value); } while (0) -#define set_current_state (state_value) \ - smp_store_mb(current->state, (state_value)) - +#define __set_current_state (state_value) do { current->state = (state_value); } while (0) +#define set_current_state (state_value) smp_store_mb(current->state, (state_value))#endif -/* Task command name length */ -#define TASK_COMM_LEN 16 +/* Task command name length: */ +#define TASK_COMM_LEN 16 -extern cpumask_var_t cpu_isolated_map; +extern cpumask_var_t cpu_isolated_map;extern void scheduler_tick (void ); -#define MAX_SCHEDULE_TIMEOUT LONG_MAX -extern signed long schedule_timeout (signed long timeout); -extern signed long schedule_timeout_interruptible (signed long timeout); -extern signed long schedule_timeout_killable (signed long timeout); -extern signed long schedule_timeout_uninterruptible (signed long timeout); -extern signed long schedule_timeout_idle (signed long timeout); +#define MAX_SCHEDULE_TIMEOUT LONG_MAX + +extern long schedule_timeout (long timeout); +extern long schedule_timeout_interruptible (long timeout); +extern long schedule_timeout_killable (long timeout); +extern long schedule_timeout_uninterruptible (long timeout); +extern long schedule_timeout_idle (long timeout); asmlinkage void schedule(void);extern void schedule_preempt_disabled (void );
@@ -197,9 +196,9 @@ extern void io_schedule(void);*/ struct prev_cputime {#ifndef CONFIG_VIRT_CPU_ACCOUNTING_NATIVE -u64 utime; -u64 stime; -raw_spinlock_t lock; +u64 utime; +u64 stime; +raw_spinlock_t lock;#endif };
@@ -214,25 +213,34 @@ struct prev_cputime {* these counts together and treat all three of them in parallel. */ struct task_cputime { -u64 utime; -u64 stime; -unsigned long long sum_exec_runtime; +u64 utime; +u64 stime; +unsigned long long sum_exec_runtime; }; -/* Alternate field names when used to cache expirations. */ -#define virt_exp utime -#define prof_exp stime -#define sched_exp sum_exec_runtime +/* Alternate field names when used on cache expirations: */ +#define virt_exp utime +#define prof_exp stime +#define sched_exp sum_exec_runtimestruct sched_info {#ifdef CONFIG_SCHED_INFO -/* cumulative counters */ -unsigned long pcount;/* # of times run on this cpu */ -unsigned long long run_delay;/* time spent waiting on a runqueue */ +/* Cumulative counters: */ + +/* # of times we have run on this CPU: */ +unsigned long pcount; + +/* Time spent waiting on a runqueue: */ +unsigned long long run_delay; + +/* Timestamps: */ + +/* When did we last run on a CPU? */ +unsigned long long last_arrival; + +/* When were we last queued to run? */ +unsigned long long last_queued; -/* timestamps */ -unsigned long long last_arrival,/* when we last ran on a cpu */ - last_queued;/* when we were last queued to run */ #endif /* CONFIG_SCHED_INFO */ };
@@ -243,12 +251,12 @@ struct sched_info {* We define a basic fixed point arithmetic range, and then formalize * all these metrics based on that basic range. */ -# define SCHED_FIXEDPOINT_SHIFT 10 -# define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT) +# define SCHED_FIXEDPOINT_SHIFT 10 +# define SCHED_FIXEDPOINT_SCALE (1L << SCHED_FIXEDPOINT_SHIFT)struct load_weight { -unsigned long weight; -u32 inv_weight; +unsigned long weight; +u32 inv_weight; };/*
@@ -304,69 +312,73 @@ struct load_weight {* issues. */ struct sched_avg { -u64 last_update_time, load_sum; -u32 util_sum, period_contrib; -unsigned long load_avg, util_avg; +u64 last_update_time; +u64 load_sum; +u32 util_sum; +u32 period_contrib; +unsigned long load_avg; +unsigned long util_avg; };struct sched_statistics {#ifdef CONFIG_SCHEDSTATS -u64 wait_start; -u64 wait_max; -u64 wait_count; -u64 wait_sum; -u64 iowait_count; -u64 iowait_sum; - -u64 sleep_start; -u64 sleep_max; -s64 sum_sleep_runtime; - -u64 block_start; -u64 block_max; -u64 exec_max; -u64 slice_max; - -u64 nr_migrations_cold; -u64 nr_failed_migrations_affine; -u64 nr_failed_migrations_running; -u64 nr_failed_migrations_hot; -u64 nr_forced_migrations; - -u64 nr_wakeups; -u64 nr_wakeups_sync; -u64 nr_wakeups_migrate; -u64 nr_wakeups_local; -u64 nr_wakeups_remote; -u64 nr_wakeups_affine; -u64 nr_wakeups_affine_attempts; -u64 nr_wakeups_passive; -u64 nr_wakeups_idle; +u64 wait_start; +u64 wait_max; +u64 wait_count; +u64 wait_sum; +u64 iowait_count; +u64 iowait_sum; + +u64 sleep_start; +u64 sleep_max; +s64 sum_sleep_runtime; + +u64 block_start; +u64 block_max; +u64 exec_max; +u64 slice_max; + +u64 nr_migrations_cold; +u64 nr_failed_migrations_affine; +u64 nr_failed_migrations_running; +u64 nr_failed_migrations_hot; +u64 nr_forced_migrations; + +u64 nr_wakeups; +u64 nr_wakeups_sync; +u64 nr_wakeups_migrate; +u64 nr_wakeups_local; +u64 nr_wakeups_remote; +u64 nr_wakeups_affine; +u64 nr_wakeups_affine_attempts; +u64 nr_wakeups_passive; +u64 nr_wakeups_idle;#endif };struct sched_entity { -struct load_weight load;/* for load-balancing */ -struct rb_node run_node; -struct list_head group_node; -unsigned int on_rq; +/* For load-balancing: */ +struct load_weight load; +struct rb_node run_node; +struct list_head group_node; +unsigned int on_rq; -u64 exec_start; -u64 sum_exec_runtime; -u64 vruntime; -u64 prev_sum_exec_runtime; +u64 exec_start; +u64 sum_exec_runtime; +u64 vruntime; +u64 prev_sum_exec_runtime; -u64 nr_migrations; +u64 nr_migrations; -struct sched_statistics statistics; +struct sched_statistics statistics;#ifdef CONFIG_FAIR_GROUP_SCHED -int depth; -struct sched_entity *parent; +int depth; +struct sched_entity *parent;/* rq on which this entity is (to be) queued: */ -struct cfs_rq *cfs_rq; +struct cfs_rq *cfs_rq;/* rq "owned" by this entity/group: */ -struct cfs_rq *my_q; +struct cfs_rq *my_q;#endif #ifdef CONFIG_SMP
@@ -376,49 +388,49 @@ struct sched_entity {* Put into separate cache line so it does not * collide with read-mostly values above. */ -struct sched_avg avg____cacheline_aligned_in_smp ; +struct sched_avg avg____cacheline_aligned_in_smp ;#endif };struct sched_rt_entity { -struct list_head run_list; -unsigned long timeout; -unsigned long watchdog_stamp; -unsigned int time_slice; -unsigned short on_rq; -unsigned short on_list; - -struct sched_rt_entity *back; +struct list_head run_list; +unsigned long timeout; +unsigned long watchdog_stamp; +unsigned int time_slice; +unsigned short on_rq; +unsigned short on_list; + +struct sched_rt_entity *back;#ifdef CONFIG_RT_GROUP_SCHED -struct sched_rt_entity *parent; +struct sched_rt_entity *parent;/* rq on which this entity is (to be) queued: */ -struct rt_rq *rt_rq; +struct rt_rq *rt_rq;/* rq "owned" by this entity/group: */ -struct rt_rq *my_q; +struct rt_rq *my_q;#endif };struct sched_dl_entity { -struct rb_node rb_node; +struct rb_node rb_node;/* * Original scheduling parameters. Copied here from sched_attr * during sched_setattr(), they will remain the same until * the next sched_setattr(). */ -u64 dl_runtime;/* maximum runtime for each instance */ -u64 dl_deadline;/* relative deadline of each instance */ -u64 dl_period;/* separation of two instances (period) */ -u64 dl_bw;/* dl_runtime / dl_deadline */ +u64 dl_runtime;/* Maximum runtime for each instance */ +u64 dl_deadline;/* Relative deadline of each instance */ +u64 dl_period;/* Separation of two instances (period) */ +u64 dl_bw;/* dl_runtime / dl_deadline */ /* * Actual scheduling parameters. Initialized with the values above, * they are continously updated during task execution. Note that * the remaining runtime could be < 0 in case we are in overrun. */ -s64 runtime;/* remaining runtime for this instance */ -u64 deadline;/* absolute deadline for this instance */ -unsigned int flags;/* specifying the scheduler behaviour */ +s64 runtime;/* Remaining runtime for this instance */ +u64 deadline;/* Absolute deadline for this instance */ +unsigned int flags;/* Specifying the scheduler behaviour */ /* * Some bool flags:
@@ -431,24 +443,28 @@ struct sched_dl_entity {* outside bandwidth enforcement mechanism (but only until we * exit the critical section); * -* @dl_yielded tells if task gave up the cpu before consuming +* @dl_yielded tells if task gave up the CPU before consuming * all its available runtime during the last job. */ -int dl_throttled, dl_boosted, dl_yielded; +int dl_throttled; +int dl_boosted; +int dl_yielded;/* * Bandwidth enforcement timer. Each -deadline task has its * own bandwidth to be enforced, thus we need one timer per task. */ -struct hrtimer dl_timer; +struct hrtimer dl_timer; };union rcu_special {struct { -u8 blocked; -u8 need_qs; -u8 exp_need_qs; -u8 pad;/* Otherwise the compiler can store garbage here. */ +u8 blocked; +u8 need_qs; +u8 exp_need_qs; + +/* Otherwise the compiler can store garbage here: */ +u8 pad; } b;/* Bits. */ u32 s;/* Set of bits. */ };
@@ -466,361 +482,417 @@ struct task_struct {* For reasons of header soup (see current_thread_info()), this * must be the first element of task_struct. */ -struct thread_info thread_info; +struct thread_info thread_info;#endif -volatile long state;/* -1 unrunnable, 0 runnable, >0 stopped */ -void *stack; -atomic_t usage; -unsigned int flags;/* per process flags, defined below */ -unsigned int ptrace; +/* -1 unrunnable, 0 runnable, >0 stopped: */ +volatile long state; +void *stack; +atomic_t usage; +/* Per task flags (PF_*), defined further below: */ +unsigned int flags; +unsigned int ptrace;#ifdef CONFIG_SMP -struct llist_node wake_entry; -int on_cpu; +struct llist_node wake_entry; +int on_cpu;#ifdef CONFIG_THREAD_INFO_IN_TASK -unsigned int cpu;/* current CPU */ +/* Current CPU: */ +unsigned int cpu;#endif -unsigned int wakee_flips; -unsigned long wakee_flip_decay_ts; -struct task_struct *last_wakee; +unsigned int wakee_flips; +unsigned long wakee_flip_decay_ts; +struct task_struct *last_wakee; -int wake_cpu; +int wake_cpu;#endif -int on_rq; +int on_rq; + +int prio; +int static_prio; +int normal_prio; +unsigned int rt_priority; -int prio, static_prio, normal_prio; -unsigned int rt_priority; -const struct sched_class *sched_class; -struct sched_entity se; -struct sched_rt_entity rt; +const struct sched_class *sched_class; +struct sched_entity se; +struct sched_rt_entity rt;#ifdef CONFIG_CGROUP_SCHED -struct task_group *sched_task_group; +struct task_group *sched_task_group;#endif -struct sched_dl_entity dl; +struct sched_dl_entity dl;#ifdef CONFIG_PREEMPT_NOTIFIERS -/* list of struct preempt_notifier: */ -struct hlist_head preempt_notifiers; +/* List of struct preempt_notifier: */ +struct hlist_head preempt_notifiers;#endif #ifdef CONFIG_BLK_DEV_IO_TRACE -unsigned int btrace_seq; +unsigned int btrace_seq;#endif -unsigned int policy; -int nr_cpus_allowed; -cpumask_t cpus_allowed; +unsigned int policy; +int nr_cpus_allowed; +cpumask_t cpus_allowed;#ifdef CONFIG_PREEMPT_RCU -int rcu_read_lock_nesting; -union rcu_special rcu_read_unlock_special; -struct list_head rcu_node_entry; -struct rcu_node *rcu_blocked_node; +int rcu_read_lock_nesting; +union rcu_special rcu_read_unlock_special; +struct list_head rcu_node_entry; +struct rcu_node *rcu_blocked_node;#endif /* #ifdef CONFIG_PREEMPT_RCU */ +#ifdef CONFIG_TASKS_RCU -unsigned long rcu_tasks_nvcsw; -bool rcu_tasks_holdout; -struct list_head rcu_tasks_holdout_list; -int rcu_tasks_idle_cpu; +unsigned long rcu_tasks_nvcsw; +bool rcu_tasks_holdout; +struct list_head rcu_tasks_holdout_list; +int rcu_tasks_idle_cpu;#endif /* #ifdef CONFIG_TASKS_RCU */ -struct sched_info sched_info; +struct sched_info sched_info; -struct list_head tasks; +struct list_head tasks;#ifdef CONFIG_SMP -struct plist_node pushable_tasks; -struct rb_node pushable_dl_tasks; +struct plist_node pushable_tasks; +struct rb_node pushable_dl_tasks;#endif -struct mm_struct *mm, *active_mm; +struct mm_struct *mm; +struct mm_struct *active_mm;/* Per-thread vma caching: */ -struct vmacache vmacache; - -#if defined(SPLIT_RSS_COUNTING ) -struct task_rss_stat rss_stat; -#endif -/* task state */ -int exit_state; -int exit_code, exit_signal; -int pdeath_signal;/* The signal sent when the parent dies */ -unsigned long jobctl;/* JOBCTL_*, siglock protected */ - -/* Used for emulating ABI behavior of previous Linux versions */ -unsigned int personality; - -/* scheduler bits, serialized by scheduler locks */ - unsigned sched_reset_on_fork:1; - unsigned sched_contributes_to_load:1; - unsigned sched_migrated:1; - unsigned sched_remote_wakeup:1; - unsigned :0; /* force alignment to the next boundary */ - -/* unserialized, strictly 'current' */ - unsigned in_execve:1; /* bit to tell LSMs we're in execve */ - unsigned in_iowait:1; -#if !defined(TIF_RESTORE_SIGMASK ) - unsigned restore_sigmask:1; +struct vmacache vmacache; + +#ifdef SPLIT_RSS_COUNTING +struct task_rss_stat rss_stat; +#endif +int exit_state; +int exit_code; +int exit_signal; +/* The signal sent when the parent dies: */ +int pdeath_signal; +/* JOBCTL_*, siglock protected: */ +unsigned long jobctl; + +/* Used for emulating ABI behavior of previous Linux versions: */ +unsigned int personality; + +/* Scheduler bits, serialized by scheduler locks: */ + unsigned sched_reset_on_fork:1; + unsigned sched_contributes_to_load:1; + unsigned sched_migrated:1; + unsigned sched_remote_wakeup:1; +/* Force alignment to the next boundary: */ + unsigned :0; + +/* Unserialized, strictly 'current' */ + +/* Bit to tell LSMs we're in execve(): */ + unsigned in_execve:1; + unsigned in_iowait:1; +#ifndef TIF_RESTORE_SIGMASK + unsigned restore_sigmask:1;#endif #ifdef CONFIG_MEMCG - unsigned memcg_may_oom:1; + unsigned memcg_may_oom:1;#ifndef CONFIG_SLOB - unsigned memcg_kmem_skip_account:1; + unsigned memcg_kmem_skip_account:1;#endif #endif #ifdef CONFIG_COMPAT_BRK - unsigned brk_randomized:1; + unsigned brk_randomized:1;#endif -unsigned long atomic_flags;/* Flags needing atomic access. */ +unsigned long atomic_flags;/* Flags requiring atomic access. */ -struct restart_block restart_block; +struct restart_block restart_block; -pid_t pid; -pid_t tgid; +pid_t pid; +pid_t tgid;#ifdef CONFIG_CC_STACKPROTECTOR -/* Canary value for the -fstack-protector gcc feature */ -unsigned long stack_canary; +/* Canary value for the -fstack-protector GCC feature: */ +unsigned long stack_canary;#endif /* -* pointers to (original) parent process, youngest child, younger sibling, +* Pointers to the (original) parent process, youngest child, younger sibling, * older sibling, respectively. (p->father can be replaced with * p->real_parent->pid) */ -struct task_struct __rcu *real_parent;/* real parent process */ -struct task_struct __rcu *parent;/* recipient of SIGCHLD, wait4() reports */ + +/* Real parent process: */ +struct task_struct __rcu *real_parent; + +/* Recipient of SIGCHLD, wait4() reports: */ +struct task_struct __rcu *parent; +/* -* children/sibling forms the list of my natural children +* Children/sibling form the list of natural children: */ -struct list_head children;/* list of my children */ -struct list_head sibling;/* linkage in my parent's children list */ -struct task_struct *group_leader;/* threadgroup leader */ +struct list_head children; +struct list_head sibling; +struct task_struct *group_leader;/* -* ptraced is the list of tasks this task is using ptrace on. +* 'ptraced' is the list of tasks this task is using ptrace() on. +* * This includes both natural children and PTRACE_ATTACH targets. -* p->ptrace_entry is p's link on the p->parent->ptraced list. +* 'ptrace_entry' is this task's link on the p->parent->ptraced list. */ -struct list_head ptraced; -struct list_head ptrace_entry; +struct list_head ptraced; +struct list_head ptrace_entry;/* PID/PID hash table linkage. */ -struct pid_link pids[PIDTYPE_MAX ]; -struct list_head thread_group; -struct list_head thread_node; +struct pid_link pids[PIDTYPE_MAX ]; +struct list_head thread_group; +struct list_head thread_node; + +struct completion *vfork_done; -struct completion *vfork_done;/* for vfork() */ -int __user *set_child_tid;/* CLONE_CHILD_SETTID */ -int __user *clear_child_tid;/* CLONE_CHILD_CLEARTID */ +/* CLONE_CHILD_SETTID: */ +int __user *set_child_tid; -u64 utime, stime; +/* CLONE_CHILD_CLEARTID: */ +int __user *clear_child_tid; + +u64 utime; +u64 stime;#ifdef CONFIG_ARCH_HAS_SCALED_CPUTIME -u64 utimescaled, stimescaled; +u64 utimescaled; +u64 stimescaled;#endif -u64 gtime; -struct prev_cputime prev_cputime; +u64 gtime; +struct prev_cputime prev_cputime;#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN -seqcount_t vtime_seqcount; -unsigned long long vtime_snap; +seqcount_t vtime_seqcount; +unsigned long long vtime_snap;enum { -/* Task is sleeping or running in a CPU with VTIME inactive */ +/* Task is sleeping or running in a CPU with VTIME inactive: */ VTIME_INACTIVE =0 , -/* Task runs in userspace in a CPU with VTIME active */ +/* Task runs in userspace in a CPU with VTIME active: */ VTIME_USER , -/* Task runs in kernelspace in a CPU with VTIME active */ +/* Task runs in kernelspace in a CPU with VTIME active: */ VTIME_SYS , } vtime_snap_whence;#endif #ifdef CONFIG_NO_HZ_FULL -atomic_t tick_dep_mask; +atomic_t tick_dep_mask;#endif -unsigned long nvcsw, nivcsw;/* context switch counts */ -u64 start_time;/* monotonic time in nsec */ -u64 real_start_time;/* boot based time in nsec */ -/* mm fault and swap info: this can arguably be seen as either mm-specific or thread-specific */ -unsigned long min_flt, maj_flt; +/* Context switch counts: */ +unsigned long nvcsw; +unsigned long nivcsw; + +/* Monotonic time in nsecs: */ +u64 start_time; + +/* Boot based time in nsecs: */ +u64 real_start_time; + +/* MM fault and swap info: this can arguably be seen as either mm-specific or thread-specific: */ +unsigned long min_flt; +unsigned long maj_flt;#ifdef CONFIG_POSIX_TIMERS -struct task_cputime cputime_expires; -struct list_head cpu_timers[3 ]; -#endif - -/* process credentials */ -const struct cred __rcu *ptracer_cred;/* Tracer's credentials at attach */ -const struct cred __rcu *real_cred;/* objective and real subjective task -* credentials (COW) */ -const struct cred __rcu *cred;/* effective (overridable) subjective task -* credentials (COW) */ -char comm[TASK_COMM_LEN ];/* executable name excluding path -- access with [gs]et_task_comm (which lock -it with task_lock()) -- initialized normally by setup_new_exec */ -/* file system info */ -struct nameidata *nameidata; +struct task_cputime cputime_expires; +struct list_head cpu_timers[3 ]; +#endif + +/* Process credentials: */ + +/* Tracer's credentials at attach: */ +const struct cred __rcu *ptracer_cred; + +/* Objective and real subjective task credentials (COW): */ +const struct cred __rcu *real_cred; + +/* Effective (overridable) subjective task credentials (COW): */ +const struct cred __rcu *cred; + +/* +* executable name, excluding path. +* +* - normally initialized setup_new_exec() +* - access it with [gs]et_task_comm() +* - lock it with task_lock() +*/ +char comm[TASK_COMM_LEN ]; + +struct nameidata *nameidata; +#ifdef CONFIG_SYSVIPC -/* ipc stuff */ -struct sysv_sem sysvsem; -struct sysv_shm sysvshm; +struct sysv_sem sysvsem; +struct sysv_shm sysvshm;#endif #ifdef CONFIG_DETECT_HUNG_TASK -/* hung task detection */ -unsigned long last_switch_count; -#endif -/* filesystem information */ -struct fs_struct *fs; -/* open file information */ -struct files_struct *files; -/* namespaces */ -struct nsproxy *nsproxy; -/* signal handlers */ -struct signal_struct *signal; -struct sighand_struct *sighand; - -sigset_t blocked, real_blocked; -sigset_t saved_sigmask;/* restored if set_restore_sigmask() was used */ -struct sigpending pending; - -unsigned long sas_ss_sp; -size_t sas_ss_size; -unsigned sas_ss_flags; - -struct callback_head *task_works; - -struct audit_context *audit_context; +unsigned long last_switch_count; +#endif +/* Filesystem information: */ +struct fs_struct *fs; + +/* Open file information: */ +struct files_struct *files; + +/* Namespaces: */ +struct nsproxy *nsproxy; + +/* Signal handlers: */ +struct signal_struct *signal; +struct sighand_struct *sighand; +sigset_t blocked; +sigset_t real_blocked; +/* Restored if set_restore_sigmask() was used: */ +sigset_t saved_sigmask; +struct sigpending pending; +unsigned long sas_ss_sp; +size_t sas_ss_size; +unsigned int sas_ss_flags; + +struct callback_head *task_works; + +struct audit_context *audit_context;#ifdef CONFIG_AUDITSYSCALL -kuid_t loginuid; -unsigned int sessionid; +kuid_t loginuid; +unsigned int sessionid;#endif -struct seccomp seccomp; +struct seccomp seccomp; -/* Thread group tracking */ -u32 parent_exec_id; -u32 self_exec_id; -/* Protection of (de-)allocation: mm, files, fs, tty, keyrings, mems_allowed, -* mempolicy */ -spinlock_t alloc_lock; +/* Thread group tracking: */ +u32 parent_exec_id; +u32 self_exec_id; + +/* Protection against (de-)allocation: mm, files, fs, tty, keyrings, mems_allowed, mempolicy: */ +spinlock_t alloc_lock;/* Protection of the PI data structures: */ -raw_spinlock_t pi_lock; +raw_spinlock_t pi_lock; -void *wake_q; +void *wake_q;#ifdef CONFIG_RT_MUTEXES -/* PI waiters blocked on a rt_mutex held by this task */ -struct rb_root pi_waiters; -struct rb_node *pi_waiters_leftmost; -/* Deadlock detection and priority inheritance handling */ -struct rt_mutex_waiter *pi_blocked_on; +/* PI waiters blocked on a rt_mutex held by this task: */ +struct rb_root pi_waiters; +struct rb_node *pi_waiters_leftmost; +/* Deadlock detection and priority inheritance handling: */ +struct rt_mutex_waiter *pi_blocked_on;#endif #ifdef CONFIG_DEBUG_MUTEXES -/* mutex deadlock detection */ -struct mutex_waiter *blocked_on; +/* Mutex deadlock detection: */ +struct mutex_waiter *blocked_on;#endif +#ifdef CONFIG_TRACE_IRQFLAGS -unsigned int irq_events; -unsigned long hardirq_enable_ip; -unsigned long hardirq_disable_ip; -unsigned int hardirq_enable_event; -unsigned int hardirq_disable_event; -int hardirqs_enabled; -int hardirq_context; -unsigned long softirq_disable_ip; -unsigned long softirq_enable_ip; -unsigned int softirq_disable_event; -unsigned int softirq_enable_event; -int softirqs_enabled; -int softirq_context; +unsigned int irq_events; +unsigned long hardirq_enable_ip; +unsigned long hardirq_disable_ip; +unsigned int hardirq_enable_event; +unsigned int hardirq_disable_event; +int hardirqs_enabled; +int hardirq_context; +unsigned long softirq_disable_ip; +unsigned long softirq_enable_ip; +unsigned int softirq_disable_event; +unsigned int softirq_enable_event; +int softirqs_enabled; +int softirq_context;#endif +#ifdef CONFIG_LOCKDEP -# define MAX_LOCK_DEPTH 48UL -u64 curr_chain_key; -int lockdep_depth; -unsigned int lockdep_recursion; -struct held_lock held_locks[MAX_LOCK_DEPTH ]; -gfp_t lockdep_reclaim_gfp; +# define MAX_LOCK_DEPTH 48UL +u64 curr_chain_key; +int lockdep_depth; +unsigned int lockdep_recursion; +struct held_lock held_locks[MAX_LOCK_DEPTH ]; +gfp_t lockdep_reclaim_gfp;#endif +#ifdef CONFIG_UBSAN -unsigned int in_ubsan; +unsigned int in_ubsan;#endif -/* journalling filesystem info */ -void *journal_info; +/* Journalling filesystem info: */ +void *journal_info; -/* stacked block device info */ -struct bio_list *bio_list; +/* Stacked block device info: */ +struct bio_list *bio_list;#ifdef CONFIG_BLOCK -/* stack plugging */ -struct blk_plug *plug; +/* Stack plugging: */ +struct blk_plug *plug;#endif -/* VM state */ -struct reclaim_state *reclaim_state; +/* VM state: */ +struct reclaim_state *reclaim_state; + +struct backing_dev_info *backing_dev_info; -struct backing_dev_info *backing_dev_info; +struct io_context *io_context; -struct io_context *io_context; +/* Ptrace state: */ +unsigned long ptrace_message; +siginfo_t *last_siginfo; -unsigned long ptrace_message; -siginfo_t *last_siginfo;/* For ptrace use. */ -struct task_io_accounting ioac; -#if defined(CONFIG_TASK_XACCT ) -u64 acct_rss_mem1;/* accumulated rss usage */ -u64 acct_vm_mem1;/* accumulated virtual memory usage */ -u64 acct_timexpd;/* stime + utime since last update */ +struct task_io_accounting ioac; +#ifdef CONFIG_TASK_XACCT +/* Accumulated RSS usage: */ +u64 acct_rss_mem1; +/* Accumulated virtual memory usage: */ +u64 acct_vm_mem1; +/* stime + utime since last update: */ +u64 acct_timexpd;#endif #ifdef CONFIG_CPUSETS -nodemask_t mems_allowed;/* Protected by alloc_lock */ -seqcount_t mems_allowed_seq;/* Seqence no to catch updates */ -int cpuset_mem_spread_rotor; -int cpuset_slab_spread_rotor; +/* Protected by ->alloc_lock: */ +nodemask_t mems_allowed; +/* Seqence number to catch updates: */ +seqcount_t mems_allowed_seq; +int cpuset_mem_spread_rotor; +int cpuset_slab_spread_rotor;#endif #ifdef CONFIG_CGROUPS -/* Control Group info protected by css_set_lock */ -struct css_set __rcu *cgroups; -/* cg_list protected by css_set_lock and tsk->alloc_lock */ -struct list_head cg_list; +/* Control Group info protected by css_set_lock: */ +struct css_set __rcu *cgroups; +/* cg_list protected by css_set_lock and tsk->alloc_lock: */ +struct list_head cg_list;#endif #ifdef CONFIG_INTEL_RDT_A -int closid; +int closid;#endif #ifdef CONFIG_FUTEX -struct robust_list_head __user *robust_list; +struct robust_list_head __user *robust_list;#ifdef CONFIG_COMPAT struct compat_robust_list_head __user *compat_robust_list;#endif -struct list_head pi_state_list; -struct futex_pi_state *pi_state_cache; +struct list_head pi_state_list; +struct futex_pi_state *pi_state_cache;#endif #ifdef CONFIG_PERF_EVENTS -struct perf_event_context *perf_event_ctxp[perf_nr_task_contexts]; -struct mutex perf_event_mutex; -struct list_head perf_event_list; +struct perf_event_context *perf_event_ctxp[perf_nr_task_contexts]; +struct mutex perf_event_mutex; +struct list_head perf_event_list;#endif #ifdef CONFIG_DEBUG_PREEMPT -unsigned long preempt_disable_ip; +unsigned long preempt_disable_ip;#endif #ifdef CONFIG_NUMA -struct mempolicy *mempolicy;/* Protected by alloc_lock */ -short il_next; -short pref_node_fork; +/* Protected by alloc_lock: */ +struct mempolicy *mempolicy; +short il_next; +short pref_node_fork;#endif #ifdef CONFIG_NUMA_BALANCING -int numa_scan_seq; -unsigned int numa_scan_period; -unsigned int numa_scan_period_max; -int numa_preferred_nid; -unsigned long numa_migrate_retry; -u64 node_stamp;/* migration stamp */ -u64 last_task_numa_placement; -u64 last_sum_exec_runtime; -struct callback_head numa_work; - -struct list_head numa_entry; -struct numa_group *numa_group; +int numa_scan_seq; +unsigned int numa_scan_period; +unsigned int numa_scan_period_max; +int numa_preferred_nid; +unsigned long numa_migrate_retry; +/* Migration stamp: */ +u64 node_stamp; +u64 last_task_numa_placement; +u64 last_sum_exec_runtime; +struct callback_head numa_work; + +struct list_head numa_entry; +struct numa_group *numa_group;/* * numa_faults is an array split into four regions:
@@ -836,8 +908,8 @@ struct task_struct {* during the current scan window. When the scan completes, the counts * in faults_memory and faults_cpu decay and these values are copied. */ -unsigned long *numa_faults; -unsigned long total_numa_faults; +unsigned long *numa_faults; +unsigned long total_numa_faults;/* * numa_faults_locality tracks if faults recorded during the last
@@ -845,117 +917,130 @@ struct task_struct {* period is adapted based on the locality of the faults with different * weights depending on whether they were shared or private faults */ -unsigned long numa_faults_locality[3 ]; +unsigned long numa_faults_locality[3 ]; -unsigned long numa_pages_migrated; +unsigned long numa_pages_migrated;#endif /* CONFIG_NUMA_BALANCING */ -struct tlbflush_unmap_batch tlb_ubc; +struct tlbflush_unmap_batch tlb_ubc; -struct rcu_head rcu; +struct rcu_head rcu; -/* -* cache last used pipe for splice -*/ -struct pipe_inode_info *splice_pipe; +/* Cache last used pipe for splice(): */ +struct pipe_inode_info *splice_pipe; -struct page_frag task_frag; +struct page_frag task_frag; -struct task_delay_info *delays; +struct task_delay_info *delays;#ifdef CONFIG_FAULT_INJECTION -int make_it_fail; +int make_it_fail;#endif /* -* when (nr_dirtied >= nr_dirtied_pause), it's time to call -* balance_dirty_pages() for some dirty throttling pause +* When (nr_dirtied >= nr_dirtied_pause), it's time to call +* balance_dirty_pages() for a dirty throttling pause: */ -int nr_dirtied; -int nr_dirtied_pause; -unsigned long dirty_paused_when;/* start of a write-and-pause period */ +int nr_dirtied; +int nr_dirtied_pause; +/* Start of a write-and-pause period: */ +unsigned long dirty_paused_when;#ifdef CONFIG_LATENCYTOP -int latency_record_count; -struct latency_record latency_record[LT_SAVECOUNT ]; +int latency_record_count; +struct latency_record latency_record[LT_SAVECOUNT ];#endif /* -* time slack values; these are used to round up poll() and +* Time slack values; these are used to round up poll() and * select() etc timeout values. These are in nanoseconds. */ -u64 timer_slack_ns; -u64 default_timer_slack_ns; +u64 timer_slack_ns; +u64 default_timer_slack_ns;#ifdef CONFIG_KASAN -unsigned int kasan_depth; +unsigned int kasan_depth;#endif +#ifdef CONFIG_FUNCTION_GRAPH_TRACER -/* Index of current stored address in ret_stack */ -int curr_ret_stack; -/* Stack of return addresses for return function tracing */ -struct ftrace_ret_stack *ret_stack; -/* time stamp for last schedule */ -unsigned long long ftrace_timestamp; +/* Index of current stored address in ret_stack: */ +int curr_ret_stack; + +/* Stack of return addresses for return function tracing: */ +struct ftrace_ret_stack *ret_stack; + +/* Timestamp for last schedule: */ +unsigned long long ftrace_timestamp; +/* * Number of functions that haven't been traced -* because of depth overrun. +* because of depth overrun: */ -atomic_t trace_overrun; -/* Pause for the tracing */ -atomic_t tracing_graph_pause; +atomic_t trace_overrun; + +/* Pause tracing: */ +atomic_t tracing_graph_pause;#endif +#ifdef CONFIG_TRACING -/* state flags for use by tracers */ -unsigned long trace; -/* bitmask and counter of trace recursion */ -unsigned long trace_recursion; +/* State flags for use by tracers: */ +unsigned long trace; + +/* Bitmask and counter of trace recursion: */ +unsigned long trace_recursion;#endif /* CONFIG_TRACING */ +#ifdef CONFIG_KCOV -/* Coverage collection mode enabled for this task (0 if disabled). */ -enum kcov_mode kcov_mode; -/* Size of the kcov_area. */ -unsigned kcov_size; -/* Buffer for coverage collection. */ -void *kcov_area; -/* kcov desciptor wired with this task or NULL. */ -struct kcov *kcov; +/* Coverage collection mode enabled for this task (0 if disabled): */ +enum kcov_mode kcov_mode; + +/* Size of the kcov_area: */ +unsigned int kcov_size; + +/* Buffer for coverage collection: */ +void *kcov_area; + +/* KCOV descriptor wired with this task or NULL: */ +struct kcov *kcov;#endif +#ifdef CONFIG_MEMCG -struct mem_cgroup *memcg_in_oom; -gfp_t memcg_oom_gfp_mask; -int memcg_oom_order; +struct mem_cgroup *memcg_in_oom; +gfp_t memcg_oom_gfp_mask; +int memcg_oom_order; -/* number of pages to reclaim on returning to userland */ -unsigned int memcg_nr_pages_over_high; +/* Number of pages to reclaim on returning to userland: */ +unsigned int memcg_nr_pages_over_high;#endif +#ifdef CONFIG_UPROBES -struct uprobe_task *utask; +struct uprobe_task *utask;#endif #if defined(CONFIG_BCACHE ) || defined(CONFIG_BCACHE_MODULE ) -unsigned int sequential_io; -unsigned int sequential_io_avg; +unsigned int sequential_io; +unsigned int sequential_io_avg;#endif #ifdef CONFIG_DEBUG_ATOMIC_SLEEP -unsigned long task_state_change; +unsigned long task_state_change;#endif -int pagefault_disabled; +int pagefault_disabled;#ifdef CONFIG_MMU -struct task_struct *oom_reaper_list; +struct task_struct *oom_reaper_list;#endif #ifdef CONFIG_VMAP_STACK -struct vm_struct *stack_vm_area; +struct vm_struct *stack_vm_area;#endif #ifdef CONFIG_THREAD_INFO_IN_TASK -/* A live task holds one reference. */ -atomic_t stack_refcount; +/* A live task holds one reference: */ +atomic_t stack_refcount;#endif -/* CPU-specific state of this task */ -struct thread_struct thread; -/* -* WARNING: on x86, 'thread_struct' contains a variable-sized -* structure. It *MUST* be at the end of 'task_struct'. -* -* Do not put anything below here! -*/ +/* CPU-specific state of this task: */ +struct thread_struct thread; + +/* +* WARNING: on x86, 'thread_struct' contains a variable-sized +* structure. It *MUST* be at the end of 'task_struct'. +* +* Do not put anything below here! +*/ };static inline struct pid *task_pid (struct task_struct *task)
@@ -969,7 +1054,7 @@ static inline struct pid *task_tgid(struct task_struct *task) }/* -* Without tasklist or rcu lock it is not safe to dereference +* Without tasklist or RCU lock it is not safe to dereference * the result of task_pgrp/task_session even if task == current, * we can race with another thread doing sys_setsid/sys_setpgid. */
@@ -996,16 +1081,14 @@ static inline struct pid *task_session(struct task_struct *task)* * see also pid_nr() etc in include/linux/pid.h */ -pid_t __task_pid_nr_ns (struct task_struct *task,enum pid_type type, -struct pid_namespace *ns); +pid_t __task_pid_nr_ns (struct task_struct *task,enum pid_type type,struct pid_namespace *ns);static inline pid_t task_pid_nr (struct task_struct *tsk) {return tsk->pid; } -static inline pid_t task_pid_nr_ns (struct task_struct *tsk, -struct pid_namespace *ns) +static inline pid_t task_pid_nr_ns (struct task_struct *tsk,struct pid_namespace *ns) {return __task_pid_nr_ns (tsk,PIDTYPE_PID , ns); }
@@ -1021,15 +1104,28 @@ static inline pid_t task_tgid_nr(struct task_struct *tsk)return tsk->tgid; } -pid_t task_tgid_nr_ns (struct task_struct *tsk,struct pid_namespace *ns); +extern pid_t task_tgid_nr_ns (struct task_struct *tsk,struct pid_namespace *ns);static inline pid_t task_tgid_vnr (struct task_struct *tsk) {return pid_vnr (task_tgid (tsk)); } +/** +* pid_alive - check that a task structure is not stale +* @p: Task structure to be checked. +* +* Test if a process is not yet dead (at most zombie state) +* If pid_alive fails, then pointers within the task structure +* can be stale and must not be dereferenced. +* +* Return: 1 if the process is alive. 0 otherwise. +*/ +static inline int pid_alive (const struct task_struct *p) +{ +return p->pids[PIDTYPE_PID ].pid !=NULL ; +} -static inline int pid_alive (const struct task_struct *p);static inline pid_t task_ppid_nr_ns (const struct task_struct *tsk,struct pid_namespace *ns) {pid_t pid =0 ;
@@ -1047,8 +1143,7 @@ static inline pid_t task_ppid_nr(const struct task_struct *tsk)return task_ppid_nr_ns (tsk, &init_pid_ns); } -static inline pid_t task_pgrp_nr_ns (struct task_struct *tsk, -struct pid_namespace *ns) +static inline pid_t task_pgrp_nr_ns (struct task_struct *tsk,struct pid_namespace *ns) {return __task_pid_nr_ns (tsk,PIDTYPE_PGID , ns); }
@@ -1059,8 +1154,7 @@ static inline pid_t task_pgrp_vnr(struct task_struct *tsk) } -static inline pid_t task_session_nr_ns (struct task_struct *tsk, -struct pid_namespace *ns) +static inline pid_t task_session_nr_ns (struct task_struct *tsk,struct pid_namespace *ns) {return __task_pid_nr_ns (tsk,PIDTYPE_SID , ns); }
@@ -1070,28 +1164,13 @@ static inline pid_t task_session_vnr(struct task_struct *tsk)return __task_pid_nr_ns (tsk,PIDTYPE_SID ,NULL ); } -/* obsolete, do not use */ +/* Obsolete, do not use: */ static inline pid_t task_pgrp_nr (struct task_struct *tsk) {return task_pgrp_nr_ns (tsk, &init_pid_ns); }/** -* pid_alive - check that a task structure is not stale -* @p: Task structure to be checked. -* -* Test if a process is not yet dead (at most zombie state) -* If pid_alive fails, then pointers within the task structure -* can be stale and must not be dereferenced. -* -* Return: 1 if the process is alive. 0 otherwise. -*/ -static inline int pid_alive (const struct task_struct *p) -{ -return p->pids[PIDTYPE_PID ].pid !=NULL ; -} - -/** * is_global_init - check if a task structure is init. Since init * is free to have sub-threads we need to check tgid. * @tsk: Task structure to be checked.
@@ -1110,34 +1189,34 @@ extern struct pid *cad_pid;/* * Per process flags */ -#define PF_IDLE 0x00000002/* I am an IDLE thread */ -#define PF_EXITING 0x00000004/* getting shut down */ -#define PF_EXITPIDONE 0x00000008/* pi exit done on shut down */ -#define PF_VCPU 0x00000010/* I'm a virtual CPU */ -#define PF_WQ_WORKER 0x00000020/* I'm a workqueue worker */ -#define PF_FORKNOEXEC 0x00000040/* forked but didn't exec */ -#define PF_MCE_PROCESS 0x00000080/* process policy on mce errors */ -#define PF_SUPERPRIV 0x00000100/* used super-user privileges */ -#define PF_DUMPCORE 0x00000200/* dumped core */ -#define PF_SIGNALED 0x00000400/* killed by a signal */ -#define PF_MEMALLOC 0x00000800/* Allocating memory */ -#define PF_NPROC_EXCEEDED 0x00001000/* set_user noticed that RLIMIT_NPROC was exceeded */ -#define PF_USED_MATH 0x00002000/* if unset the fpu must be initialized before use */ -#define PF_USED_ASYNC 0x00004000/* used async_schedule*(), used by module init */ -#define PF_NOFREEZE 0x00008000/* this thread should not be frozen */ -#define PF_FROZEN 0x00010000/* frozen for system suspend */ -#define PF_FSTRANS 0x00020000/* inside a filesystem transaction */ -#define PF_KSWAPD 0x00040000/* I am kswapd */ -#define PF_MEMALLOC_NOIO 0x00080000/* Allocating memory without IO involved */ -#define PF_LESS_THROTTLE 0x00100000/* Throttle me less: I clean memory */ -#define PF_KTHREAD 0x00200000/* I am a kernel thread */ -#define PF_RANDOMIZE 0x00400000/* randomize virtual address space */ -#define PF_SWAPWRITE 0x00800000/* Allowed to write to swap */ -#define PF_NO_SETAFFINITY 0x04000000/* Userland is not allowed to meddle with cpus_allowed */ -#define PF_MCE_EARLY 0x08000000/* Early kill for mce process policy */ -#define PF_MUTEX_TESTER 0x20000000/* Thread belongs to the rt mutex tester */ -#define PF_FREEZER_SKIP 0x40000000/* Freezer should not count it as freezable */ -#define PF_SUSPEND_TASK 0x80000000/* this thread called freeze_processes and should not be frozen */ +#define PF_IDLE 0x00000002/* I am an IDLE thread */ +#define PF_EXITING 0x00000004/* Getting shut down */ +#define PF_EXITPIDONE 0x00000008/* PI exit done on shut down */ +#define PF_VCPU 0x00000010/* I'm a virtual CPU */ +#define PF_WQ_WORKER 0x00000020/* I'm a workqueue worker */ +#define PF_FORKNOEXEC 0x00000040/* Forked but didn't exec */ +#define PF_MCE_PROCESS 0x00000080/* Process policy on mce errors */ +#define PF_SUPERPRIV 0x00000100/* Used super-user privileges */ +#define PF_DUMPCORE 0x00000200/* Dumped core */ +#define PF_SIGNALED 0x00000400/* Killed by a signal */ +#define PF_MEMALLOC 0x00000800/* Allocating memory */ +#define PF_NPROC_EXCEEDED 0x00001000/* set_user() noticed that RLIMIT_NPROC was exceeded */ +#define PF_USED_MATH 0x00002000/* If unset the fpu must be initialized before use */ +#define PF_USED_ASYNC 0x00004000/* Used async_schedule*(), used by module init */ +#define PF_NOFREEZE 0x00008000/* This thread should not be frozen */ +#define PF_FROZEN 0x00010000/* Frozen for system suspend */ +#define PF_FSTRANS 0x00020000/* Inside a filesystem transaction */ +#define PF_KSWAPD 0x00040000/* I am kswapd */ +#define PF_MEMALLOC_NOIO 0x00080000/* Allocating memory without IO involved */ +#define PF_LESS_THROTTLE 0x00100000/* Throttle me less: I clean memory */ +#define PF_KTHREAD 0x00200000/* I am a kernel thread */ +#define PF_RANDOMIZE 0x00400000/* Randomize virtual address space */ +#define PF_SWAPWRITE 0x00800000/* Allowed to write to swap */ +#define PF_NO_SETAFFINITY 0x04000000/* Userland is not allowed to meddle with cpus_allowed */ +#define PF_MCE_EARLY 0x08000000/* Early kill for mce process policy */ +#define PF_MUTEX_TESTER 0x20000000/* Thread belongs to the rt mutex tester */ +#define PF_FREEZER_SKIP 0x40000000/* Freezer should not count it as freezable */ +#define PF_SUSPEND_TASK 0x80000000/* This thread called freeze_processes() and should not be frozen */ /* * Only the _current_ task can read/write to tsk->flags, but other
@@ -1150,33 +1229,38 @@ extern struct pid *cad_pid;* child is not running and in turn not changing child->flags * at the same time the parent does it. */ -#define clear_stopped_child_used_math (child) do { (child)->flags &= ~PF_USED_MATH; } while (0) -#define set_stopped_child_used_math (child) do { (child)->flags |= PF_USED_MATH; } while (0) -#define clear_used_math () clear_stopped_child_used_math(current) -#define set_used_math () set_stopped_child_used_math(current) +#define clear_stopped_child_used_math (child) do { (child)->flags &= ~PF_USED_MATH; } while (0) +#define set_stopped_child_used_math (child) do { (child)->flags |= PF_USED_MATH; } while (0) +#define clear_used_math () clear_stopped_child_used_math(current) +#define set_used_math () set_stopped_child_used_math(current) +#define conditional_stopped_child_used_math (condition, child) \ do { (child)->flags &= ~PF_USED_MATH, (child)->flags |= (condition) ? PF_USED_MATH : 0; } while (0) -#define conditional_used_math (condition) \ - conditional_stopped_child_used_math(condition, current) + +#define conditional_used_math (condition) conditional_stopped_child_used_math(condition, current) +#define copy_to_stopped_child_used_math (child) \ do { (child)->flags &= ~PF_USED_MATH, (child)->flags |= current->flags & PF_USED_MATH; } while (0) +/* NOTE: this will return 0 or PF_USED_MATH, it will never return 1 */ -#define tsk_used_math (p) ((p)->flags & PF_USED_MATH) -#define used_math () tsk_used_math(current) +#define tsk_used_math (p) ((p)->flags & PF_USED_MATH) +#define used_math () tsk_used_math(current)/* 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 */ -#define PFA_SPREAD_SLAB 2/* Spread some slab caches over cpuset */ -#define PFA_LMK_WAITING 3/* Lowmemorykiller is waiting */ +#define PFA_NO_NEW_PRIVS 0/* May not gain new privileges. */ +#define PFA_SPREAD_PAGE 1/* Spread page cache over cpuset */ +#define PFA_SPREAD_SLAB 2/* Spread some slab caches over cpuset */ +#define PFA_LMK_WAITING 3/* Lowmemorykiller is waiting */ #define TASK_PFA_TEST (name, func) \ static inline bool task_##func(struct task_struct *p) \ { return test_bit(PFA_##name, &p->atomic_flags); } +#define TASK_PFA_SET (name, func) \ static inline void task_set_##func(struct task_struct *p) \ { set_bit(PFA_##name, &p->atomic_flags); } +#define TASK_PFA_CLEAR (name, func) \ static inline void task_clear_##func(struct task_struct *p) \ { clear_bit(PFA_##name, &p->atomic_flags); }
@@ -1195,30 +1279,23 @@ TASK_PFA_CLEAR(SPREAD_SLAB, spread_slab) TASK_PFA_TEST(LMK_WAITING, lmk_waiting) TASK_PFA_SET(LMK_WAITING, lmk_waiting) -static inline void tsk_restore_flags (struct task_struct *task, -unsigned long orig_flags,unsigned long flags) +static inline void +tsk_restore_flags (struct task_struct *task,unsigned long orig_flags,unsigned long flags) { task->flags &= ~flags; task->flags |= orig_flags & flags; } -extern int cpuset_cpumask_can_shrink (const struct cpumask *cur, -const struct cpumask *trial); -extern int task_can_attach (struct task_struct *p, -const struct cpumask *cs_cpus_allowed); +extern int cpuset_cpumask_can_shrink (const struct cpumask *cur,const struct cpumask *trial); +extern int task_can_attach (struct task_struct *p,const struct cpumask *cs_cpus_allowed);#ifdef CONFIG_SMP -extern void do_set_cpus_allowed (struct task_struct *p, -const struct cpumask *new_mask); - -extern int set_cpus_allowed_ptr (struct task_struct *p, -const struct cpumask *new_mask); +extern void do_set_cpus_allowed (struct task_struct *p,const struct cpumask *new_mask); +extern int set_cpus_allowed_ptr (struct task_struct *p,const struct cpumask *new_mask);#else -static inline void do_set_cpus_allowed (struct task_struct *p, -const struct cpumask *new_mask) +static inline void do_set_cpus_allowed (struct task_struct *p,const struct cpumask *new_mask) { } -static inline int set_cpus_allowed_ptr (struct task_struct *p, -const struct cpumask *new_mask) +static inline int set_cpus_allowed_ptr (struct task_struct *p,const struct cpumask *new_mask) {if (!cpumask_test_cpu (0 , new_mask))return -EINVAL ;
@@ -1233,6 +1310,7 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,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); +/** * task_nice - return the nice value of a given task. * @p: the task in question.
@@ -1243,16 +1321,15 @@ static inline int task_nice(const struct task_struct *p) {return PRIO_TO_NICE ((p)->static_prio); } +extern int can_nice (const struct task_struct *p,const int nice);extern int task_curr (const struct task_struct *p);extern int idle_cpu (int cpu); -extern int sched_setscheduler (struct task_struct *,int , -const struct sched_param *); -extern int sched_setscheduler_nocheck (struct task_struct *,int , -const struct sched_param *); -extern int sched_setattr (struct task_struct *, -const struct sched_attr *); +extern int sched_setscheduler (struct task_struct *,int ,const struct sched_param *); +extern int sched_setscheduler_nocheck (struct task_struct *,int ,const struct sched_param *); +extern int sched_setattr (struct task_struct *,const struct sched_attr *);extern struct task_struct *idle_task (int cpu); +/** * is_idle_task - is the specified task an idle task? * @p: the task in question.
@@ -1263,6 +1340,7 @@ static inline bool is_idle_task(const struct task_struct *p) {return !!(p->flags &PF_IDLE ); } +extern struct task_struct *curr_task (int cpu);extern void ia64_set_curr_task (int cpu,struct task_struct *p);
@@ -1296,23 +1374,25 @@ static inline struct thread_info *task_thread_info(struct task_struct *task)*/ 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); +extern struct task_struct *find_task_by_pid_ns (pid_t nr,struct pid_namespace *ns);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); +#ifdef CONFIG_SMP -extern void kick_process (struct task_struct *tsk); +extern void kick_process (struct task_struct *tsk);#else -static inline void kick_process (struct task_struct *tsk) { } +static inline void kick_process (struct task_struct *tsk) { }#endif 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) {__set_task_comm (tsk, from, false); } +extern char *get_task_comm (char *to,struct task_struct *tsk);#ifdef CONFIG_SMP
@@ -1320,15 +1400,15 @@ void scheduler_ipi(void);extern unsigned long wait_task_inactive (struct task_struct *,long match_state);#else static inline void scheduler_ipi (void ) { } -static inline unsigned long wait_task_inactive (struct task_struct *p, -long match_state) +static inline unsigned long wait_task_inactive (struct task_struct *p,long match_state) {return 1 ; }#endif -/* set thread flags in other task's structures -* - see asm/thread_info.h for TIF_xxxx flags available +/* +* Set thread flags in other task's structures. +* See asm/thread_info.h for TIF_xxxx flags available: */ static inline void set_tsk_thread_flag (struct task_struct *tsk,int flag) {
Signature · 1 line
2.7.4
Quoted 2 lines · Ingo Molnar
So 25+ years ago, in Linux-0.01,
include/linux/sched.hwas already the biggest core kernel header file: [...]
Ok, so having tried to look through this series I do like it, but I'd be *really* much happier if more of it was just verifiably a semantic no-op.
There were all those small things in there (Peter pointed out those cpumask things I wouldn't for the life of me have noticed) that were really subtle, and were really hidden by the fact that there was just a lot of non-semantic changes.
Linus
Ingo Molnar
maintainerQuoted 6 lines · Linus Torvalds
Quoted 2 lines · Ingo Molnar
So 25+ years ago, in Linux-0.01,
include/linux/sched.hwas already the biggest core kernel header file: [...]Ok, so having tried to look through this series I do like it, but I'd be *really* much happier if more of it was just verifiably a semantic no-op.
Yeah - that was the intention.
It's really hard to verify it in an automated fashion I think, in a cross arch way. I did a sizeof(task_struct) before/after check on x86 defconfig, which did not uncover the extra pointer on CONFIG_TASK_DELAY_ACCT=n, because defconfig has that enabled...
On the latest tree I've done a wider test of sizeof(task_struct):
allnoconfig defconfig allmodconfig
-----------------------------------------------------------
before: 0x1400 0x19c0 0x3f00
after: 0x1400 0x19c0 0x3f00
Which seems to support my intention that the series should be an overall invariant on 'struct task_struct' semantics.
Quoted 4 lines
There were all those small things in there (Peter pointed out those cpumask things I wouldn't for the life of me have noticed) that were really subtle, and were really hidden by the fact that there was just a lot of non-semantic changes.
I think the ->cpus_allowed bugs Peter noticed are pre-existing - that patch doesn't intend to make any semantic changes.
Thanks,
Ingo
Peter Zijlstra
maintainerQuoted 9 lines · Ingo Molnar
Quoted 4 lines · Linus Torvalds
There were all those small things in there (Peter pointed out those cpumask things I wouldn't for the life of me have noticed) that were really subtle, and were really hidden by the fact that there was just a lot of non-semantic changes.
I think the ->cpus_allowed bugs Peter noticed are pre-existing - that patch doesn't intend to make any semantic changes.
Correct, those are pre-existing, just noticed then (again) because the changes made me look at the code.