From owner-svn-src-all@freebsd.org  Sun Oct 25 22:17:12 2015
Return-Path: <owner-svn-src-all@freebsd.org>
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 23ABE8D78;
 Sun, 25 Oct 2015 22:17:12 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (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 E2A831601;
 Sun, 25 Oct 2015 22:17:11 +0000 (UTC) (envelope-from zbb@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t9PMHADu011224;
 Sun, 25 Oct 2015 22:17:10 GMT (envelope-from zbb@FreeBSD.org)
Received: (from zbb@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9PMHAeJ011223;
 Sun, 25 Oct 2015 22:17:10 GMT (envelope-from zbb@FreeBSD.org)
Message-Id: <201510252217.t9PMHAeJ011223@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zbb set sender to zbb@FreeBSD.org
 using -f
From: Zbigniew Bodek <zbb@FreeBSD.org>
Date: Sun, 25 Oct 2015 22:17:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r289948 - head/sys/dev/mge
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 25 Oct 2015 22:17:12 -0000

Author: zbb
Date: Sun Oct 25 22:17:10 2015
New Revision: 289948
URL: https://svnweb.freebsd.org/changeset/base/289948

Log:
  Change improper locking assertion in mge
  
  Assertion used here was invalid. If current thread helds any of locks,
  we never want to recurse on them.
  
  Obtained from:  Semihalf
  Submitted by:   Bartosz Szczepanek <bsz@semihalf.com>
  Differential revision: https://reviews.freebsd.org/D3903

Modified:
  head/sys/dev/mge/if_mgevar.h

Modified: head/sys/dev/mge/if_mgevar.h
==============================================================================
--- head/sys/dev/mge/if_mgevar.h	Sun Oct 25 22:14:04 2015	(r289947)
+++ head/sys/dev/mge/if_mgevar.h	Sun Oct 25 22:17:10 2015	(r289948)
@@ -137,10 +137,8 @@ struct mge_softc {
 #define MGE_RECEIVE_LOCK_ASSERT(sc)	mtx_assert(&(sc)->receive_lock, MA_OWNED)
 
 #define MGE_GLOBAL_LOCK(sc) do {						\
-			if ((mtx_owned(&(sc)->transmit_lock) ? 1 : 0) !=	\
-			    (mtx_owned(&(sc)->receive_lock) ? 1 : 0)) {		\
-				panic("mge deadlock possibility detection!");	\
-			}							\
+			mtx_assert(&(sc)->transmit_lock, MA_NOTOWNED);		\
+			mtx_assert(&(sc)->receive_lock, MA_NOTOWNED);		\
 			mtx_lock(&(sc)->transmit_lock);				\
 			mtx_lock(&(sc)->receive_lock);				\
 } while (0)