From 8aa91803be9dee8e9965bdc6628a203817a9a070 Mon Sep 17 00:00:00 2001 From: Joe Lawrence Date: Thu, 16 Jun 2022 08:46:39 -0400 Subject: [PATCH] test/integration: tweak paravirt call in module.patch Calling __flush_tlb_local() may result in a kernel warning: STATIC_NOPV void native_flush_tlb_local(void) { /* * Preemption or interrupts must be disabled to protect the access * to the per CPU variable and to prevent being preempted between * read_cr3() and write_cr3(). */ WARN_ON_ONCE(preemptible()); so use another paravirt call like slow_down_io() instead. Signed-off-by: Joe Lawrence --- test/integration/linux-5.18.0/module.patch | 2 +- test/integration/rhel-9.0/module.patch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/linux-5.18.0/module.patch b/test/integration/linux-5.18.0/module.patch index e5d8bee..af01b1c 100644 --- a/test/integration/linux-5.18.0/module.patch +++ b/test/integration/linux-5.18.0/module.patch @@ -35,7 +35,7 @@ diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c + alternative("ud2", "call single_task_running", X86_FEATURE_ALWAYS); + alternative("call single_task_running", "ud2", X86_FEATURE_IA64); + -+ __flush_tlb_local(); /* paravirt call */ ++ slow_down_io(); /* paravirt call */ +#endif + + pr_debug("kpatch: pr_debug() test\n"); diff --git a/test/integration/rhel-9.0/module.patch b/test/integration/rhel-9.0/module.patch index f83d265..7dcd332 100644 --- a/test/integration/rhel-9.0/module.patch +++ b/test/integration/rhel-9.0/module.patch @@ -35,7 +35,7 @@ diff -Nupr src.orig/fs/nfsd/export.c src/fs/nfsd/export.c + alternative("ud2", "call single_task_running", X86_FEATURE_ALWAYS); + alternative("call single_task_running", "ud2", X86_FEATURE_IA64); + -+ __flush_tlb_local(); /* paravirt call */ ++ slow_down_io(); /* paravirt call */ +#endif + + pr_debug("kpatch: pr_debug() test\n");