From: Miaomiao Liu <miaomiao.liu@intel.com>
Date: Fri, 14 Jan 2022 05:44:15 +0000 (+0800)
Subject: crypto/qat: fix issues about QAT based Encryption for RGW
X-Git-Tag: v17.2.0~61^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9a9fb9a3355872fbeb5b807e6ecbeb32c420c4ef;p=ceph.git

crypto/qat: fix issues about QAT based Encryption for RGW

update the librares usage and add a namespace before ostream

Fixes: https://tracker.ceph.com/issues/54059
Signed-off-by: Miaomiao Liu <miaomiao.liu@intel.com>
Signed-off-by: Hualong Feng <hualong.feng@intel.com>
(cherry picked from commit 6b879a74782b5ff3a7cba999bf583e1a92578787)
---

diff --git a/src/crypto/qat/CMakeLists.txt b/src/crypto/qat/CMakeLists.txt
index ea4c1e25d14..fb751967a97 100644
--- a/src/crypto/qat/CMakeLists.txt
+++ b/src/crypto/qat/CMakeLists.txt
@@ -2,24 +2,19 @@
 # QAT wrapper for Ceph
 ##
 
-# Build QAT driver library first
-include(BuildQatDrv)
-
 set(qat_crypto_plugin_srcs
   qat_crypto_accel.cc
   qat_crypto_plugin.cc
   qcccrypto.cc)
 
 add_library(ceph_crypto_qat SHARED ${qat_crypto_plugin_srcs})
-add_dependencies(ceph_crypto_qat QatDrv)
-target_include_directories(ceph_crypto_qat PRIVATE
-  ${EXTRA_LIBS}
-  ${QatDrv_INCLUDE_DIRS})
 
 add_dependencies(crypto_plugins ceph_crypto_qat)
 
-target_link_libraries(ceph_crypto_qat
-  ${QatDrv_LIBRARIES})
+target_link_libraries(ceph_crypto_qat PRIVATE
+                      QatDrv::qat_s
+                      QatDrv::usdm_drv_s)
+
 add_dependencies(crypto_plugins ceph_crypto_qat)
 set_target_properties(ceph_crypto_qat PROPERTIES VERSION 1.0.0 SOVERSION 1)
 install(TARGETS ceph_crypto_qat DESTINATION ${crypto_plugin_dir})
diff --git a/src/crypto/qat/qat_crypto_plugin.h b/src/crypto/qat/qat_crypto_plugin.h
index 736f14706cc..a8d4df7cb8f 100644
--- a/src/crypto/qat/qat_crypto_plugin.h
+++ b/src/crypto/qat/qat_crypto_plugin.h
@@ -29,8 +29,7 @@ public:
   {}
   ~QccCryptoPlugin()
   {}
-  virtual int factory(CryptoAccelRef *cs,
-      ostream *ss)
+  virtual int factory(CryptoAccelRef *cs, std::ostream *ss)
   {
     std::lock_guard<std::mutex> l(qat_init);
     if (cryptoaccel == nullptr)
diff --git a/src/crypto/qat/qcccrypto.cc b/src/crypto/qat/qcccrypto.cc
index 410727d3b61..a3f25372643 100644
--- a/src/crypto/qat/qcccrypto.cc
+++ b/src/crypto/qat/qcccrypto.cc
@@ -4,6 +4,8 @@
 #include <pthread.h>
 #include "common/debug.h"
 #include "include/scope_guard.h"
+#include "common/dout.h"
+#include "common/errno.h"
 
 // -----------------------------------------------------------------------------
 #define dout_context g_ceph_context
@@ -11,8 +13,7 @@
 #undef dout_prefix
 #define dout_prefix _prefix(_dout)
 
-static ostream&
-_prefix(std::ostream* _dout)
+static std::ostream& _prefix(std::ostream* _dout)
 {
   return *_dout << "QccCrypto: ";
 }
@@ -28,6 +29,7 @@ static std::atomic<bool> init_called = { false };
 void* QccCrypto::crypt_thread(void *args) {
   struct qcc_thread_args *thread_args = (struct qcc_thread_args *)args;
   thread_args->qccinstance->do_crypt(thread_args);
+  return thread_args;
 }
 
 void QccCrypto::QccFreeInstance(int entry) {