From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F27AA39D6FA for ; Fri, 10 Jul 2026 20:49:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783716548; cv=none; b=FwvS1C+salPT5chddiidEHBZGhoEDC9HFvfLFis+WgnphVQYeAajOiib2faCb2BPlVLJDXnzkcGvef+beAYucX/Uiz6DI/g8QL5D8DE0yaA86uBdghVZEQwsJ7G1nA29NffekjIwzWy8a4Ch6u5gY7bHhk5QwOY5RYAacdThjco= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783716548; c=relaxed/simple; bh=gC5eUqeAebp3PWfUT6EP2kjPnQImFCyW8H71EpslMQY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=EC8eCZ2N3cgpG8G5sGXJzdojgfDHDc3UifWTQ/XJfssEIdP8KNP0NswAS+G2070JQ1r9FXJYuZpHCbf9OJnX3Wb/jXhvLNFzgkIJNDpcCg/837aQrmW8CA+Q3EDx3Cee8+apKhS3nJDHbBuMmcsllQehcq1KbepPNUm0z5VpX2k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=fonv6uPz; arc=none smtp.client-ip=209.85.160.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="fonv6uPz" Received: by mail-qt1-f181.google.com with SMTP id d75a77b69052e-51c2a76536bso12443101cf.1 for ; Fri, 10 Jul 2026 13:49:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1783716545; x=1784321345; darn=vger.kernel.org; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:from:to:cc:subject :date:message-id:reply-to:content-type; bh=fM3Bw1AZy4lAkPPHaL59OrI7vB0RIP/keCGdI0vS7tk=; b=fonv6uPzbSKpXVdHanWV5yL2JqDJx0BGpTTlatVYw7KbdZpIPvlukInSDvuGJzFPvj 9Rb6nF6N1V592BAcnYZj+KuIQ6SUkNVw5BFkU33l8++hsxVZYpm6N2yINGX4SeQYz5Pm 0uC+wmjY2g/BzoUPQOVBvgQPzF+896+ru9GQ2Bke9PjtSUaYf3ji+w173v1VHl2JDf2D cuZ4xUZCBkOxjsAwjzBGUe8aor3Jv10fASVIo+klHJhyWjemtNaXu9/XAhOtcs6ap+8P tLKZ/vRdwaA27+Rqe3dkWQovqS2cERzk2/CXU2jrO9ebCfwVgJ2tr/qigd8Ad8xNjTbV N9kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783716545; x=1784321345; h=in-reply-to:content-disposition:content-type:mime-version :references:message-id:subject:cc:to:from:date:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=fM3Bw1AZy4lAkPPHaL59OrI7vB0RIP/keCGdI0vS7tk=; b=E1CsORyO+erZdV4FJVZi+AnV8L1zxuwK3NpZf7GfiCtRiwv4yux6PPlljeLOF/Vo3g qGQt8+O9Ov6NHipUzAafbxvojyYgUNwfcBpJYFdJ2fbWYGUUAIJkMMumkIJWdILowmni mn9olzgDdrw4S9dzf5/6sUBVEb2QEXDygGH/KZlOgQ7O59nZonLHqaBYVSOqWaI1jaZy zB8WDxrN7MCH+fDW2jEPVO3uGa4GYS5s/hr7H/7GsJ6D/7tweSrQ8gVniAwrK1CSMuz6 ChZBmAsxw6iW/yxNuWr8OE+3JY4aJu9+H+PuFqjf0yD116FvwYyaX/D5zyFP1XcWoL0T 82UA== X-Forwarded-Encrypted: i=1; AHgh+RoCabkLRasmUZn2LVjRQh+/L3gv1eys9PZksVAVw7EtLK1Z5jrxd+FxMPCPqNrZssuKKvyPjAn4JzRVOlSNagxSnjY=@vger.kernel.org X-Gm-Message-State: AOJu0Yzshn4okg3yVlzL+a5ummSnGjpfqTfCzLN9HUVKshrb3IpyYSt1 PzDj8LCRr3EfBzyYbNm9zLMMyhvb/cXofsM6nXWIy6JteZHatuTblJmBDCCnmRLS6vo= X-Gm-Gg: AfdE7cnFnwFia0FzBsrbNLAvPJiyVjk5m8p1HWOrw9zK0BTHzar6JZ5AbiN94tZpT6q nHa9pR3lWa+nrZ2F2ybweO/8p4+YiotyJW69VfvvB1ftzGQE+SH1A1G8kOS3EhWY7mZHR/ioBs3 46BtI7Sz1GDi2DKh1OIwHDjWSE4r7EPlk7vMf9wzJd3+gIy7BvL56x2btcfRIUUXQPAsysNFVuw LKke6cBIUChGDTPQZwrFB5JR6sXcEFZd6koUSifzFsabqCNczLZ6mT+Hqp46MM7xgcmRTi4mUPG YdwUM81kaKnzB+XhqaFPWf+1MhCKOODYzkwFBJjcR98iN9Jv1R/WWuI4uekJSJdGOKTZ9dabfeG EEfLUQiV/7wgBxPcag8Y6VoQ/QsmpjBRMZJKq2cwyf2J5Q+ggyXnL0GEGQa9CdfYy06qNBR1s0T tyl9YvP9Z3n6T70+MjQtcQOcnRG5N5mYgtiJ0paxXYC5xlZB9H76jN4NDHMJk0Fntob7CN X-Received: by 2002:a05:622a:15c4:b0:51c:7b11:41a3 with SMTP id d75a77b69052e-51cbf361a3bmr5658901cf.80.1783716544856; Fri, 10 Jul 2026 13:49:04 -0700 (PDT) Received: from gourry-fedora-PF4VCD3F (pool-173-79-60-52.washdc.fios.verizon.net. [173.79.60.52]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-51caaf5f61csm24147321cf.22.2026.07.10.13.49.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jul 2026 13:49:04 -0700 (PDT) Date: Fri, 10 Jul 2026 16:48:58 -0400 From: Gregory Price To: Lorenzo Stoakes 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> Precedence: bulk X-Mailing-List: linux-trace-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <432444fa4c12ae1c4047550e2b205d3e9bab458f.1782735110.git.ljs@kernel.org> 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