From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 42BCAC43458 for ; Sat, 11 Jul 2026 06:26:55 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7F90510E72D; Sat, 11 Jul 2026 06:26:54 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="cnxr8ph+"; dkim-atps=neutral Received: from tor.source.kernel.org (tor.source.kernel.org [172.105.4.254]) by gabe.freedesktop.org (Postfix) with ESMTPS id CF86D10E2EC; Sat, 11 Jul 2026 06:26:52 +0000 (UTC) Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) by tor.source.kernel.org (Postfix) with ESMTP id ADF21600C3; Sat, 11 Jul 2026 06:26:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8C64C1F000E9; Sat, 11 Jul 2026 06:26:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1783751211; bh=oEOFuhzeieMbnwaju2e0IyYLOOljLY7Vu3oSd3kdBHA=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=cnxr8ph+JvOklROMnVucJQrwHjsALSCj4Ss+aIH/0LX604Xs1T9DH/LiBtq8DJ7CB bbFTc6S7EMzv13aXVNHz37o3w0H8cJVDkv4EEInq5aeJXRMvt824n4tG1k47YNFa8G EEA2Db90wtgvblrtq8KsiTYxReeJpSlF3eZjjkyY3N1viC0WHBwCxq3l1oRlpcYqS7 QgRD0/favy08A6S+5sgaUW5i6AYO6b9zdbFwe0prWZorlAfVWtQE7i8a/bTndcjz/R KrW6QiZSCXk9Ev7/ALIwvBmzcfBLHJNn0n1YTZf1YI9xC0rUFXaw8voXqV1/nPb13z PG0yxvDGEfIrA== Date: Sat, 11 Jul 2026 07:26:27 +0100 From: Lorenzo Stoakes To: Gregory Price Cc: Andrew Morton , Russell King , Dinh Nguyen , Simon Schuster , "James E . J . Bottomley" , Helge Deller , Jarkko Sakkinen , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Ian Abbott , H Hartley Sweeten , Lucas Stach , David Airlie , Simona Vetter , Patrik Jakobsson , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Rob Clark , Dmitry Baryshkov , Tomi Valkeinen , Thierry Reding , Mikko Perttunen , Jonathan Hunter , Christian Koenig , Huang Rui , Ankit Agrawal , Alex Williamson , Alexander Viro , Christian Brauner , Dan Williams , Muchun Song , Oscar Salvador , David Hildenbrand , Suren Baghdasaryan , "Liam R . Howlett" , Matthew Wilcox , Marek Szyprowski , Peter Zijlstra , Arnaldo Carvalho de Melo , Namhyung Kim , Masami Hiramatsu , Oleg Nesterov , Steven Rostedt , SeongJae Park , Miaohe Lin , Hugh Dickins , Mike Rapoport , Kees Cook , Paolo Bonzini , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-parisc@vger.kernel.org, linux-sgx@vger.kernel.org, etnaviv@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-tegra@vger.kernel.org, kvm@vger.kernel.org, linux-fsdevel@vger.kernel.org, nvdimm@lists.linux.dev, linux-mm@kvack.org, iommu@lists.linux.dev, linux-perf-users@vger.kernel.org, linux-trace-kernel@vger.kernel.org, kasan-dev@googlegroups.com, damon@lists.linux.dev, Pedro Falcato , Rik van Riel , Harry Yoo , Jann Horn Subject: Re: [PATCH 30/30] tools/testing/vma: output compared expression on ASSERT_[EQ, NE]() Message-ID: References: <432444fa4c12ae1c4047550e2b205d3e9bab458f.1782735110.git.ljs@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On Fri, Jul 10, 2026 at 04:48:58PM -0400, Gregory Price wrote: > On Mon, Jun 29, 2026 at 01:23:41PM +0100, Lorenzo Stoakes wrote: > > -#define ASSERT_TRUE(_expr) \ > > - do { \ > > - if (!(_expr)) { \ > > - fprintf(stderr, \ > > - "Assert FAILED at %s:%d:%s(): %s is FALSE.\n", \ > > - __FILE__, __LINE__, __FUNCTION__, #_expr); \ > > - return false; \ > > - } \ > > +#define __ASSERT_TRUE(_expr, _fmt, ...) \ > > + do { \ > > + if (!(_expr)) { \ > > + fprintf(stderr, \ > > + "Assert FAILED at %s:%d:%s(): %s is FALSE" \ > > + _fmt ".\n", \ > > + __FILE__, __LINE__, __FUNCTION__, #_expr \ > > + __VA_OPT__(,) __VA_ARGS__); \ > > + return false; \ > > + } \ > > } while (0) > > > > +#define __TO_SCALAR(x) ((unsigned long long)(uintptr_t)(x)) > > + > > +#define ASSERT_TRUE(_expr) __ASSERT_TRUE(_expr, "") > > Mmmmm... macro madness.... I don't think this is what you want. > > I think you end up double-running the expression in the failure branch. > > ASSERT_EQ(cleanup_mm(&mm, &vmi), 2) > > run through the preprocessor expands to: > > do { > if (!( (cleanup_mm(&mm, &vmi)) == (2) )) { > **** first run **** > > fprintf(stderr, > "Assert FAILED at %s:%d:%s(): %s is FALSE" " (0x%llx != 0x%llx)" ".\n", > "merge.c", 645, __FUNCTION__, > "(cleanup_mm(&mm, &vmi)) == (2)", > ((unsigned long long)(uintptr_t)(cleanup_mm(&mm, &vmi))), > **** second run **** > > ((unsigned long long)(uintptr_t)(2))); > return false; > } > } while (0); > > > A bunch of existing ASSERT callers mutate state, so there's no guarantee > the printed value matches teh actual test value. > > I think you want something like: > > #define ASSERT_EQ(_val1, _val2) do { \ > __auto_type _v1 = (_val1); \ > __auto_type _v2 = (_val2); \ > __ASSERT_TRUE(_v1 == _v2, " (0x%llx != 0x%llx)", \ > __TO_SCALAR(_v1), __TO_SCALAR(_v2)); \ > } while (0) > > which expands to: > > do { > __auto_type _v1 = (cleanup_mm(&mm, &vmi)); > __auto_type _v2 = (2); > do { > if (!(_v1 == _v2)) { > fprintf(stderr, "...FALSE (0x%llx != 0x%llx).\n", > "merge.c", 645, __FUNCTION__, "_v1 == _v2", > ((unsigned long long)(uintptr_t)(_v1)), > ((unsigned long long)(uintptr_t)(_v2))); > return false; > } > } while (0); > } while (0); > > ~Gregory It's funny you should mention that... fixed in v2. But ugh sorry that you reviewed this while I was also fixing this up (Claude reported it also), your review's very appreciated :>) Cheers, Lorenzo