From owner-p4-projects@FreeBSD.ORG Fri Mar 14 02:56:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 45F5610656C6; Fri, 14 Mar 2008 02:56:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 048E710656C4 for ; Fri, 14 Mar 2008 02:56:26 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E3FD78FC22 for ; Fri, 14 Mar 2008 02:56:25 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2E2uP8W075020 for ; Fri, 14 Mar 2008 02:56:25 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2E2uPUo075018 for perforce@freebsd.org; Fri, 14 Mar 2008 02:56:25 GMT (envelope-from peter-gmail@wemm.org) Date: Fri, 14 Mar 2008 02:56:25 GMT Message-Id: <200803140256.m2E2uPUo075018@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 137665 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 14 Mar 2008 02:56:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=137665 Change 137665 by peter@peter_overcee on 2008/03/14 02:56:09 Sigh. sched_userret() diverged. Affected files ... .. //depot/projects/bike_sched/sys/kern/sched_4bsd.c#21 edit .. //depot/projects/bike_sched/sys/kern/sched_ule.c#21 edit .. //depot/projects/bike_sched/sys/kern/subr_trap.c#8 edit Differences ... ==== //depot/projects/bike_sched/sys/kern/sched_4bsd.c#21 (text+ko) ==== @@ -1246,7 +1246,6 @@ thread_unlock(td); } -/* XXX removed */ void sched_userret(struct thread *td) { ==== //depot/projects/bike_sched/sys/kern/sched_ule.c#21 (text+ko) ==== @@ -2023,9 +2023,28 @@ thread_unlock(td); } -MISMERGE! -p4 - you suck! /* + * Fix priorities on return to user-space. Priorities may be elevated due + * to static priorities in msleep() or similar. + */ +void +sched_userret(struct thread *td) +{ + /* + * XXX we cheat slightly on the locking here to avoid locking in + * the usual case. Setting td_priority here is essentially an + * incomplete workaround for not setting it properly elsewhere. + * Now that some interrupt handlers are threads, not setting it + * properly elsewhere can clobber it in the window between setting + * it here and returning to user mode, so don't waste time setting + * it perfectly here. + */ + KASSERT((td->td_flags & TDF_BORROWING) == 0, + ("thread with borrowed priority returning to userland")); + if (td->td_priority != td->td_user_pri) { + thread_lock(td); + td->td_priority = td->td_user_pri; + td->td_base_pri = td->td_user_pri; tdq_setlowpri(TDQ_SELF(), td); thread_unlock(td); } ==== //depot/projects/bike_sched/sys/kern/subr_trap.c#8 (text+ko) ==== @@ -124,26 +124,11 @@ */ if (p->p_flag & P_PROFIL) addupc_task(td, TRAPF_PC(frame), td->td_pticks * psratio); + /* - * Fix priorities on return to user-space. Priorities may be elevated due - * to static priorities in msleep() or similar. - * - * XXX we cheat slightly on the locking here to avoid locking in - * the usual case. Setting td_priority here is essentially an - * incomplete workaround for not setting it properly elsewhere. - * Now that some interrupt handlers are threads, not setting it - * properly elsewhere can clobber it in the window between setting - * it here and returning to user mode, so don't waste time setting - * it perfectly here. + * Let the scheduler adjust our priority etc. */ - KASSERT((td->td_flags & TDF_BORROWING) == 0, - ("userret: thread with borrowed priority returning to userland")); - if (td->td_priority != td->td_user_pri) { - thread_lock(td); - td->td_priority = td->td_user_pri; - td->td_base_pri = td->td_user_pri; - thread_unlock(td); - } + sched_userret(td); KASSERT(td->td_locks == 0, ("userret: Returning with %d locks held.", td->td_locks)); }