Skip to content

kpatch: add openEuler 6.6 kernel support #1504

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

Open
qjl21 wants to merge 2 commits into
base: master
Choose a base branch
from
+10 −1
Open

kpatch: add openEuler 6.6 kernel support #1504

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
1d5cc0d
kpatch: add support for CONFIG_LIVEPATCH_WO_FTRACE on openEuler 6.6
qjling May 16, 2026
eeffe76
kpatch-build: skip CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY check on k…
qjling May 16, 2026
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
7 changes: 7 additions & 0 deletions kmod/patch/livepatch-patch-hook.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,11 @@
#define KLP_REPLACE_ENABLE true
#endif


#ifdef CONFIG_LIVEPATCH_WO_FTRACE
#define HAVE_WO_FTRACE_ENABLE
#endif

/*
* There are quite a few similar structures at play in this file:
* - livepatch.h structs prefixed with klp_*
Expand Down Expand Up @@ -576,6 +581,7 @@ static int __init patch_init(void)
}
#endif

#if defined(HAVE_WO_FTRACE_ENABLE)
ret = klp_enable_patch(lpatch);
if (ret) {
#ifndef HAVE_SIMPLE_ENABLE
Expand All @@ -584,6 +590,7 @@ static int __init patch_init(void)
patch_free_livepatch(lpatch);
return ret;
}
#endif

return 0;
out:
Expand Down
4 changes: 3 additions & 1 deletion kpatch-build/kpatch-build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1194,7 +1194,7 @@ trace_off "reading .config"
source "$CONFIGFILE"
trace_on

[[ "$DISTRO" = openEuler ]] && [[ -z "$CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY" ]] && \
[[ "$DISTRO" = openEuler ]] && ! kernel_version_gte 6.6.0 && [[ -z "$CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY" ]] && \
die "openEuler kernel doesn't have 'CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY' enabled"

[[ -z "$CONFIG_DEBUG_INFO" ]] && die "kernel doesn't have 'CONFIG_DEBUG_INFO' enabled"
Expand Down Expand Up @@ -1232,6 +1232,8 @@ else
KBUILD_EXTRA_SYMBOLS="$SYMVERSFILE"
fi

grep -q "CONFIG_LIVEPATCH_WO_FTRACE=y" "$CONFIGFILE" && export NO_PROFILING_CALLS=1

# unsupported kernel option checking
[[ -n "$CONFIG_DEBUG_INFO_SPLIT" ]] && die "kernel option 'CONFIG_DEBUG_INFO_SPLIT' not supported"
[[ -n "$CONFIG_GCC_PLUGIN_LATENT_ENTROPY" ]] && die "kernel option 'CONFIG_GCC_PLUGIN_LATENT_ENTROPY' not supported"
Expand Down