From 2df822c808677a0ad691b8d513e76064b0365cef Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Fri, 27 Oct 2023 16:19:37 +0000 Subject: [PATCH] [Java] Drop legacy glibc support in release builds --- .github/workflows/build.yml | 22 ++++++++-------- genbindings.sh | 52 ------------------------------------- 2 files changed, 11 insertions(+), 63 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e354b95..32895fcd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: runs-on: ubuntu-latest # Ubuntu's version of rustc uses its own LLVM instead of being a real native package. # This leaves us with an incompatible LLVM version when linking. Instead, use a real OS. - container: debian:bullseye + container: debian:bookworm strategy: fail-fast: false steps: @@ -116,7 +116,7 @@ jobs: run: | apt-get update apt-get -y dist-upgrade - apt-get -y install cargo valgrind lld git g++ clang openjdk-11-jdk maven faketime zip unzip llvm curl + apt-get -y install cargo valgrind lld git g++ clang openjdk-17-jdk maven faketime zip unzip llvm curl - name: Checkout source code uses: actions/checkout@v2 with: @@ -153,15 +153,15 @@ jobs: cd ldk-c-bindings ./genbindings.sh ../rust-lightning true - name: Build Java Debug Bindings - run: ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-11-openjdk-amd64/include/ -I/usr/lib/jvm/java-11-openjdk-amd64/include/linux/" true false + run: ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-17-openjdk-amd64/include/ -I/usr/lib/jvm/java-17-openjdk-amd64/include/linux/" true false - name: Run Java Tests against Debug Bindings run: | mv liblightningjni_debug_Linux-amd64.so liblightningjni.so export ASAN_OPTIONS=detect_leaks=0 - LD_PRELOAD=/usr/lib/llvm-11/lib/clang/11.0.1/lib/linux/libclang_rt.asan-x86_64.so LD_LIBRARY_PATH=. mvn test + LD_PRELOAD=/usr/lib/llvm-14/lib/clang/14.0.6/lib/linux/libclang_rt.asan-x86_64.so LD_LIBRARY_PATH=. mvn test - name: Build Java Release Bindings run: | - ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-11-openjdk-amd64/include/ -I/usr/lib/jvm/java-11-openjdk-amd64/include/linux/" false false + ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-17-openjdk-amd64/include/ -I/usr/lib/jvm/java-17-openjdk-amd64/include/linux/" false false - name: Check latest headers are in git run: | git checkout pom.xml @@ -171,7 +171,7 @@ jobs: runs-on: ubuntu-latest # Ubuntu's version of rustc uses its own LLVM instead of being a real native package. # This leaves us with an incompatible LLVM version when linking. Instead, use a real OS. - container: debian:bullseye + container: debian:bookworm strategy: fail-fast: false steps: @@ -179,7 +179,7 @@ jobs: run: | apt-get update apt-get -y dist-upgrade - apt-get -y install cargo valgrind lld git g++ clang openjdk-11-jdk maven faketime zip unzip llvm curl + apt-get -y install cargo valgrind lld git g++ clang openjdk-17-jdk maven faketime zip unzip llvm curl - name: Checkout source code uses: actions/checkout@v2 with: @@ -238,7 +238,7 @@ jobs: - name: Build Leaktracking Java Release Bindings run: | export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" - ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-11-openjdk-amd64/include/ -I/usr/lib/jvm/java-11-openjdk-amd64/include/linux/" leaks false + ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-17-openjdk-amd64/include/ -I/usr/lib/jvm/java-17-openjdk-amd64/include/linux/" leaks false - name: Build deterministic release jar run: | ./build-release-jar.sh @@ -251,7 +251,7 @@ jobs: - name: Build Java Release Bindings run: | export LDK_GARBAGECOLLECTED_GIT_OVERRIDE="$(git describe --tag HEAD)" - ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-11-openjdk-amd64/include/ -I/usr/lib/jvm/java-11-openjdk-amd64/include/linux/" false false + ./genbindings.sh ./ldk-c-bindings/ "-I/usr/lib/jvm/java-17-openjdk-amd64/include/ -I/usr/lib/jvm/java-17-openjdk-amd64/include/linux/" false false - name: Build deterministic release jar run: ./build-release-jar.sh - name: Check latest library and jars are in bins repo @@ -409,7 +409,7 @@ jobs: android: runs-on: ubuntu-latest # Frankly, I'm not really sure why debian and ubuntu differ in the results here, they really shouldn't - container: debian:bullseye + container: debian:bookworm strategy: fail-fast: false steps: @@ -417,7 +417,7 @@ jobs: run: | apt-get update apt-get -y dist-upgrade - apt-get -y install git g++ clang faketime zip unzip curl openjdk-11-jdk + apt-get -y install git g++ clang faketime zip unzip curl openjdk-17-jdk curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh chmod +x ./rustup.sh ./rustup.sh -y diff --git a/genbindings.sh b/genbindings.sh index fbc237f7..e1d5c9d9 100755 --- a/genbindings.sh +++ b/genbindings.sh @@ -280,62 +280,10 @@ else LDK_LIB="$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then LINK="$LINK -Wl,--version-script=libcode.version -fuse-ld=lld" - # __cxa_thread_atexit_impl is used to more effeciently cleanup per-thread local storage by rust libstd. - # However, it is not available on glibc versions 2.17 or earlier, and rust libstd has a null-check and - # fallback in case it is missing. - # Because it is weak-linked on the rust side, we should be able to simply define it - # explicitly, forcing rust to use the fallback. However, for some reason involving ancient - # dark magic and haunted code segments, overriding the weak symbol only impacts sites which - # *call* the symbol in question, not sites which *compare with* the symbol in question. - # This means that the NULL check in rust's libstd will always think the function is - # callable while the function which is called ends up being NULL (leading to a jmp to the - # zero page and a quick SEGFAULT). - # This issue persists not only with directly providing a symbol, but also ld.lld's -wrap - # and --defsym arguments. - # In smaller programs, it appears to be possible to work around this with -Bsymbolic and - # -nostdlib, however when applied the full-sized JNI library here it no longer works. - # After exhausting nearly every flag documented in lld, the only reliable method appears - # to be editing the LDK binary. Luckily, LLVM's tooling makes this rather easy as we can - # disassemble it into very readable code, edit it, and then reassemble it. - # Note that if we do so we don't have to bother overriding the actual call, LLVM should - # optimize it away, which also provides a good check that there isn't anything actually - # relying on it elsewhere. - [ ! -f "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a ] && exit 1 - if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep -v "\.o$" || echo)" != "" ]; then - echo "Archive contained non-object files!" - exit 1 - fi - if [ "$(ar t "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a | grep ldk.*-cgu.*.rcgu.o | wc -l)" != "1" ]; then - echo "Archive contained more than one LDK object file" - exit 1 - fi - mkdir -p tmp - rm -f tmp/* - ar x --output=tmp "$1"/lightning-c-bindings/target/$LDK_TARGET/release/libldk.a - pushd tmp - llvm-dis ldk*-cgu.*.rcgu.o - sed -i 's/br i1 icmp eq (i8\* @__cxa_thread_atexit_impl, i8\* null)/br i1 icmp eq (i8* null, i8* null)/g' ldk*-cgu.*.rcgu.o.ll - llvm-as ldk*-cgu.*.rcgu.o.ll -o ./libldk.bc - ar q libldk.a *.o - popd - LDK_LIB="tmp/libldk.bc tmp/libldk.a" fi $COMPILE -o bindings.o -c -O3 -I"$1"/lightning-c-bindings/include/ $2 src/main/jni/bindings.c $COMPILE $LINK -o liblightningjni_release$LDK_TARGET_SUFFIX.so -O3 -I"$1"/lightning-c-bindings/include/ $2 bindings.o $LDK_LIB -lm [ "$IS_APPLE_CLANG" != "true" ] && llvm-strip liblightningjni_release$LDK_TARGET_SUFFIX.so - if [ "$IS_MAC" = "false" -a "$4" = "false" ]; then - GLIBC_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep GLIBC_ | grep -v "GLIBC_2\.2\." | grep -v "GLIBC_2\.3\(\.\| \)" | grep -v "GLIBC_2.\(14\|17\) " || echo)" - if [ "$GLIBC_SYMBS" != "" ]; then - echo "Unexpected glibc version dependency! Some users need glibc 2.17 support, symbols for newer glibcs cannot be included." - echo "$GLIBC_SYMBS" - exit 1 - fi - REALLOC_ARRAY_SYMBS="$(objdump -T liblightningjni_release$LDK_TARGET_SUFFIX.so | grep reallocarray || echo)" - if [ "$REALLOC_ARRAY_SYMBS" != "" ]; then - echo "Unexpected reallocarray dependency!" - exit 1 - fi - fi if [ "$LDK_JAR_TARGET" = "true" ]; then # Copy to JNI native directory for inclusion in JARs mkdir -p src/main/resources/ -- 2.39.5