From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (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 E27BC3537D0 for ; Fri, 10 Jul 2026 20:49:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783716547; cv=none; b=AHCa7DvKZFbSlPp73ucP3+FFgpKzYzJd78pxbR79z8efjMhs5qFnmr9NNTH8Wdt0JQ2G0HpyFvcdYbUVQ+JWbnpioy8ibMmUbEhy3oTb0Vt6OKqpUyJYctQF79fFBg1mhgJsvJUOWTCf1t8ioA0Uclk5LS8oEJUX4kCdh5kRKLU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783716547; c=relaxed/simple; bh=gC5eUqeAebp3PWfUT6EP2kjPnQImFCyW8H71EpslMQY=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=iN2nunwZglLRmeww0QKaNdYNWaSAQDxCLLRmU5bmf5u8ZvG1wYtCDte6YACpMncfPDdwCA95/N/b3jqKPXJ/9gazeoz+n998X04Fd4/i/l068mIbNcFiNfT54SPOYkPikmP4qbBLf8UBUCpsV+HZXAGzMquLGSv6LzR//kATMGI= 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.169 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-f169.google.com with SMTP id d75a77b69052e-517dc520840so9180771cf.3 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=nJH/J2E0aek6fb4FrHmuDtfKk1e8losiqeG0qLjTyQEZJ+8PhrhiySD/R+Aftss96g qOCZlP3LjFvG2ZTi/eT4+kv3yb7Y/jhFZAhrPu072yp+6U4uk7MOnHfBrJZvG1iCFMWd AEbOFXdiz6+RtnJagPtwRpDE3MHq01TwnqaFaMPAcAM+bM6fcnJAsqsGG2E7a7EgfNfq g/RbEFgXey2Zbkf6jIEy+k/YyVizNvrzA0WU1Kl9RcslxWib0W5a2cYKo6P0K9gWKmDA y16Nf58WMrdysnTLlEohAdVnk8iGagXRvtDFwf1JwCA2lVa9Cbgzlm6rGjBxtHQvza78 /OgA== X-Forwarded-Encrypted: i=1; AHgh+RoEtXyF6E5/jXE+qyuGSLy4jH9urnWWCXlYEqFWlQk37RlCI+So4f7VOqMWKDjMSpn+3jA=@vger.kernel.org X-Gm-Message-State: AOJu0YxswCtY49Q7e5neQ6uFoNBPDwuT3aYHaBavZareqnZkczxP41lb D24hKxXD3L9AM8rNs/3MaYRtbEv166VKnIMwCbPB/KeyZvPerHC5YaD36k6oFznrg8U= X-Gm-Gg: AfdE7cn2gwVoGjAtTqkgO5e7DNp9mMdUPtWnc1G9qTU8AH9BUd7JOlaHJIKUBb3etNZ pXP5scOCf7tQHXFpjnJ9XPXyXy76iaS/eHDmh+rakVeSYKN1ZKkcXg7jQ43jF8FV52Weq8Pe1ua AlpR/QJB13UnpQBnko72iJywL4px41fvjeiGMrrkkiqJKISad7KJwxchYjqJVvB4k64iorfY3Ji IroRG3rXacvGV213GFpROd9KZ1rSbduJ0yhWjBOYAmtu8xbvUltbOCiL6wWCkm+Z72DiTn41Xgi yM1RrJ7Xcv6UbMcSB+RGnssv/pj9J6cHqI16EPos8exv83mPKZGqlXWK9qdAtdGJ49R85xN73rX KsnU+47ISJsEDOej2LHvL25Gaqg0WmjUd6e3t8PolE+wCWmv4Bk29knMN+r+eLD5NHJObf3kJDT wO3PNCwjAdWEZq+fRWNsgyfeaJJpeZbrysMNj3L1CIXe9RqXczTm8YseASuDwiB9F8EbQT 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: kvm@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