hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched-fixes:
  sched: fix weight calculations
  semaphore: fix
This commit is contained in:
Linus Torvalds 2008-05-08 11:31:07 -07:00
parent f589274533 46151122e0
commit c4f51b4662
2 changed files with 38 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel/sched_fair.c
View File

@ -662,10 +662,15 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial)
if (!initial) { if (!initial) {
/* sleeps upto a single latency don't count. */ /* sleeps upto a single latency don't count. */
if (sched_feat(NEW_FAIR_SLEEPERS)) { if (sched_feat(NEW_FAIR_SLEEPERS)) {
unsigned long thresh = sysctl_sched_latency;
/*
* convert the sleeper threshold into virtual time
*/
if (sched_feat(NORMALIZED_SLEEPER)) if (sched_feat(NORMALIZED_SLEEPER))
vruntime -= calc_delta_weight(sysctl_sched_latency, se); thresh = calc_delta_fair(thresh, se);
else
vruntime -= sysctl_sched_latency; vruntime -= thresh;
} }
/* ensure we never gain time by being placed backwards. */ /* ensure we never gain time by being placed backwards. */

64
kernel/semaphore.c
View File

@ -54,10 +54,9 @@ void down(struct semaphore *sem)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&sem->lock, flags); spin_lock_irqsave(&sem->lock, flags);
if (likely(sem->count > 0)) if (unlikely(!sem->count))
sem->count--;
else
__down(sem); __down(sem);
sem->count--;
spin_unlock_irqrestore(&sem->lock, flags); spin_unlock_irqrestore(&sem->lock, flags);
} }
EXPORT_SYMBOL(down); EXPORT_SYMBOL(down);
@ -77,10 +76,10 @@ int down_interruptible(struct semaphore *sem)
int result = 0; int result = 0;
spin_lock_irqsave(&sem->lock, flags); spin_lock_irqsave(&sem->lock, flags);
if (likely(sem->count > 0)) if (unlikely(!sem->count))
sem->count--;
else
result = __down_interruptible(sem); result = __down_interruptible(sem);
if (!result)
sem->count--;
spin_unlock_irqrestore(&sem->lock, flags); spin_unlock_irqrestore(&sem->lock, flags);
return result; return result;
@ -103,10 +102,10 @@ int down_killable(struct semaphore *sem)
int result = 0; int result = 0;
spin_lock_irqsave(&sem->lock, flags); spin_lock_irqsave(&sem->lock, flags);
if (likely(sem->count > 0)) if (unlikely(!sem->count))
sem->count--;
else
result = __down_killable(sem); result = __down_killable(sem);
if (!result)
sem->count--;
spin_unlock_irqrestore(&sem->lock, flags); spin_unlock_irqrestore(&sem->lock, flags);
return result; return result;
@ -157,10 +156,10 @@ int down_timeout(struct semaphore *sem, long jiffies)
int result = 0; int result = 0;
spin_lock_irqsave(&sem->lock, flags); spin_lock_irqsave(&sem->lock, flags);
if (likely(sem->count > 0)) if (unlikely(!sem->count))
sem->count--;
else
result = __down_timeout(sem, jiffies); result = __down_timeout(sem, jiffies);
if (!result)
sem->count--;
spin_unlock_irqrestore(&sem->lock, flags); spin_unlock_irqrestore(&sem->lock, flags);
return result; return result;
@ -179,9 +178,8 @@ void up(struct semaphore *sem)
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&sem->lock, flags); spin_lock_irqsave(&sem->lock, flags);
if (likely(list_empty(&sem->wait_list))) sem->count++;
sem->count++; if (unlikely(!list_empty(&sem->wait_list)))
else
__up(sem); __up(sem);
spin_unlock_irqrestore(&sem->lock, flags); spin_unlock_irqrestore(&sem->lock, flags);
} }
@ -192,7 +190,6 @@ EXPORT_SYMBOL(up);
struct semaphore_waiter { struct semaphore_waiter {
struct list_head list; struct list_head list;
struct task_struct *task; struct task_struct *task;
int up;
}; };
/* /*
@ -205,33 +202,34 @@ static inline int __sched __down_common(struct semaphore *sem, long state,
{ {
struct task_struct *task = current; struct task_struct *task = current;
struct semaphore_waiter waiter; struct semaphore_waiter waiter;
int ret = 0;
list_add_tail(&waiter.list, &sem->wait_list);
waiter.task = task; waiter.task = task;
waiter.up = 0; list_add_tail(&waiter.list, &sem->wait_list);
for (;;) { for (;;) {
if (state == TASK_INTERRUPTIBLE && signal_pending(task)) if (state == TASK_INTERRUPTIBLE && signal_pending(task)) {
goto interrupted; ret = -EINTR;
if (state == TASK_KILLABLE && fatal_signal_pending(task)) break;
goto interrupted; }
if (timeout <= 0) if (state == TASK_KILLABLE && fatal_signal_pending(task)) {
goto timed_out; ret = -EINTR;
break;
}
if (timeout <= 0) {
ret = -ETIME;
break;
}
__set_task_state(task, state); __set_task_state(task, state);
spin_unlock_irq(&sem->lock); spin_unlock_irq(&sem->lock);
timeout = schedule_timeout(timeout); timeout = schedule_timeout(timeout);
spin_lock_irq(&sem->lock); spin_lock_irq(&sem->lock);
if (waiter.up) if (sem->count > 0)
return 0; break;
} }
timed_out:
list_del(&waiter.list); list_del(&waiter.list);
return -ETIME; return ret;
interrupted:
list_del(&waiter.list);
return -EINTR;
} }
static noinline void __sched __down(struct semaphore *sem) static noinline void __sched __down(struct semaphore *sem)
@ -258,7 +256,5 @@ static noinline void __sched __up(struct semaphore *sem)
{ {
struct semaphore_waiter *waiter = list_first_entry(&sem->wait_list, struct semaphore_waiter *waiter = list_first_entry(&sem->wait_list,
struct semaphore_waiter, list); struct semaphore_waiter, list);
list_del(&waiter->list);
waiter->up = 1;
wake_up_process(waiter->task); wake_up_process(waiter->task);
} }