From owner-svn-src-all@FreeBSD.ORG Wed Nov 5 21:00:43 2008 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DCA5D1065759; Wed, 5 Nov 2008 21:00:43 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (bigknife-pt.tunnel.tserv9.chi1.ipv6.he.net [IPv6:2001:470:1f10:75::2]) by mx1.freebsd.org (Postfix) with ESMTP id 261FB8FC14; Wed, 5 Nov 2008 21:00:39 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from localhost.corp.yahoo.com (john@localhost [IPv6:::1]) (authenticated bits=0) by server.baldwin.cx (8.14.3/8.14.3) with ESMTP id mA5L0Le0015327; Wed, 5 Nov 2008 16:00:33 -0500 (EST) (envelope-from jhb@freebsd.org) From: John Baldwin To: David Xu Date: Wed, 5 Nov 2008 10:44:08 -0500 User-Agent: KMail/1.9.7 References: <200810240109.m9O19P1u071214@svn.freebsd.org> <200811041705.48043.jhb@freebsd.org> <4910F8E7.4010805@freebsd.org> In-Reply-To: <4910F8E7.4010805@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200811051044.08650.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [IPv6:::1]); Wed, 05 Nov 2008 16:00:34 -0500 (EST) X-Virus-Scanned: ClamAV 0.93.1/8576/Wed Nov 5 13:28:48 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-2.4 required=4.2 tests=AWL,BAYES_00, DATE_IN_PAST_03_06,NO_RELAYS autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r184217 - head/sys/kern X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 05 Nov 2008 21:00:44 -0000 On Tuesday 04 November 2008 08:37:43 pm David Xu wrote: > John Baldwin wrote: > > On Thursday 23 October 2008 09:09:25 pm David Xu wrote: > >> Author: davidxu > >> Date: Fri Oct 24 01:09:24 2008 > >> New Revision: 184217 > >> URL: http://svn.freebsd.org/changeset/base/184217 > >> > >> Log: > >> Don't rearm callout if the process is exiting, it may leak a callout > >> because callout_drain() only waits for running callout, but not disable > >> it if it is rearmed. > > > > Can you please revert this as per previous discussion? > > > > I will do it, maybe I lost previous discussion ? I thought someone else had followed up to my original e-mail, but here are my comments from when this was first committed: > Log: > Don't rearm callout if the process is exiting, it may leak a callout > because callout_drain() only waits for running callout, but not disable > it if it is rearmed. Actually, it does prevent rearming from within the callout routine itself while waiting: int callout_reset_on(struct callout *c, int to_ticks, void (*ftn)(void *), void *arg, int cpu) { ... if (cc->cc_curr == c) { ... if (cc->cc_waiting) { /* * Someone has called callout_drain to kill this * callout. Don't reschedule. */ CTR4(KTR_CALLOUT, "%s %p func %p arg %p", cancelled ? "cancelled" : "failed to cancel", c, c->c_func, c->c_arg); CC_UNLOCK(cc); return (cancelled); } } ... } Lots of callouts using callout_init_mtx() (e.g. all the callouts in the NIC drivers) depend on this feature. Please revert this. -- John Baldwin