x86: decode Xen/KVM emulate prefixes
Subsystems (7)
cover x86: decode Xen/KVM emulate prefixes
This is a backport of a patch series for 5.4.x.
The patch series allows the x86 decoder to decode the Xen and KVM emulate prefixes.
In particular this solves the following issue that appeared when commit db6c6a0df840 ("objtool: Fix noreturn detection for ignored functions") was backported to 5.4.69:
arch/x86/xen/enlighten_pv.o: warning: objtool: xen_cpuid()+0x25: can't find jump dest instruction at .text+0x9c
Also now that this decoding is possible, also backport the commit which prevents kprobes on probing such prefixed instructions. This was also part of the original series.
The series applied mostly cleanly on 5.4.192 except for a contextual problem in the 3rd patch ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature").
Masami Hiramatsu (4):
x86/asm: Allow to pass macros to __ASM_FORM()
x86: xen: kvm: Gather the definition of emulate prefixes
x86: xen: insn: Decode Xen and KVM emulate-prefix signature
x86: kprobes: Prohibit probing on instruction which has emulate prefix
arch/x86/include/asm/asm.h | 8 +++-- arch/x86/include/asm/emulate_prefix.h | 14 +++++++++ arch/x86/include/asm/insn.h | 6 ++++ arch/x86/include/asm/xen/interface.h | 11 +++---- arch/x86/kernel/kprobes/core.c | 4 +++ arch/x86/kvm/x86.c | 4 ++- arch/x86/lib/insn.c | 34 +++++++++++++++++++++ tools/arch/x86/include/asm/emulate_prefix.h | 14 +++++++++ tools/arch/x86/include/asm/insn.h | 6 ++++ tools/arch/x86/lib/insn.c | 34 +++++++++++++++++++++ tools/objtool/sync-check.sh | 3 +- tools/perf/check-headers.sh | 3 +- 12 files changed, 128 insertions(+), 13 deletions(-) create mode 100644 arch/x86/include/asm/emulate_prefix.h create mode 100644 tools/arch/x86/include/asm/emulate_prefix.h
base-commit: 1d72b776f6dc973211f5d153453cf8955fb3d70a
Signature · 12 lines
2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
PATCH 1/4 x86/asm: Allow to pass macros to __ASM_FORM()
From: Masami Hiramatsu <[email protected]>
commit f7919fd943abf0c77aed4441ea9897a323d132f5 upstream
Use __stringify() at __ASM_FORM() so that user can pass code including macros to __ASM_FORM().
--- arch/x86/include/asm/asm.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
arch/x86/include/asm/asm.h +5 -3
@@ -7,9 +7,11 @@# define __ASM_FORM_RAW (x) x# define __ASM_FORM_COMMA (x) x,#else -# define __ASM_FORM (x) " " #x " " -# define __ASM_FORM_RAW (x) #x -# define __ASM_FORM_COMMA (x) " " #x "," +#include <linux/stringify.h> + +# define __ASM_FORM (x) " " __stringify(x) " " +# define __ASM_FORM_RAW (x) __stringify(x) +# define __ASM_FORM_COMMA (x) " " __stringify(x) ","#endif #ifndef __x86_64__
Signature · 12 lines
2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
PATCH 2/4 x86: xen: kvm: Gather the definition of emulate prefixes
In reply to Maximilian HeyneFrom: Masami Hiramatsu <[email protected]>
commit b3dc0695fa40c3b280230fb6fb7fb7a94ce28bf4 upstream
Gather the emulate prefixes, which forcibly make the following instruction emulated on virtualization, in one place.
--- arch/x86/include/asm/emulate_prefix.h | 14 ++++++++++++++ arch/x86/include/asm/xen/interface.h | 11 ++++------- arch/x86/kvm/x86.c | 4 +++- 3 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 arch/x86/include/asm/emulate_prefix.h
arch/x86/include/asm/emulate_prefix.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_EMULATE_PREFIX_H +#define _ASM_X86_EMULATE_PREFIX_H + +/* +* Virt escape sequences to trigger instruction emulation; +* ideally these would decode to 'whole' instruction and not destroy +* the instruction stream; sadly this is not true for the 'kvm' one :/ +*/ + +#define __XEN_EMULATE_PREFIX 0x0f,0x0b,0x78,0x65,0x6e/* ud2 ; .ascii "xen" */ +#define __KVM_EMULATE_PREFIX 0x0f,0x0b,0x6b,0x76,0x6d/* ud2 ; .ascii "kvm" */ + +#endif
arch/x86/include/asm/xen/interface.h +4 -7
@@ -379,12 +379,9 @@ struct xen_pmu_arch {* Prefix forces emulation of some non-trapping instructions. * Currently only CPUID. */ -#ifdef __ASSEMBLY__ -#define XEN_EMULATE_PREFIX .byte 0x0f,0x0b,0x78,0x65,0x6e ; -#define XEN_CPUID XEN_EMULATE_PREFIX cpuid -#else -#define XEN_EMULATE_PREFIX ".byte 0x0f,0x0b,0x78,0x65,0x6e ; " -#define XEN_CPUID XEN_EMULATE_PREFIX "cpuid" -#endif +#include <asm/emulate_prefix.h> + +#define XEN_EMULATE_PREFIX __ASM_FORM(.byte __XEN_EMULATE_PREFIX ;) +#define XEN_CPUID XEN_EMULATE_PREFIX __ASM_FORM(cpuid)#endif /* _ASM_X86_XEN_INTERFACE_H */
arch/x86/kvm/x86.c +3 -1
@@ -68,6 +68,7 @@#include <asm/mshyperv.h> #include <asm/hypervisor.h> #include <asm/intel_pt.h> +#include <asm/emulate_prefix.h> #include <clocksource/hyperv_timer.h> #define CREATE_TRACE_POINTS
@@ -5583,6 +5584,7 @@ EXPORT_SYMBOL_GPL(kvm_write_guest_virt_system);int handle_ud (struct kvm_vcpu *vcpu) { +static const char kvm_emulate_prefix[] = { __KVM_EMULATE_PREFIX };int emul_type =EMULTYPE_TRAP_UD ;char sig[5 ];/* ud2; .ascii "kvm" */ struct x86_exception e;
@@ -5590,7 +5592,7 @@ int handle_ud(struct kvm_vcpu *vcpu)if (force_emulation_prefix &&kvm_read_guest_virt (vcpu,kvm_get_linear_rip (vcpu), sig,sizeof (sig), &e) ==0 && -memcmp (sig,"\xf\xbkvm" ,sizeof (sig)) ==0 ) { +memcmp (sig, kvm_emulate_prefix,sizeof (sig)) ==0 ) {kvm_rip_write (vcpu,kvm_rip_read (vcpu) +sizeof (sig)); emul_type =EMULTYPE_TRAP_UD_FORCED ; }
Signature · 12 lines
2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
PATCH 3/4 x86: xen: insn: Decode Xen and KVM emulate-prefix signature
In reply to Maximilian HeyneFrom: Masami Hiramatsu <[email protected]>
commit 4d65adfcd1196818659d3bd9b42dccab291e1751 upstream
Decode Xen and KVM's emulate-prefix signature by x86 insn decoder. It is called "prefix" but actually not x86 instruction prefix, so this adds insn.emulate_prefix_size field instead of reusing insn.prefixes.
If x86 decoder finds a special sequence of instructions of XEN_EMULATE_PREFIX and 'ud2a; .ascii "kvm"', it just counts the length, set insn.emulate_prefix_size and fold it with the next instruction. In other words, the signature and the next instruction is treated as a single instruction.
--- arch/x86/include/asm/insn.h | 6 ++++ arch/x86/lib/insn.c | 34 +++++++++++++++++++++ tools/arch/x86/include/asm/emulate_prefix.h | 14 +++++++++ tools/arch/x86/include/asm/insn.h | 6 ++++ tools/arch/x86/lib/insn.c | 34 +++++++++++++++++++++ tools/objtool/sync-check.sh | 3 +- tools/perf/check-headers.sh | 3 +- 7 files changed, 98 insertions(+), 2 deletions(-) create mode 100644 tools/arch/x86/include/asm/emulate_prefix.h
arch/x86/include/asm/insn.h +6 -0
@@ -45,6 +45,7 @@ struct insn {struct insn_field immediate2;/* for 64bit imm or seg16 */ }; +int emulate_prefix_size;insn_attr_t attr;unsigned char opnd_bytes;unsigned char addr_bytes;
@@ -128,6 +129,11 @@ static inline int insn_is_evex(struct insn *insn)return (insn->vex_prefix.nbytes ==4 ); } +static inline int insn_has_emulate_prefix (struct insn *insn) +{ +return !!insn->emulate_prefix_size; +} +/* Ensure this instruction is decoded completely */ static inline int insn_complete (struct insn *insn) {
arch/x86/lib/insn.c +34 -0
@@ -13,6 +13,8 @@#include <asm/inat.h> #include <asm/insn.h> +#include <asm/emulate_prefix.h> +/* Verify next sizeof(t) bytes can be on the same instruction */ #define validate_next (t, insn, n) \ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)
@@ -58,6 +60,36 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64) insn->addr_bytes =4 ; } +static const insn_byte_t xen_prefix[] = { __XEN_EMULATE_PREFIX }; +static const insn_byte_t kvm_prefix[] = { __KVM_EMULATE_PREFIX }; + +static int __insn_get_emulate_prefix (struct insn *insn, +const insn_byte_t *prefix,size_t len) +{ +size_t i; + +for (i =0 ; i < len; i++) { +if (peek_nbyte_next (insn_byte_t, insn, i) != prefix[i]) + goto err_out; + } + + insn->emulate_prefix_size = len; + insn->next_byte += len; + +return 1 ; + +err_out: +return 0 ; +} + +static void insn_get_emulate_prefix (struct insn *insn) +{ +if (__insn_get_emulate_prefix (insn, xen_prefix,sizeof (xen_prefix))) +return ; + +__insn_get_emulate_prefix (insn, kvm_prefix,sizeof (kvm_prefix)); +} +/** * insn_get_prefixes - scan x86 instruction prefix bytes * @insn: &struct insn containing instruction
@@ -76,6 +108,8 @@ void insn_get_prefixes(struct insn *insn)if (prefixes->got)return ; +insn_get_emulate_prefix (insn); + nb =0 ; lb =0 ; b =peek_next (insn_byte_t, insn);
tools/arch/x86/include/asm/emulate_prefix.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _ASM_X86_EMULATE_PREFIX_H +#define _ASM_X86_EMULATE_PREFIX_H + +/* +* Virt escape sequences to trigger instruction emulation; +* ideally these would decode to 'whole' instruction and not destroy +* the instruction stream; sadly this is not true for the 'kvm' one :/ +*/ + +#define __XEN_EMULATE_PREFIX 0x0f,0x0b,0x78,0x65,0x6e/* ud2 ; .ascii "xen" */ +#define __KVM_EMULATE_PREFIX 0x0f,0x0b,0x6b,0x76,0x6d/* ud2 ; .ascii "kvm" */ + +#endif
tools/arch/x86/include/asm/insn.h +6 -0
@@ -45,6 +45,7 @@ struct insn {struct insn_field immediate2;/* for 64bit imm or seg16 */ }; +int emulate_prefix_size;insn_attr_t attr;unsigned char opnd_bytes;unsigned char addr_bytes;
@@ -128,6 +129,11 @@ static inline int insn_is_evex(struct insn *insn)return (insn->vex_prefix.nbytes ==4 ); } +static inline int insn_has_emulate_prefix (struct insn *insn) +{ +return !!insn->emulate_prefix_size; +} +/* Ensure this instruction is decoded completely */ static inline int insn_complete (struct insn *insn) {
tools/arch/x86/lib/insn.c +34 -0
@@ -13,6 +13,8 @@#include "../include/asm/inat.h" #include "../include/asm/insn.h" +#include "../include/asm/emulate_prefix.h" +/* Verify next sizeof(t) bytes can be on the same instruction */ #define validate_next (t, insn, n) \ ((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)
@@ -58,6 +60,36 @@ void insn_init(struct insn *insn, const void *kaddr, int buf_len, int x86_64) insn->addr_bytes =4 ; } +static const insn_byte_t xen_prefix[] = { __XEN_EMULATE_PREFIX }; +static const insn_byte_t kvm_prefix[] = { __KVM_EMULATE_PREFIX }; + +static int __insn_get_emulate_prefix (struct insn *insn, +const insn_byte_t *prefix,size_t len) +{ +size_t i; + +for (i =0 ; i < len; i++) { +if (peek_nbyte_next (insn_byte_t, insn, i) != prefix[i]) + goto err_out; + } + + insn->emulate_prefix_size = len; + insn->next_byte += len; + +return 1 ; + +err_out: +return 0 ; +} + +static void insn_get_emulate_prefix (struct insn *insn) +{ +if (__insn_get_emulate_prefix (insn, xen_prefix,sizeof (xen_prefix))) +return ; + +__insn_get_emulate_prefix (insn, kvm_prefix,sizeof (kvm_prefix)); +} +/** * insn_get_prefixes - scan x86 instruction prefix bytes * @insn: &struct insn containing instruction
@@ -76,6 +108,8 @@ void insn_get_prefixes(struct insn *insn)if (prefixes->got)return ; +insn_get_emulate_prefix (insn); + nb =0 ; lb =0 ; b =peek_next (insn_byte_t, insn);
tools/objtool/sync-check.sh +2 -1
@@ -4,6 +4,7 @@ FILES=' arch/x86/include/asm/inat_types.h arch/x86/include/asm/orc_types.h +arch/x86/include/asm/emulate_prefix.h arch/x86/lib/x86-opcode-map.txt arch/x86/tools/gen-insn-attr-x86.awk '
@@ -46,4 +47,4 @@ done check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' -check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]"' +check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"'
tools/perf/check-headers.sh +2 -1
@@ -28,6 +28,7 @@ arch/x86/include/asm/disabled-features.h arch/x86/include/asm/required-features.h arch/x86/include/asm/cpufeatures.h arch/x86/include/asm/inat_types.h +arch/x86/include/asm/emulate_prefix.h arch/x86/include/uapi/asm/prctl.h arch/x86/lib/x86-opcode-map.txt arch/x86/tools/gen-insn-attr-x86.awk
@@ -116,7 +117,7 @@ check lib/ctype.c '-I "^EXPORT_SYMBOL" -I "^#include <linux/export.h>" -B check arch/x86/include/asm/inat.h '-I "^#include [\"<]\(asm/\)*inat_types.h[\">]"' check arch/x86/include/asm/insn.h '-I "^#include [\"<]\(asm/\)*inat.h[\">]"' check arch/x86/lib/inat.c '-I "^#include [\"<]\(../include/\)*asm/insn.h[\">]"' -check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]"' +check arch/x86/lib/insn.c '-I "^#include [\"<]\(../include/\)*asm/in\(at\|sn\).h[\">]" -I "^#include [\"<]\(../include/\)*asm/emulate_prefix.h[\">]"' # diff non-symmetric files check_2 tools/perf/arch/x86/entry/syscalls/syscall_64.tbl arch/x86/entry/syscalls/syscall_64.tbl
Signature · 12 lines
2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
PATCH 4/4 x86: kprobes: Prohibit probing on instruction which has emulate prefix
In reply to Maximilian HeyneFrom: Masami Hiramatsu <[email protected]>
commit 004e8dce9c5595697951f7cd0e9f66b35c92265e upstream
Prohibit probing on instruction which has XEN_EMULATE_PREFIX or KVM's emulate prefix. Since that prefix is a marker for Xen and KVM, if we modify the marker by kprobe's int3, that doesn't work as expected.
--- arch/x86/kernel/kprobes/core.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/x86/kernel/kprobes/core.c +4 -0
@@ -358,6 +358,10 @@ int __copy_instruction(u8 *dest, u8 *src, u8 *real, struct insn *insn)kernel_insn_init (insn, dest,MAX_INSN_SIZE );insn_get_length (insn); +/* We can not probe force emulate prefixed instruction */ +if (insn_has_emulate_prefix (insn)) +return 0 ; +/* Another subsystem puts a breakpoint, failed to recover */ if (insn->opcode.bytes[0 ] ==BREAKPOINT_INSTRUCTION )return 0 ;
Signature · 12 lines
2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
Greg KH
maintainerQuoted 41 lines · Maximilian Heyne
This is a backport of a patch series for 5.4.x.
The patch series allows the x86 decoder to decode the Xen and KVM emulate prefixes.
In particular this solves the following issue that appeared when commit
db6c6a0df840("objtool: Fix noreturn detection for ignored functions") was backported to 5.4.69:
arch/x86/xen/enlighten_pv.o: warning: objtool: xen_cpuid()+0x25: can't find jump dest instruction at .text+0x9cAlso now that this decoding is possible, also backport the commit which prevents kprobes on probing such prefixed instructions. This was also part of the original series.
The series applied mostly cleanly on 5.4.192 except for a contextual problem in the 3rd patch ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature").
Masami Hiramatsu (4):
x86/asm: Allow to pass macros to__ASM_FORM()
x86: xen: kvm: Gather the definition of emulate prefixes
x86: xen: insn: Decode Xen and KVM emulate-prefix signature
x86: kprobes: Prohibit probing on instruction which has emulate prefixarch/x86/include/asm/asm.h | 8 +++-- arch/x86/include/asm/emulate_prefix.h | 14 +++++++++ arch/x86/include/asm/insn.h | 6 ++++ arch/x86/include/asm/xen/interface.h | 11 +++---- arch/x86/kernel/kprobes/core.c | 4 +++ arch/x86/kvm/x86.c | 4 ++- arch/x86/lib/insn.c | 34 +++++++++++++++++++++ tools/arch/x86/include/asm/emulate_prefix.h | 14 +++++++++ tools/arch/x86/include/asm/insn.h | 6 ++++ tools/arch/x86/lib/insn.c | 34 +++++++++++++++++++++ tools/objtool/sync-check.sh | 3 +- tools/perf/check-headers.sh | 3 +- 12 files changed, 128 insertions(+), 13 deletions(-) create mode 100644 arch/x86/include/asm/emulate_prefix.h create mode 100644 tools/arch/x86/include/asm/emulate_prefix.h
Quoted 17 lines
base-commit:
1d72b776f6dc973211f5d153453cf8955fb3d70aSignature · 12 lines
2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879
All now queued up, thanks.
greg k-h