RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 01:16:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
54a75a0e40
ceph/cmake/modules/Finddpdk.cmake

144 lines
3.3 KiB
CMake
Raw Normal View History

msg/async: add dpdk stack plugin Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-08-02 15:50:13 +00:00
# Try to find dpdk
cmake: add Find{dpdk,pciaccess}.cmake to ready the SPDK support Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-03 10:31:45 +00:00
#
# Once done, this will define
#
cmake: define dpdk_LIBRARIES properly dpdk_LIBRARIES should not be a list of dpdk library target, it should be a list of paths to them. this also align with the definition of `Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined, we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as our `Finddpdk.cmake` has higher priority than the one in seastar, and is used when `find_package(dpdk...)` is called. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:10:32 +00:00
# dpdk::dpdk
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
# dpdk_FOUND
# dpdk_INCLUDE_DIR
# dpdk_LIBRARIES
cmake: add Find{dpdk,pciaccess}.cmake to ready the SPDK support Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-03 10:31:45 +00:00
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
find_package(PkgConfig QUIET)
if(PKG_CONFIG_FOUND)
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
pkg_check_modules(dpdk QUIET libdpdk)
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
endif()
cmake: enable Finddpdk to find DPDK to be built find_package(dpdk...) is used by seastar to find DPDK if Seastar_DPDK is enabled. but `build_dpdk()` only exposes `dpdk::dpdk`, and it does not set the variables like `dpdk_INCLUDE_DIRS` and `dpdk_LIBRARIES` when it gets called. so we need to adapt Finddpdk to query them from `dpdk::dpdk` target. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 09:35:26 +00:00
if(dpdk_INCLUDE_DIRS)
# good
elseif(TARGET dpdk::dpdk)
get_target_property(dpdk_INCLUDE_DIRS
dpdk::dpdk INTERFACE_INCLUDE_DIRECTORIES)
else()
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
find_path(dpdk_config_INCLUDE_DIR rte_config.h
HINTS
ENV DPDK_DIR
PATH_SUFFIXES
dpdk
include)
find_path(dpdk_common_INCLUDE_DIR rte_common.h
HINTS
cmake: dpdk: fix typo in HINTS when looking for DPDK Signed-off-by: Clément Péron <peron.clem@gmail.com>
2022-01-13 13:26:29 +00:00
ENV DPDK_DIR
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
PATH_SUFFIXES
dpdk
include)
set(dpdk_INCLUDE_DIRS "${dpdk_config_INCLUDE_DIR}")
cmake: dpdk: only append common dir if it has been found Signed-off-by: Clément Péron <peron.clem@gmail.com>
2022-01-13 13:32:20 +00:00
if(dpdk_common_INCLUDE_DIR AND NOT dpdk_config_INCLUDE_DIR STREQUAL dpdk_common_INCLUDE_DIR)
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
list(APPEND dpdk_INCLUDE_DIRS "${dpdk_common_INCLUDE_DIR}")
endif()
endif()
msg/async: add dpdk stack plugin Signed-off-by: Haomai Wang <haomai@xsky.com>
2016-08-02 15:50:13 +00:00
cmake: add rte_mempool_{ring,stack} to Finddpdk.cmake * also refactor it a little bit Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-01-10 07:14:01 +00:00
set(components
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
bus_pci
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
bus_vdev
cfgfile
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
cmdline
eal
ethdev
hash
kvargs
mbuf
mempool
mempool_ring
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
net
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
pci
pmd_af_packet
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
pmd_bnxt
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
pmd_bond
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
pmd_cxgbe
pmd_e1000
pmd_ena
pmd_enic
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
pmd_i40e
pmd_ixgbe
pmd_mlx5
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
pmd_nfp
pmd_qede
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
pmd_ring
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
pmd_sfc_efx
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
pmd_vmxnet3_uio
cmake: link DPDK shared libraries to avoid DPDK initialization failure The common_async_dpdk library depends on the dpdk librte_eal file. If the static library is used, the dependency is transferred to libceph-common. By default, libceph-common uses the PUBLIC keyword, the keyword PUBLIC determines that both the application and libceph-common link to dpdk librte_eal.a. As a result, the global variables in dpdk librte_eal.a has two copies. So link DPDK shared libs to avoid DPDK initialization failure. Fixes: https://tracker.ceph.com/issues/42861 Signed-off-by: Chunsong Feng <fengchunsong@huawei.com> Signed-off-by: luorixin <luorixin@huawei.com>
2021-10-14 12:17:50 +00:00
pmd_hns3
pmd_hinic
crimson: link required dpdk components for seastar see https://github.com/scylladb/seastar/blob/ 809b3ef875e7edb7c56643812dc8347ff9a82cee/cmake/Finddpdk.cmake#L60-L85 Signed-off-by: Yingxin Cheng <yingxin.cheng@intel.com>
2019-11-06 09:27:39 +00:00
ring
timer)
cmake: add Find{dpdk,pciaccess}.cmake to ready the SPDK support Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-03 10:31:45 +00:00
cmake: define dpdk_LIBRARIES properly dpdk_LIBRARIES should not be a list of dpdk library target, it should be a list of paths to them. this also align with the definition of `Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined, we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as our `Finddpdk.cmake` has higher priority than the one in seastar, and is used when `find_package(dpdk...)` is called. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:10:32 +00:00
# for collecting dpdk library targets, it will be used when defining dpdk::dpdk
set(_dpdk_libs)
# for list of dpdk library archive paths
cmake: initialize dpdk_LIBRARIES with empty list set(dpdk_LIBRARIES) does not reset this variable, it leaves it unchanged. if pkg-config manages to find DPDK libraries, dpdk_LIBRARIES would be set with a string like "rte_node;rte_graph;..." by pkg_check_modules(dpdk QUIET libdpdk). but we would want to set this variable to the import paths of the required libraries. so reset it before appending them to this variable. this change helps to address the build failure when building Ceph with DPDK installed into system along with its .pc file. Signed-off-by: Kefu Chai <kchai@redhat.com>
2021-07-31 07:49:20 +00:00
set(dpdk_LIBRARIES "")
cmake: add rte_mempool_{ring,stack} to Finddpdk.cmake * also refactor it a little bit Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-01-10 07:14:01 +00:00
foreach(c ${components})
cmake: enable Finddpdk to find DPDK to be built find_package(dpdk...) is used by seastar to find DPDK if Seastar_DPDK is enabled. but `build_dpdk()` only exposes `dpdk::dpdk`, and it does not set the variables like `dpdk_INCLUDE_DIRS` and `dpdk_LIBRARIES` when it gets called. so we need to adapt Finddpdk to query them from `dpdk::dpdk` target. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 09:35:26 +00:00
set(dpdk_lib dpdk::${c})
if(TARGET ${dpdk_lib})
get_target_property(DPDK_rte_${c}_LIBRARY
${dpdk_lib} IMPORTED_LOCATION)
else()
cmake: link DPDK shared libraries to avoid DPDK initialization failure The common_async_dpdk library depends on the dpdk librte_eal file. If the static library is used, the dependency is transferred to libceph-common. By default, libceph-common uses the PUBLIC keyword, the keyword PUBLIC determines that both the application and libceph-common link to dpdk librte_eal.a. As a result, the global variables in dpdk librte_eal.a has two copies. So link DPDK shared libs to avoid DPDK initialization failure. Fixes: https://tracker.ceph.com/issues/42861 Signed-off-by: Chunsong Feng <fengchunsong@huawei.com> Signed-off-by: luorixin <luorixin@huawei.com>
2021-10-14 12:17:50 +00:00
find_library(DPDK_rte_${c}_LIBRARY rte_${c}
cmake: enable Finddpdk to find DPDK to be built find_package(dpdk...) is used by seastar to find DPDK if Seastar_DPDK is enabled. but `build_dpdk()` only exposes `dpdk::dpdk`, and it does not set the variables like `dpdk_INCLUDE_DIRS` and `dpdk_LIBRARIES` when it gets called. so we need to adapt Finddpdk to query them from `dpdk::dpdk` target. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 09:35:26 +00:00
HINTS
ENV DPDK_DIR
${dpdk_LIBRARY_DIRS}
PATH_SUFFIXES lib)
endif()
cmake: Finddpdk: add dpdk::${component} libs Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-20 10:50:07 +00:00
if(DPDK_rte_${c}_LIBRARY)
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
if (NOT TARGET ${dpdk_lib})
add_library(${dpdk_lib} UNKNOWN IMPORTED)
set_target_properties(${dpdk_lib} PROPERTIES
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
INTERFACE_INCLUDE_DIRECTORIES "${dpdk_INCLUDE_DIRS}"
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
IMPORTED_LOCATION "${DPDK_rte_${c}_LIBRARY}")
if(c STREQUAL pmd_mlx5)
find_package(verbs QUIET)
if(verbs_FOUND)
target_link_libraries(${dpdk_lib} INTERFACE IBVerbs::verbs)
endif()
endif()
endif()
cmake: define dpdk_LIBRARIES properly dpdk_LIBRARIES should not be a list of dpdk library target, it should be a list of paths to them. this also align with the definition of `Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined, we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as our `Finddpdk.cmake` has higher priority than the one in seastar, and is used when `find_package(dpdk...)` is called. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:10:32 +00:00
list(APPEND _dpdk_libs ${dpdk_lib})
list(APPEND dpdk_LIBRARIES ${DPDK_rte_${c}_LIBRARY})
cmake: Finddpdk: add dpdk::${component} libs Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-07-20 10:50:07 +00:00
endif()
cmake: add rte_mempool_{ring,stack} to Finddpdk.cmake * also refactor it a little bit Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-01-10 07:14:01 +00:00
endforeach()
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
mark_as_advanced(dpdk_INCLUDE_DIRS ${dpdk_LIBRARIES})
cmake: add Find{dpdk,pciaccess}.cmake to ready the SPDK support Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-03 10:31:45 +00:00
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(dpdk DEFAULT_MSG
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
dpdk_INCLUDE_DIRS
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
dpdk_LIBRARIES)
cmake: add Find{dpdk,pciaccess}.cmake to ready the SPDK support Signed-off-by: Kefu Chai <kchai@redhat.com>
2016-02-03 10:31:45 +00:00
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
if(dpdk_FOUND)
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
if(NOT TARGET dpdk::cflags)
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64|x86_64|AMD64")
set(rte_cflags "-march=core2")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm|ARM")
set(rte_cflags "-march=armv7-a")
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|AARCH64")
set(rte_cflags "-march=armv8-a+crc")
endif()
add_library(dpdk::cflags INTERFACE IMPORTED)
if (rte_cflags)
set_target_properties(dpdk::cflags PROPERTIES
INTERFACE_COMPILE_OPTIONS "${rte_cflags}")
endif()
endif()
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
if(NOT TARGET dpdk::dpdk)
add_library(dpdk::dpdk INTERFACE IMPORTED)
find_package(Threads QUIET)
cmake: define dpdk_LIBRARIES properly dpdk_LIBRARIES should not be a list of dpdk library target, it should be a list of paths to them. this also align with the definition of `Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined, we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as our `Finddpdk.cmake` has higher priority than the one in seastar, and is used when `find_package(dpdk...)` is called. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:10:32 +00:00
list(APPEND _dpdk_libs
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
Threads::Threads
cmake: link DPDK shared libraries to avoid DPDK initialization failure The common_async_dpdk library depends on the dpdk librte_eal file. If the static library is used, the dependency is transferred to libceph-common. By default, libceph-common uses the PUBLIC keyword, the keyword PUBLIC determines that both the application and libceph-common link to dpdk librte_eal.a. As a result, the global variables in dpdk librte_eal.a has two copies. So link DPDK shared libs to avoid DPDK initialization failure. Fixes: https://tracker.ceph.com/issues/42861 Signed-off-by: Chunsong Feng <fengchunsong@huawei.com> Signed-off-by: luorixin <luorixin@huawei.com>
2021-10-14 12:17:50 +00:00
dpdk::cflags
numa)
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
set_target_properties(dpdk::dpdk PROPERTIES
cmake: define dpdk_LIBRARIES properly dpdk_LIBRARIES should not be a list of dpdk library target, it should be a list of paths to them. this also align with the definition of `Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined, we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as our `Finddpdk.cmake` has higher priority than the one in seastar, and is used when `find_package(dpdk...)` is called. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:10:32 +00:00
INTERFACE_LINK_LIBRARIES "${_dpdk_libs}"
cmake: fix the build WITH_DPDK=ON * add Findcryptopp.cmake back cryptopp support was dropped in #20015, but it's required by src/msg/async/dpdk/TCP.h, which `#include <cryptopp/md5.h>` so, to fix the FTBFS of WITH_DPDK=ON, we need to bring Findcryptopp.cmake back. it was also removed in #20015. * pass "-march=core2" when building sources which include dpdk headers. i was wrong that the headers shipped by distro are generic. the headers use the sse instructions for speedup memcpy, see /usr/include/x86_64-linux-gnu/dpdk/rte_memcpy.h . * also, we need to include the arch specific include directory for building with dpdk. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-20 14:11:02 +00:00
INTERFACE_INCLUDE_DIRECTORIES "${dpdk_INCLUDE_DIRS}")
cmake: add rte_mempool_{ring,stack} to Finddpdk.cmake * also refactor it a little bit Signed-off-by: Kefu Chai <kchai@redhat.com>
2017-01-10 07:14:01 +00:00
endif()
cmake: fix Finddpdk.cmake * add dpdk::dpdk if dpdk is built or found, as seastar checks for it before adding its component libraries. if user installs libdpdk and builds WITH_SEASTAR=ON or WITH_DPDK=ON, cmake fails to configure the building system without this fix. * add dpdk::cflags target for populating the -march=<arch> compile option. * also use pkg-config for finding dpdk. * link common_async_dpdk against dpdk::dpdk instead please note, the reason why we can remove the "-march=native" compile option from Finddpdk.cmake, is that the distro shipped header files are "generic" in the sense of "-march=<ARCH>", they do not enable the arch specific intrinsic by default, hence the source files including them do not need specific compiler options. Signed-off-by: Kefu Chai <kchai@redhat.com>
2018-08-17 04:27:49 +00:00
endif()
cmake: define dpdk_LIBRARIES properly dpdk_LIBRARIES should not be a list of dpdk library target, it should be a list of paths to them. this also align with the definition of `Finddpdk.cmake` in seastar project. so, if `Seastar_DPDK` is defined, we should be able to offer the expected `dpdk_LIBRARIES` for seastar, as our `Finddpdk.cmake` has higher priority than the one in seastar, and is used when `find_package(dpdk...)` is called. Signed-off-by: Kefu Chai <kchai@redhat.com>
2019-10-24 06:10:32 +00:00
unset(_dpdk_libs)
Reference in New Issue Copy Permalink