Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
raspberrypi-kernel
提交
d986434a
R
raspberrypi-kernel
项目概览
openeuler
/
raspberrypi-kernel
通知
13
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
raspberrypi-kernel
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
d986434a
编写于
7月 20, 2008
作者:
I
Ingo Molnar
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'sched/urgent' into sched/devel
上级
1b427c15
31656519
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
66 addition
and
155 deletion
+66
-155
arch/x86/kernel/signal_32.c
arch/x86/kernel/signal_32.c
+0
-3
arch/x86/kernel/signal_64.c
arch/x86/kernel/signal_64.c
+0
-3
include/asm-x86/thread_info.h
include/asm-x86/thread_info.h
+1
-3
kernel/Kconfig.hz
kernel/Kconfig.hz
+1
-1
kernel/sched.c
kernel/sched.c
+60
-142
kernel/sched_fair.c
kernel/sched_fair.c
+2
-3
kernel/sched_rt.c
kernel/sched_rt.c
+2
-0
未找到文件。
arch/x86/kernel/signal_32.c
浏览文件 @
d986434a
...
...
@@ -667,8 +667,5 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
if
(
thread_info_flags
&
_TIF_SIGPENDING
)
do_signal
(
regs
);
if
(
thread_info_flags
&
_TIF_HRTICK_RESCHED
)
hrtick_resched
();
clear_thread_flag
(
TIF_IRET
);
}
arch/x86/kernel/signal_64.c
浏览文件 @
d986434a
...
...
@@ -502,9 +502,6 @@ void do_notify_resume(struct pt_regs *regs, void *unused,
/* deal with pending signal delivery */
if
(
thread_info_flags
&
_TIF_SIGPENDING
)
do_signal
(
regs
);
if
(
thread_info_flags
&
_TIF_HRTICK_RESCHED
)
hrtick_resched
();
}
void
signal_fault
(
struct
pt_regs
*
regs
,
void
__user
*
frame
,
char
*
where
)
...
...
include/asm-x86/thread_info.h
浏览文件 @
d986434a
...
...
@@ -81,7 +81,6 @@ struct thread_info {
#define TIF_SYSCALL_AUDIT 7
/* syscall auditing active */
#define TIF_SECCOMP 8
/* secure computing */
#define TIF_MCE_NOTIFY 10
/* notify userspace of an MCE */
#define TIF_HRTICK_RESCHED 11
/* reprogram hrtick timer */
#define TIF_NOTSC 16
/* TSC is not accessible in userland */
#define TIF_IA32 17
/* 32bit process */
#define TIF_FORK 18
/* ret_from_fork */
...
...
@@ -108,7 +107,6 @@ struct thread_info {
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
#define _TIF_MCE_NOTIFY (1 << TIF_MCE_NOTIFY)
#define _TIF_HRTICK_RESCHED (1 << TIF_HRTICK_RESCHED)
#define _TIF_NOTSC (1 << TIF_NOTSC)
#define _TIF_IA32 (1 << TIF_IA32)
#define _TIF_FORK (1 << TIF_FORK)
...
...
@@ -132,7 +130,7 @@ struct thread_info {
/* Only used for 64 bit */
#define _TIF_DO_NOTIFY_MASK \
(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY
|_TIF_HRTICK_RESCHED
)
(_TIF_SIGPENDING|_TIF_SINGLESTEP|_TIF_MCE_NOTIFY)
/* flags to check in __switch_to() */
#define _TIF_WORK_CTXSW \
...
...
kernel/Kconfig.hz
浏览文件 @
d986434a
...
...
@@ -55,4 +55,4 @@ config HZ
default 1000 if HZ_1000
config SCHED_HRTICK
def_bool HIGH_RES_TIMERS
&& X86
def_bool HIGH_RES_TIMERS
kernel/sched.c
浏览文件 @
d986434a
...
...
@@ -571,8 +571,10 @@ struct rq {
#endif
#ifdef CONFIG_SCHED_HRTICK
unsigned
long
hrtick_flags
;
ktime_t
hrtick_expire
;
#ifdef CONFIG_SMP
int
hrtick_csd_pending
;
struct
call_single_data
hrtick_csd
;
#endif
struct
hrtimer
hrtick_timer
;
#endif
...
...
@@ -983,13 +985,6 @@ static struct rq *this_rq_lock(void)
return
rq
;
}
static
void
__resched_task
(
struct
task_struct
*
p
,
int
tif_bit
);
static
inline
void
resched_task
(
struct
task_struct
*
p
)
{
__resched_task
(
p
,
TIF_NEED_RESCHED
);
}
#ifdef CONFIG_SCHED_HRTICK
/*
* Use HR-timers to deliver accurate preemption points.
...
...
@@ -1001,25 +996,6 @@ static inline void resched_task(struct task_struct *p)
* When we get rescheduled we reprogram the hrtick_timer outside of the
* rq->lock.
*/
static
inline
void
resched_hrt
(
struct
task_struct
*
p
)
{
__resched_task
(
p
,
TIF_HRTICK_RESCHED
);
}
static
inline
void
resched_rq
(
struct
rq
*
rq
)
{
unsigned
long
flags
;
spin_lock_irqsave
(
&
rq
->
lock
,
flags
);
resched_task
(
rq
->
curr
);
spin_unlock_irqrestore
(
&
rq
->
lock
,
flags
);
}
enum
{
HRTICK_SET
,
/* re-programm hrtick_timer */
HRTICK_RESET
,
/* not a new slice */
HRTICK_BLOCK
,
/* stop hrtick operations */
};
/*
* Use hrtick when:
...
...
@@ -1030,72 +1006,17 @@ static inline int hrtick_enabled(struct rq *rq)
{
if
(
!
sched_feat
(
HRTICK
))
return
0
;
if
(
unlikely
(
test_bit
(
HRTICK_BLOCK
,
&
rq
->
hrtick_flags
)))
if
(
!
cpu_online
(
cpu_of
(
rq
)))
return
0
;
return
hrtimer_is_hres_active
(
&
rq
->
hrtick_timer
);
}
/*
* Called to set the hrtick timer state.
*
* called with rq->lock held and irqs disabled
*/
static
void
hrtick_start
(
struct
rq
*
rq
,
u64
delay
,
int
reset
)
{
assert_spin_locked
(
&
rq
->
lock
);
/*
* preempt at: now + delay
*/
rq
->
hrtick_expire
=
ktime_add_ns
(
rq
->
hrtick_timer
.
base
->
get_time
(),
delay
);
/*
* indicate we need to program the timer
*/
__set_bit
(
HRTICK_SET
,
&
rq
->
hrtick_flags
);
if
(
reset
)
__set_bit
(
HRTICK_RESET
,
&
rq
->
hrtick_flags
);
/*
* New slices are called from the schedule path and don't need a
* forced reschedule.
*/
if
(
reset
)
resched_hrt
(
rq
->
curr
);
}
static
void
hrtick_clear
(
struct
rq
*
rq
)
{
if
(
hrtimer_active
(
&
rq
->
hrtick_timer
))
hrtimer_cancel
(
&
rq
->
hrtick_timer
);
}
/*
* Update the timer from the possible pending state.
*/
static
void
hrtick_set
(
struct
rq
*
rq
)
{
ktime_t
time
;
int
set
,
reset
;
unsigned
long
flags
;
WARN_ON_ONCE
(
cpu_of
(
rq
)
!=
smp_processor_id
());
spin_lock_irqsave
(
&
rq
->
lock
,
flags
);
set
=
__test_and_clear_bit
(
HRTICK_SET
,
&
rq
->
hrtick_flags
);
reset
=
__test_and_clear_bit
(
HRTICK_RESET
,
&
rq
->
hrtick_flags
);
time
=
rq
->
hrtick_expire
;
clear_thread_flag
(
TIF_HRTICK_RESCHED
);
spin_unlock_irqrestore
(
&
rq
->
lock
,
flags
);
if
(
set
)
{
hrtimer_start
(
&
rq
->
hrtick_timer
,
time
,
HRTIMER_MODE_ABS
);
if
(
reset
&&
!
hrtimer_active
(
&
rq
->
hrtick_timer
))
resched_rq
(
rq
);
}
else
hrtick_clear
(
rq
);
}
/*
* High-resolution timer tick.
* Runs from hardirq context with interrupts disabled.
...
...
@@ -1115,27 +1036,37 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer)
}
#ifdef CONFIG_SMP
static
void
hotplug_hrtick_disable
(
int
cpu
)
/*
* called from hardirq (IPI) context
*/
static
void
__hrtick_start
(
void
*
arg
)
{
struct
rq
*
rq
=
cpu_rq
(
cpu
);
unsigned
long
flags
;
spin_lock_irqsave
(
&
rq
->
lock
,
flags
);
rq
->
hrtick_flags
=
0
;
__set_bit
(
HRTICK_BLOCK
,
&
rq
->
hrtick_flags
);
spin_unlock_irqrestore
(
&
rq
->
lock
,
flags
);
struct
rq
*
rq
=
arg
;
hrtick_clear
(
rq
);
spin_lock
(
&
rq
->
lock
);
hrtimer_restart
(
&
rq
->
hrtick_timer
);
rq
->
hrtick_csd_pending
=
0
;
spin_unlock
(
&
rq
->
lock
);
}
static
void
hotplug_hrtick_enable
(
int
cpu
)
/*
* Called to set the hrtick timer state.
*
* called with rq->lock held and irqs disabled
*/
static
void
hrtick_start
(
struct
rq
*
rq
,
u64
delay
)
{
struct
rq
*
rq
=
cpu_rq
(
cpu
)
;
unsigned
long
flags
;
struct
hrtimer
*
timer
=
&
rq
->
hrtick_timer
;
ktime_t
time
=
ktime_add_ns
(
timer
->
base
->
get_time
(),
delay
)
;
spin_lock_irqsave
(
&
rq
->
lock
,
flags
);
__clear_bit
(
HRTICK_BLOCK
,
&
rq
->
hrtick_flags
);
spin_unlock_irqrestore
(
&
rq
->
lock
,
flags
);
timer
->
expires
=
time
;
if
(
rq
==
this_rq
())
{
hrtimer_restart
(
timer
);
}
else
if
(
!
rq
->
hrtick_csd_pending
)
{
__smp_call_function_single
(
cpu_of
(
rq
),
&
rq
->
hrtick_csd
);
rq
->
hrtick_csd_pending
=
1
;
}
}
static
int
...
...
@@ -1150,16 +1081,7 @@ hotplug_hrtick(struct notifier_block *nfb, unsigned long action, void *hcpu)
case
CPU_DOWN_PREPARE_FROZEN
:
case
CPU_DEAD
:
case
CPU_DEAD_FROZEN
:
hotplug_hrtick_disable
(
cpu
);
return
NOTIFY_OK
;
case
CPU_UP_PREPARE
:
case
CPU_UP_PREPARE_FROZEN
:
case
CPU_DOWN_FAILED
:
case
CPU_DOWN_FAILED_FROZEN
:
case
CPU_ONLINE
:
case
CPU_ONLINE_FROZEN
:
hotplug_hrtick_enable
(
cpu
);
hrtick_clear
(
cpu_rq
(
cpu
));
return
NOTIFY_OK
;
}
...
...
@@ -1170,46 +1092,45 @@ static void init_hrtick(void)
{
hotcpu_notifier
(
hotplug_hrtick
,
0
);
}
#endif
/* CONFIG_SMP */
#else
/*
* Called to set the hrtick timer state.
*
* called with rq->lock held and irqs disabled
*/
static
void
hrtick_start
(
struct
rq
*
rq
,
u64
delay
)
{
hrtimer_start
(
&
rq
->
hrtick_timer
,
ns_to_ktime
(
delay
),
HRTIMER_MODE_REL
);
}
static
void
init_
rq_hrtick
(
struct
rq
*
rq
)
static
void
init_
hrtick
(
void
)
{
rq
->
hrtick_flags
=
0
;
hrtimer_init
(
&
rq
->
hrtick_timer
,
CLOCK_MONOTONIC
,
HRTIMER_MODE_REL
);
rq
->
hrtick_timer
.
function
=
hrtick
;
rq
->
hrtick_timer
.
cb_mode
=
HRTIMER_CB_IRQSAFE_NO_SOFTIRQ
;
}
#endif
/* CONFIG_SMP */
void
hrtick_resched
(
void
)
static
void
init_rq_hrtick
(
struct
rq
*
rq
)
{
struct
rq
*
rq
;
unsigned
long
flags
;
#ifdef CONFIG_SMP
rq
->
hrtick_csd_pending
=
0
;
if
(
!
test_thread_flag
(
TIF_HRTICK_RESCHED
))
return
;
rq
->
hrtick_csd
.
flags
=
0
;
rq
->
hrtick_csd
.
func
=
__hrtick_start
;
rq
->
hrtick_csd
.
info
=
rq
;
#endif
local_irq_save
(
flags
);
rq
=
cpu_rq
(
smp_processor_id
());
hrtick_set
(
rq
);
local_irq_restore
(
flags
);
hrtimer_init
(
&
rq
->
hrtick_timer
,
CLOCK_MONOTONIC
,
HRTIMER_MODE_REL
);
rq
->
hrtick_timer
.
function
=
hrtick
;
rq
->
hrtick_timer
.
cb_mode
=
HRTIMER_CB_IRQSAFE_NO_SOFTIRQ
;
}
#else
static
inline
void
hrtick_clear
(
struct
rq
*
rq
)
{
}
static
inline
void
hrtick_set
(
struct
rq
*
rq
)
{
}
static
inline
void
init_rq_hrtick
(
struct
rq
*
rq
)
{
}
void
hrtick_resched
(
void
)
{
}
static
inline
void
init_hrtick
(
void
)
{
}
...
...
@@ -1228,16 +1149,16 @@ static inline void init_hrtick(void)
#define tsk_is_polling(t) test_tsk_thread_flag(t, TIF_POLLING_NRFLAG)
#endif
static
void
__resched_task
(
struct
task_struct
*
p
,
int
tif_bit
)
static
void
resched_task
(
struct
task_struct
*
p
)
{
int
cpu
;
assert_spin_locked
(
&
task_rq
(
p
)
->
lock
);
if
(
unlikely
(
test_tsk_thread_flag
(
p
,
tif_bit
)))
if
(
unlikely
(
test_tsk_thread_flag
(
p
,
TIF_NEED_RESCHED
)))
return
;
set_tsk_thread_flag
(
p
,
tif_bit
);
set_tsk_thread_flag
(
p
,
TIF_NEED_RESCHED
);
cpu
=
task_cpu
(
p
);
if
(
cpu
==
smp_processor_id
())
...
...
@@ -1303,10 +1224,10 @@ void wake_up_idle_cpu(int cpu)
#endif
/* CONFIG_NO_HZ */
#else
/* !CONFIG_SMP */
static
void
__resched_task
(
struct
task_struct
*
p
,
int
tif_bit
)
static
void
resched_task
(
struct
task_struct
*
p
)
{
assert_spin_locked
(
&
task_rq
(
p
)
->
lock
);
set_tsk_
thread_flag
(
p
,
tif_bit
);
set_tsk_
need_resched
(
p
);
}
#endif
/* CONFIG_SMP */
...
...
@@ -4395,7 +4316,7 @@ asmlinkage void __sched schedule(void)
struct
task_struct
*
prev
,
*
next
;
unsigned
long
*
switch_count
;
struct
rq
*
rq
;
int
cpu
,
hrtick
=
sched_feat
(
HRTICK
)
;
int
cpu
;
need_resched:
preempt_disable
();
...
...
@@ -4410,7 +4331,7 @@ asmlinkage void __sched schedule(void)
schedule_debug
(
prev
);
if
(
hrtick
)
if
(
sched_feat
(
HRTICK
)
)
hrtick_clear
(
rq
);
/*
...
...
@@ -4457,9 +4378,6 @@ asmlinkage void __sched schedule(void)
}
else
spin_unlock_irq
(
&
rq
->
lock
);
if
(
hrtick
)
hrtick_set
(
rq
);
if
(
unlikely
(
reacquire_kernel_lock
(
current
)
<
0
))
goto
need_resched_nonpreemptible
;
...
...
kernel/sched_fair.c
浏览文件 @
d986434a
...
...
@@ -878,7 +878,6 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
#ifdef CONFIG_SCHED_HRTICK
static
void
hrtick_start_fair
(
struct
rq
*
rq
,
struct
task_struct
*
p
)
{
int
requeue
=
rq
->
curr
==
p
;
struct
sched_entity
*
se
=
&
p
->
se
;
struct
cfs_rq
*
cfs_rq
=
cfs_rq_of
(
se
);
...
...
@@ -899,10 +898,10 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
* Don't schedule slices shorter than 10000ns, that just
* doesn't make sense. Rely on vruntime for fairness.
*/
if
(
!
requeue
)
if
(
rq
->
curr
!=
p
)
delta
=
max
(
10000LL
,
delta
);
hrtick_start
(
rq
,
delta
,
requeue
);
hrtick_start
(
rq
,
delta
);
}
}
#else
/* !CONFIG_SCHED_HRTICK */
...
...
kernel/sched_rt.c
浏览文件 @
d986434a
...
...
@@ -505,7 +505,9 @@ void inc_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq)
rt_rq
->
rt_nr_running
++
;
#if defined CONFIG_SMP || defined CONFIG_RT_GROUP_SCHED
if
(
rt_se_prio
(
rt_se
)
<
rt_rq
->
highest_prio
)
{
#ifdef CONFIG_SMP
struct
rq
*
rq
=
rq_of_rt_rq
(
rt_rq
);
#endif
rt_rq
->
highest_prio
=
rt_se_prio
(
rt_se
);
#ifdef CONFIG_SMP
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录