From owner-svn-src-head@FreeBSD.ORG  Thu Jan  6 22:17:08 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 26BAE106564A;
	Thu,  6 Jan 2011 22:17:08 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F02AF8FC15;
	Thu,  6 Jan 2011 22:17:07 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p06MH7if030121;
	Thu, 6 Jan 2011 22:17:07 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p06MH7ff030118;
	Thu, 6 Jan 2011 22:17:07 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201101062217.p06MH7ff030118@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 6 Jan 2011 22:17:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217076 - in head/sys: kern net
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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2011 22:17:08 -0000

Author: jhb
Date: Thu Jan  6 22:17:07 2011
New Revision: 217076
URL: http://svn.freebsd.org/changeset/base/217076

Log:
  - Restore dropping the priority of syncer down to PPAUSE when it is idle.
    This was lost when it was converted to using a condition variable instead
    of lbolt.
  - Drop the priority of flowtable down to PPAUSE when it is idle as well
    since it is a similar background task.
  
  MFC after:	2 weeks

Modified:
  head/sys/kern/vfs_subr.c
  head/sys/net/flowtable.c

Modified: head/sys/kern/vfs_subr.c
==============================================================================
--- head/sys/kern/vfs_subr.c	Thu Jan  6 22:09:37 2011	(r217075)
+++ head/sys/kern/vfs_subr.c	Thu Jan  6 22:17:07 2011	(r217076)
@@ -65,6 +65,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/namei.h>
 #include <sys/priv.h>
 #include <sys/reboot.h>
+#include <sys/sched.h>
 #include <sys/sleepqueue.h>
 #include <sys/stat.h>
 #include <sys/sysctl.h>
@@ -1880,6 +1881,12 @@ sched_sync(void)
 		 * matter as we are just trying to generally pace the
 		 * filesystem activity.
 		 */
+		if (syncer_state != SYNCER_RUNNING ||
+		    time_uptime == starttime) {
+			thread_lock(td);
+			sched_prio(td, PPAUSE);
+			thread_unlock(td);
+		}
 		if (syncer_state != SYNCER_RUNNING)
 			cv_timedwait(&sync_wakeup, &sync_mtx,
 			    hz / SYNCER_SHUTDOWN_SPEEDUP);

Modified: head/sys/net/flowtable.c
==============================================================================
--- head/sys/net/flowtable.c	Thu Jan  6 22:09:37 2011	(r217075)
+++ head/sys/net/flowtable.c	Thu Jan  6 22:17:07 2011	(r217076)
@@ -1549,9 +1549,11 @@ static void
 flowtable_cleaner(void)
 {
 	VNET_ITERATOR_DECL(vnet_iter);
+	struct thread *td;
 
 	if (bootverbose)
 		log(LOG_INFO, "flowtable cleaner started\n");
+	td = curthread;
 	while (1) {
 		VNET_LIST_RLOCK();
 		VNET_FOREACH(vnet_iter) {
@@ -1566,6 +1568,9 @@ flowtable_cleaner(void)
 		 * is arbitrary
 		 */
 		mtx_lock(&flowclean_lock);
+		thread_lock(td);
+		sched_prio(td, PPAUSE);
+		thread_unlock(td);
 		flowclean_cycles++;
 		cv_broadcast(&flowclean_f_cv);
 		cv_timedwait(&flowclean_c_cv, &flowclean_lock, flowclean_freq);