From: tip-bot for Yong Zhang <yong.zhang0@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
a.p.zijlstra@chello.nl, efault@gmx.de, yong.zhang0@gmail.com,
tglx@linutronix.de, mingo@elte.hu
Subject: [tip:sched/core] sched: Kill WAKEUP_PREEMPT
Date: Sun, 14 Aug 2011 15:57:36 GMT [thread overview]
Message-ID: <tip-2c2efaed9bc973e3aeab1385c618017b56c8f6d7@git.kernel.org> (raw)
In-Reply-To: <20110729082033.GB12106@zhy>
Commit-ID: 2c2efaed9bc973e3aeab1385c618017b56c8f6d7
Gitweb: http://git.kernel.org/tip/2c2efaed9bc973e3aeab1385c618017b56c8f6d7
Author: Yong Zhang <yong.zhang0@gmail.com>
AuthorDate: Fri, 29 Jul 2011 16:20:33 +0800
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 14 Aug 2011 12:00:41 +0200
sched: Kill WAKEUP_PREEMPT
Remove the WAKEUP_PREEMPT feature, disabling it doesn't make any sense
and its outlived its use by a long long while.
Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Acked-by: Mike Galbraith <efault@gmx.de>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110729082033.GB12106@zhy
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
kernel/sched_fair.c | 9 +--------
kernel/sched_features.h | 5 -----
2 files changed, 1 insertions(+), 13 deletions(-)
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c
index bc8ee99..241fc86 100644
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
@@ -1095,9 +1095,6 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
* narrow margin doesn't have to wait for a full slice.
* This also mitigates buddy induced latencies under load.
*/
- if (!sched_feat(WAKEUP_PREEMPT))
- return;
-
if (delta_exec < sysctl_sched_min_granularity)
return;
@@ -1233,7 +1230,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
return;
#endif
- if (cfs_rq->nr_running > 1 || !sched_feat(WAKEUP_PREEMPT))
+ if (cfs_rq->nr_running > 1)
check_preempt_tick(cfs_rq, curr);
}
@@ -1899,10 +1896,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (unlikely(p->policy != SCHED_NORMAL))
return;
-
- if (!sched_feat(WAKEUP_PREEMPT))
- return;
-
find_matching_se(&se, &pse);
update_curr(cfs_rq_of(se));
BUG_ON(!pse);
diff --git a/kernel/sched_features.h b/kernel/sched_features.h
index 2e74677..efa0a7b 100644
--- a/kernel/sched_features.h
+++ b/kernel/sched_features.h
@@ -12,11 +12,6 @@ SCHED_FEAT(GENTLE_FAIR_SLEEPERS, 1)
SCHED_FEAT(START_DEBIT, 1)
/*
- * Should wakeups try to preempt running tasks.
- */
-SCHED_FEAT(WAKEUP_PREEMPT, 1)
-
-/*
* Based on load and program behaviour, see if it makes sense to place
* a newly woken task on the same cpu as the task that woke it --
* improve cache locality. Typically used with SYNC wakeups as
next prev parent reply other threads:[~2011-08-14 15:57 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 9:43 [PATCH] sched: Remove WAKEUP_PREEMPT feature check in entity_tick Lin Ming
2011-07-29 6:21 ` Yong Zhang
2011-07-29 6:24 ` Yong Zhang
2011-07-29 6:49 ` Lin Ming
2011-07-29 7:03 ` Yong Zhang
2011-07-29 7:36 ` Lin Ming
2011-07-29 7:46 ` Yong Zhang
2011-07-29 7:56 ` Lin Ming
2011-07-29 7:56 ` Peter Zijlstra
2011-07-29 8:18 ` Yong Zhang
2011-07-29 8:20 ` Peter Zijlstra
2011-07-29 8:44 ` Lin Ming
2011-07-29 8:46 ` Yong Zhang
2011-07-29 11:45 ` Peter Zijlstra
2011-08-01 1:33 ` Yong Zhang
2011-07-29 8:20 ` [RFC PATCH] sched: Kill WAKEUP_PREEMPT Yong Zhang
2011-07-29 8:30 ` Lin Ming
2011-07-29 8:32 ` Lin Ming
2011-08-14 15:57 ` tip-bot for Yong Zhang [this message]
2011-07-29 9:04 ` [PATCH] sched: Remove WAKEUP_PREEMPT feature check in entity_tick Mike Galbraith
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-2c2efaed9bc973e3aeab1385c618017b56c8f6d7@git.kernel.org \
--to=yong.zhang0@gmail.com \
--cc=a.p.zijlstra@chello.nl \
--cc=efault@gmx.de \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.