The compilation of ISAL compress in the current code depends on the macro HAVE_NASM_X...

fix: https://tracker.ceph.com/issues/63780

Signed-off-by: Yao guotao <yaoguot@gmail.com>
(cherry picked from commit b31fbab5bef3f5a18dfc7ab6a7f41ed78b5af1a8)

diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc
index fb7c1a0886cb6a456deb98f2710449dc5c4ae9ca..685b7fc4320103653fa695a90eeaef8c3e45c885 100644 (file)
--- a/src/compressor/zlib/ZlibCompressor.cc
+++ b/src/compressor/zlib/ZlibCompressor.cc
@@ -69,6 +69,14 @@ UadkAccel ZlibCompressor::uadk_accel;
 ZlibCompressor::ZlibCompressor(CephContext *cct, bool isal)
   : Compressor(COMP_ALG_ZLIB, "zlib"), isal_enabled(isal), cct(cct)
 {
+
+#if !(__x86_64__ && defined(HAVE_NASM_X64_AVX2)) || defined(__aarch64__)
+  if (isal_enabled) {
+    derr << "WARN: ISA-L enabled (compressor_zlib_isal=true) but not supported"
+         << dendl;
+  }
+#endif
+
 #ifdef HAVE_QATZIP
   if (cct->_conf->qat_compressor_enabled && qat_accel.init("zlib"))
     qat_enabled = true;

diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake
index 48358fce936be65c22701d2074068b627ba56e19..bc85aac22ee978b7cebe1531d8be55706fd325c6 100644 (file)
--- a/src/include/config-h.in.cmake
+++ b/src/include/config-h.in.cmake
@@ -250,6 +250,9 @@
 /* we have a recent nasm and are x86_64 */
 #cmakedefine HAVE_NASM_X64
 
+/* nasm can also build the isa-l:avx2 */
+#cmakedefine HAVE_NASM_X64_AVX2
+
 /* nasm can also build the isa-l:avx512 */
 #cmakedefine HAVE_NASM_X64_AVX512