Date: Thu, 30 Sep 2010 10:18:33 -0700 From: mdf@FreeBSD.org To: Andriy Gapon <avg@freebsd.org> Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r213305 - in head/sys: gdb kern sys Message-ID: <AANLkTi=03MUdHz2u%2BOz3G3PQqNkCHrB5S1K6zwhs2XMt@mail.gmail.com> In-Reply-To: <201009301705.o8UH5Nmm075714@svn.freebsd.org> References: <201009301705.o8UH5Nmm075714@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Sep 30, 2010 at 10:05 AM, Andriy Gapon <avg@freebsd.org> wrote: > Author: avg > Date: Thu Sep 30 17:05:23 2010 > New Revision: 213305 > URL: http://svn.freebsd.org/changeset/base/213305 > > Log: > =A0there must be only one SYSINIT with SI_SUB_RUN_SCHEDULER+SI_ORDER_ANY = order > > =A0SI_SUB_RUN_SCHEDULER+SI_ORDER_ANY should only be used to call > =A0scheduler() function which turns the initial thread into swapper prope= r > =A0and thus there is no further SYSINIT processing. Does this imply that scheduler() shouldn't be called from a sysinit at all, and instead a hand-call after processing all the boot-time sysinit's would make more sense? This prevents the bug from reoccuring, and also prevents bugs with adding a SYSINIT that runs at SI_SUB_RUN_SCHEDULER + 1 time. Thanks, matthew > =A0Other SYSINITs with SI_SUB_RUN_SCHEDULER+SI_ORDER_ANY may get ordered > =A0after scheduler() and thus never executed. =A0That particular relative > =A0order is semi-arbitrary. > > =A0Thus, change such places to use SI_ORDER_MIDDLE. > =A0Also, use SI_ORDER_MIDDLE instead of correct, but less appealing, > =A0SI_ORDER_ANY - 1. > > =A0MFC after: =A0 =A01 week > > Modified: > =A0head/sys/gdb/gdb_cons.c > =A0head/sys/kern/kern_ntptime.c > =A0head/sys/sys/sched.h > > Modified: head/sys/gdb/gdb_cons.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/gdb/gdb_cons.c =A0 =A0 Thu Sep 30 16:47:01 2010 =A0 =A0 =A0 = =A0(r213304) > +++ head/sys/gdb/gdb_cons.c =A0 =A0 Thu Sep 30 17:05:23 2010 =A0 =A0 =A0 = =A0(r213305) > @@ -126,7 +126,7 @@ oktousecallout(void *data __unused) > =A0{ > =A0 =A0 =A0 =A0calloutok =3D 1; > =A0} > -SYSINIT(gdbhack, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, oktousecallout, NUL= L); > +SYSINIT(gdbhack, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, oktousecallout, = NULL); > > =A0static void > =A0gdb_cnputc(struct consdev *cp, int c) > > Modified: head/sys/kern/kern_ntptime.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/kern/kern_ntptime.c =A0 =A0 =A0 =A0Thu Sep 30 16:47:01 2010 = =A0 =A0 =A0 =A0(r213304) > +++ head/sys/kern/kern_ntptime.c =A0 =A0 =A0 =A0Thu Sep 30 17:05:23 2010 = =A0 =A0 =A0 =A0(r213305) > @@ -1035,5 +1035,5 @@ start_periodic_resettodr(void *arg __unu > =A0 =A0 =A0 =A0 =A0 =A0periodic_resettodr, NULL); > =A0} > > -SYSINIT(periodic_resettodr, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY - 1, > +SYSINIT(periodic_resettodr, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, > =A0 =A0 =A0 =A0start_periodic_resettodr, NULL); > > Modified: head/sys/sys/sched.h > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/sys/sched.h =A0 =A0 =A0 =A0Thu Sep 30 16:47:01 2010 =A0 =A0 = =A0 =A0(r213304) > +++ head/sys/sys/sched.h =A0 =A0 =A0 =A0Thu Sep 30 17:05:23 2010 =A0 =A0 = =A0 =A0(r213305) > @@ -173,7 +173,7 @@ static void name ## _add_proc(void *dumm > =A0 =A0 =A0 =A0 =A0 =A0#name, CTLTYPE_LONG|CTLFLAG_RD|CTLFLAG_MPSAFE, =A0= =A0 =A0 =A0 =A0 =A0 =A0\ > =A0 =A0 =A0 =A0 =A0 =A0ptr, 0, sysctl_dpcpu_long, "LU", descr); =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > =A0} =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > -SYSINIT(name, SI_SUB_RUN_SCHEDULER, SI_ORDER_ANY, name ## _add_proc, NUL= L); > +SYSINIT(name, SI_SUB_RUN_SCHEDULER, SI_ORDER_MIDDLE, name ## _add_proc, = NULL); > > =A0#define =A0 =A0 =A0 =A0SCHED_STAT_DEFINE(name, descr) =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0\ > =A0 =A0 DPCPU_DEFINE(unsigned long, name); =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 \ >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AANLkTi=03MUdHz2u%2BOz3G3PQqNkCHrB5S1K6zwhs2XMt>