This is a note to let you know that I've just added the patch titled x86/alternative: Relax text_poke_bp() constraint to the 5.10-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-alternative-relax-text_poke_bp-constraint.patch and it can be found in the queue-5.10 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From foo@baz Tue Jul 12 05:07:35 PM CEST 2022 From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Date: Sat, 4 Dec 2021 14:43:43 +0100 Subject: x86/alternative: Relax text_poke_bp() constraint From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> commit 26c44b776dba4ac692a0bf5a3836feb8a63fea6b upstream. Currently, text_poke_bp() is very strict to only allow patching a single instruction; however with straight-line-speculation it will be required to patch: ret; int3, which is two instructions. As such, relax the constraints a little to allow int3 padding for all instructions that do not imply the execution of the next instruction, ie: RET, JMP.d8 and JMP.d32. While there, rename the text_poke_loc::rel32 field to ::disp. Note: this fills up the text_poke_loc structure which is now a round 16 bytes big. [ bp: Put comments ontop instead of on the side. ] Signed-off-by: Peter Zijlstra (Intel) <peterz@xxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lore.kernel.org/r/20211204134908.082342723@xxxxxxxxxxxxx Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/alternative.c | 49 +++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 15 deletions(-) --- a/arch/x86/kernel/alternative.c +++ b/arch/x86/kernel/alternative.c @@ -1243,10 +1243,13 @@ void text_poke_sync(void) } struct text_poke_loc { - s32 rel_addr; /* addr := _stext + rel_addr */ - s32 rel32; + /* addr := _stext + rel_addr */ + s32 rel_addr; + s32 disp; + u8 len; u8 opcode; const u8 text[POKE_MAX_OPCODE_SIZE]; + /* see text_poke_bp_batch() */ u8 old; }; @@ -1261,7 +1264,8 @@ static struct bp_patching_desc *bp_desc; static __always_inline struct bp_patching_desc *try_get_desc(struct bp_patching_desc **descp) { - struct bp_patching_desc *desc = __READ_ONCE(*descp); /* rcu_dereference */ + /* rcu_dereference */ + struct bp_patching_desc *desc = __READ_ONCE(*descp); if (!desc || !arch_atomic_inc_not_zero(&desc->refs)) return NULL; @@ -1295,7 +1299,7 @@ noinstr int poke_int3_handler(struct pt_ { struct bp_patching_desc *desc; struct text_poke_loc *tp; - int len, ret = 0; + int ret = 0; void *ip; if (user_mode(regs)) @@ -1335,8 +1339,7 @@ noinstr int poke_int3_handler(struct pt_ goto out_put; } - len = text_opcode_size(tp->opcode); - ip += len; + ip += tp->len; switch (tp->opcode) { case INT3_INSN_OPCODE: @@ -1351,12 +1354,12 @@ noinstr int poke_int3_handler(struct pt_ break; case CALL_INSN_OPCODE: - int3_emulate_call(regs, (long)ip + tp->rel32); + int3_emulate_call(regs, (long)ip + tp->disp); break; case JMP32_INSN_OPCODE: case JMP8_INSN_OPCODE: - int3_emulate_jmp(regs, (long)ip + tp->rel32); + int3_emulate_jmp(regs, (long)ip + tp->disp); break; default: @@ -1431,7 +1434,7 @@ static void text_poke_bp_batch(struct te */ for (do_sync = 0, i = 0; i < nr_entries; i++) { u8 old[POKE_MAX_OPCODE_SIZE] = { tp[i].old, }; - int len = text_opcode_size(tp[i].opcode); + int len = tp[i].len; if (len - INT3_INSN_SIZE > 0) { memcpy(old + INT3_INSN_SIZE, @@ -1508,21 +1511,37 @@ static void text_poke_loc_init(struct te const void *opcode, size_t len, const void *emulate) { struct insn insn; - int ret; + int ret, i; memcpy((void *)tp->text, opcode, len); if (!emulate) emulate = opcode; ret = insn_decode_kernel(&insn, emulate); - BUG_ON(ret < 0); - BUG_ON(len != insn.length); tp->rel_addr = addr - (void *)_stext; + tp->len = len; tp->opcode = insn.opcode.bytes[0]; switch (tp->opcode) { + case RET_INSN_OPCODE: + case JMP32_INSN_OPCODE: + case JMP8_INSN_OPCODE: + /* + * Control flow instructions without implied execution of the + * next instruction can be padded with INT3. + */ + for (i = insn.length; i < len; i++) + BUG_ON(tp->text[i] != INT3_INSN_OPCODE); + break; + + default: + BUG_ON(len != insn.length); + }; + + + switch (tp->opcode) { case INT3_INSN_OPCODE: case RET_INSN_OPCODE: break; @@ -1530,7 +1549,7 @@ static void text_poke_loc_init(struct te case CALL_INSN_OPCODE: case JMP32_INSN_OPCODE: case JMP8_INSN_OPCODE: - tp->rel32 = insn.immediate.value; + tp->disp = insn.immediate.value; break; default: /* assume NOP */ @@ -1538,13 +1557,13 @@ static void text_poke_loc_init(struct te case 2: /* NOP2 -- emulate as JMP8+0 */ BUG_ON(memcmp(emulate, ideal_nops[len], len)); tp->opcode = JMP8_INSN_OPCODE; - tp->rel32 = 0; + tp->disp = 0; break; case 5: /* NOP5 -- emulate as JMP32+0 */ BUG_ON(memcmp(emulate, ideal_nops[NOP_ATOMIC5], len)); tp->opcode = JMP32_INSN_OPCODE; - tp->rel32 = 0; + tp->disp = 0; break; default: /* unknown instruction */ Patches currently in stable-queue which might be from peterz@xxxxxxxxxxxxx are queue-5.10/objtool-cache-instruction-relocs.patch queue-5.10/x86-sev-avoid-using-__x86_return_thunk.patch queue-5.10/objtool-add-elf_create_undef_symbol.patch queue-5.10/x86-ftrace-use-alternative-ret-encoding.patch queue-5.10/objtool-re-add-unwind_hint_-save_restore.patch queue-5.10/x86-bugs-add-retbleed-ibpb.patch queue-5.10/x86-bugs-enable-stibp-for-jmp2ret.patch queue-5.10/x86-retpoline-cleanup-some-ifdefery.patch queue-5.10/objtool-handle-__sanitize_cov-tail-calls.patch queue-5.10/x86-prepare-asm-files-for-straight-line-speculation.patch queue-5.10/kvm-vmx-flatten-__vmx_vcpu_run.patch queue-5.10/x86-kvm-vmx-make-noinstr-clean.patch queue-5.10/objtool-x86-replace-alternatives-with-.retpoline_sites.patch queue-5.10/objtool-skip-magical-retpoline-.altinstr_replacement.patch queue-5.10/x86-retbleed-add-fine-grained-kconfig-knobs.patch queue-5.10/x86-cpu-amd-add-spectral-chicken.patch queue-5.10/objtool-add-straight-line-speculation-validation.patch queue-5.10/kvm-vmx-fix-ibrs-handling-after-vmexit.patch queue-5.10/kvm-vmx-prevent-guest-rsb-poisoning-attacks-with-eibrs.patch queue-5.10/x86-vsyscall_emu-64-don-t-use-ret-in-vsyscall-emulation.patch queue-5.10/tools-arch-update-arch-x86-lib-mem-cpy-set-_64.s-copies-used-in-perf-bench-mem-memcpy.patch queue-5.10/x86-add-straight-line-speculation-mitigation.patch queue-5.10/x86-add-magic-amd-return-thunk.patch queue-5.10/x86-bugs-keep-a-per-cpu-ia32_spec_ctrl-value.patch queue-5.10/x86-alternatives-optimize-optimize_nops.patch queue-5.10/x86-objtool-create-.return_sites.patch queue-5.10/crypto-x86-poly1305-fixup-sls.patch queue-5.10/x86-alternative-handle-jcc-__x86_indirect_thunk_-reg.patch queue-5.10/x86-kvm-fix-setcc-emulation-for-return-thunks.patch queue-5.10/objtool-fix-objtool-regression-on-x32-systems.patch queue-5.10/x86-alternative-relax-text_poke_bp-constraint.patch queue-5.10/x86-retpoline-swizzle-retpoline-thunk.patch queue-5.10/objtool-rework-the-elf_rebuild_reloc_section-logic.patch queue-5.10/x86-speculation-fix-firmware-entry-spec_ctrl-handling.patch queue-5.10/x86-retpoline-remove-unused-replacement-symbols.patch queue-5.10/objtool-fix-symbol-creation.patch queue-5.10/x86-speculation-add-spectre_v2-ibrs-option-to-support-kernel-ibrs.patch queue-5.10/bpf-x86-respect-x86_feature_retpoline.patch queue-5.10/objtool-fix-type-of-reloc-addend.patch queue-5.10/objtool-x86-rewrite-retpoline-thunk-calls.patch queue-5.10/x86-undo-return-thunk-damage.patch queue-5.10/x86-prepare-inline-asm-for-straight-line-speculation.patch queue-5.10/x86-alternative-support-alternative_ternary.patch queue-5.10/kvm-emulate-fix-setcc-emulation-function-offsets-with-sls.patch queue-5.10/objtool-handle-per-arch-retpoline-naming.patch queue-5.10/x86-retpoline-create-a-retpoline-thunk-array.patch queue-5.10/x86-retpoline-simplify-retpolines.patch queue-5.10/x86-asm-fix-register-order.patch queue-5.10/x86-speculation-fill-rsb-on-vmexit-for-ibrs.patch queue-5.10/objtool-add-entry-unret-validation.patch queue-5.10/objtool-keep-track-of-retpoline-call-sites.patch queue-5.10/kvm-vmx-convert-launched-argument-to-flags.patch queue-5.10/objtool-add-elf_create_reloc-helper.patch queue-5.10/objtool-make-.altinstructions-section-entry-size-consistent.patch queue-5.10/x86-bpf-use-alternative-ret-encoding.patch queue-5.10/x86-common-stamp-out-the-stepping-madness.patch queue-5.10/x86-bugs-split-spectre_v2_select_mitigation-and-spectre_v2_user_select_mitigation.patch queue-5.10/x86-bugs-report-intel-retbleed-vulnerability.patch queue-5.10/bpf-x86-simplify-computing-label-offsets.patch queue-5.10/x86-cpufeatures-move-retpoline-flags-to-word-11.patch queue-5.10/x86-speculation-fix-spec_ctrl-write-on-smt-state-change.patch queue-5.10/x86-retpoline-use-mfunction-return.patch queue-5.10/x86-xen-rename-sys-entry-points.patch queue-5.10/objtool-only-rewrite-unconditional-retpoline-thunk-calls.patch queue-5.10/x86-bugs-optimize-spec_ctrl-msr-writes.patch queue-5.10/x86-alternative-optimize-single-byte-nops-at-an-arbitrary-position.patch queue-5.10/objtool-fix-code-relocs-vs-weak-symbols.patch queue-5.10/x86-bugs-report-amd-retbleed-vulnerability.patch queue-5.10/x86-static_call-use-alternative-ret-encoding.patch queue-5.10/x86-speculation-fix-rsb-filling-with-config_retpoline-n.patch queue-5.10/x86-asm-fixup-odd-gen-for-each-reg.h-usage.patch queue-5.10/x86-alternative-add-debug-prints-to-apply_retpolines.patch queue-5.10/objtool-extract-elf_symbol_add.patch queue-5.10/x86-use-return-thunk-in-asm-code.patch queue-5.10/objtool-remove-reloc-symbol-type-checks-in-get_alt_entry.patch queue-5.10/objtool-classify-symbols.patch queue-5.10/intel_idle-disable-ibrs-during-long-idle.patch queue-5.10/objtool-correctly-handle-retpoline-thunk-calls.patch queue-5.10/objtool-fix-.symtab_shndx-handling-for-elf_create_undef_symbol.patch queue-5.10/x86-retpoline-move-the-retpoline-thunk-declarations-to-nospec-branch.h.patch queue-5.10/objtool-support-asm-jump-tables.patch queue-5.10/x86-alternative-implement-.retpoline_sites-support.patch queue-5.10/objtool-x86-ignore-__x86_indirect_alt_-symbols.patch queue-5.10/objtool-fix-sls-validation-for-kcov-tail-call-replacement.patch queue-5.10/x86-alternative-try-inline-spectre_v2-retpoline-amd.patch queue-5.10/x86-entry-remove-skip_r11rcx.patch queue-5.10/objtool-explicitly-avoid-self-modifying-code-in-.altinstr_replacement.patch queue-5.10/x86-speculation-use-cached-host-spec_ctrl-value-for-guest-entry-exit.patch queue-5.10/x86-bugs-add-amd-retbleed-boot-parameter.patch queue-5.10/objtool-create-reloc-sections-implicitly.patch queue-5.10/x86-entry-add-kernel-ibrs-implementation.patch queue-5.10/objtool-treat-.text.__x86.-as-noinstr.patch queue-5.10/x86-lib-atomic64_386_32-rename-things.patch queue-5.10/objtool-introduce-cfi-hash.patch queue-5.10/objtool-default-ignore-int3-for-unreachable.patch queue-5.10/objtool-extract-elf_strtab_concat.patch queue-5.10/objtool-teach-get_alt_entry-about-more-relocation-types.patch queue-5.10/objtool-update-retpoline-validation.patch