Skip to content

Commit 7fdb26c

Browse files
committed
tar-artifacts: Include samples/livepatch/livepatch-sample.ko
livepatch and bpf trampoline both use ftrace direct functions. Special cares are needed to make the two work together. To add selftests for livepatch + trampoline, a livepatch kernel module is needed. Enable compiling samples/livepatch/livepatch-sample.ko and include it in the tar artifacts. Signed-off-by: Song Liu <[email protected]>
1 parent dc6aea4 commit 7fdb26c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

ci/vmtest/configs/config

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
CONFIG_KASAN=y
22
CONFIG_KASAN_GENERIC=y
33
CONFIG_KASAN_VMALLOC=y
4+
CONFIG_LIVEPATCH=y
5+
CONFIG_SAMPLES=y
6+
CONFIG_SAMPLE_LIVEPATCH=m
47
# CONFIG_UBSAN=y

tar-artifacts/tar-artifacts.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ source "${GITHUB_ACTION_PATH}/../helpers.sh"
2929
"${arch}"-linux-gnu-strip --strip-debug "${KBUILD_OUTPUT}"/vmlinux
3030

3131
image_name=$(make -C ${REPO_ROOT} ARCH="$(platform_to_kernel_arch "${arch}")" -s image_name)
32-
kbuild_output_file_list=(".config" "${image_name}" "vmlinux")
32+
kbuild_output_file_list=(".config" "${image_name}" "vmlinux" "samples/livepatch/livepatch-sample.ko")
3333

3434
function push_to_kout_list() {
3535
local item="$1"
@@ -88,4 +88,3 @@ if [[ -n "${ARCHIVE_SCHED_EXT_SELFTESTS}" ]]; then
8888
fi
8989

9090
zstd -T0 -19 -i "${tarball}" -o "${zst_tarball}"
91-

0 commit comments

Comments
 (0)