Pull scheduler updates from Ingo Molnar:
"The main changes in this (fairly busy) cycle were:
- There was a class of scheduler bugs related to forgetting to update
the rq-clock timestamp which can cause weird and hard to debug
problems, so there's a new debug facility for this: which uncovered
a whole lot of bugs which convinced us that we want to keep the
debug facility.
(Peter Zijlstra, Matt Fleming)
- Various cputime related updates: eliminate cputime and use u64
nanoseconds directly, simplify and improve the arch interfaces,
implement delayed accounting more widely, etc. - (Frederic
Weisbecker)
- Move code around for better structure plus cleanups (Ingo Molnar)
- Move IO schedule accounting deeper into the scheduler plus related
changes to improve the situation (Tejun Heo)
- ... plus a round of sched/rt and sched/deadline fixes, plus other
fixes, updats and cleanups"
* 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (85 commits)
sched/core: Remove unlikely() annotation from sched_move_task()
sched/autogroup: Rename auto_group.[ch] to autogroup.[ch]
sched/topology: Split out scheduler topology code from core.c into topology.c
sched/core: Remove unnecessary #include headers
sched/rq_clock: Consolidate the ordering of the rq_clock methods
delayacct: Include <uapi/linux/taskstats.h>
sched/core: Clean up comments
sched/rt: Show the 'sched_rr_timeslice' SCHED_RR timeslice tuning knob in milliseconds
sched/clock: Add dummy clear_sched_clock_stable() stub function
sched/cputime: Remove generic asm headers
sched/cputime: Remove unused nsec_to_cputime()
s390, sched/cputime: Remove unused cputime definitions
powerpc, sched/cputime: Remove unused cputime definitions
s390, sched/cputime: Make arch_cpu_idle_time() to return nsecs
ia64, sched/cputime: Remove unused cputime definitions
ia64: Convert vtime to use nsec units directly
ia64, sched/cputime: Move the nsecs based cputime headers to the last arch using it
sched/cputime: Remove jiffies based cputime
sched/cputime, vtime: Return nsecs instead of cputime_t to account
sched/cputime: Complete nsec conversion of tick based accounting
...
tirimbino
Linus Torvalds
8 years ago
commit
828cad8ea0
@ -1,15 +0,0 @@ |
||||
#ifndef _ASM_GENERIC_CPUTIME_H |
||||
#define _ASM_GENERIC_CPUTIME_H |
||||
|
||||
#include <linux/time.h> |
||||
#include <linux/jiffies.h> |
||||
|
||||
#ifndef CONFIG_VIRT_CPU_ACCOUNTING |
||||
# include <asm-generic/cputime_jiffies.h> |
||||
#endif |
||||
|
||||
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN |
||||
# include <asm-generic/cputime_nsecs.h> |
||||
#endif |
||||
|
||||
#endif |
||||
@ -1,75 +0,0 @@ |
||||
#ifndef _ASM_GENERIC_CPUTIME_JIFFIES_H |
||||
#define _ASM_GENERIC_CPUTIME_JIFFIES_H |
||||
|
||||
typedef unsigned long __nocast cputime_t; |
||||
|
||||
#define cmpxchg_cputime(ptr, old, new) cmpxchg(ptr, old, new) |
||||
|
||||
#define cputime_one_jiffy jiffies_to_cputime(1) |
||||
#define cputime_to_jiffies(__ct) (__force unsigned long)(__ct) |
||||
#define jiffies_to_cputime(__hz) (__force cputime_t)(__hz) |
||||
|
||||
typedef u64 __nocast cputime64_t; |
||||
|
||||
#define cputime64_to_jiffies64(__ct) (__force u64)(__ct) |
||||
#define jiffies64_to_cputime64(__jif) (__force cputime64_t)(__jif) |
||||
|
||||
|
||||
/*
|
||||
* Convert nanoseconds <-> cputime |
||||
*/ |
||||
#define cputime_to_nsecs(__ct) \ |
||||
jiffies_to_nsecs(cputime_to_jiffies(__ct)) |
||||
#define nsecs_to_cputime64(__nsec) \ |
||||
jiffies64_to_cputime64(nsecs_to_jiffies64(__nsec)) |
||||
#define nsecs_to_cputime(__nsec) \ |
||||
jiffies_to_cputime(nsecs_to_jiffies(__nsec)) |
||||
|
||||
|
||||
/*
|
||||
* Convert cputime to microseconds and back. |
||||
*/ |
||||
#define cputime_to_usecs(__ct) \ |
||||
jiffies_to_usecs(cputime_to_jiffies(__ct)) |
||||
#define usecs_to_cputime(__usec) \ |
||||
jiffies_to_cputime(usecs_to_jiffies(__usec)) |
||||
#define usecs_to_cputime64(__usec) \ |
||||
jiffies64_to_cputime64(nsecs_to_jiffies64((__usec) * 1000)) |
||||
|
||||
/*
|
||||
* Convert cputime to seconds and back. |
||||
*/ |
||||
#define cputime_to_secs(jif) (cputime_to_jiffies(jif) / HZ) |
||||
#define secs_to_cputime(sec) jiffies_to_cputime((sec) * HZ) |
||||
|
||||
/*
|
||||
* Convert cputime to timespec and back. |
||||
*/ |
||||
#define timespec_to_cputime(__val) \ |
||||
jiffies_to_cputime(timespec_to_jiffies(__val)) |
||||
#define cputime_to_timespec(__ct,__val) \ |
||||
jiffies_to_timespec(cputime_to_jiffies(__ct),__val) |
||||
|
||||
/*
|
||||
* Convert cputime to timeval and back. |
||||
*/ |
||||
#define timeval_to_cputime(__val) \ |
||||
jiffies_to_cputime(timeval_to_jiffies(__val)) |
||||
#define cputime_to_timeval(__ct,__val) \ |
||||
jiffies_to_timeval(cputime_to_jiffies(__ct),__val) |
||||
|
||||
/*
|
||||
* Convert cputime to clock and back. |
||||
*/ |
||||
#define cputime_to_clock_t(__ct) \ |
||||
jiffies_to_clock_t(cputime_to_jiffies(__ct)) |
||||
#define clock_t_to_cputime(__x) \ |
||||
jiffies_to_cputime(clock_t_to_jiffies(__x)) |
||||
|
||||
/*
|
||||
* Convert cputime64 to clock. |
||||
*/ |
||||
#define cputime64_to_clock_t(__ct) \ |
||||
jiffies_64_to_clock_t(cputime64_to_jiffies64(__ct)) |
||||
|
||||
#endif |
||||
@ -1,121 +0,0 @@ |
||||
/*
|
||||
* Definitions for measuring cputime in nsecs resolution. |
||||
* |
||||
* Based on <arch/ia64/include/asm/cputime.h> |
||||
* |
||||
* Copyright (C) 2007 FUJITSU LIMITED |
||||
* Copyright (C) 2007 Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> |
||||
* |
||||
* This program is free software; you can redistribute it and/or |
||||
* modify it under the terms of the GNU General Public License |
||||
* as published by the Free Software Foundation; either version |
||||
* 2 of the License, or (at your option) any later version. |
||||
* |
||||
*/ |
||||
|
||||
#ifndef _ASM_GENERIC_CPUTIME_NSECS_H |
||||
#define _ASM_GENERIC_CPUTIME_NSECS_H |
||||
|
||||
#include <linux/math64.h> |
||||
|
||||
typedef u64 __nocast cputime_t; |
||||
typedef u64 __nocast cputime64_t; |
||||
|
||||
#define cmpxchg_cputime(ptr, old, new) cmpxchg64(ptr, old, new) |
||||
|
||||
#define cputime_one_jiffy jiffies_to_cputime(1) |
||||
|
||||
#define cputime_div(__ct, divisor) div_u64((__force u64)__ct, divisor) |
||||
#define cputime_div_rem(__ct, divisor, remainder) \ |
||||
div_u64_rem((__force u64)__ct, divisor, remainder); |
||||
|
||||
/*
|
||||
* Convert cputime <-> jiffies (HZ) |
||||
*/ |
||||
#define cputime_to_jiffies(__ct) \ |
||||
cputime_div(__ct, NSEC_PER_SEC / HZ) |
||||
#define jiffies_to_cputime(__jif) \ |
||||
(__force cputime_t)((__jif) * (NSEC_PER_SEC / HZ)) |
||||
#define cputime64_to_jiffies64(__ct) \ |
||||
cputime_div(__ct, NSEC_PER_SEC / HZ) |
||||
#define jiffies64_to_cputime64(__jif) \ |
||||
(__force cputime64_t)((__jif) * (NSEC_PER_SEC / HZ)) |
||||
|
||||
|
||||
/*
|
||||
* Convert cputime <-> nanoseconds |
||||
*/ |
||||
#define cputime_to_nsecs(__ct) \ |
||||
(__force u64)(__ct) |
||||
#define nsecs_to_cputime(__nsecs) \ |
||||
(__force cputime_t)(__nsecs) |
||||
#define nsecs_to_cputime64(__nsecs) \ |
||||
(__force cputime64_t)(__nsecs) |
||||
|
||||
|
||||
/*
|
||||
* Convert cputime <-> microseconds |
||||
*/ |
||||
#define cputime_to_usecs(__ct) \ |
||||
cputime_div(__ct, NSEC_PER_USEC) |
||||
#define usecs_to_cputime(__usecs) \ |
||||
(__force cputime_t)((__usecs) * NSEC_PER_USEC) |
||||
#define usecs_to_cputime64(__usecs) \ |
||||
(__force cputime64_t)((__usecs) * NSEC_PER_USEC) |
||||
|
||||
/*
|
||||
* Convert cputime <-> seconds |
||||
*/ |
||||
#define cputime_to_secs(__ct) \ |
||||
cputime_div(__ct, NSEC_PER_SEC) |
||||
#define secs_to_cputime(__secs) \ |
||||
(__force cputime_t)((__secs) * NSEC_PER_SEC) |
||||
|
||||
/*
|
||||
* Convert cputime <-> timespec (nsec) |
||||
*/ |
||||
static inline cputime_t timespec_to_cputime(const struct timespec *val) |
||||
{ |
||||
u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + val->tv_nsec; |
||||
return (__force cputime_t) ret; |
||||
} |
||||
static inline void cputime_to_timespec(const cputime_t ct, struct timespec *val) |
||||
{ |
||||
u32 rem; |
||||
|
||||
val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem); |
||||
val->tv_nsec = rem; |
||||
} |
||||
|
||||
/*
|
||||
* Convert cputime <-> timeval (msec) |
||||
*/ |
||||
static inline cputime_t timeval_to_cputime(const struct timeval *val) |
||||
{ |
||||
u64 ret = (u64)val->tv_sec * NSEC_PER_SEC + |
||||
val->tv_usec * NSEC_PER_USEC; |
||||
return (__force cputime_t) ret; |
||||
} |
||||
static inline void cputime_to_timeval(const cputime_t ct, struct timeval *val) |
||||
{ |
||||
u32 rem; |
||||
|
||||
val->tv_sec = cputime_div_rem(ct, NSEC_PER_SEC, &rem); |
||||
val->tv_usec = rem / NSEC_PER_USEC; |
||||
} |
||||
|
||||
/*
|
||||
* Convert cputime <-> clock (USER_HZ) |
||||
*/ |
||||
#define cputime_to_clock_t(__ct) \ |
||||
cputime_div(__ct, (NSEC_PER_SEC / USER_HZ)) |
||||
#define clock_t_to_cputime(__x) \ |
||||
(__force cputime_t)((__x) * (NSEC_PER_SEC / USER_HZ)) |
||||
|
||||
/*
|
||||
* Convert cputime64 to clock. |
||||
*/ |
||||
#define cputime64_to_clock_t(__ct) \ |
||||
cputime_to_clock_t((__force cputime_t)__ct) |
||||
|
||||
#endif |
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue