From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7CF0D33C502; Sat, 28 Feb 2026 04:30:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772253010; cv=none; b=m462VCxZ+e2KTSGfN4uWd5rp1nzv6rEFl8wKVbwJFtRDJFRUDYetZiS7PB3waZSQdpLeRVvkbJEyJS+lUuqrrP+udfvt+qRd6whJXV0qq0QvurFIpB06aHxc+vamsiHeQbnItIinCXJBWQVqGwRaBrtvTQd7hPhHWRukJcj8ZEc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772253010; c=relaxed/simple; bh=NxIyVYtgLysk+spkHOyEoka9HT1s3BaoNbqWwqQmPXE=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=HUvS67CHw80Mks59p1LuE/sx/g2hqWl4+f9JjCWSRaD0v6Wp9z/DKnKG0n6SQwCe3gu+uZymT4yM1GIxLPPDaZ0cPRXjKUOL9gdctunNNIec/fgxGLRckRXEI4xVd9/m30MRd2wYNRcuOGt3rEJvTPIhCL6KXO154j0dHWXiUrQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Fyh0YCjc; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Fyh0YCjc" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 198B3C116D0; Sat, 28 Feb 2026 04:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772253010; bh=NxIyVYtgLysk+spkHOyEoka9HT1s3BaoNbqWwqQmPXE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Fyh0YCjcPmsVmzz5h+F1Yy8gWejjphUUrGeKnqhIxGQ+qjYtEztmeP1kaQL7ddsRN jdkA6zr3qARSLzOxvszanCJtbGe6MxgPdM+Z6+dhb7aZQXTNmMRzbGAktPG2fY5fUl TBJYgxI6xb9qhwF67ngcAYU9OKtc/uqzcX+3yEYAKMVGlX0rGBTQLNzUCfh3Qw8tog 0VEAgqbQJ3xpTSjCyP3w5YgI628hkJaD1By1DZb0TabsJZRA6BOO4+elbK3T8jYutF xqGj5SaKcx64Foh0YOFWYjXkw2x5ciOjaB0TEjg5I3513gVMPITkGZ7CF1NbrQ8JTi 72nJ1I+TSmVTQ== Date: Fri, 27 Feb 2026 20:30:06 -0800 From: Eric Biggers To: Christoph Hellwig Cc: Andrew Morton , Richard Henderson , Matt Turner , Magnus Lindholm , Russell King , Catalin Marinas , Will Deacon , Huacai Chen , WANG Xuerui , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "David S. Miller" , Andreas Larsson , Richard Weinberger , Anton Ivanov , Johannes Berg , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Herbert Xu , Dan Williams , Chris Mason , David Sterba , Arnd Bergmann , Song Liu , Yu Kuai , Li Nan , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-crypto@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-arch@vger.kernel.org, linux-raid@vger.kernel.org Subject: Re: [PATCH 03/25] um/xor: don't override XOR_SELECT_TEMPLATE Message-ID: <20260228043006.GA65277@quark> References: <20260226151106.144735-1-hch@lst.de> <20260226151106.144735-4-hch@lst.de> Precedence: bulk X-Mailing-List: linux-btrfs@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: <20260226151106.144735-4-hch@lst.de> On Thu, Feb 26, 2026 at 07:10:15AM -0800, Christoph Hellwig wrote: > XOR_SELECT_TEMPLATE is only ever called with a NULL argument, so all the > ifdef'ery doesn't do anything. With our without this, the time travel > mode should work fine on CPUs that support AVX2, as the AVX2 > implementation is forced in this case, and won't work otherwise. > > Signed-off-by: Christoph Hellwig > --- > arch/um/include/asm/xor.h | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/arch/um/include/asm/xor.h b/arch/um/include/asm/xor.h > index 647fae200c5d..c9ddedc19301 100644 > --- a/arch/um/include/asm/xor.h > +++ b/arch/um/include/asm/xor.h > @@ -4,21 +4,11 @@ > > #ifdef CONFIG_64BIT > #undef CONFIG_X86_32 > -#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_sse_pf64)) > #else > #define CONFIG_X86_32 1 > -#define TT_CPU_INF_XOR_DEFAULT (AVX_SELECT(&xor_block_8regs)) > #endif > > #include > #include <../../x86/include/asm/xor.h> > -#include > - > -#ifdef CONFIG_UML_TIME_TRAVEL_SUPPORT > -#undef XOR_SELECT_TEMPLATE > -/* pick an arbitrary one - measuring isn't possible with inf-cpu */ > -#define XOR_SELECT_TEMPLATE(x) \ > - (time_travel_mode == TT_MODE_INFCPU ? TT_CPU_INF_XOR_DEFAULT : x) > -#endif I'm not following this change. Previously, in TT_MODE_INFCPU mode, XOR_SELECT_TEMPLATE(NULL) returned &xor_block_avx, &xor_block_sse_pf64, or &xor_block_8regs, causing the benchmark to be skipped. After this change, the benchmark starts being done on CPUs that don't support AVX. - Eric