1 --- ceph-17.2.3/CMakeLists.txt.orig 2022-07-28 23:52:12.000000000 +0200
2 +++ ceph-17.2.3/CMakeLists.txt 2022-08-28 14:39:36.852487766 +0200
3 @@ -278,7 +278,7 @@ option(WITH_BLUEFS "libbluefs library" O
5 option(WITH_QAT "Enable Qat driver" OFF)
7 - find_package(QatDrv REQUIRED COMPONENTS qat_s usdm_drv_s)
8 + find_package(QatDrv REQUIRED COMPONENTS qat usdm)
9 set(HAVE_QATDRV $(QatDrv_FOUND))
12 --- ceph-17.2.3/src/crypto/qat/CMakeLists.txt.orig 2022-07-28 23:52:12.000000000 +0200
13 +++ ceph-17.2.3/src/crypto/qat/CMakeLists.txt 2022-08-28 14:39:51.893274653 +0200
14 @@ -12,8 +12,8 @@ add_library(ceph_crypto_qat SHARED ${qat
15 add_dependencies(crypto_plugins ceph_crypto_qat)
17 target_link_libraries(ceph_crypto_qat PRIVATE
23 add_dependencies(crypto_plugins ceph_crypto_qat)
24 set_target_properties(ceph_crypto_qat PROPERTIES VERSION 1.0.0 SOVERSION 1)
25 --- ceph-17.2.3/cmake/modules/FindQatDrv.cmake.orig 2022-07-28 23:52:12.000000000 +0200
26 +++ ceph-17.2.3/cmake/modules/FindQatDrv.cmake 2022-08-28 17:59:19.158087689 +0200
27 @@ -39,23 +39,15 @@ function(get_qatdrv_version versionfile)
30 find_path(QATDRV_INCLUDE_DIR
31 - name quickassist/include/cpa.h
32 - HINTS $ENV{ICP_ROOT} /opt/APP/driver/QAT
35 + HINTS $ENV{ICP_ROOT}
37 if(QATDRV_INCLUDE_DIR)
38 - get_qatdrv_version(${QATDRV_INCLUDE_DIR}/versionfile)
39 - set(QatDrv_INCLUDE_DIRS
40 - ${QATDRV_INCLUDE_DIR}/quickassist/include
41 - ${QATDRV_INCLUDE_DIR}/quickassist/include/dc
42 - ${QATDRV_INCLUDE_DIR}/quickassist/lookaside/access_layer/include
43 - ${QATDRV_INCLUDE_DIR}/quickassist/include/lac
44 - ${QATDRV_INCLUDE_DIR}/quickassist/utilities/libusdm_drv
45 - ${QATDRV_INCLUDE_DIR}/quickassist/utilities/libusdm_drv/include)
46 + set(QatDrv_INCLUDE_DIRS ${QATDRV_INCLUDE_DIR})
48 foreach(component ${QatDrv_FIND_COMPONENTS})
49 find_library(QatDrv_${component}_LIBRARIES
51 - HINTS ${QATDRV_INCLUDE_DIR}/build/)
53 mark_as_advanced(QatDrv_INCLUDE_DIRS
54 QatDrv_${component}_LIBRARIES)
55 list(APPEND QatDrv_LIBRARIES "${QatDrv_${component}_LIBRARIES}")
56 @@ -71,7 +63,7 @@ find_package_handle_standard_args(QatDrv
58 foreach(component ${QatDrv_FIND_COMPONENTS})
59 if(NOT TARGET QatDrv::${component})
60 - add_library(QatDrv::${component} STATIC IMPORTED GLOBAL)
61 + add_library(QatDrv::${component} SHARED IMPORTED GLOBAL)
62 set_target_properties(QatDrv::${component} PROPERTIES
63 INTERFACE_INCLUDE_DIRECTORIES "${QatDrv_INCLUDE_DIRS}"
64 IMPORTED_LINK_INTERFACE_LANGUAGES "C"
65 --- ceph-17.2.3/src/compressor/CMakeLists.txt.orig 2022-07-28 23:52:12.000000000 +0200
66 +++ ceph-17.2.3/src/compressor/CMakeLists.txt 2022-08-28 18:59:38.018324891 +0200
67 @@ -7,8 +7,8 @@ endif()
68 add_library(compressor_objs OBJECT ${compressor_srcs})
69 if(HAVE_QATZIP AND HAVE_QATDRV)
70 target_link_libraries(compressor_objs PRIVATE
78 --- ceph-17.2.3/src/crypto/qat/qcccrypto.h.orig 2022-07-28 23:52:12.000000000 +0200
79 +++ ceph-17.2.3/src/crypto/qat/qcccrypto.h 2022-08-28 20:18:02.916194325 +0200
85 -#include "lac/cpa_cy_sym.h"
86 -#include "lac/cpa_cy_im.h"
88 -#include "icp_sal_user.h"
89 -#include "icp_sal_poll.h"
90 -#include "qae_mem_utils.h"
92 +#include "qat/cpa_cy_sym.h"
93 +#include "qat/cpa_cy_im.h"
94 +#include "qat/qae_mem.h"
95 +#include "qat/icp_sal_user.h"
96 +#include "qat/icp_sal_poll.h"
98 +CpaStatus qaeMemInit(void);
99 +void qaeMemDestroy(void);