From owner-svn-src-head@freebsd.org Sun Jul 31 00:46:15 2016 Return-Path: Delivered-To: svn-src-head@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 0BD2BBA2D77; Sun, 31 Jul 2016 00:46:15 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: from mail-wm0-x22f.google.com (mail-wm0-x22f.google.com [IPv6:2a00:1450:400c:c09::22f]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 941261356; Sun, 31 Jul 2016 00:46:14 +0000 (UTC) (envelope-from mjguzik@gmail.com) Received: by mail-wm0-x22f.google.com with SMTP id i5so197613861wmg.0; Sat, 30 Jul 2016 17:46:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=sOrtbxNvx/08av28Hu8dds6ecvEzx4GBtA9Z0viP2LQ=; b=DEKrAeUEaO86did0tYa7SypJ7CG9wsttshyTXkh0SeMV8mk31M5g1ydY0zPK3/hEva eS2Pa6+hWKCTPiR3Hn+8ryHwzvx5+y5iaqlNm09vfiAs42xNzji7+p/mAs/IrBza7uVT 4ukSptcOL5ilAZUqh9vTI9g5EOGSBVQpPZt32XpA4FigIddg+rSIEX4p+RIBxQxMYxcS H6gu7bRhmNjn9CEdAlqrQsDUcPtVpHscUmclWRhxPNlUaMHf2RNzvfIYnfpLQyMXujv0 Rd+aYpxRblBbIrEtqKb/IGcBBaO/wf4a4FQCkcNQCpuzjfRqjNiMKDnjag6UX5SP2/0x AHLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=sOrtbxNvx/08av28Hu8dds6ecvEzx4GBtA9Z0viP2LQ=; b=WS42dr5vVvivX0ZkB1FMBgIwPgKPyIg+H7dmv/Cogb9Xos7QrRD+l8sWG5AN5dMi3D vgEtKHXNEv8xtb+eJtmFEf2rdvmg1ZdFLFCTpfQMQS3kyflavNeJ3MQl6rQWFE+97gEC iWz1GgxVHj5PVs7qWS1pntRvMDLI6yF9ooXroUpIH6/EaFurXDKQZJOXbMvg7O2F3LqD OFxGceeFbamQQh6IXbH9IoNvHc1RaY0bzlwAGG3VZ8rtql8M8R+ggey8ed2cCYl90wax GRyJ/ttnx2VUcpKu1cpMo219P2/ItiAFXgikhK9aNPJ0HxH/hr4XxmtHgZCQLfSwSpzm ZlOQ== X-Gm-Message-State: AEkooutd3Dn60DUdIRgMyyRqbDOjJGpEkh0CBoH1HvFRyd4Hg5SGYKpKAKMTFEPsAGm9tQ== X-Received: by 10.28.14.68 with SMTP id 65mr48710469wmo.68.1469925972357; Sat, 30 Jul 2016 17:46:12 -0700 (PDT) Received: from dft-labs.eu (n1x0n-1-pt.tunnel.tserv5.lon1.ipv6.he.net. [2001:470:1f08:1f7::2]) by smtp.gmail.com with ESMTPSA id p23sm9892465wme.8.2016.07.30.17.46.11 (version=TLS1_2 cipher=AES128-SHA bits=128/128); Sat, 30 Jul 2016 17:46:11 -0700 (PDT) Date: Sun, 31 Jul 2016 02:46:09 +0200 From: Mateusz Guzik To: Conrad Meyer Cc: Mateusz Guzik , src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r303563 - head/sys/kern Message-ID: <20160731004609.GA9408@dft-labs.eu> References: <201607302223.u6UMNWD7037665@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 00:46:15 -0000 On Sat, Jul 30, 2016 at 05:44:16PM -0700, Conrad Meyer wrote: > On Sat, Jul 30, 2016 at 3:23 PM, Mateusz Guzik wrote: > > Author: mjg > > Date: Sat Jul 30 22:23:31 2016 > > New Revision: 303563 > > URL: https://svnweb.freebsd.org/changeset/base/303563 > > > > Log: > > sx: increment spin_cnt before cpu_spinwait in xlock > > Looks like it's after cpu_spinwait instead. > Brainfarted the commit message. The actual order as seen is the patch is what's seen in the file. > > > > The change is a no-op only done for consistency with the rest of the file. > > > > Modified: > > head/sys/kern/kern_sx.c > > > > Modified: head/sys/kern/kern_sx.c > > ============================================================================== > > --- head/sys/kern/kern_sx.c Sat Jul 30 22:21:48 2016 (r303562) > > +++ head/sys/kern/kern_sx.c Sat Jul 30 22:23:31 2016 (r303563) > > @@ -889,10 +889,10 @@ _sx_slock_hard(struct sx *sx, int opts, > > GIANT_SAVE(); > > while (SX_OWNER(sx->sx_lock) == x && > > TD_IS_RUNNING(owner)) { > > + cpu_spinwait(); > > #ifdef KDTRACE_HOOKS > > spin_cnt++; > > #endif > > - cpu_spinwait(); > > } > > KTR_STATE0(KTR_SCHED, "thread", > > sched_tdname(curthread), "running"); > > -- Mateusz Guzik