In order to simplify Hyper-V VSM secure memory intercept generation in user-space (it avoids the need of implementing an x86 instruction decoder and the actual decoding). Pass the instruction length being run at the time of the guest exit as part of the memory fault exit information. The presence of this additional information is indicated by a new capability, KVM_CAP_FAULT_EXIT_INSN_LEN. Signed-off-by: Nicolas Saenz Julienne <nsaenz@xxxxxxxxxx> --- Documentation/virt/kvm/api.rst | 6 +++++- arch/x86/kvm/mmu/mmu_internal.h | 2 +- arch/x86/kvm/x86.c | 1 + include/linux/kvm_host.h | 3 ++- include/uapi/linux/kvm.h | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/virt/kvm/api.rst b/Documentation/virt/kvm/api.rst index 761b99987cf1a..18ddea9c4c58a 100644 --- a/Documentation/virt/kvm/api.rst +++ b/Documentation/virt/kvm/api.rst @@ -7021,11 +7021,15 @@ spec refer, https://github.com/riscv/riscv-sbi-doc. __u64 flags; __u64 gpa; __u64 size; + __u8 insn_len; } memory_fault; KVM_EXIT_MEMORY_FAULT indicates the vCPU has encountered a memory fault that could not be resolved by KVM. The 'gpa' and 'size' (in bytes) describe the -guest physical address range [gpa, gpa + size) of the fault. The 'flags' field +guest physical address range [gpa, gpa + size) of the fault. The +'insn_len' field describes the size (in bytes) of the instruction +that caused the fault. It is only available if the underlying HW exposes that +information on guest exit, otherwise it's set to 0. The 'flags' field describes properties of the faulting access that are likely pertinent: - KVM_MEMORY_EXIT_FLAG_READ/WRITE/EXEC - When set, indicates that the memory diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index a0cde1a0e39b0..4f5c4c8af9941 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -285,7 +285,7 @@ static inline void kvm_mmu_prepare_memory_fault_exit(struct kvm_vcpu *vcpu, { kvm_prepare_memory_fault_exit(vcpu, fault->gfn << PAGE_SHIFT, PAGE_SIZE, fault->write, fault->exec, - fault->is_private); + fault->is_private, fault->insn_len); } static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a6e2312ccb68f..d2b8b74cb48bf 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4704,6 +4704,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_VM_DISABLE_NX_HUGE_PAGES: case KVM_CAP_IRQFD_RESAMPLE: case KVM_CAP_MEMORY_FAULT_INFO: + case KVM_CAP_FAULT_EXIT_INSN_LEN: r = 1; break; case KVM_CAP_EXIT_HYPERCALL: diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 59f687985ba24..4fa16c4772269 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -2391,11 +2391,12 @@ static inline void kvm_account_pgtable_pages(void *virt, int nr) static inline void kvm_prepare_memory_fault_exit(struct kvm_vcpu *vcpu, gpa_t gpa, gpa_t size, bool is_write, bool is_exec, - bool is_private) + bool is_private, u8 insn_len) { vcpu->run->exit_reason = KVM_EXIT_MEMORY_FAULT; vcpu->run->memory_fault.gpa = gpa; vcpu->run->memory_fault.size = size; + vcpu->run->memory_fault.insn_len = insn_len; vcpu->run->memory_fault.flags = 0; diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h index d6d8b17bfa9a7..516d39910f9ab 100644 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@ -441,6 +441,7 @@ struct kvm_run { __u64 flags; __u64 gpa; __u64 size; + __u8 insn_len; } memory_fault; /* Fix the size of the union. */ char padding[256]; @@ -927,6 +928,7 @@ struct kvm_enable_cap { #define KVM_CAP_MEMORY_ATTRIBUTES 233 #define KVM_CAP_GUEST_MEMFD 234 #define KVM_CAP_VM_TYPES 235 +#define KVM_CAP_FAULT_EXIT_INSN_LEN 236 struct kvm_irq_routing_irqchip { __u32 irqchip; -- 2.40.1
