Re: [PATCH 03/25] um/xor: don't override XOR_SELECT_TEMPLATE
Eric Biggers <[email protected]>
| Newsgroups | gmane.linux.kernel.cryptoapi,gmane.linux.ports.alpha,gmane.linux.kernel,gmane.linux.ports.arm.kernel,gmane.linux.ports.ppc64.devel,gmane.linux.ports.riscv,gmane.linux.ports.sparc,gmane.linux.uml.devel,gmane.comp.file-systems.btrfs,gmane.linux.kernel.cross-arch,gmane.linux.raid |
|---|---|
| Message-ID | <20260228043006.GA65277@quark> |
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 <[email protected]> > --- > 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 <asm/cpufeature.h> > #include <../../x86/include/asm/xor.h> > -#include <linux/time-internal.h> > - > -#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