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.

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

draft: improve CPU cores affinity to NUMA nodes v6 #12248

Draft
wants to merge 7 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
64 changes: 64 additions & 0 deletions .github/workflows/builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libtool \
Expand Down Expand Up @@ -258,6 +260,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libtool \
Expand Down Expand Up @@ -353,6 +357,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libtool \
Expand Down Expand Up @@ -504,6 +510,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libtool \
Expand Down Expand Up @@ -601,6 +609,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libtool \
Expand Down Expand Up @@ -693,6 +703,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
hiredis-devel \
jansson-devel \
jq \
Expand Down Expand Up @@ -791,6 +803,8 @@ jobs:
gcc-c++ \
git \
hiredis-devel \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libasan \
Expand Down Expand Up @@ -889,6 +903,8 @@ jobs:
gcc-c++ \
git \
hiredis-devel \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libasan \
Expand Down Expand Up @@ -987,6 +1003,8 @@ jobs:
gcc-c++ \
git \
hiredis-devel \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libasan \
Expand Down Expand Up @@ -1080,6 +1098,8 @@ jobs:
gcc-c++ \
git \
hiredis-devel \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libasan \
Expand Down Expand Up @@ -1165,6 +1185,8 @@ jobs:
gcc-c++ \
git \
hiredis-devel \
hwloc \
hwloc-devel \
jansson-devel \
jq \
libasan \
Expand Down Expand Up @@ -1261,6 +1283,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-devel \
libasan \
libtool \
libyaml-devel \
Expand Down Expand Up @@ -1382,6 +1406,8 @@ jobs:
coccinelle \
dpdk-dev \
git \
hwloc \
hwloc-dev \
jq \
libcap-ng-dev \
libevent-dev \
Expand Down Expand Up @@ -1454,6 +1480,8 @@ jobs:
clang-14 \
curl \
git \
hwloc \
hwloc-dev \
jq \
libtool \
libpcap-dev \
Expand Down Expand Up @@ -1591,6 +1619,8 @@ jobs:
llvm-14-dev \
clang-14 \
git \
hwloc \
hwloc-dev \
jq \
inetutils-ping \
libc++-dev \
Expand Down Expand Up @@ -1696,6 +1726,8 @@ jobs:
llvm-14-dev \
clang-14 \
git \
hwloc \
hwloc-dev \
jq \
inetutils-ping \
libc++-dev \
Expand Down Expand Up @@ -1835,6 +1867,8 @@ jobs:
cbindgen \
clang-18 \
git \
hwloc \
hwloc-dev \
jq \
libc++-dev \
libc++abi-dev \
Expand Down Expand Up @@ -1922,6 +1956,8 @@ jobs:
cbindgen \
clang-18 \
git \
hwloc \
hwloc-dev \
jq \
inetutils-ping \
libc++-dev \
Expand Down Expand Up @@ -2023,6 +2059,8 @@ jobs:
llvm-14-dev \
clang-14 \
git \
hwloc \
hwloc-dev \
jq \
libc++-dev \
libc++abi-dev \
Expand Down Expand Up @@ -2122,6 +2160,8 @@ jobs:
automake \
cargo \
git \
hwloc \
hwloc-dev \
jq \
libtool \
libpcap-dev \
Expand Down Expand Up @@ -2205,6 +2245,8 @@ jobs:
apt -y install \
build-essential \
curl \
hwloc \
hwloc-dev \
libtool \
libpcap-dev \
libnet1-dev \
Expand Down Expand Up @@ -2274,6 +2316,8 @@ jobs:
automake \
cargo \
git \
hwloc \
hwloc-dev \
jq \
libtool \
libpcap-dev \
Expand Down Expand Up @@ -2358,6 +2402,8 @@ jobs:
automake \
cargo \
git \
hwloc \
hwloc-dev \
libtool \
libpcap-dev \
libnet1-dev \
Expand Down Expand Up @@ -2423,6 +2469,8 @@ jobs:
automake \
cargo \
git \
hwloc \
hwloc-dev \
jq \
libtool \
libpcap-dev \
Expand Down Expand Up @@ -2562,6 +2610,8 @@ jobs:
automake \
cargo \
git \
hwloc \
hwloc-dev \
jq \
libtool \
libpcap-dev \
Expand Down Expand Up @@ -2660,6 +2710,8 @@ jobs:
curl \
dpdk-dev \
git \
hwloc \
hwloc-dev \
jq \
make \
libpcre3 \
Expand Down Expand Up @@ -2763,6 +2815,8 @@ jobs:
cmake \
curl \
git \
hwloc \
hwloc-dev \
jq \
make \
libpcre3 \
Expand Down Expand Up @@ -2844,6 +2898,8 @@ jobs:
curl \
dpdk-dev \
git \
hwloc \
hwloc-dev \
jq \
make \
libpcre3 \
Expand Down Expand Up @@ -2928,6 +2984,8 @@ jobs:
ccache \
curl \
git \
hwloc \
hwloc-dev \
jq \
libpcre2-dev \
libpcap-dev \
Expand Down Expand Up @@ -3001,6 +3059,8 @@ jobs:
ccache \
curl \
git \
hwloc \
hwloc-dev \
jq \
libpcre2-dev \
libpcap-dev \
Expand Down Expand Up @@ -3065,6 +3125,8 @@ jobs:
cbindgen \
curl \
hiredis \
hwloc \
hwloc-dev \
jansson \
jq \
libmagic \
Expand Down Expand Up @@ -3294,6 +3356,8 @@ jobs:
gcc \
gcc-c++ \
git \
hwloc \
hwloc-dev \
jansson-devel \
libtool \
libyaml-devel \
Expand Down
23 changes: 23 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -741,6 +741,28 @@
exit 1
fi

LIBHWLOC=""
PKG_CHECK_MODULES([HWLOC], [hwloc >= 2.0.0],
[AC_DEFINE([HAVE_HWLOC], [1], [Define if hwloc library is present and meets version requirements])],
LIBHWLOC="no")

if test "$LIBHWLOC" = "no"; then
echo
echo " ERROR! hwloc library version > 2.0.0 not found, go get it"
echo " from https://www.open-mpi.org/projects/hwloc/ "
echo " or your distribution:"
echo
echo " Ubuntu: apt-get install hwloc libhwloc-dev"
echo " Fedora: dnf install hwloc hwloc-devel"
echo " CentOS/RHEL: yum install hwloc hwloc-devel"
echo
exit 1
else
CFLAGS="${CFLAGS} ${HWLOC_CFLAGS}"
LDFLAGS="${LDFLAGS} ${HWLOC_LIBS}"
enable_hwloc="yes"
fi

# libpthread
AC_ARG_WITH(libpthread_includes,
[ --with-libpthread-includes=DIR libpthread include directory],
Expand Down Expand Up @@ -2561,6 +2583,7 @@ SURICATA_BUILD_CONF="Suricata Configuration:
JA4 support: ${enable_ja4}
Non-bundled htp: ${enable_non_bundled_htp}
Hyperscan support: ${enable_hyperscan}
Hwloc support: ${enable_hwloc}
Libnet support: ${enable_libnet}
liblz4 support: ${enable_liblz4}
Landlock support: ${enable_landlock}
Expand Down
Loading
Loading