Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restore multi arch support #342

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

restore multi arch support #342

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
215eeff
use VPP plugin cmake infrastructure
RoadRunnr Jun 20, 2023
cdeee39
restore multi arch support
RoadRunnr Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
254 changes: 25 additions & 229 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,245 +1,41 @@
# TBD: license (udpi etc.)

cmake_minimum_required(VERSION 3.13 FATAL_ERROR)

set(CMAKE_C_COMPILER_NAMES
clang-13
clang-12
clang-11
clang-10
clang-9
gcc-10
gcc-9
cc
)

project(upf-plugin)

# rm
set(CMAKE_VERBOSE_MAKEFILE ON)

include(GNUInstallDirs)

set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/"
)

set (CMAKE_CXX_STANDARD 11)
set (CMAKE_C_STANDARD 11)

# Check for memfd_create syscall
include(CheckSymbolExists)
CHECK_SYMBOL_EXISTS ( "__NR_memfd_create" "sys/syscall.h" HAVE_MEMFD_CREATE )
if ( HAVE_MEMFD_CREATE )
add_definitions ( -DHAVE_MEMFD_CREATE )
endif()

if(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
set(UPF_PLUGIN upf-plugin)
endif()

include (Packager)

# Dependencies

# message(STATUS "Looking for hyperscan")
# pkg_check_modules(HS libhs)

# if(HS_FOUND)
# include_directories(${HS_INCLUDE_DIRS})
# message(STATUS "Found Hyperscan in ${HYPERSCAN_INCLUDE_DIRS}")
# else()
# message(WARNING "-- Hyperscan not found")
# endif()

message(STATUS "Looking for Hyperscan")
find_path(HYPERSCAN_INCLUDE_DIR NAMES hs/hs.h)
find_library(HYPERSCAN_LIB1 NAMES hs)
find_library(HYPERSCAN_LIB2 NAMES hs_runtime)
set (HYPERSCAN_LIB ${HYPERSCAN_LIB1} ${HYPERSCAN_LIB2})
if(HYPERSCAN_INCLUDE_DIR AND HYPERSCAN_LIB)
include_directories(${HYPERSCAN_INCLUDE_DIR})
message(STATUS "Found Hyperscan in ${HYPERSCAN_INCLUDE_DIR}")
else()
message(WARNING "-- Hyperscan not found")
endif()
cmake_minimum_required(VERSION 3.13 FATAL_ERROR)
include(cmake/misc.cmake)
include(cmake/Packager.cmake)

find_package(VPP REQUIRED)

include_directories(${VPP_INCLUDE_DIR})

set(UPF_PLUGIN_SOURCES
upf/upf.c
upf/upf_api.c
upf/upf_cli.c
upf/upf_gtpu_encap.c
upf/upf_gtpu_decap.c
upf/upf_flow_node.c
upf/upf_classify.c
upf/upf_adf.c
upf/upf_input.c
upf/upf_forward.c
upf/upf_session_dpo.c
upf/pfcp.c
upf/upf_pfcp.c
upf/upf_pfcp_api.c
upf/upf_pfcp_server.c
upf/upf_pfcp_session_server.c
upf/upf_proxy_accept.c
upf/upf_proxy_input.c
upf/upf_proxy_output.c
upf/upf_tcp_forward.c
upf/upf_proxy.c
upf/upf_app_db.c
upf/upf_ipfilter.c
upf/upf_app_dpo.c
upf/upf_ipfix.c
upf/upf_ipfix_templates.c
upf/upf_tw_timer_1t_3w_1024sl_ov.c
upf/upf_tw_timer_2t_1w_2048sl.c
upf/flowtable_init.c
upf/flowtable.c
upf/unittest.c

upf/upf_gtpu_encap.c
upf/upf_gtpu_decap.c
upf/upf_flow_node.c
upf/upf_classify.c
upf/upf_proxy_accept.c
upf/upf_proxy_input.c
upf/upf_proxy_output.c
upf/upf_tcp_forward.c
upf/upf_input.c
upf/upf_forward.c
upf/upf_session_dpo.c
)

set(UPF_PLUGIN_HEADER_FILES
upf/upf.h
upf/pfcp.h
upf/upf_pfcp.h
upf/upf_pfcp_api.h
upf/upf_pfcp_server.h
upf/upf_proxy.h
upf/upf_app_db.h
upf/upf_ipfilter.h
upf/upf_app_dpo.h
upf/upf_app_db.h
upf/flowtable.h
upf/flowtable_tcp.h
upf/upf_ipfix.h
upf/upf_ipfix_templates.h
upf/upf_tw_timer_1t_3w_1024sl_ov.h
upf/upf_tw_timer_2t_1w_2048sl.h
upf/upf_tw_timer_template.h
upf/upf_gtpu_error.def
upf/version.h
)

set(UPF_API_TEST_SOURCE_FILES
upf/upf_test.c
)

set(UPF_API_GENERATED_FILES
${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.h
${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api_types.h
${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api_enum.h
)

set(UPF_VAPI_GENERATED_FILES
${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.vapi.h
${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.vapi.hpp
)

if (NOT VPP_HOME)
set(VPP_HOME /usr)
endif()

if (NOT CMAKE_BUILD_TYPE)
set (CMAKE_BUILD_TYPE "Release")
endif (NOT CMAKE_BUILD_TYPE)
# Standard installation directories.
include(GNUInstallDirs)

SET(UPF_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "upf_install_prefix")
# Control where libraries and executables are placed during the build.
set(VPP_LIBRARY_DIR ${CMAKE_INSTALL_LIBDIR})

if (CMAKE_BUILD_TYPE STREQUAL "Release")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -march=corei7 -mtune=corei7-avx -O3 -g")
set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Wall -O3 -g")
elseif (CMAKE_BUILD_TYPE STREQUAL "Debug")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -Wall -march=corei7 -mtune=corei7-avx -O0 -g")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -g")
add_definitions(-DCLIB_DEBUG -DVLIB_BUFFER_TRACE_TRAJECTORY -fPIC -fstack-protector-all)
endif()

execute_process(
COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf
)

add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.h ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api_types.h ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api_enum.h
COMMAND ${VPP_HOME}/bin/vppapigen ARGS --includedir ${VPP_HOME}/include --input ${CMAKE_CURRENT_SOURCE_DIR}/upf/upf.api --output ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.h --outputdir ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/upf/upf.api
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.json
COMMAND ${VPP_HOME}/bin/vppapigen ARGS JSON --includedir ${VPP_HOME}/include --input ${CMAKE_CURRENT_SOURCE_DIR}/upf/upf.api --output ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.json --outputdir ${CMAKE_CURRENT_BINARY_DIR}/vapi/
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.vapi.h
COMMAND python3 ${VPP_HOME}/share/vpp/vapi_c_gen.py ARGS ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.json
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.vapi.hpp
COMMAND python3 ${VPP_HOME}/share/vpp/vapi_cpp_gen.py ARGS ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.json
)

include_directories(SYSTEM)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf)

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUPF_VPP_PLUGIN=1")
add_library(upf_plugin SHARED
${UPF_PLUGIN_SOURCES}
${UPF_API_GENERATED_FILES}
${UPF_VAPI_GENERATED_FILES})
target_link_libraries(upf_plugin ${HYPERSCAN_LIB})

file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf)
file(COPY ${UPF_PLUGIN_HEADER_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf)
include_directories(${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins)

# add_library(upf_api_test_plugin SHARED
# ${UPF_API_TEST_SOURCE_FILES}
# ${UPF_API_GENERATED_FILES})

set(VPP_INSTALL_PLUGIN ${UPF_INSTALL_PREFIX}/vpp_plugins)
# set(VPP_INSTALL_API_TEST_PLUGIN ${UPF_INSTALL_PREFIX}/vpp_api_test_plugins CACHE STRING "vpp_install_api_test_plugin")

set_target_properties(upf_plugin
PROPERTIES
LINKER_LANGUAGE C
INSTALL_RPATH ${VPP_INSTALL_PLUGIN}
PREFIX "")
# set_target_properties(upf_api_test_plugin
# PROPERTIES
# LINKER_LANGUAGE C
# PREFIX "")

install(DIRECTORY
DESTINATION ${VPP_INSTALL_PLUGIN}
COMPONENT ${UPF_PLUGIN})
install(TARGETS upf_plugin
DESTINATION ${VPP_INSTALL_PLUGIN}
COMPONENT ${UPF_PLUGIN})

#install(DIRECTORY
# DESTINATION ${VPP_INSTALL_API_TEST_PLUGIN}
# COMPONENT ${UPF_PLUGIN})
#install(TARGETS upf_api_test_plugin
# DESTINATION ${VPP_INSTALL_API_TEST_PLUGIN}
# COMPONENT ${UPF_PLUGIN})

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/vpp_plugins/upf/upf.api.json
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/vpp/api/plugins
COMPONENT ${UPF_PLUGIN}-dev)

install(FILES ${UPF_API_HEADER_FILES} ${UPF_API_GENERATED_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/vpp_plugins/upf
COMPONENT ${UPF_PLUGIN}-dev)

install(FILES ${UPF_VAPI_GENERATED_FILES}
DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/vapi
COMPONENT ${UPF_PLUGIN}-dev)
add_subdirectory(upf)

make_packages()

##############################################################################
# print configuration
##############################################################################
message(STATUS "Configuration:")
pr("Build type" ${CMAKE_BUILD_TYPE})
pr("C compiler" "${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION})")
pr("C flags" ${CMAKE_C_FLAGS}${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UC}})
pr("Linker flags (apps)" ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}})
pr("Linker flags (libs)" ${CMAKE_SHARED_LINKER_FLAGS} ${CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UC}})
pr("Host processor" ${CMAKE_HOST_SYSTEM_PROCESSOR})
pr("Target processor" ${CMAKE_SYSTEM_PROCESSOR})
pr("Prefix path" ${CMAKE_PREFIX_PATH})
pr("Install prefix" ${CMAKE_INSTALL_PREFIX})
pr("Library dir" ${VPP_LIBRARY_DIR})
74 changes: 0 additions & 74 deletions cmake/FindVPP.cmake
View file
Open in desktop

This file was deleted.

Loading