On Wed, Apr 6, 2011 at 8:36 AM, John Baldwin <j...@freebsd.org> wrote:
> Hummm. Patching 4BSD to use the same route as ULE may be the best solution
> for now if that is easiest. Alternatively, you could change 4BSD's
> sched_add() to not try to kick other CPUs until smp_started is true.
At first I thought that it was a consequence of the way it does CPU
affinity, but now I see that it shortcuts if smp_started is not true.
How about something like the following for 4BSD?
--- sched_4bsd.c (revision 220222)
+++ sched_4bsd.c (working copy)
@@ -1242,14 +1242,14 @@
}
TD_SET_RUNQ(td);
- if (td->td_pinned != 0) {
+ if (smp_started && td->td_pinned != 0) {
cpu = td->td_lastcpu;
ts->ts_runq = &runq_pcpu[cpu];
single_cpu = 1;
CTR3(KTR_RUNQ,
"sched_add: Put td_sched:%p(td:%p) on cpu%d runq", ts, td,
cpu);
- } else if (td->td_flags & TDF_BOUND) {
+ } else if (smp_started && (td->td_flags & TDF_BOUND)) {
/* Find CPU from bound runq. */
KASSERT(SKE_RUNQ_PCPU(ts),
("sched_add: bound td_sched not on cpu runq"));
@@ -1258,7 +1258,7 @@
CTR3(KTR_RUNQ,
"sched_add: Put td_sched:%p(td:%p) on cpu%d runq", ts, td,
cpu);
- } else if (ts->ts_flags & TSF_AFFINITY) {
+ } else if (smp_started && (ts->ts_flags & TSF_AFFINITY)) {
/* Find a valid CPU for our cpuset */
cpu = sched_pickcpu(td);
ts->ts_runq = &runq_pcpu[cpu];
The flow control is a bit awkward because of the multiple
affinity/bound cpu cases. If somebody prefers the code to be
structured differently I'd be open to suggestions.
Ryan
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
