From owner-svn-src-head@FreeBSD.ORG Thu Sep 30 17:18:45 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 381A810656A9; Thu, 30 Sep 2010 17:18:45 +0000 (UTC) (envelope-from mdf356@gmail.com) Received: from mail-iw0-f182.google.com (mail-iw0-f182.google.com [209.85.214.182]) by mx1.freebsd.org (Postfix) with ESMTP id C8F1E8FC1A; Thu, 30 Sep 2010 17:18:39 +0000 (UTC) Received: by iwn34 with SMTP id 34so3306298iwn.13 for ; Thu, 30 Sep 2010 10:18:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:sender:received :in-reply-to:references:date:x-google-sender-auth:message-id:subject :from:to:cc:content-type:content-transfer-encoding; bh=qZ9oLxZJIpWWm6SzKkPnt9l2M5VAiRWgY88MorlzW0M=; b=BGZ8Iek94xCxAlTv6E+yaaGcm/AZqCteqqh+xxJLC56PuH1A/Bq6Bpw1ZMSqVbCase Q0ehebUn9rrmMaPrJToeBTC0sk+C+NXh0DGW8H16nDNr0vnahGjRpdavjzF/IQj223l4 iQqiip3TB3qr2lYIpk+CX3STSFPo4tdold75k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:sender:in-reply-to:references:date :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; b=pQykhtqhmzv3JN5rI1qbUrCbPk67FS0r6v+DRP39c1F5JMQDn0WGDX+Ye7D7bBhRQt Vmo9DMNlQL9QOKv7Y/pXlrrOpxv11uB4mwBfFK53oQYuWQCCxM6c/i4B9ZS1ckeauWTy c6hQDCZY5IuKwB5GXRUN4WiQw7prSrKxDM5W4= MIME-Version: 1.0 Received: by 10.231.170.208 with SMTP id e16mr4091295ibz.44.1285867113339; Thu, 30 Sep 2010 10:18:33 -0700 (PDT) Sender: mdf356@gmail.com Received: by 10.231.167.140 with HTTP; Thu, 30 Sep 2010 10:18:33 -0700 (PDT) In-Reply-To: <201009301705.o8UH5Nmm075714@svn.freebsd.org> References: <201009301705.o8UH5Nmm075714@svn.freebsd.org> Date: Thu, 30 Sep 2010 10:18:33 -0700 X-Google-Sender-Auth: U1UCLUz8PEW4KqUr9DkrKb5RQhQ Message-ID: From: mdf@FreeBSD.org To: Andriy Gapon Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable 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 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Sep 2010 17:18:45 -0000 On Thu, Sep 30, 2010 at 10:05 AM, Andriy Gapon 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 \ >