x86/ibt,paravirt: Use text_gen_insn() for paravirt_patch()

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / text-patching.h

diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h
index 1c4cfb1c6e4f0248b4667f7a2854abb32681628c..c6015b4074614c39c740dec407b564aa3f0f396e 100644 (file)
--- a/arch/x86/include/asm/text-patching.h
+++ b/arch/x86/include/asm/text-patching.h
@@ -96,32 +96,40 @@ union text_poke_insn {
 };
 
 static __always_inline
-void *text_gen_insn(u8 opcode, const void *addr, const void *dest)
+void __text_gen_insn(void *buf, u8 opcode, const void *addr, const void *dest, int size)
 {
-       static union text_poke_insn insn; /* per instance */
-       int size = text_opcode_size(opcode);
+       union text_poke_insn *insn = buf;
+
+       BUG_ON(size < text_opcode_size(opcode));
 
        /*
         * Hide the addresses to avoid the compiler folding in constants when
         * referencing code, these can mess up annotations like
         * ANNOTATE_NOENDBR.
         */
+       OPTIMIZER_HIDE_VAR(insn);
        OPTIMIZER_HIDE_VAR(addr);
        OPTIMIZER_HIDE_VAR(dest);
 
-       insn.opcode = opcode;
+       insn->opcode = opcode;
 
        if (size > 1) {
-               insn.disp = (long)dest - (long)(addr + size);
+               insn->disp = (long)dest - (long)(addr + size);
                if (size == 2) {
                        /*
                         * Ensure that for JMP8 the displacement
                         * actually fits the signed byte.
                         */
-                       BUG_ON((insn.disp >> 31) != (insn.disp >> 7));
+                       BUG_ON((insn->disp >> 31) != (insn->disp >> 7));
                }
        }
+}
 
+static __always_inline
+void *text_gen_insn(u8 opcode, const void *addr, const void *dest)
+{
+       static union text_poke_insn insn; /* per instance */
+       __text_gen_insn(&insn, opcode, addr, dest, text_opcode_size(opcode));
        return &insn.text;
 }