From owner-freebsd-current@FreeBSD.ORG  Thu Nov 13 18:56:33 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 DF1D4D78
 for <freebsd-current@freebsd.org>; Thu, 13 Nov 2014 18:56:33 +0000 (UTC)
Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1])
 (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 53405697
 for <freebsd-current@freebsd.org>; Thu, 13 Nov 2014 18:56:33 +0000 (UTC)
Received: from tom.home (kostik@localhost [127.0.0.1])
 by kib.kiev.ua (8.14.9/8.14.9) with ESMTP id sADIuQvM024096
 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);
 Thu, 13 Nov 2014 20:56:26 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
DKIM-Filter: OpenDKIM Filter v2.9.2 kib.kiev.ua sADIuQvM024096
Received: (from kostik@localhost)
 by tom.home (8.14.9/8.14.9/Submit) id sADIuQ8V024095;
 Thu, 13 Nov 2014 20:56:26 +0200 (EET)
 (envelope-from kostikbel@gmail.com)
X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com
 using -f
Date: Thu, 13 Nov 2014 20:56:26 +0200
From: Konstantin Belousov <kostikbel@gmail.com>
To: Eric van Gyzen <eric@vangyzen.net>
Subject: Re: [patch] Wrong assertion in kern_umtx.c
Message-ID: <20141113185626.GB17068@kib.kiev.ua>
References: <5464ECDC.1080002@vangyzen.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <5464ECDC.1080002@vangyzen.net>
User-Agent: Mutt/1.5.23 (2014-03-12)
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.0
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on tom.home
Cc: FreeBSD current <freebsd-current@freebsd.org>
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 18:56:34 -0000

On Thu, Nov 13, 2014 at 12:39:40PM -0500, Eric van Gyzen wrote:
> 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,
> 
Yes, I tested it, thanks for the submission.

I committed r274478, and I decided to remove macro used in single place,
at all.  There is one more place, which I added several weeks ago, but
I really do not see much point in using the macro, it obfuscates the code.