From owner-svn-src-all@freebsd.org Tue Oct 4 20:56:01 2016 Return-Path: Delivered-To: svn-src-all@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 BBBCBAF54AE; Tue, 4 Oct 2016 20:56:01 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (glebi.us [96.95.210.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id A35CC140; Tue, 4 Oct 2016 20:56:01 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id u94Ku0Qg015720 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 4 Oct 2016 13:56:00 -0700 (PDT) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id u94Ku0LH015719; Tue, 4 Oct 2016 13:56:00 -0700 (PDT) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@FreeBSD.org using -f Date: Tue, 4 Oct 2016 13:56:00 -0700 From: Gleb Smirnoff To: Eric van Gyzen Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r306346 - head/sys/kern Message-ID: <20161004205600.GN23123@FreeBSD.org> References: <201609261530.u8QFUUZd020174@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201609261530.u8QFUUZd020174@repo.freebsd.org> User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 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: Tue, 04 Oct 2016 20:56:01 -0000 Eric, On Mon, Sep 26, 2016 at 03:30:30PM +0000, Eric van Gyzen wrote: E> Author: vangyzen E> Date: Mon Sep 26 15:30:30 2016 E> New Revision: 306346 E> URL: https://svnweb.freebsd.org/changeset/base/306346 E> E> Log: E> Make no assertions about mutex state when the scheduler is stopped. E> E> This changes the assert path to match the lock and unlock paths. E> E> MFC after: 1 week E> Sponsored by: Dell EMC E> E> Modified: E> head/sys/kern/kern_mutex.c E> E> Modified: head/sys/kern/kern_mutex.c E> ============================================================================== E> --- head/sys/kern/kern_mutex.c Mon Sep 26 15:03:31 2016 (r306345) E> +++ head/sys/kern/kern_mutex.c Mon Sep 26 15:30:30 2016 (r306346) E> @@ -924,7 +924,7 @@ __mtx_assert(const volatile uintptr_t *c E> { E> const struct mtx *m; E> E> - if (panicstr != NULL || dumping) E> + if (panicstr != NULL || dumping || SCHEDULER_STOPPED()) E> return; I wonder if all this disjunct can be reduced just to SCHEDULER_STOPPED()? Positive panicstr and dumping imply scheduler stopped. -- Totus tuus, Glebius.