From nobody Sat Sep 26 13:08:13 2026 Received: from mta1.migadu.com (out-75.mta1.migadu.com [95.215.58.75]) (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 94461477E20 for ; Tue, 1 Sep 2026 11:08:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.75 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788260939; cv=none; b=LZDOf/jqmoE2/1m71B3fa1TIa2pZ+vk/WS8Wtm9R0+c7kluZu65cmUpc+yTJz4ftv3BWgokDNRkODYnGL++VFmz0y1ZX/wWSCwq+OSFRJ+iNQ+7Hqx2pcq4KJwjyuOchFWh2xE/Bjuk2iswqK8sr0PeTy22Gd5vxDjKpNehHfbw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788260939; c=relaxed/simple; bh=GAVGkBKgIT+5W4soILfBMtzTyj4hIYcnKlAuurk89uU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k/3bYTMn9cW00zxTpNEKDbcxdZMESRtME0c2Av4cAzGp3u7UgQEm1Nuwoe5npxhJY4htFktgEwhVp4OkfGrvX8vxKa6TZPzG+FiHfwsaOF8la5PkKzocFR1cN7MLSDq+NzuqQ06I/G2UDxuf9L0diq7QUk53xoCApiBU+tbJrJw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=uH+CfPFu; arc=none smtp.client-ip=95.215.58.75 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="uH+CfPFu" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=GAVGkBKgIT+5W4soILfBMtzTyj4hIYcnKlAuurk89uU=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1788260935; v=1; x=1788865735; b=uH+CfPFuIlYnmVhGAaZzjHNoVo0jbUKwM6nNrGFaZtoFmsfaMeiDYcI5n20wtmGx3hdFR9iX WO8il3/eBL7hnc8fmGIXrryUbG0uw0OyRN3y6qkvCq0NowJ0hrEIe06saT9uXuwkG86hvKm/lnB 6o4oVxYK/W25RvbijZcsTCaY= X-Envelope-To: linux-kernel@vger.kernel.org Received: by mta12.migadu.com with ESMTPS id 5472b1e3b94e1808; Tue, 01 Sep 2026 11:08:55 +0000 X-Mizu-Trace-ID: 5472b1e3b94e1808 X-Migadu-Flow: FLOW_OUT From: Usama Arif To: dsterba@suse.com, linux-kernel@vger.kernel.org, terrelln@fb.com, terrelln@meta.com, linux-crypto@vger.kernel.org, yosry@kernel.org, ebiggers@kernel.org, torvalds@linux-foundation.org Cc: hannes@cmpxchg.org, nphamcs@gmail.com, chengming.zhou@linux.dev, shakeel.butt@linux.dev, kernel-team@meta.com, Usama Arif Subject: [PATCH v3 1/2] lib/zstd: add fallback aliases for disabled BMI2 variants Date: Tue, 1 Sep 2026 04:07:56 -0700 Message-ID: <20260901110850.1805747-2-usama.arif@linux.dev> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260901110850.1805747-1-usama.arif@linux.dev> References: <20260901110850.1805747-1-usama.arif@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" When dynamic BMI2 dispatch is disabled, the BMI2-specific functions are not compiled and each selector is conditionally compiled to avoid naming them. The selector-level preprocessor guards will be replaced with a predicate that becomes constant false when dynamic BMI2 dispatch is disabled. Although the compiler eliminates an `if (0)` branch, it must still parse and resolve the BMI2 function referenced by it. Add aliases from the unavailable BMI2 function names to their default implementations. These aliases make the names valid without emitting BMI2-specific code. The selectors remain unchanged in this patch, so the aliases are not used yet and there is no code-generation change. Signed-off-by: Usama Arif Reviewed-by: Dhruva Gole --- lib/zstd/common/entropy_common.c | 4 ++++ lib/zstd/common/fse_decompress.c | 2 ++ lib/zstd/compress/zstd_compress_sequences.c | 4 ++++ lib/zstd/decompress/huf_decompress.c | 4 ++++ lib/zstd/decompress/zstd_decompress_block.c | 12 ++++++++++++ 5 files changed, 26 insertions(+) diff --git a/lib/zstd/common/entropy_common.c b/lib/zstd/common/entropy_com= mon.c index 6cdd82233fb59..15a7c14ae8040 100644 --- a/lib/zstd/common/entropy_common.c +++ b/lib/zstd/common/entropy_common.c @@ -202,6 +202,8 @@ BMI2_TARGET_ATTRIBUTE static size_t FSE_readNCount_body= _bmi2( { return FSE_readNCount_body(normalizedCounter, maxSVPtr, tableLogPtr, h= eaderBuffer, hbSize); } +#else +#define FSE_readNCount_body_bmi2 FSE_readNCount_body_default #endif =20 size_t FSE_readNCount_bmi2( @@ -323,6 +325,8 @@ static BMI2_TARGET_ATTRIBUTE size_t HUF_readStats_body_= bmi2(BYTE* huffWeight, si { return HUF_readStats_body(huffWeight, hwSize, rankStats, nbSymbolsPtr,= tableLogPtr, src, srcSize, workSpace, wkspSize, 1); } +#else +#define HUF_readStats_body_bmi2 HUF_readStats_body_default #endif =20 size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwSize, U32* rankStats, diff --git a/lib/zstd/common/fse_decompress.c b/lib/zstd/common/fse_decompr= ess.c index 15081d8dc607c..8d9c43b928833 100644 --- a/lib/zstd/common/fse_decompress.c +++ b/lib/zstd/common/fse_decompress.c @@ -300,6 +300,8 @@ BMI2_TARGET_ATTRIBUTE static size_t FSE_decompress_wksp= _body_bmi2(void* dst, siz { return FSE_decompress_wksp_body(dst, dstCapacity, cSrc, cSrcSize, maxL= og, workSpace, wkspSize, 1); } +#else +#define FSE_decompress_wksp_body_bmi2 FSE_decompress_wksp_body_default #endif =20 size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void*= cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, = int bmi2) diff --git a/lib/zstd/compress/zstd_compress_sequences.c b/lib/zstd/compres= s/zstd_compress_sequences.c index 256980c9d85ad..64abcdf2c5714 100644 --- a/lib/zstd/compress/zstd_compress_sequences.c +++ b/lib/zstd/compress/zstd_compress_sequences.c @@ -415,6 +415,10 @@ ZSTD_encodeSequences_bmi2( sequences, nbSeq, longOffsets); } =20 +#else + +#define ZSTD_encodeSequences_bmi2 ZSTD_encodeSequences_default + #endif =20 size_t ZSTD_encodeSequences( diff --git a/lib/zstd/decompress/huf_decompress.c b/lib/zstd/decompress/huf= _decompress.c index ac8b87f48f847..5663ae524cd83 100644 --- a/lib/zstd/decompress/huf_decompress.c +++ b/lib/zstd/decompress/huf_decompress.c @@ -700,6 +700,8 @@ size_t HUF_decompress4X1_usingDTable_internal_bmi2(void= * dst, size_t dstSize, vo size_t cSrcSize, HUF_DTable const* DTable) { return HUF_decompress4X1_usingDTable_internal_body(dst, dstSize, cSrc,= cSrcSize, DTable); } +#else +#define HUF_decompress4X1_usingDTable_internal_bmi2 HUF_decompress4X1_usin= gDTable_internal_default #endif =20 static @@ -1503,6 +1505,8 @@ size_t HUF_decompress4X2_usingDTable_internal_bmi2(vo= id* dst, size_t dstSize, vo size_t cSrcSize, HUF_DTable const* DTable) { return HUF_decompress4X2_usingDTable_internal_body(dst, dstSize, cSrc,= cSrcSize, DTable); } +#else +#define HUF_decompress4X2_usingDTable_internal_bmi2 HUF_decompress4X2_usin= gDTable_internal_default #endif =20 static diff --git a/lib/zstd/decompress/zstd_decompress_block.c b/lib/zstd/decompr= ess/zstd_decompress_block.c index 710eb0ffd5a37..9c4215e435014 100644 --- a/lib/zstd/decompress/zstd_decompress_block.c +++ b/lib/zstd/decompress/zstd_decompress_block.c @@ -622,6 +622,8 @@ BMI2_TARGET_ATTRIBUTE static void ZSTD_buildFSETable_bo= dy_bmi2(ZSTD_seqSymbol* d ZSTD_buildFSETable_body(dt, normalizedCounter, maxSymbolValue, baseValue, nbAdditionalBits, tableLog, wksp, wkspSize); } +#else +#define ZSTD_buildFSETable_body_bmi2 ZSTD_buildFSETable_body_default #endif =20 void ZSTD_buildFSETable(ZSTD_seqSymbol* dt, @@ -1934,6 +1936,16 @@ ZSTD_decompressSequencesLong_bmi2(ZSTD_DCtx* dctx, } #endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */ =20 +#else + +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG +#define ZSTD_decompressSequences_bmi2 ZSTD_decompressSequences_default +#define ZSTD_decompressSequencesSplitLitBuffer_bmi2 ZSTD_decompressSequenc= esSplitLitBuffer_default +#endif +#ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT +#define ZSTD_decompressSequencesLong_bmi2 ZSTD_decompressSequencesLong_def= ault +#endif + #endif /* DYNAMIC_BMI2 */ =20 #ifndef ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG --=20 2.53.0-Meta From nobody Sat Sep 26 13:08:13 2026 Received: from mta1.migadu.com (out-79.mta1.migadu.com [95.215.58.79]) (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 D272A47CC89 for ; Tue, 1 Sep 2026 11:08:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.79 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788260942; cv=none; b=CruCfpQMn0EyRZq2lcffnOINOTEYP005sd8z0EWV6Chrd119vPQmGfrTgJUHfp1/4cdSZtkhZMY+mtL0PZ474kAk4vh5oTBIQc3t7aVMh99npok1uLtPyXKU/3CxYCUSQjDFm7ermXff+WkockNZmCW4rkjeFsJJIjaAzTjGXBk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788260942; c=relaxed/simple; bh=gcnUrxY69ITTj+Ofe5rtFfD6sa60dJljj1Wx6d/mCjo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gpdCF6c+IcVIx1S/1L8iyYr6h2dnEgPGEnXAR3tmW9aMBBYrdXXsIfSV+fltbwe4DYoAXEccxDUo7gyrCDDrpmPlzYm3DpHHrRuQN6orKWwV50DWmw/7E3sOVxQ0OyY5gFC3HmNyfnF73pYD5VyfFbLPx7TYN1QVQrTY+Xqaxhc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=pIdPHKsh; arc=none smtp.client-ip=95.215.58.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="pIdPHKsh" X-Envelope-To: linux-kernel@vger.kernel.org DKIM-Signature: a=rsa-sha256; bh=gcnUrxY69ITTj+Ofe5rtFfD6sa60dJljj1Wx6d/mCjo=; c=simple/simple; d=linux.dev; h=from:to:subject:date:message-id:mime-version:content-type; s=key1; t=1788260937; v=1; x=1788865737; b=pIdPHKshIwi4K2n0PcT9eBHJjWtLOGrRpzanYkV1GeoW5SdG9QxiXZOthW4v1B2FXDrUmJd6 M4ugjuFBaB3Mxw2t/k1no7E4HztDlRYxeGGUKENtq72bQOGnVq0wPNR7BB8CJnB43JgiFcptzbC j+q97Ew+xOnN8QU5fYW25rcw= X-Envelope-To: linux-kernel@vger.kernel.org Received: by mta12.migadu.com with ESMTPS id 902a3c03b0b1b999; Tue, 01 Sep 2026 11:08:57 +0000 X-Mizu-Trace-ID: 902a3c03b0b1b999 X-Migadu-Flow: FLOW_OUT From: Usama Arif To: dsterba@suse.com, linux-kernel@vger.kernel.org, terrelln@fb.com, terrelln@meta.com, linux-crypto@vger.kernel.org, yosry@kernel.org, ebiggers@kernel.org, torvalds@linux-foundation.org Cc: hannes@cmpxchg.org, nphamcs@gmail.com, chengming.zhou@linux.dev, shakeel.butt@linux.dev, kernel-team@meta.com, Usama Arif Subject: [PATCH v3 2/2] zstd: use cpu_feature_enabled() for in-kernel BMI2 dispatch Date: Tue, 1 Sep 2026 04:07:57 -0700 Message-ID: <20260901110850.1805747-3-usama.arif@linux.dev> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260901110850.1805747-1-usama.arif@linux.dev> References: <20260901110850.1805747-1-usama.arif@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Zstd's dynamic BMI2 implementation probes CPUID when a compression or decompression context is initialized, stores the result in the context, and tests that value at every dispatch site. In normal kernel builds this bypasses the x86 feature policy and uses ordinary runtime branches instead of allowing x86 alternatives to resolve the feature check at boot. Add ZSTD_USE_BMI2() and use it at every runtime BMI2/default selector. For normal x86 kernel objects, the predicate expands directly to cpu_feature_enabled(X86_FEATURE_BMI2). When dynamic BMI2 dispatch is not available it is false; other builds retain the caller-provided flag. Keep the existing HUF conditional layout because DYNAMIC_BMI2 also controls whether target-attributed variants are emitted. Add the matching ZSTD_SET_BMI2() abstraction for context initialization. Normal x86 kernel objects and builds without dynamic BMI2 do not cache CPU state. Other builds with dynamic dispatch, including preboot, retain the existing behavior. Keep the BMI2 members in the context structures so their layouts do not change, and make the accessors return zero when cached state is unused. Select the normal-kernel policy in zstd_deps.h. Builds which define __DISABLE_EXPORTS, including the x86 preboot decompressor, retain the exist= ing CPUID-backed dispatch because the normal alternatives infrastructure is not available there. A 4 KiB zstd-generic crypto_acomp benchmark in a one-vCPU KVM guest gave these median results: Before After Change Compression 16,634 ns/op 13,394 ns/op -19.5% Decompression 3,480 ns/op 963 ns/op -72.3% Signed-off-by: Usama Arif Reviewed-by: Dhruva Gole --- lib/zstd/common/compiler.h | 12 ++++++++++++ lib/zstd/common/entropy_common.c | 12 ++++++------ lib/zstd/common/fse_decompress.c | 7 ++++--- lib/zstd/common/zstd_deps.h | 5 +++++ lib/zstd/compress/huf_compress.c | 6 +++++- lib/zstd/compress/zstd_compress.c | 12 ++++++------ lib/zstd/compress/zstd_compress_internal.h | 9 +++++++++ lib/zstd/compress/zstd_compress_sequences.c | 8 +++++--- lib/zstd/compress/zstd_compress_superblock.c | 2 +- lib/zstd/decompress/huf_decompress.c | 18 +++++++++--------- lib/zstd/decompress/zstd_decompress.c | 4 +--- lib/zstd/decompress/zstd_decompress_block.c | 19 +++++++------------ .../decompress/zstd_decompress_internal.h | 2 +- 13 files changed, 71 insertions(+), 45 deletions(-) diff --git a/lib/zstd/common/compiler.h b/lib/zstd/common/compiler.h index dc9bd15e174e9..47f6c0372c58c 100644 --- a/lib/zstd/common/compiler.h +++ b/lib/zstd/common/compiler.h @@ -14,6 +14,7 @@ =20 #include =20 +#include "zstd_deps.h" #include "portability_macros.h" =20 /*-******************************************************* @@ -96,6 +97,17 @@ */ #define BMI2_TARGET_ATTRIBUTE TARGET_ATTRIBUTE("lzcnt,bmi,bmi2") =20 +#if !DYNAMIC_BMI2 +# define ZSTD_USE_BMI2(bmi2) 0 +# define ZSTD_SET_BMI2(state, value) do { } while (0) +#elif defined(ZSTD_USE_KERNEL_CPU_FEATURES) +# define ZSTD_USE_BMI2(bmi2) cpu_feature_enabled(X86_FEATURE_BMI2) +# define ZSTD_SET_BMI2(state, value) do { } while (0) +#else +# define ZSTD_USE_BMI2(bmi2) (bmi2) +# define ZSTD_SET_BMI2(state, value) do { (state) =3D (value); } while (0) +#endif + /* prefetch * can be disabled, by declaring NO_PREFETCH build macro */ #if ( (__GNUC__ >=3D 4) || ( (__GNUC__ =3D=3D 3) && (__GNUC_MINOR__ >=3D 1= ) ) ) diff --git a/lib/zstd/common/entropy_common.c b/lib/zstd/common/entropy_com= mon.c index 15a7c14ae8040..701bd495b13c8 100644 --- a/lib/zstd/common/entropy_common.c +++ b/lib/zstd/common/entropy_common.c @@ -16,6 +16,10 @@ /* ************************************* * Dependencies ***************************************/ +#include "zstd_deps.h" +#if defined(ZSTD_USE_KERNEL_CPU_FEATURES) +#include +#endif #include "mem.h" #include "error_private.h" /* ERR_*, ERROR */ #define FSE_STATIC_LINKING_ONLY /* FSE_MIN_TABLELOG */ @@ -210,11 +214,9 @@ size_t FSE_readNCount_bmi2( short* normalizedCounter, unsigned* maxSVPtr, unsigned* tableLogPt= r, const void* headerBuffer, size_t hbSize, int bmi2) { -#if DYNAMIC_BMI2 - if (bmi2) { + if (ZSTD_USE_BMI2(bmi2)) { return FSE_readNCount_body_bmi2(normalizedCounter, maxSVPtr, table= LogPtr, headerBuffer, hbSize); } -#endif (void)bmi2; return FSE_readNCount_body_default(normalizedCounter, maxSVPtr, tableL= ogPtr, headerBuffer, hbSize); } @@ -335,11 +337,9 @@ size_t HUF_readStats_wksp(BYTE* huffWeight, size_t hwS= ize, U32* rankStats, void* workSpace, size_t wkspSize, int flags) { -#if DYNAMIC_BMI2 - if (flags & HUF_flags_bmi2) { + if (ZSTD_USE_BMI2(flags & HUF_flags_bmi2)) { return HUF_readStats_body_bmi2(huffWeight, hwSize, rankStats, nbSy= mbolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize); } -#endif (void)flags; return HUF_readStats_body_default(huffWeight, hwSize, rankStats, nbSym= bolsPtr, tableLogPtr, src, srcSize, workSpace, wkspSize); } diff --git a/lib/zstd/common/fse_decompress.c b/lib/zstd/common/fse_decompr= ess.c index 8d9c43b928833..008ce3401726a 100644 --- a/lib/zstd/common/fse_decompress.c +++ b/lib/zstd/common/fse_decompress.c @@ -24,6 +24,9 @@ #include "fse.h" #include "error_private.h" #include "zstd_deps.h" /* ZSTD_memcpy */ +#if defined(ZSTD_USE_KERNEL_CPU_FEATURES) +#include +#endif #include "bits.h" /* ZSTD_highbit32 */ =20 =20 @@ -306,11 +309,9 @@ BMI2_TARGET_ATTRIBUTE static size_t FSE_decompress_wks= p_body_bmi2(void* dst, siz =20 size_t FSE_decompress_wksp_bmi2(void* dst, size_t dstCapacity, const void*= cSrc, size_t cSrcSize, unsigned maxLog, void* workSpace, size_t wkspSize, = int bmi2) { -#if DYNAMIC_BMI2 - if (bmi2) { + if (ZSTD_USE_BMI2(bmi2)) { return FSE_decompress_wksp_body_bmi2(dst, dstCapacity, cSrc, cSrcS= ize, maxLog, workSpace, wkspSize); } -#endif (void)bmi2; return FSE_decompress_wksp_body_default(dst, dstCapacity, cSrc, cSrcSi= ze, maxLog, workSpace, wkspSize); } diff --git a/lib/zstd/common/zstd_deps.h b/lib/zstd/common/zstd_deps.h index f931f7d0e2947..a312029df5660 100644 --- a/lib/zstd/common/zstd_deps.h +++ b/lib/zstd/common/zstd_deps.h @@ -26,6 +26,11 @@ #ifndef ZSTD_DEPS_COMMON #define ZSTD_DEPS_COMMON =20 +#if defined(__KERNEL__) && defined(CONFIG_X86) && \ + !defined(__DISABLE_EXPORTS) +#define ZSTD_USE_KERNEL_CPU_FEATURES +#endif + #include #include =20 diff --git a/lib/zstd/compress/huf_compress.c b/lib/zstd/compress/huf_compr= ess.c index 0b229f5d2ae22..f3f53240c981d 100644 --- a/lib/zstd/compress/huf_compress.c +++ b/lib/zstd/compress/huf_compress.c @@ -22,6 +22,9 @@ * Includes ****************************************************************/ #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset */ +#if defined(ZSTD_USE_KERNEL_CPU_FEATURES) +#include +#endif #include "../common/compiler.h" #include "../common/bitstream.h" #include "hist.h" @@ -1138,9 +1141,10 @@ HUF_compress1X_usingCTable_internal(void* dst, size_= t dstSize, const void* src, size_t srcSize, const HUF_CElt* CTable, const int flags) { - if (flags & HUF_flags_bmi2) { + if (ZSTD_USE_BMI2(flags & HUF_flags_bmi2)) { return HUF_compress1X_usingCTable_internal_bmi2(dst, dstSize, src,= srcSize, CTable); } + (void)flags; return HUF_compress1X_usingCTable_internal_default(dst, dstSize, src, = srcSize, CTable); } =20 diff --git a/lib/zstd/compress/zstd_compress.c b/lib/zstd/compress/zstd_com= press.c index c41a747413e01..638bc0bf83127 100644 --- a/lib/zstd/compress/zstd_compress.c +++ b/lib/zstd/compress/zstd_compress.c @@ -102,7 +102,7 @@ static void ZSTD_initCCtx(ZSTD_CCtx* cctx, ZSTD_customM= em memManager) assert(cctx !=3D NULL); ZSTD_memset(cctx, 0, sizeof(*cctx)); cctx->customMem =3D memManager; - cctx->bmi2 =3D ZSTD_cpuSupportsBmi2(); + ZSTD_SET_BMI2(cctx->bmi2, ZSTD_cpuSupportsBmi2()); { size_t const err =3D ZSTD_CCtx_reset(cctx, ZSTD_reset_parameters); assert(!ZSTD_isError(err)); (void)err; @@ -142,7 +142,7 @@ ZSTD_CCtx* ZSTD_initStaticCCtx(void* workspace, size_t = workspaceSize) cctx->blockState.nextCBlock =3D (ZSTD_compressedBlockState_t*)ZSTD_cwk= sp_reserve_object(&cctx->workspace, sizeof(ZSTD_compressedBlockState_t)); cctx->tmpWorkspace =3D ZSTD_cwksp_reserve_object(&cctx->workspace, TMP= _WORKSPACE_SIZE); cctx->tmpWkspSize =3D TMP_WORKSPACE_SIZE; - cctx->bmi2 =3D ZSTD_cpuid_bmi2(ZSTD_cpuid()); + ZSTD_SET_BMI2(cctx->bmi2, ZSTD_cpuid_bmi2(ZSTD_cpuid())); return cctx; } =20 @@ -4042,7 +4042,7 @@ ZSTD_compressSeqStore_singleBlock(ZSTD_CCtx* zc, op + ZSTD_blockHeaderSize, dstCapacity - ZSTD_blockHeaderS= ize, srcSize, zc->tmpWorkspace, zc->tmpWkspSize /* statically allocated = in resetCCtx */, - zc->bmi2); + ZSTD_CCtx_get_bmi2(zc)); FORWARD_IF_ERROR(cSeqsSize, "ZSTD_entropyCompressSeqStore failed!"); =20 if (!zc->isFirstBlock && @@ -4332,7 +4332,7 @@ ZSTD_compressBlock_internal(ZSTD_CCtx* zc, dst, dstCapacity, srcSize, zc->tmpWorkspace, zc->tmpWkspSize /* statically allocated in r= esetCCtx */, - zc->bmi2); + ZSTD_CCtx_get_bmi2(zc)); =20 if (frame && /* We don't want to emit our first block as a RLE even if it quali= fies because @@ -6796,7 +6796,7 @@ ZSTD_compressSequences_internal(ZSTD_CCtx* cctx, op + ZSTD_blockHeaderSize /* Leave space f= or block header */, dstCapacity - ZSTD_blockHeaderSize, blockSize, cctx->tmpWorkspace, cctx->tmpWkspSize /* s= tatically allocated in resetCCtx */, - cctx->bmi2); + ZSTD_CCtx_get_bmi2(cctx)); FORWARD_IF_ERROR(compressedSeqsSize, "Compressing sequences of blo= ck failed"); DEBUGLOG(5, "Compressed sequences size: %zu", compressedSeqsSize); =20 @@ -7321,7 +7321,7 @@ ZSTD_compressSequencesAndLiterals_internal(ZSTD_CCtx*= cctx, &cctx->blockState.prevCBlock->entropy, &cc= tx->blockState.nextCBlock->entropy, &cctx->appliedParams, cctx->tmpWorkspace, cctx->tmpWkspSize /* s= tatically allocated in resetCCtx */, - cctx->bmi2); + ZSTD_CCtx_get_bmi2(cctx)); FORWARD_IF_ERROR(compressedSeqsSize, "Compressing sequences of blo= ck failed"); /* note: the spec forbids for any compressed block to be larger th= an maximum block size */ if (compressedSeqsSize > cctx->blockSizeMax) compressedSeqsSize = =3D 0; diff --git a/lib/zstd/compress/zstd_compress_internal.h b/lib/zstd/compress= /zstd_compress_internal.h index b109783858763..99ebe1e0c923f 100644 --- a/lib/zstd/compress/zstd_compress_internal.h +++ b/lib/zstd/compress/zstd_compress_internal.h @@ -537,6 +537,15 @@ struct ZSTD_CCtx_s { size_t extSeqBufCapacity; }; =20 +MEM_STATIC int ZSTD_CCtx_get_bmi2(const struct ZSTD_CCtx_s *cctx) { +#if DYNAMIC_BMI2 && !defined(ZSTD_USE_KERNEL_CPU_FEATURES) + return cctx->bmi2; +#else + (void)cctx; + return 0; +#endif +} + typedef enum { ZSTD_dtlm_fast, ZSTD_dtlm_full } ZSTD_dictTableLoadMethod_e; typedef enum { ZSTD_tfp_forCCtx, ZSTD_tfp_forCDict } ZSTD_tableFillPurpose= _e; =20 diff --git a/lib/zstd/compress/zstd_compress_sequences.c b/lib/zstd/compres= s/zstd_compress_sequences.c index 64abcdf2c5714..7a03a8fceea7d 100644 --- a/lib/zstd/compress/zstd_compress_sequences.c +++ b/lib/zstd/compress/zstd_compress_sequences.c @@ -12,6 +12,10 @@ /*-************************************* * Dependencies ***************************************/ +#include "../common/zstd_deps.h" +#if defined(ZSTD_USE_KERNEL_CPU_FEATURES) +#include +#endif #include "zstd_compress_sequences.h" =20 /* @@ -429,15 +433,13 @@ size_t ZSTD_encodeSequences( SeqDef const* sequences, size_t nbSeq, int longOffsets, int bm= i2) { DEBUGLOG(5, "ZSTD_encodeSequences: dstCapacity =3D %u", (unsigned)dstC= apacity); -#if DYNAMIC_BMI2 - if (bmi2) { + if (ZSTD_USE_BMI2(bmi2)) { return ZSTD_encodeSequences_bmi2(dst, dstCapacity, CTable_MatchLength, mlCodeTable, CTable_OffsetBits, ofCodeTable, CTable_LitLength, llCodeTable, sequences, nbSeq, longOffsets); } -#endif (void)bmi2; return ZSTD_encodeSequences_default(dst, dstCapacity, CTable_MatchLength, mlCodeTable, diff --git a/lib/zstd/compress/zstd_compress_superblock.c b/lib/zstd/compre= ss/zstd_compress_superblock.c index dc12d64e935c4..fada5979c3b84 100644 --- a/lib/zstd/compress/zstd_compress_superblock.c +++ b/lib/zstd/compress/zstd_compress_superblock.c @@ -684,6 +684,6 @@ size_t ZSTD_compressSuperBlock(ZSTD_CCtx* zc, &zc->appliedParams, dst, dstCapacity, src, srcSize, - zc->bmi2, lastBlock, + ZSTD_CCtx_get_bmi2(zc), lastBlock, zc->tmpWorkspace, zc->tmpWkspSize /* statically allocated in r= esetCCtx */); } diff --git a/lib/zstd/decompress/huf_decompress.c b/lib/zstd/decompress/huf= _decompress.c index 5663ae524cd83..8bf2279887e8f 100644 --- a/lib/zstd/decompress/huf_decompress.c +++ b/lib/zstd/decompress/huf_decompress.c @@ -17,6 +17,9 @@ * Dependencies ****************************************************************/ #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memset */ +#if defined(ZSTD_USE_KERNEL_CPU_FEATURES) +#include +#endif #include "../common/compiler.h" #include "../common/bitstream.h" /* BIT_* */ #include "../common/fse.h" /* to compress headers */ @@ -113,9 +116,10 @@ typedef size_t (*HUF_DecompressUsingDTableFn)(void *ds= t, size_t dstSize, static size_t fn(void* dst, size_t dstSize, void const* cSrc, = \ size_t cSrcSize, HUF_DTable const* DTable, int flags)= \ { = \ - if (flags & HUF_flags_bmi2) { = \ + if (ZSTD_USE_BMI2(flags & HUF_flags_bmi2)) { = \ return fn##_bmi2(dst, dstSize, cSrc, cSrcSize, DTable); = \ } = \ + (void)flags; = \ return fn##_default(dst, dstSize, cSrc, cSrcSize, DTable); = \ } =20 @@ -899,18 +903,16 @@ static size_t HUF_decompress4X1_usingDTable_internal(= void* dst, size_t dstSize, HUF_DecompressUsingDTableFn fallbackFn =3D HUF_decompress4X1_usingDTab= le_internal_default; HUF_DecompressFastLoopFn loopFn =3D HUF_decompress4X1_usingDTable_inte= rnal_fast_c_loop; =20 -#if DYNAMIC_BMI2 - if (flags & HUF_flags_bmi2) { + if (ZSTD_USE_BMI2(flags & HUF_flags_bmi2)) { fallbackFn =3D HUF_decompress4X1_usingDTable_internal_bmi2; # if ZSTD_ENABLE_ASM_X86_64_BMI2 if (!(flags & HUF_flags_disableAsm)) { loopFn =3D HUF_decompress4X1_usingDTable_internal_fast_asm_loo= p; } # endif - } else { + } else if (DYNAMIC_BMI2) { return fallbackFn(dst, dstSize, cSrc, cSrcSize, DTable); } -#endif =20 #if ZSTD_ENABLE_ASM_X86_64_BMI2 && defined(__BMI2__) if (!(flags & HUF_flags_disableAsm)) { @@ -1723,18 +1725,16 @@ static size_t HUF_decompress4X2_usingDTable_interna= l(void* dst, size_t dstSize, HUF_DecompressUsingDTableFn fallbackFn =3D HUF_decompress4X2_usingDTab= le_internal_default; HUF_DecompressFastLoopFn loopFn =3D HUF_decompress4X2_usingDTable_inte= rnal_fast_c_loop; =20 -#if DYNAMIC_BMI2 - if (flags & HUF_flags_bmi2) { + if (ZSTD_USE_BMI2(flags & HUF_flags_bmi2)) { fallbackFn =3D HUF_decompress4X2_usingDTable_internal_bmi2; # if ZSTD_ENABLE_ASM_X86_64_BMI2 if (!(flags & HUF_flags_disableAsm)) { loopFn =3D HUF_decompress4X2_usingDTable_internal_fast_asm_loo= p; } # endif - } else { + } else if (DYNAMIC_BMI2) { return fallbackFn(dst, dstSize, cSrc, cSrcSize, DTable); } -#endif =20 #if ZSTD_ENABLE_ASM_X86_64_BMI2 && defined(__BMI2__) if (!(flags & HUF_flags_disableAsm)) { diff --git a/lib/zstd/decompress/zstd_decompress.c b/lib/zstd/decompress/zs= td_decompress.c index bb009554e3a61..cc6ecd364970a 100644 --- a/lib/zstd/decompress/zstd_decompress.c +++ b/lib/zstd/decompress/zstd_decompress.c @@ -259,9 +259,7 @@ static void ZSTD_initDCtx_internal(ZSTD_DCtx* dctx) dctx->noForwardProgress =3D 0; dctx->oversizedDuration =3D 0; dctx->isFrameDecompression =3D 1; -#if DYNAMIC_BMI2 - dctx->bmi2 =3D ZSTD_cpuSupportsBmi2(); -#endif + ZSTD_SET_BMI2(dctx->bmi2, ZSTD_cpuSupportsBmi2()); dctx->ddictSet =3D NULL; ZSTD_DCtx_resetParameters(dctx); #ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION diff --git a/lib/zstd/decompress/zstd_decompress_block.c b/lib/zstd/decompr= ess/zstd_decompress_block.c index 9c4215e435014..31804cbf1f7ed 100644 --- a/lib/zstd/decompress/zstd_decompress_block.c +++ b/lib/zstd/decompress/zstd_decompress_block.c @@ -16,6 +16,9 @@ * Dependencies *********************************************************/ #include "../common/zstd_deps.h" /* ZSTD_memcpy, ZSTD_memmove, ZSTD_mems= et */ +#if defined(ZSTD_USE_KERNEL_CPU_FEATURES) +#include +#endif #include "../common/compiler.h" /* prefetch */ #include "../common/cpu.h" /* bmi2 */ #include "../common/mem.h" /* low level memory routines */ @@ -631,13 +634,11 @@ void ZSTD_buildFSETable(ZSTD_seqSymbol* dt, const U32* baseValue, const U8* nbAdditionalBits, unsigned tableLog, void* wksp, size_t wkspSize, int bmi2) { -#if DYNAMIC_BMI2 - if (bmi2) { + if (ZSTD_USE_BMI2(bmi2)) { ZSTD_buildFSETable_body_bmi2(dt, normalizedCounter, maxSymbolValue, baseValue, nbAdditionalBits, tableLog, wksp, wkspSize); return; } -#endif (void)bmi2; ZSTD_buildFSETable_body_default(dt, normalizedCounter, maxSymbolValue, baseValue, nbAdditionalBits, tableLog, wksp, wkspSize); @@ -1955,11 +1956,9 @@ ZSTD_decompressSequences(ZSTD_DCtx* dctx, void* dst,= size_t maxDstSize, const ZSTD_longOffset_e isLongOffset) { DEBUGLOG(5, "ZSTD_decompressSequences"); -#if DYNAMIC_BMI2 - if (ZSTD_DCtx_get_bmi2(dctx)) { + if (ZSTD_USE_BMI2(ZSTD_DCtx_get_bmi2(dctx))) { return ZSTD_decompressSequences_bmi2(dctx, dst, maxDstSize, seqSta= rt, seqSize, nbSeq, isLongOffset); } -#endif return ZSTD_decompressSequences_default(dctx, dst, maxDstSize, seqStar= t, seqSize, nbSeq, isLongOffset); } static size_t @@ -1968,11 +1967,9 @@ ZSTD_decompressSequencesSplitLitBuffer(ZSTD_DCtx* dc= tx, void* dst, size_t maxDst const ZSTD_longOffset_e isLongOffset) { DEBUGLOG(5, "ZSTD_decompressSequencesSplitLitBuffer"); -#if DYNAMIC_BMI2 - if (ZSTD_DCtx_get_bmi2(dctx)) { + if (ZSTD_USE_BMI2(ZSTD_DCtx_get_bmi2(dctx))) { return ZSTD_decompressSequencesSplitLitBuffer_bmi2(dctx, dst, maxD= stSize, seqStart, seqSize, nbSeq, isLongOffset); } -#endif return ZSTD_decompressSequencesSplitLitBuffer_default(dctx, dst, maxDs= tSize, seqStart, seqSize, nbSeq, isLongOffset); } #endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_LONG */ @@ -1991,11 +1988,9 @@ ZSTD_decompressSequencesLong(ZSTD_DCtx* dctx, const ZSTD_longOffset_e isLongOffset) { DEBUGLOG(5, "ZSTD_decompressSequencesLong"); -#if DYNAMIC_BMI2 - if (ZSTD_DCtx_get_bmi2(dctx)) { + if (ZSTD_USE_BMI2(ZSTD_DCtx_get_bmi2(dctx))) { return ZSTD_decompressSequencesLong_bmi2(dctx, dst, maxDstSize, se= qStart, seqSize, nbSeq, isLongOffset); } -#endif return ZSTD_decompressSequencesLong_default(dctx, dst, maxDstSize, seqSt= art, seqSize, nbSeq, isLongOffset); } #endif /* ZSTD_FORCE_DECOMPRESS_SEQUENCES_SHORT */ diff --git a/lib/zstd/decompress/zstd_decompress_internal.h b/lib/zstd/deco= mpress/zstd_decompress_internal.h index 2a225d1811c4f..401f2b526bbce 100644 --- a/lib/zstd/decompress/zstd_decompress_internal.h +++ b/lib/zstd/decompress/zstd_decompress_internal.h @@ -204,7 +204,7 @@ struct ZSTD_DCtx_s }; /* typedef'd to ZSTD_DCtx within "zstd.h" */ =20 MEM_STATIC int ZSTD_DCtx_get_bmi2(const struct ZSTD_DCtx_s *dctx) { -#if DYNAMIC_BMI2 +#if DYNAMIC_BMI2 && !defined(ZSTD_USE_KERNEL_CPU_FEATURES) return dctx->bmi2; #else (void)dctx; --=20 2.53.0-Meta