From owner-freebsd-arch@FreeBSD.ORG Mon Jul 29 18:36:27 2013 Return-Path: Delivered-To: freebsd-arch@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id AA4ADBD1 for ; Mon, 29 Jul 2013 18:36:27 +0000 (UTC) (envelope-from avg@FreeBSD.org) Received: from citadel.icyb.net.ua (citadel.icyb.net.ua [212.40.38.140]) by mx1.freebsd.org (Postfix) with ESMTP id D614927CF for ; Mon, 29 Jul 2013 18:36:26 +0000 (UTC) Received: from porto.starpoint.kiev.ua (porto-e.starpoint.kiev.ua [212.40.38.100]) by citadel.icyb.net.ua (8.8.8p3/ICyb-2.3exp) with ESMTP id VAA08937; Mon, 29 Jul 2013 21:36:24 +0300 (EEST) (envelope-from avg@FreeBSD.org) Received: from localhost ([127.0.0.1]) by porto.starpoint.kiev.ua with esmtp (Exim 4.34 (FreeBSD)) id 1V3sIy-0007NI-44; Mon, 29 Jul 2013 21:36:24 +0300 Message-ID: <51F6B5EF.5020407@FreeBSD.org> Date: Mon, 29 Jul 2013 21:35:27 +0300 From: Andriy Gapon User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:17.0) Gecko/20130708 Thunderbird/17.0.7 MIME-Version: 1.0 To: Steven Hartland Subject: Re: translate INVARIANTS to DEBUG for code from OpenSolaris References: <51F67B2A.3040302@FreeBSD.org> <69CEF0CC3C8C4B9BBA8E3ACACB18DC2B@multiplay.co.uk> In-Reply-To: <69CEF0CC3C8C4B9BBA8E3ACACB18DC2B@multiplay.co.uk> X-Enigmail-Version: 1.5.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-arch@FreeBSD.org X-BeenThere: freebsd-arch@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion related to FreeBSD architecture List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 29 Jul 2013 18:36:27 -0000 on 29/07/2013 21:25 Steven Hartland said the following: > ----- Original Message ----- From: "Andriy Gapon" > >> [zfs-devel@, fs@, dtrace@ are Bcc-ed] >> >> In OpenSolaris and its descendants DEBUG is used in a fashion similar to our >> INVARIANTS. For example, ASSERT macros are enabled by it. >> In our kernel code DEBUG has a different meaning and enables far too verbose or >> far too obscure code and, as such, it is very rarely enabled. >> >> The idea of a change that I would like to propose is to translate INVARIANTS >> kernel option into DEBUG for the files that originated from OpenSolaris (and >> hopefully only for them). >> >> The change: >> opensolaris code: translate INVARIANTS to DEBUG and ZFS_DEBUG >> >> do this by forcing inclusion of >> sys/cddl/compat/opensolaris/sys/debug_compat.h >> via -include option into all source files from OpenSolaris. >> Note that this -include option must always be after -include opt_global.h. >> >> Additionally, remove forced definition of DEBUG for some modules and fix >> their build without DEBUG. >> >> Also, meaning of DEBUG was overloaded to enable WITNESS support for some >> OpenSolaris (primarily ZFS) locks. Now this overloading is removed and >> that use of DEBUG is replaced with a new option OPENSOLARIS_WITNESS. >> >> http://people.freebsd.org/~avg/osol-invariants-debug.diff >> >> I would like to ask for your feedback on the soundness of the whole idea. >> Also on the name, location and style of inclusion for >> sys/cddl/compat/opensolaris/sys/debug_compat.h. >> And on any other details of the proposed change. >> >> Testing is also welcome, of course. >> >> Thank you very much. > > I'm not sure you need #define ZFS_DEBUG as its already a dependency on > DEBUG see: > sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h Good point. Thank you. > Should this connection be broken and INVARIANTS only trigger DEBUG by > default? One potential reason for this distinction is that ZFS_DEBUG brings > with it some potentially quite heavy weight validation such as dnode_verify. > > If so I have small list of additional fixes here that where required when > I tested enabling ASSERTS checking without ZFS_DEBUG. > > What do others think, should INVARIANTS trigger ZFS_DEBUG or should that > be kept seperate? I would prefer to follow what upstream does in this respect. If DEBUG implies ZFS_DEBUG upstream, then I think that we should do the same for INVARIANTS -> DEBUG -> ZFS_DEBUG. Unless there are strong reasons to do otherwise. -- Andriy Gapon