From 5bdbcf42e9e3a1f61dd9445af9effbc23cb67930 Mon Sep 17 00:00:00 2001 From: Cheng Jian Date: Mon, 28 Jan 2019 10:09:21 +0800 Subject: [PATCH] livepatch/core: add livepatch consistency depends euler inclusion category: feature Bugzilla: 5507 CVE: N/A ---------------------------------------- Now, arm64 don't support DYNAMIC_FTRACE_WITH_REGS and RELIABLE_STACKTRACE. which the first is necessary to implement livepatch with ftrace and the second allow to implement per-task consistency. So. arm64 only support LIVEPATCH_WO_FTRACE and STOP_MACHINE_CONSISTENCY. but other architectures can work under LIVEPATCH_FTRACE with PER_TASK_CONSISTENCY. commit the depends to avoid incorrect configuration. Signed-off-by: Cheng Jian Reviewed-by: Li Bin Signed-off-by: Yang Yingliang --- kernel/livepatch/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/kernel/livepatch/Kconfig b/kernel/livepatch/Kconfig index 123777f82d17..02bf7e84b845 100644 --- a/kernel/livepatch/Kconfig +++ b/kernel/livepatch/Kconfig @@ -37,6 +37,7 @@ config LIVEPATCH_FTRACE bool "based on ftrace" depends on HAVE_LIVEPATCH_FTRACE depends on DYNAMIC_FTRACE_WITH_REGS + select LIVEPATCH_PER_TASK_CONSISTENCY help Supports kernel live patching based on ftrace @@ -44,6 +45,7 @@ config LIVEPATCH_WO_FTRACE bool "without ftrace" depends on HAVE_LIVEPATCH_WO_FTRACE depends on DEBUG_INFO + select LIVEPATCH_STOP_MACHINE_CONSISTENCY help Supports kernel live patching without ftrace @@ -59,6 +61,7 @@ choice config LIVEPATCH_PER_TASK_CONSISTENCY bool "per task consistency" + depends on LIVEPATCH_FTRACE help Use basic per-task consistency model It's a hybrid of kGraft and kpatch: @@ -69,6 +72,7 @@ config LIVEPATCH_PER_TASK_CONSISTENCY config LIVEPATCH_STOP_MACHINE_CONSISTENCY bool "stop machine consistency" + depends on LIVEPATCH_WO_FTRACE help Use stop machine consistency model stop-machine consistency and kpatch's stack -- GitLab