From owner-svn-src-all@freebsd.org Fri Aug 28 16:29:45 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7D3E39C5931; Fri, 28 Aug 2015 16:29:45 +0000 (UTC) (envelope-from hps@selasky.org) Received: from mail.turbocat.net (mail.turbocat.net [IPv6:2a01:4f8:d16:4514::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1166A1CF7; Fri, 28 Aug 2015 16:29:45 +0000 (UTC) (envelope-from hps@selasky.org) Received: from laptop015.home.selasky.org (cm-176.74.213.204.customer.telag.net [176.74.213.204]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.turbocat.net (Postfix) with ESMTPSA id 2FF6F1FE023; Fri, 28 Aug 2015 18:29:42 +0200 (CEST) Subject: Re: svn commit: r287196 - head/sys/kern To: Julien Charbon , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org References: <201508270815.t7R8FXek029896@repo.freebsd.org> From: Hans Petter Selasky Message-ID: <55E08CCC.6010208@selasky.org> Date: Fri, 28 Aug 2015 18:31:08 +0200 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:38.0) Gecko/20100101 Thunderbird/38.1.0 MIME-Version: 1.0 In-Reply-To: <201508270815.t7R8FXek029896@repo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Fri, 28 Aug 2015 16:29:45 -0000 On 08/27/15 10:15, Julien Charbon wrote: > Author: jch > Date: Thu Aug 27 08:15:32 2015 > New Revision: 287196 > URL: https://svnweb.freebsd.org/changeset/base/287196 > > Log: > In callout_stop(), if a callout is both pending and currently > being serviced return 0 (fail) but it is applicable only > mpsafe callouts. Thanks to hselasky for finding this. > > Differential Revision: https://reviews.freebsd.org/D3078 (Updated) > Submitted by: hselasky > Reviewed by: jch > Hi, I suggest that this special case be made into a new function, named callout_drain_async() inspired from projects/hps_head and that r287196 be backed out, so that callout_stop() works like before. See: https://reviews.freebsd.org/D3521 And that the following patch be MFC'ed to -current from projects/hps_head after D3521. https://svnweb.freebsd.org/changeset/base/287261 It should close the race in question. --HPS