From owner-svn-src-stable-11@freebsd.org Sat Sep 3 08:44:25 2016 Return-Path: Delivered-To: svn-src-stable-11@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 479AFBCD33F; Sat, 3 Sep 2016 08:44:25 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BBF892FA9; Sat, 3 Sep 2016 08:44:24 +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 u838iI6g025951 (version=TLSv1 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Sat, 3 Sep 2016 11:44:18 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua u838iI6g025951 Received: (from kostik@localhost) by tom.home (8.15.2/8.15.2/Submit) id u838iIkQ025950; Sat, 3 Sep 2016 11:44:18 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 3 Sep 2016 11:44:18 +0300 From: Konstantin Belousov To: Oleksandr Tymoshenko Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: Re: svn commit: r305308 - stable/11/sys/arm/ti Message-ID: <20160903084418.GU83214@kib.kiev.ua> References: <201609022204.u82M4KOm025953@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201609022204.u82M4KOm025953@repo.freebsd.org> User-Agent: Mutt/1.6.1 (2016-04-27) 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-stable-11@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Sep 2016 08:44:25 -0000 On Fri, Sep 02, 2016 at 10:04:20PM +0000, Oleksandr Tymoshenko wrote: > Author: gonzo > Date: Fri Sep 2 22:04:20 2016 > New Revision: 305308 > URL: https://svnweb.freebsd.org/changeset/base/305308 > > Log: > MFC r305039: > > Fix TI PRUSS driver panic with INVARIANTS enabled > > Value passed as islocked argument to knlist_add should > be consistent with actual lock state so add lock/unlock > calls around knlist_add > > PR: 212120 > Submitted by: Manuel Stuhn > > Modified: > stable/11/sys/arm/ti/ti_pruss.c > Directory Properties: > stable/11/ (props changed) > > Modified: stable/11/sys/arm/ti/ti_pruss.c > ============================================================================== > --- stable/11/sys/arm/ti/ti_pruss.c Fri Sep 2 21:35:32 2016 (r305307) > +++ stable/11/sys/arm/ti/ti_pruss.c Fri Sep 2 22:04:20 2016 (r305308) > @@ -310,7 +310,9 @@ ti_pruss_kqfilter(struct cdev *cdev, str > case EVFILT_READ: > kn->kn_hook = sc; > kn->kn_fop = &ti_pruss_kq_read; > + mtx_lock(&sc->sc_mtx); > knlist_add(&sc->sc_selinfo.si_note, kn, 1); > + mtx_unlock(&sc->sc_mtx); > break; > default: > return (EINVAL); Wouldn't it be less code to just change the arg to indicate 'unlocked' ?