This is a note to let you know that I've just added the patch titled tools/insn: Restore the relative include paths for cross building 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: tools-insn-restore-the-relative-include-paths-for-cross-building.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 0705ef64d1ff52b817e278ca6e28095585ff31e1 Mon Sep 17 00:00:00 2001 From: Borislav Petkov <bp@xxxxxxx> Date: Wed, 17 Mar 2021 11:33:04 +0100 Subject: tools/insn: Restore the relative include paths for cross building From: Borislav Petkov <bp@xxxxxxx> commit 0705ef64d1ff52b817e278ca6e28095585ff31e1 upstream. Building perf on ppc causes: In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15: util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory 14 | #include <asm/inat.h> /*__ignore_sync_check__ */ | ^~~~~~~~~~~~ Restore the relative include paths so that the compiler can find the headers. Fixes: 93281c4a9657 ("x86/insn: Add an insn_decode() API") Reported-by: Ian Rogers <irogers@xxxxxxxxxx> Reported-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Tested-by: Ian Rogers <irogers@xxxxxxxxxx> Tested-by: Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> Link: https://lkml.kernel.org/r/20210317150858.02b1bbc8@xxxxxxxxxxxxxxxx Cc: Florian Fainelli <f.fainelli@xxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- tools/arch/x86/lib/insn.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/tools/arch/x86/lib/insn.c +++ b/tools/arch/x86/lib/insn.c @@ -10,13 +10,13 @@ #else #include <string.h> #endif -#include <asm/inat.h> /* __ignore_sync_check__ */ -#include <asm/insn.h> /* __ignore_sync_check__ */ +#include "../include/asm/inat.h" /* __ignore_sync_check__ */ +#include "../include/asm/insn.h" /* __ignore_sync_check__ */ #include <linux/errno.h> #include <linux/kconfig.h> -#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */ +#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */ /* Verify next sizeof(t) bytes can be on the same instruction */ #define validate_next(t, insn, n) \ Patches currently in stable-queue which might be from bp@xxxxxxx are queue-5.10/objtool-cache-instruction-relocs.patch queue-5.10/x86-alternative-merge-include-files.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-kexec-disable-ret-on-kexec.patch queue-5.10/x86-bugs-enable-stibp-for-jmp2ret.patch queue-5.10/x86-retpoline-cleanup-some-ifdefery.patch queue-5.10/x86-prepare-asm-files-for-straight-line-speculation.patch queue-5.10/x86-speculation-disable-rrsba-behavior.patch queue-5.10/kvm-vmx-flatten-__vmx_vcpu_run.patch queue-5.10/x86-kvm-vmx-make-noinstr-clean.patch queue-5.10/x86-static_call-serialize-__static_call_fixup-properly.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/x86-bugs-do-ibpb-fallback-check-only-once.patch queue-5.10/x86-alternative-support-not-feature.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/x86-alternative-handle-jcc-__x86_indirect_thunk_-reg.patch queue-5.10/x86-alternative-use-insn_decode.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-cpu-amd-enumerate-btc_no.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-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/x86-speculation-remove-x86_spec_ctrl_mask.patch queue-5.10/kvm-emulate-fix-setcc-emulation-function-offsets-with-sls.patch queue-5.10/x86-bugs-add-cannon-lake-to-retbleed-affected-cpu-list.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/x86-alternative-use-alternative_ternary-in-_static_cpu_has.patch queue-5.10/x86-insn-rename-insn_decode-to-insn_decode_from_regs.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/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/x86-bugs-optimize-spec_ctrl-msr-writes.patch queue-5.10/x86-bugs-do-not-enable-ibpb-on-entry-when-ibpb-is-not-supported.patch queue-5.10/x86-alternative-optimize-single-byte-nops-at-an-arbitrary-position.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-insn-add-an-insn_decode-api.patch queue-5.10/x86-use-return-thunk-in-asm-code.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/x86-retpoline-move-the-retpoline-thunk-declarations-to-nospec-branch.h.patch queue-5.10/x86-alternative-implement-.retpoline_sites-support.patch queue-5.10/tools-insn-restore-the-relative-include-paths-for-cross-building.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-extract-elf_strtab_concat.patch queue-5.10/x86-insn-add-a-__ignore_sync_check__-marker.patch queue-5.10/x86-insn-eval-handle-return-values-from-the-decoder.patch queue-5.10/objtool-update-retpoline-validation.patch