From: Ingo Molnar <mingo@elte.hu>
To: Robert Love <rml@tech9.net>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>,
"David S. Miller" <davem@redhat.com>,
<linux-kernel@vger.kernel.org>,
Linus Torvalds <torvalds@transmeta.com>
Subject: Re: [patch] 2.4.19-pre10-ac2: O(1) scheduler merge, -A3.
Date: Mon, 17 Jun 2002 05:49:16 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.44.0206170525520.2941-100000@e2> (raw)
In-Reply-To: <1024272924.922.35.camel@sinai>
i agree with the comment fixes, except these items:
> - if (unlikely(in_interrupt()))
> - BUG();
> + BUG_ON(in_interrupt());
> +
see the previous mail.
> @@ -1790,4 +1790,4 @@
> while (!cpu_rq(cpu_logical_map(cpu))->migration_thread)
> schedule_timeout(2);
> }
> -#endif
> +#endif /* CONFIG_SMP */
and this is just silly... I can see the point in doing #if comments in
include files, but the nesting here is just so obvious.
the rest looks fine. (patch of my current 2.5 scheduler tree attached,
against 2.5.22, with some more other nonfunctional bits added as well.)
Ingo
--- linux/kernel/sched.c.orig Mon Jun 17 05:43:53 2002
+++ linux/kernel/sched.c Mon Jun 17 05:42:03 2002
@@ -6,14 +6,14 @@
* Copyright (C) 1991-2002 Linus Torvalds
*
* 1996-12-23 Modified by Dave Grothe to fix bugs in semaphores and
- * make semaphores SMP safe
+ * make semaphores SMP safe
* 1998-11-19 Implemented schedule_timeout() and related stuff
* by Andrea Arcangeli
* 2002-01-04 New ultra-scalable O(1) scheduler by Ingo Molnar:
- * hybrid priority-list and round-robin design with
- * an array-switch method of distributing timeslices
- * and per-CPU runqueues. Additional code by Davide
- * Libenzi, Robert Love, and Rusty Russell.
+ * hybrid priority-list and round-robin design with
+ * an array-switch method of distributing timeslices
+ * and per-CPU runqueues. Additional code by Davide
+ * Libenzi, Robert Love, and Rusty Russell.
*/
#include <linux/mm.h>
@@ -797,7 +797,8 @@
list_t *queue;
int idx;
- BUG_ON(in_interrupt());
+ if (in_interrupt())
+ BUG();
#if CONFIG_DEBUG_HIGHMEM
check_highmem_ptes();
@@ -1392,25 +1393,35 @@
asmlinkage long sys_sched_yield(void)
{
- runqueue_t *rq;
- prio_array_t *array;
-
- rq = rq_lock(rq);
+ runqueue_t *rq = rq_lock(rq);
+ prio_array_t *array = current->array;
/*
- * Decrease the yielding task's priority by one, to avoid
- * livelocks. This priority loss is temporary, it's recovered
- * once the current timeslice expires.
+ * There are three levels of how a yielding task will give up
+ * the current CPU:
*
- * If priority is already MAX_PRIO-1 then we still
- * roundrobin the task within the runlist.
- */
- array = current->array;
- /*
- * If the task has reached maximum priority (or is a RT task)
- * then just requeue the task to the end of the runqueue:
+ * #1 - it decreases its priority by one. This priority loss is
+ * temporary, it's recovered once the current timeslice
+ * expires.
+ *
+ * #2 - once it has reached the lowest priority level,
+ * it will give up timeslices one by one. (We do not
+ * want to give them up all at once, it's gradual,
+ * to protect the casual yield()er.)
+ *
+ * #3 - once all timeslices are gone we put the process into
+ * the expired array.
+ *
+ * (special rule: RT tasks do not lose any priority, they just
+ * roundrobin on their current priority level.)
*/
- if (likely(current->prio == MAX_PRIO-1 || rt_task(current))) {
+ if (likely(current->prio == MAX_PRIO-1)) {
+ if (current->time_slice <= 1) {
+ dequeue_task(current, rq->active);
+ enqueue_task(current, rq->expired);
+ } else
+ current->time_slice--;
+ } else if (unlikely(rt_task(current))) {
list_del(¤t->run_list);
list_add_tail(¤t->run_list, array->queue + current->prio);
} else {
@@ -1836,15 +1847,14 @@
int cpu;
current->cpus_allowed = 1UL << cpu_logical_map(0);
- for (cpu = 0; cpu < smp_num_cpus; cpu++) {
+ for (cpu = 0; cpu < smp_num_cpus; cpu++)
if (kernel_thread(migration_thread, (void *) (long) cpu,
CLONE_FS | CLONE_FILES | CLONE_SIGNAL) < 0)
BUG();
- }
current->cpus_allowed = -1L;
for (cpu = 0; cpu < smp_num_cpus; cpu++)
while (!cpu_rq(cpu_logical_map(cpu))->migration_thread)
schedule_timeout(2);
}
-#endif /* CONFIG_SMP */
+#endif
next prev parent reply other threads:[~2002-06-17 3:51 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-06-13 19:21 [PATCH] 2.4-ac: sparc64 support for O(1) scheduler Robert Love
2002-06-14 4:25 ` David S. Miller
2002-06-14 17:32 ` Robert Love
2002-06-15 13:22 ` David S. Miller
2002-06-20 19:42 ` Alan Cox
2002-06-16 15:19 ` Ingo Molnar
2002-06-16 17:00 ` [patch] 2.4.19-pre10-ac2: O(1) scheduler merge, -A3 Ingo Molnar
2002-06-16 23:57 ` Robert Love
2002-06-17 0:13 ` J.A. Magallon
2002-06-17 4:28 ` Ingo Molnar
2002-06-17 0:15 ` Robert Love
2002-06-17 3:49 ` Ingo Molnar [this message]
2002-06-17 3:57 ` Robert Love
2002-06-17 4:07 ` Ingo Molnar
2002-06-17 4:02 ` Robert Love
2002-06-17 4:26 ` Ingo Molnar
2002-06-17 4:49 ` [patch] 2.5.22 current scheduler bits #1 Ingo Molnar
2002-06-17 3:24 ` [patch] 2.4.19-pre10-ac2: O(1) scheduler merge, -A3 Ingo Molnar
2002-06-17 3:35 ` Robert Love
2002-06-17 4:01 ` Ingo Molnar
2002-06-17 7:50 ` Zwane Mwaikambo
2002-06-17 8:32 ` Ingo Molnar
2002-06-17 8:23 ` Zwane Mwaikambo
2002-06-17 9:00 ` Ingo Molnar
2002-06-17 9:34 ` Zwane Mwaikambo
2002-06-18 7:16 ` William Lee Irwin III
2002-06-19 1:05 ` Matthew Dobson
2002-06-20 20:22 ` Andrew Theurer
2002-06-24 0:16 ` Martin J. Bligh
2002-06-17 16:26 ` Rusty Russell
2002-06-17 4:51 ` Toshiba PCToPIC97 PC Card freeze in 2.4.18 Stephen Satchell
2002-06-16 23:45 ` [PATCH] 2.4-ac: sparc64 support for O(1) scheduler Robert Love
2002-06-17 5:28 ` David S. Miller
2002-06-17 21:18 ` Robert Love
2002-06-14 22:00 ` Thomas Duffy
2002-06-15 13:35 ` David S. Miller
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=Pine.LNX.4.44.0206170525520.2941-100000@e2 \
--to=mingo@elte.hu \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=davem@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rml@tech9.net \
--cc=torvalds@transmeta.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®