From owner-svn-src-head@freebsd.org Sun Nov 5 13:06:13 2017 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 12EB5E6B85C; Sun, 5 Nov 2017 13:06:13 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 80AE37F304; Sun, 5 Nov 2017 13:06:12 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.15.2/8.15.2) with ESMTPS id vA5D67OM094427 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Sun, 5 Nov 2017 15:06:07 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua vA5D67OM094427 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id vA5D67qP094426; Sun, 5 Nov 2017 15:06:07 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sun, 5 Nov 2017 15:06:07 +0200 From: Konstantin Belousov To: Conrad Meyer Cc: src-committers , svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r325386 - head/sys/kern Message-ID: <20171105130607.GA2566@kib.kiev.ua> References: <201711041049.vA4AnZUE096709@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.1 (2017-09-22) X-Spam-Status: No, score=-2.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FREEMAIL_FROM,NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on tom.home X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 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, 05 Nov 2017 13:06:13 -0000 On Sat, Nov 04, 2017 at 12:04:56PM -0700, Conrad Meyer wrote: > This is a functional change, because MPASS (via KASSERT) is only > enabled on DEBUG kernels. Ideally we would have a kind of ASSERT that > worked on NODEBUG kernels. Why would we need such thing ? Our conventions are clear: consistency checks are normally done with KASSERT() and enabled for DEBUG (INVARIANTS or harder) configurations. We only leave explicit panics in the production kernels when there continuation of operations is worse then abort, e.g. when UFS detects the metadata corruption. The submission perfectly fits into this model. > > Best, > Conrad > > On Sat, Nov 4, 2017 at 3:49 AM, Konstantin Belousov wrote: > > Author: kib > > Date: Sat Nov 4 10:49:34 2017 > > New Revision: 325386 > > URL: https://svnweb.freebsd.org/changeset/base/325386 > > > > Log: > > Convert explicit panic() call to assert. > > > > Based on github pull request: #113 > > Submitted by: pmarillo@github > > MFC after: 1 week > > > > Modified: > > head/sys/kern/kern_umtx.c > > > > Modified: head/sys/kern/kern_umtx.c > > ============================================================================== > > --- head/sys/kern/kern_umtx.c Sat Nov 4 10:10:34 2017 (r325385) > > +++ head/sys/kern/kern_umtx.c Sat Nov 4 10:49:34 2017 (r325386) > > @@ -1579,8 +1579,7 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow > > > > uq_owner = owner->td_umtxq; > > mtx_assert(&umtx_lock, MA_OWNED); > > - if (pi->pi_owner != NULL) > > - panic("pi_owner != NULL"); > > + MPASS(pi->pi_owner == NULL); > > pi->pi_owner = owner; > > TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link); > > } > >