From owner-freebsd-current@FreeBSD.ORG  Thu Nov 13 17:39:49 2014
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@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 E07A0A72;
 Thu, 13 Nov 2014 17:39:49 +0000 (UTC)
Received: from smtp.vangyzen.net (hotblack.vangyzen.net [199.48.133.146])
 by mx1.freebsd.org (Postfix) with ESMTP id C6962BCA;
 Thu, 13 Nov 2014 17:39:49 +0000 (UTC)
Received: from marvin.lab.vangyzen.net (c-24-125-214-90.hsd1.va.comcast.net
 [24.125.214.90])
 by smtp.vangyzen.net (Postfix) with ESMTPSA id E587856467;
 Thu, 13 Nov 2014 11:39:41 -0600 (CST)
Message-ID: <5464ECDC.1080002@vangyzen.net>
Date: Thu, 13 Nov 2014 12:39:40 -0500
From: Eric van Gyzen <eric@vangyzen.net>
User-Agent: Mozilla/5.0 (X11; FreeBSD amd64;
 rv:31.0) Gecko/20100101 Thunderbird/31.0
MIME-Version: 1.0
To: FreeBSD current <freebsd-current@freebsd.org>, kib@freebsd.org
Subject: [patch] Wrong assertion in kern_umtx.c
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 7bit
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 13 Nov 2014 17:39:50 -0000

There is a [practically] tautological assertion in kern_umtx.c.  I have
not even compile-tested the following patch.  I'll test it when I have
time.  I'd be grateful if someone beats me to it.

Eric


diff --git a/sys/kern/kern_umtx.c b/sys/kern/kern_umtx.c
index 33fdf71..c6b42c0 100644
--- a/sys/kern/kern_umtx.c
+++ b/sys/kern/kern_umtx.c
@@ -169,7 +169,7 @@ struct umtxq_chain {
 };
 
 #define        UMTXQ_LOCKED_ASSERT(uc)        
mtx_assert(&(uc)->uc_lock, MA_OWNED)
-#define        UMTXQ_BUSY_ASSERT(uc)   KASSERT(&(uc)->uc_busy, ("umtx
chain is not busy"))
+#define        UMTXQ_BUSY_ASSERT(uc)   KASSERT((uc)->uc_busy, ("umtx
chain is not busy"))
 
 /*
  * Don't propagate time-sharing priority, there is a security reason,