Skip to content

Enable 16kb pages for x86_64 and arm64 #123

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

Merged
michalgr merged 1 commit into from
Jul 3, 2025
Merged

Enable 16kb pages for x86_64 and arm64 #123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion projects/libbpf/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@ $(LIBBPF_ANDROID): $(ANDROID_OUT_DIR)/lib/pkgconfig/zlib.pc
OBJDIR=$(abspath $(LIBBPF_ANDROID_BUILD_DIR)) \
AR=$(abspath $(ANDROID_TOOLCHAIN_PATH)/llvm-ar) \
CC=$(abspath $(ANDROID_TOOLCHAIN_PATH)/$(ANDROID_TRIPLE)$(NDK_API)-clang) \
EXTRA_CFLAGS="$(LIBBPF_EXTRA_CFLAGS)"
EXTRA_CFLAGS="$(LIBBPF_EXTRA_CFLAGS)" \
EXTRA_LDFLAGS="-Wl,-z,max-page-size=$(ANDROID_MAX_PAGE_SIZE)"
cp $(LIBBPF_SRCS)/LICENSE $(ANDROID_OUT_DIR)/licenses/libbpf
touch $@

Expand Down
1 change: 1 addition & 0 deletions toolchains/autotools.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ $(ANDROID_CONFIG_SITE): | $(ANDROID_OUT_DIR)
@sed -ibkp -e "s+<TRIPLE>+$(ANDROID_TRIPLE)+g" $@
@sed -ibkp -e "s+<SITE_PATH>+$(abspath $(ANDROID_OUT_DIR))+g" $@
@sed -ibkp -e "s+<API>+$(NDK_API)+g" $@
@sed -ibkp -e "s+<MAX_PAGE_SIZE>+$(ANDROID_MAX_PAGE_SIZE)+g" $@

$(HOST_CONFIG_SITE): | $(HOST_OUT_DIR)
cp toolchains/config.site.host.template $@
Expand Down
1 change: 1 addition & 0 deletions toolchains/cmake.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ ANDROID_EXTRA_CMAKE_FLAGS += -DANDROID_ABI=$(CMAKE_ABI)
ANDROID_EXTRA_CMAKE_FLAGS += -DANDROID_PLATFORM=android-$(NDK_API)
ANDROID_EXTRA_CMAKE_FLAGS += -DANDROID_STL=c++_shared
ANDROID_EXTRA_CMAKE_FLAGS += -DANDROID_ALLOW_UNDEFINED_SYMBOLS=TRUE
ANDROID_EXTRA_CMAKE_FLAGS += -DANDROID_SUPPORT_FLEXIBLE_PAGE_SIZES=ON
ANDROID_EXTRA_CMAKE_FLAGS += -DCMAKE_BUILD_TYPE=$(BUILD_TYPE)

# Install libs/binaries to out directory. Scan the out directory
Expand Down
2 changes: 1 addition & 1 deletion toolchains/config.site.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ test -z "$STRIP" && STRIP=<BIN_PATH>/llvm-strip
test -z "$PKG_CONFIG_LIBDIR" && PKG_CONFIG_LIBDIR=<SITE_PATH>/lib/pkgconfig
test -z "$CPPFLAGS" && CPPFLAGS="-I<SITE_PATH>/include $EXTRA_CPPFLAGS"
test -z "$CFLAGS" && CFLAGS="-fPIC $EXTRA_CFLAGS"
test -z "$LDFLAGS" && LDFLAGS="-L<SITE_PATH>/lib -L<SITE_PATH>/lib64 $EXTRA_LDFLAGS"
test -z "$LDFLAGS" && LDFLAGS="-L<SITE_PATH>/lib -L<SITE_PATH>/lib64 -Wl,-z,max-page-size=<MAX_PAGE_SIZE> $EXTRA_LDFLAGS"
9 changes: 6 additions & 3 deletions toolchains/toolchains.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ ANDROID_TOOLCHAIN_PATH = \
$(abspath $(NDK_PATH)/toolchains/llvm/prebuilt/linux-x86_64/bin)
ANDROID_TOOLCHAIN_STRIP_PATH = $(ANDROID_TOOLCHAIN_PATH)/llvm-strip

include toolchains/autotools.mk
include toolchains/cmake.mk

ifeq ($(NDK_ARCH), arm64)
ANDROID_MAX_PAGE_SIZE = 16384
ANDROID_SYSROOT_LIB_SUBDIR = aarch64-linux-android
else ifeq ($(NDK_ARCH), x86_64)
ANDROID_MAX_PAGE_SIZE = 16384
ANDROID_SYSROOT_LIB_SUBDIR = x86_64-linux-android
else ifeq ($(NDK_ARCH), armv7)
ANDROID_MAX_PAGE_SIZE = 4096
ANDROID_SYSROOT_LIB_SUBDIR = arm-linux-androideabi
else
$(error unknown abi $(NDK_ARCH))
Expand All @@ -28,3 +28,6 @@ ANDROID_SYSROOT_LIB_PATH = \

$(ANDROID_OUT_DIR)/lib/libc++_shared.so: | $(ANDROID_OUT_DIR)
cp $(ANDROID_SYSROOT_PATH)/usr/lib/$(ANDROID_SYSROOT_LIB_SUBDIR)/libc++_shared.so $@

include toolchains/autotools.mk
include toolchains/cmake.mk