From owner-svn-src-all@FreeBSD.ORG Fri Apr 10 04:15:15 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1780128B; Fri, 10 Apr 2015 04:15:15 +0000 (UTC) Received: from mail-pa0-x22b.google.com (mail-pa0-x22b.google.com [IPv6:2607:f8b0:400e:c03::22b]) (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 D5872EFF; Fri, 10 Apr 2015 04:15:14 +0000 (UTC) Received: by paboj16 with SMTP id oj16so9374820pab.0; Thu, 09 Apr 2015 21:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=NjTq0qfT1WHkiyx8B4CQlRrzEkyEG2QjVeH1HimKdEQ=; b=P4cze7arKuPuv6FoDJQVZxNnl05waa573Ar1Fl5eKj2VnGZXeaQ11k4zKbGpN40o/Z aYk+Dq8nKjfPY9kp1EIJ9H2sF49vxj9GgpVhehT50Khva1uvi2CPV5Pdh85F0aTsNQsx UT9Otxey+Il3ofbDdC14JFlypz1lYS9cPtrspeGDZtf2AWiyfT0xO+Ea0fzV6a9fxXNs ztBV/AuuYaHNHrt+z5XgvJwTdKTWmqESbEUffRWba3BVnCpIUv4ejD1gaF6aNmSFe+iX gaJUkTRQdfeucQBhNdujDrOKueznH48G0Rb0ILKPrcF1Lou/RrIQR9A2/q4/Vlyu6zrx 4VhQ== X-Received: by 10.70.128.36 with SMTP id nl4mr52113750pdb.43.1428639314211; Thu, 09 Apr 2015 21:15:14 -0700 (PDT) Received: from raichu ([104.232.114.184]) by mx.google.com with ESMTPSA id z4sm584269pdo.84.2015.04.09.21.15.12 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 21:15:12 -0700 (PDT) Sender: Mark Johnston Date: Thu, 9 Apr 2015 21:15:07 -0700 From: Mark Johnston To: Randall Stewart Subject: Re: svn commit: r280785 - in head/sys: kern netgraph/atm/sscop netgraph/atm/uni sys Message-ID: <20150410041507.GA12130@raichu> References: <201503281250.t2SCoOkt020297@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201503281250.t2SCoOkt020297@svn.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 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, 10 Apr 2015 04:15:15 -0000 On Sat, Mar 28, 2015 at 12:50:24PM +0000, Randall Stewart wrote: > Author: rrs > Date: Sat Mar 28 12:50:24 2015 > New Revision: 280785 > URL: https://svnweb.freebsd.org/changeset/base/280785 > > Log: > Change the callout to supply -1 to indicate we are not changing > CPU, also add protection against invalid CPU's as well as > split c_flags and c_iflags so that if a user plays with the active > flag (the one expected to be played with by callers in MPSAFE) without > a lock, it won't adversely affect the callout system by causing a corrupt > list. This also means that all callers need to use the macros and *not* > play with the falgs directly (like netgraph used to). > > Differential Revision: htts://reviews.freebsd.org/D1894 > Reviewed by: .. timed out but looked at by jhb, imp, adrian hselasky > tested by hiren and netflix. > Sponsored by: Netflix Inc. > > Modified: > head/sys/kern/kern_timeout.c > head/sys/netgraph/atm/sscop/ng_sscop_cust.h > head/sys/netgraph/atm/uni/ng_uni_cust.h > head/sys/sys/_callout.h > head/sys/sys/callout.h > > Modified: head/sys/kern/kern_timeout.c > ============================================================================== > --- head/sys/kern/kern_timeout.c Sat Mar 28 12:23:15 2015 (r280784) > +++ head/sys/kern/kern_timeout.c Sat Mar 28 12:50:24 2015 (r280785) > [...] > /* > * This flag used to be added by callout_cc_add, but the > * first time you call this we could end up with the > * wrong direct flag if we don't do it before we add. > */ > if (flags & C_DIRECT_EXEC) { > - c->c_flags |= CALLOUT_DIRECT; > + direct = 1; > + } else { > + direct = 0; > } > [...] Hello, With this change, C_DIRECT_EXEC appears to have stopped working. In particular, I don't see any way for the CALLOUT_DIRECT flag to be set anymore. Re-adding the deleted line above with s/c_flags/c_iflags/ fixes the problem for me, but I have not tested it extensively. -Mark