From owner-freebsd-arch@FreeBSD.ORG  Fri Oct  1 05:55:33 2004
Return-Path: <owner-freebsd-arch@FreeBSD.ORG>
Delivered-To: freebsd-arch@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4795616A4CF
	for <freebsd-arch@freebsd.org>; Fri,  1 Oct 2004 05:55:33 +0000 (GMT)
Received: from duchess.speedfactory.net (duchess.speedfactory.net
	[66.23.201.84])	by mx1.FreeBSD.org (Postfix) with SMTP id D6D2443D5A
	for <freebsd-arch@freebsd.org>; Fri,  1 Oct 2004 05:55:32 +0000 (GMT)
	(envelope-from ups@tree.com)
Received: (qmail 32529 invoked by uid 89); 1 Oct 2004 05:55:31 -0000
Received: from duchess.speedfactory.net (66.23.201.84)
  by duchess.speedfactory.net with SMTP; 1 Oct 2004 05:55:31 -0000
Received: (qmail 32490 invoked by uid 89); 1 Oct 2004 05:55:31 -0000
Received: from unknown (HELO palm.tree.com) (66.23.216.49)
  by duchess.speedfactory.net with SMTP; 1 Oct 2004 05:55:31 -0000
Received: from [127.0.0.1] (localhost.tree.com [127.0.0.1])
	by palm.tree.com (8.12.10/8.12.10) with ESMTP id i915tUmt025109;
	Fri, 1 Oct 2004 01:55:30 -0400 (EDT)
	(envelope-from ups@tree.com)
From: Stephan Uphoff <ups@tree.com>
To: "freebsd-arch@freebsd.org" <freebsd-arch@freebsd.org>
Content-Type: text/plain
Message-Id: <1096610130.21577.219.camel@palm.tree.com>
Mime-Version: 1.0
X-Mailer: Ximian Evolution 1.4.6 
Date: Fri, 01 Oct 2004 01:55:30 -0400
Content-Transfer-Encoding: 7bit
cc: Peter Holm <peter@holm.cc>
cc: Julian Elischer <julian@elischer.org>
Subject: sched_switch (sched_4bsd) may be preempted
X-BeenThere: freebsd-arch@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussion related to FreeBSD architecture
	<freebsd-arch.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-arch>
List-Post: <mailto:freebsd-arch@freebsd.org>
List-Help: <mailto:freebsd-arch-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-arch>,
	<mailto:freebsd-arch-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 01 Oct 2004 05:55:33 -0000

sched_switch (sched_4bsd) may be preempted in setrunqueue or slot_fill.
This could be ugly.
Wrapping it into a critical section and resetting TDP_OWEPREEMPT should
work.

Hand trimmed patch:

RCS file: /cvsroot/src/sys/kern/sched_4bsd.c,v
retrieving revision 1.65
diff -u -r1.65 sched_4bsd.c
--- sys/kern/sched_4bsd.c       16 Sep 2004 07:12:59 -0000      1.65
+++ sys/kern/sched_4bsd.c       1 Oct 2004 05:35:28 -0000
@@ -823,6 +823,7 @@
                TD_SET_CAN_RUN(td);
        else {
                td->td_ksegrp->kg_avail_opennings++;
+               critical_enter();
                if (TD_IS_RUNNING(td)) {
                        /* Put us back on the run queue (kse and all).
*/
                        setrunqueue(td, SRQ_OURSELF|SRQ_YIELDING);
@@ -834,6 +835,8 @@
                         */
                        slot_fill(td->td_ksegrp);
                }
+               critical_exit();
+               td->td_pflags &= ~TDP_OWEPREEMPT;
        }
        if (newtd == NULL)
                newtd = choosethread();