Merge tag 'v6.8-rc4' into x86/percpu, to resolve conflicts and refresh the branch

[sfrench/cifs-2.6.git] / arch / x86 / kernel / callthunks.c

diff --git a/arch/x86/kernel/callthunks.c b/arch/x86/kernel/callthunks.c
index 64ad2ddea121940a99a8c55746986ef0b84c1c41..cf7e5be1b844b2316aab120b21e41b0831dac2b4 100644 (file)
--- a/arch/x86/kernel/callthunks.c
+++ b/arch/x86/kernel/callthunks.c
@@ -24,6 +24,8 @@
 
 static int __initdata_or_module debug_callthunks;
 
+#define MAX_PATCH_LEN (255-1)
+
 #define prdbg(fmt, args...)                                    \
 do {                                                           \
        if (debug_callthunks)                                   \
@@ -179,10 +181,15 @@ static const u8 nops[] = {
 static void *patch_dest(void *dest, bool direct)
 {
        unsigned int tsize = SKL_TMPL_SIZE;
+       u8 insn_buff[MAX_PATCH_LEN];
        u8 *pad = dest - tsize;
 
+       memcpy(insn_buff, skl_call_thunk_template, tsize);
+       apply_relocation(insn_buff, tsize, pad,
+                        skl_call_thunk_template, tsize);
+
        /* Already patched? */
-       if (!bcmp(pad, skl_call_thunk_template, tsize))
+       if (!bcmp(pad, insn_buff, tsize))
                return pad;
 
        /* Ensure there are nops */
@@ -192,9 +199,9 @@ static void *patch_dest(void *dest, bool direct)
        }
 
        if (direct)
-               memcpy(pad, skl_call_thunk_template, tsize);
+               memcpy(pad, insn_buff, tsize);
        else
-               text_poke_copy_locked(pad, skl_call_thunk_template, tsize, true);
+               text_poke_copy_locked(pad, insn_buff, tsize, true);
        return pad;
 }
 
@@ -290,20 +297,27 @@ void *callthunks_translate_call_dest(void *dest)
 static bool is_callthunk(void *addr)
 {
        unsigned int tmpl_size = SKL_TMPL_SIZE;
-       void *tmpl = skl_call_thunk_template;
+       u8 insn_buff[MAX_PATCH_LEN];
        unsigned long dest;
+       u8 *pad;
 
        dest = roundup((unsigned long)addr, CONFIG_FUNCTION_ALIGNMENT);
        if (!thunks_initialized || skip_addr((void *)dest))
                return false;
 
-       return !bcmp((void *)(dest - tmpl_size), tmpl, tmpl_size);
+       pad = (void *)(dest - tmpl_size);
+
+       memcpy(insn_buff, skl_call_thunk_template, tmpl_size);
+       apply_relocation(insn_buff, tmpl_size, pad,
+                        skl_call_thunk_template, tmpl_size);
+
+       return !bcmp(pad, insn_buff, tmpl_size);
 }
 
 int x86_call_depth_emit_accounting(u8 **pprog, void *func)
 {
        unsigned int tmpl_size = SKL_TMPL_SIZE;
-       void *tmpl = skl_call_thunk_template;
+       u8 insn_buff[MAX_PATCH_LEN];
 
        if (!thunks_initialized)
                return 0;
@@ -312,7 +326,11 @@ int x86_call_depth_emit_accounting(u8 **pprog, void *func)
        if (func && is_callthunk(func))
                return 0;
 
-       memcpy(*pprog, tmpl, tmpl_size);
+       memcpy(insn_buff, skl_call_thunk_template, tmpl_size);
+       apply_relocation(insn_buff, tmpl_size, *pprog,
+                        skl_call_thunk_template, tmpl_size);
+
+       memcpy(*pprog, insn_buff, tmpl_size);
        *pprog += tmpl_size;
        return tmpl_size;
 }