erasure-code: preload the isa plugin by default

But only do so when it has been compiled because a recent enough yasm
has been found.

Signed-off-by: Loic Dachary <loic-201408@dachary.org>

diff --git a/configure.ac b/configure.ac
index 0440a664125a2da607c3b07313bb64fd6a645be2..4841a3a9dcf8ee4e55bef665e7fe9d1143d08972 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -94,6 +94,7 @@ if yasm -f elf64 src/common/crc32c_intel_fast_asm.S -o /dev/null; then
 
       if yasm -f elf64 -i src/ceph/src/ceph/src/erasure-code/isa/isa-l/include/ src/erasure-code/isa/isa-l/erasure_code/gf_vect_dot_prod_avx2.asm.s -o /dev/null 2> /dev/null ; then
          echo 'yasm can also build the isa-l stuff'
+         AC_DEFINE([HAVE_BETTER_YASM_ELF64], [1], [yasm can also build the isa-l])
         with_better_yasm=yes
       else
          echo "yasm doesn't build the isa-l stuff"

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index bc22e4ab3b55f199e9f6df4d47bd6d5f8643ddec..21c93d5b720d5bc78390e4bedbc81119c32b1bf6 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -444,7 +444,12 @@ OPTION(osd_pool_default_erasure_code_profile,
        "k=2 "
        "m=1 "
        ) // default properties of osd pool create
-OPTION(osd_erasure_code_plugins, OPT_STR, "jerasure") // list of erasure code plugins
+OPTION(osd_erasure_code_plugins, OPT_STR,
+       "jerasure"
+#ifdef HAVE_BETTER_YASM_ELF64
+       " isa"
+#endif
+       ) // list of erasure code plugins
 OPTION(osd_pool_default_flags, OPT_INT, 0)   // default flags for new pools
 OPTION(osd_pool_default_flag_hashpspool, OPT_BOOL, true)   // use new pg hashing to prevent pool/pg overlap
 OPTION(osd_pool_default_hit_set_bloom_fpp, OPT_FLOAT, .05)

diff --git a/src/erasure-code/ErasureCodePlugin.h b/src/erasure-code/ErasureCodePlugin.h
index 3fa7c477534c1e45d9404d118327a4ba4eca12d0..12808581a665be6d6066d31f17d0a013e22b0d98 100644 (file)
--- a/src/erasure-code/ErasureCodePlugin.h
+++ b/src/erasure-code/ErasureCodePlugin.h
@@ -4,6 +4,7 @@
  * Ceph distributed storage system
  *
  * Copyright (C) 2013,2014 Cloudwatt <libre.licensing@cloudwatt.com>
+ * Copyright (C) 2014 Red Hat <contact@redhat.com>
  *
  * Author: Loic Dachary <loic@dachary.org>
  *