From owner-svn-src-stable-10@freebsd.org Sat Mar 4 16:11:15 2017 Return-Path: Delivered-To: svn-src-stable-10@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 2F1EACF3767; Sat, 4 Mar 2017 16:11:15 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from vps1.elischer.org (vps1.elischer.org [204.109.63.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "vps1.elischer.org", Issuer "CA Cert Signing Authority" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id ED20A1CF2; Sat, 4 Mar 2017 16:11:14 +0000 (UTC) (envelope-from julian@freebsd.org) Received: from Julian-MBP3.local (106-68-109-205.dyn.iinet.net.au [106.68.109.205]) (authenticated bits=0) by vps1.elischer.org (8.15.2/8.15.2) with ESMTPSA id v24GAx5d037861 (version=TLSv1.2 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sat, 4 Mar 2017 08:11:06 -0800 (PST) (envelope-from julian@freebsd.org) Subject: Re: svn commit: r314667 - in stable/10/sys: amd64/amd64 cddl/contrib/opensolaris/uts/common/dtrace cddl/contrib/opensolaris/uts/common/fs/zfs cddl/dev/profile compat/ndis contrib/ipfilter/netinet dev/a... To: Andriy Gapon , src-committers@FreeBSD.org, svn-src-all@FreeBSD.org, svn-src-stable@FreeBSD.org, svn-src-stable-10@FreeBSD.org References: <201703041303.v24D3Vfi072728@repo.freebsd.org> <1292f504-21e4-1bee-3dd6-6205252bfd26@freebsd.org> <47d091e5-6efe-5992-f09c-8c231f2da349@FreeBSD.org> From: Julian Elischer Message-ID: <0c863f1d-4039-3698-e1f7-e9aea5d190ee@freebsd.org> Date: Sun, 5 Mar 2017 00:10:52 +0800 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:45.0) Gecko/20100101 Thunderbird/45.7.1 MIME-Version: 1.0 In-Reply-To: <47d091e5-6efe-5992-f09c-8c231f2da349@FreeBSD.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Mar 2017 16:11:15 -0000 On 5/3/17 12:02 am, Andriy Gapon wrote: > On 04/03/2017 17:30, Julian Elischer wrote: >> On 4/3/17 9:03 pm, Andriy Gapon wrote: >>> Author: avg >>> Date: Sat Mar 4 13:03:31 2017 >>> New Revision: 314667 >>> URL: https://svnweb.freebsd.org/changeset/base/314667 >>> >>> Log: >>> MFC r283291: don't use CALLOUT_MPSAFE with callout_init() >>> The main purpose of this MFC is to reduce conflicts for other merges. >>> Parts of the original change have already "trickled down" via individual MFCs. >> is there a better name than ''1" when you replace " CALLOUT_MPSAFE"? > Maybe 'true'. The argument has type int and it is documented this way: > > If the mpsafe argument is zero, the callout structure > is not considered to be “multi-processor safe”; and the Giant lock will > be acquired before calling the callout function and released when the > callout function returns. then I disagree with the change. I think CALLOUT_MPSAFE is a better value than '1'. or CALLOUT_IS_MPSAFE. I'm sort of confused by why 283291 made that change. It seems a regression to me. MFC-ing it is a different question and 'diff reduction' is a valid reason but the original change in head seems suspect. >>> - callout_init(&watchdog_callout, CALLOUT_MPSAFE); >>> + callout_init(&watchdog_callout, 1); >>> if (watchdog_cpu != -1) >>> watchdog_change(watchdog_cpu); > >