From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA927C10DCE for ; Fri, 6 Mar 2020 16:34:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7054E206E2 for ; Fri, 6 Mar 2020 16:34:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vAEPKJMa" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726185AbgCFQej (ORCPT ); Fri, 6 Mar 2020 11:34:39 -0500 Received: from mail-wm1-f65.google.com ([209.85.128.65]:38809 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbgCFQei (ORCPT ); Fri, 6 Mar 2020 11:34:38 -0500 Received: by mail-wm1-f65.google.com with SMTP id u9so3037210wml.3; Fri, 06 Mar 2020 08:34:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=CPJwhexY2/mI1fB9qceG4Ayqui54P4ZWSRKY04XJkYg=; b=vAEPKJMaDCAxc4S/Byic3BFjBmFxFzpvM6NSdWMc7tuCa5hM6/QIK9S75z3SELtlhD Nyuiv3RWxo2GtYltM7ybb8wFL0H8fdOLl2DEpXNAA2Ca6L4PZFSB50V31otljxdcstlj hEdNn5+l7u3VfihftLVkfvs30wIYQHaVM2aGkY8wVoI3heYed5+Al8Kx3owZQge5xnSY XXvTxvf2PuU+5FK0kOYrRaPf3af6f88RV95zPIomh+MtYjc/fMjyDcIG5cVPE7RVMF5F fxE0jIZyknjjm0X+eMfaleZHhI0vK+ClYzeWiVCCzAdd/DazlAH0V/T+hxANnCENiHZ7 Mv1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=CPJwhexY2/mI1fB9qceG4Ayqui54P4ZWSRKY04XJkYg=; b=ZIJHVJOqgqN/Nbv5LLtNNAnpUeXShdHR8tlKJOpTUbNWn8Hfm4zKodIk/wl97DEIM7 gwc/2GnKf4I0pCEls6no7M07KppTs0pYBexExdiQyMbMTHBKJPdRaY7Q1qZe1YMqGt1+ ywJt+t9jBlpDWlUQeYrZ9TylED0fvoxne6PLxSPOcTIgY0fBK8IqiJu28CK1VkHtmAo1 nL6dmS+6y/sKCkWbg77h0cKjpXpFsrWgvplXECqaLjiIJ4n13mL9BLqteAdsItintclB Xk6pzC5vrZBcERaV8rP6bXnwoSPh3nHQt0Avo1Jg2QFn9QrDbfLzQuqByvFq+h0IfgWn YZ4Q== X-Gm-Message-State: ANhLgQ1FzEYJ2MKe4w/k+RhhcLKHMpmZUKsSgouTYIQvrP4Ti4VcLynV bYYIIawRPCwonV9oYhNdKOeP0PRQ X-Google-Smtp-Source: ADFU+vtfpVTewi+uuqQ7Na9QjV8zLo1owOGh1BsPgTb7RDQoR/D+PF4dhIhcrXH5hDfRBu/SOvxbJQ== X-Received: by 2002:a05:600c:2283:: with SMTP id 3mr4816423wmf.100.1583512475020; Fri, 06 Mar 2020 08:34:35 -0800 (PST) Received: from jondnuc (IGLD-84-229-155-229.inter.net.il. [84.229.155.229]) by smtp.gmail.com with ESMTPSA id w206sm14881142wmg.11.2020.03.06.08.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Mar 2020 08:34:34 -0800 (PST) Date: Fri, 6 Mar 2020 18:34:33 +0200 From: Jon Doron To: Vitaly Kuznetsov Cc: kvm@vger.kernel.org, linux-hyperv@vger.kernel.org Subject: Re: [PATCH v2 2/4] x86/kvm/hyper-v: Add support for synthetic debugger capability Message-ID: <20200306163433.GA3559120@jondnuc> References: <20200305140142.413220-1-arilou@gmail.com> <20200305140142.413220-3-arilou@gmail.com> <874kv1ec7f.fsf@vitty.brq.redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <874kv1ec7f.fsf@vitty.brq.redhat.com> Sender: linux-hyperv-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org On 06/03/2020, Vitaly Kuznetsov wrote: >Jon Doron writes: > >> Add support for Hyper-V synthetic debugger (syndbg) interface. >> The syndbg interface is using MSRs to emulate a way to send/recv packets >> data. >> >> The debug transport dll (kdvm/kdnet) will identify if Hyper-V is enabled >> and if it supports the synthetic debugger interface it will attempt to >> use it, instead of trying to initialize a network adapter. >> > >I would suggest you split TLFS changes into it's own patch so Hyper-V >folks can ACK (or they can ack the whole patch with KVM changes of >course :-) > Done. >> Signed-off-by: Jon Doron >> --- >> arch/x86/include/asm/hyperv-tlfs.h | 16 ++++ >> arch/x86/include/asm/kvm_host.h | 13 ++++ >> arch/x86/kvm/hyperv.c | 114 ++++++++++++++++++++++++++++- >> arch/x86/kvm/hyperv.h | 5 ++ >> arch/x86/kvm/trace.h | 25 +++++++ >> arch/x86/kvm/x86.c | 9 +++ >> include/uapi/linux/kvm.h | 10 +++ >> 7 files changed, 191 insertions(+), 1 deletion(-) >> >> diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h >> index 92abc1e42bfc..8efdf974c23f 100644 >> --- a/arch/x86/include/asm/hyperv-tlfs.h >> +++ b/arch/x86/include/asm/hyperv-tlfs.h >> @@ -33,6 +33,9 @@ >> #define HYPERV_CPUID_ENLIGHTMENT_INFO 0x40000004 >> #define HYPERV_CPUID_IMPLEMENT_LIMITS 0x40000005 >> #define HYPERV_CPUID_NESTED_FEATURES 0x4000000A >> +#define HYPERV_CPUID_SYNDBG_VENDOR_AND_MAX_FUNCTIONS 0x40000080 >> +#define HYPERV_CPUID_SYNDBG_INTERFACE 0x40000081 >> +#define HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES 0x40000082 >> >> #define HYPERV_HYPERVISOR_PRESENT_BIT 0x80000000 >> #define HYPERV_CPUID_MIN 0x40000005 >> @@ -131,6 +134,8 @@ >> #define HV_FEATURE_FREQUENCY_MSRS_AVAILABLE BIT(8) >> /* Crash MSR available */ >> #define HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE BIT(10) >> +/* Support for debug MSRs available */ >> +#define HV_FEATURE_DEBUG_MSRS_AVAILABLE BIT(11) >> /* stimer Direct Mode is available */ >> #define HV_STIMER_DIRECT_MODE_AVAILABLE BIT(19) >> >> @@ -194,6 +199,9 @@ >> #define HV_X64_NESTED_GUEST_MAPPING_FLUSH BIT(18) >> #define HV_X64_NESTED_MSR_BITMAP BIT(19) >> >> +/* Hyper-V synthetic debugger platform capabilities */ >> +#define HV_X64_SYNDBG_CAP_ALLOW_KERNEL_DEBUGGING BIT(1) >> + > >hyperv-tlfs.h is not perfectly structured but still there is some >structure there, >e.g. HV_X64_NESTED_GUEST_MAPPING_FLUSH/HV_X64_NESTED_MSR_BITMAP/... are >said to be HYPERV_CPUID_ENLIGHTMENT_INFO.EAX >bits (see above HV_X64_AS_SWITCH_RECOMMENDED). > >To make it clear that HV_X64_SYNDBG_CAP_ALLOW_KERNEL_DEBUGGING doesn't >belong to these bits I'd suggest you add a comment like > >/* > * Hyper-V synthetic debugger platform capabilities. > * These are HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES.EAX bits. > * >*/ > >to make it clear. > Done. >> /* Hyper-V specific model specific registers (MSRs) */ >> >> /* MSR used to identify the guest OS. */ >> @@ -267,6 +275,14 @@ >> /* Hyper-V guest idle MSR */ >> #define HV_X64_MSR_GUEST_IDLE 0x400000F0 >> >> +/* Hyper-V Synthetic debug options MSR */ >> +#define HV_X64_MSR_SYNDBG_CONTROL 0x400000F1 >> +#define HV_X64_MSR_SYNDBG_STATUS 0x400000F2 >> +#define HV_X64_MSR_SYNDBG_SEND_BUFFER 0x400000F3 >> +#define HV_X64_MSR_SYNDBG_RECV_BUFFER 0x400000F4 >> +#define HV_X64_MSR_SYNDBG_PENDING_BUFFER 0x400000F5 >> +#define HV_X64_MSR_SYNDBG_OPTIONS 0x400000FF >> + >> /* Hyper-V guest crash notification MSR's */ >> #define HV_X64_MSR_CRASH_P0 0x40000100 >> #define HV_X64_MSR_CRASH_P1 0x40000101 >> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h >> index 98959e8cd448..f8e58e8866bb 100644 >> --- a/arch/x86/include/asm/kvm_host.h >> +++ b/arch/x86/include/asm/kvm_host.h >> @@ -854,6 +854,18 @@ struct kvm_apic_map { >> struct kvm_lapic *phys_map[]; >> }; >> >> +/* Hyper-V synthetic debugger (SynDbg)*/ >> +struct kvm_hv_syndbg { >> + struct { >> + u64 control; >> + u64 status; >> + u64 send_page; >> + u64 recv_page; >> + u64 pending_page; >> + } control; >> + u64 options; >> +}; >> + >> /* Hyper-V emulation context */ >> struct kvm_hv { >> struct mutex hv_lock; >> @@ -877,6 +889,7 @@ struct kvm_hv { >> atomic_t num_mismatched_vp_indexes; >> >> struct hv_partition_assist_pg *hv_pa_pg; >> + struct kvm_hv_syndbg hv_syndbg; >> }; >> >> enum kvm_irqchip_mode { >> diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c >> index a86fda7a1d03..7cbc4afe9d07 100644 >> --- a/arch/x86/kvm/hyperv.c >> +++ b/arch/x86/kvm/hyperv.c >> @@ -266,6 +266,71 @@ static int synic_set_msr(struct kvm_vcpu_hv_synic *synic, >> return ret; >> } >> >> +static int kvm_hv_syndbg_complete_userspace(struct kvm_vcpu *vcpu) >> +{ >> + struct kvm *kvm = vcpu->kvm; >> + struct kvm_hv *hv = &kvm->arch.hyperv; >> + >> + if (vcpu->run->hyperv.u.syndbg.msr == HV_X64_MSR_SYNDBG_CONTROL) >> + hv->hv_syndbg.control.status = >> + vcpu->run->hyperv.u.syndbg.status; >> + return 1; >> +} >> + >> +static void syndbg_exit(struct kvm_vcpu *vcpu, u32 msr) >> +{ >> + struct kvm_hv_syndbg *syndbg = vcpu_to_hv_syndbg(vcpu); >> + struct kvm_vcpu_hv *hv_vcpu = &vcpu->arch.hyperv; >> + >> + hv_vcpu->exit.type = KVM_EXIT_HYPERV_SYNDBG; >> + hv_vcpu->exit.u.syndbg.msr = msr; >> + hv_vcpu->exit.u.syndbg.control = syndbg->control.control; >> + hv_vcpu->exit.u.syndbg.send_page = syndbg->control.send_page; >> + hv_vcpu->exit.u.syndbg.recv_page = syndbg->control.recv_page; >> + hv_vcpu->exit.u.syndbg.pending_page = syndbg->control.pending_page; >> + vcpu->arch.complete_userspace_io = >> + kvm_hv_syndbg_complete_userspace; >> + >> + kvm_make_request(KVM_REQ_HV_EXIT, vcpu); >> +} >> + >> +static int syndbg_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data) >> +{ >> + struct kvm_hv_syndbg *syndbg = vcpu_to_hv_syndbg(vcpu); >> + int ret; >> + >> + trace_kvm_hv_syndbg_set_msr(vcpu->vcpu_id, >> + vcpu_to_hv_vcpu(vcpu)->vp_index, msr, data); >> + ret = 0; >> + switch (msr) { >> + case HV_X64_MSR_SYNDBG_CONTROL: >> + syndbg->control.control = data; >> + syndbg_exit(vcpu, msr); >> + break; >> + case HV_X64_MSR_SYNDBG_STATUS: >> + syndbg->control.status = data; >> + break; >> + case HV_X64_MSR_SYNDBG_SEND_BUFFER: >> + syndbg->control.send_page = data; >> + break; >> + case HV_X64_MSR_SYNDBG_RECV_BUFFER: >> + syndbg->control.recv_page = data; >> + break; >> + case HV_X64_MSR_SYNDBG_PENDING_BUFFER: >> + syndbg->control.pending_page = data; >> + syndbg_exit(vcpu, msr); >> + break; >> + case HV_X64_MSR_SYNDBG_OPTIONS: >> + syndbg->options = data; >> + break; >> + default: >> + ret = 1; >> + break; >> + } >> + >> + return ret; >> +} >> + >> static int synic_get_msr(struct kvm_vcpu_hv_synic *synic, u32 msr, u64 *pdata, >> bool host) >> { >> @@ -800,6 +865,8 @@ static bool kvm_hv_msr_partition_wide(u32 msr) >> case HV_X64_MSR_REENLIGHTENMENT_CONTROL: >> case HV_X64_MSR_TSC_EMULATION_CONTROL: >> case HV_X64_MSR_TSC_EMULATION_STATUS: >> + case HV_X64_MSR_SYNDBG_OPTIONS: >> + case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER: >> r = true; >> break; >> } >> @@ -1061,6 +1128,9 @@ static int kvm_hv_set_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 data, >> if (!host) >> return 1; >> break; >> + case HV_X64_MSR_SYNDBG_OPTIONS: >> + case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER: >> + return syndbg_set_msr(vcpu, msr, data); >> default: >> vcpu_unimpl(vcpu, "Hyper-V unhandled wrmsr: 0x%x data 0x%llx\n", >> msr, data); >> @@ -1227,6 +1297,24 @@ static int kvm_hv_get_msr_pw(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata) >> case HV_X64_MSR_TSC_EMULATION_STATUS: >> data = hv->hv_tsc_emulation_status; >> break; >> + case HV_X64_MSR_SYNDBG_OPTIONS: >> + data = hv->hv_syndbg.options; >> + break; >> + case HV_X64_MSR_SYNDBG_CONTROL: >> + data = hv->hv_syndbg.control.control; >> + break; >> + case HV_X64_MSR_SYNDBG_STATUS: >> + data = hv->hv_syndbg.control.status; >> + break; >> + case HV_X64_MSR_SYNDBG_SEND_BUFFER: >> + data = hv->hv_syndbg.control.send_page; >> + break; >> + case HV_X64_MSR_SYNDBG_RECV_BUFFER: >> + data = hv->hv_syndbg.control.recv_page; >> + break; >> + case HV_X64_MSR_SYNDBG_PENDING_BUFFER: >> + data = hv->hv_syndbg.control.pending_page; >> + break; >> default: >> vcpu_unimpl(vcpu, "Hyper-V unhandled rdmsr: 0x%x\n", msr); >> return 1; >> @@ -1797,6 +1885,9 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, >> { .function = HYPERV_CPUID_ENLIGHTMENT_INFO }, >> { .function = HYPERV_CPUID_IMPLEMENT_LIMITS }, >> { .function = HYPERV_CPUID_NESTED_FEATURES }, >> + { .function = HYPERV_CPUID_SYNDBG_VENDOR_AND_MAX_FUNCTIONS }, >> + { .function = HYPERV_CPUID_SYNDBG_INTERFACE }, >> + { .function = HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES }, >> }; >> int i, nent = ARRAY_SIZE(cpuid_entries); >> >> @@ -1821,7 +1912,7 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, >> case HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS: >> memcpy(signature, "Linux KVM Hv", 12); >> >> - ent->eax = HYPERV_CPUID_NESTED_FEATURES; >> + ent->eax = HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES; >> ent->ebx = signature[0]; >> ent->ecx = signature[1]; >> ent->edx = signature[2]; >> @@ -1856,9 +1947,12 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, >> >> ent->ebx |= HV_X64_POST_MESSAGES; >> ent->ebx |= HV_X64_SIGNAL_EVENTS; >> + ent->ebx |= HV_X64_DEBUGGING; >> >> ent->edx |= HV_FEATURE_FREQUENCY_MSRS_AVAILABLE; >> ent->edx |= HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE; >> + ent->edx |= HV_X64_GUEST_DEBUGGING_AVAILABLE; >> + ent->edx |= HV_FEATURE_DEBUG_MSRS_AVAILABLE; >> >> /* >> * Direct Synthetic timers only make sense with in-kernel >> @@ -1903,6 +1997,24 @@ int kvm_vcpu_ioctl_get_hv_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid, >> >> break; >> >> + case HYPERV_CPUID_SYNDBG_VENDOR_AND_MAX_FUNCTIONS: >> + memcpy(signature, "Linux KVM Hv", 12); >> + >> + ent->eax = 0; >> + ent->ebx = signature[0]; >> + ent->ecx = signature[1]; >> + ent->edx = signature[2]; > >or maybe just copy HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS.EBX if it's not >any different? > So few things about this, HYPERV_CPUID_SYNDBG_VENDOR_AND_MAX_FUNCTIONS should return "Microsoft VS" and EAX 0, while HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS should return "Microsoft Hv" with EAX as MAX CPUID leaf, with that said the implementation would look pretty weird, it would look something like ent->ebx = cpuid_entries[0].ebx; ... I thought it's a bit confusing that I'll be addressing the index and make the order of the entries in cpuid_entries important. >> + break; >> + >> + case HYPERV_CPUID_SYNDBG_INTERFACE: >> + memcpy(signature, "VS#1\0\0\0\0\0\0\0\0", 12); >> + ent->eax = signature[0]; >> + break; >> + >> + case HYPERV_CPUID_SYNDBG_PLATFORM_CAPABILITIES: >> + ent->eax |= HV_X64_SYNDBG_CAP_ALLOW_KERNEL_DEBUGGING; >> + break; >> + >> default: >> break; >> } >> diff --git a/arch/x86/kvm/hyperv.h b/arch/x86/kvm/hyperv.h >> index 757cb578101c..6a86151fac53 100644 >> --- a/arch/x86/kvm/hyperv.h >> +++ b/arch/x86/kvm/hyperv.h >> @@ -46,6 +46,11 @@ static inline struct kvm_vcpu *synic_to_vcpu(struct kvm_vcpu_hv_synic *synic) >> return hv_vcpu_to_vcpu(container_of(synic, struct kvm_vcpu_hv, synic)); >> } >> >> +static inline struct kvm_hv_syndbg *vcpu_to_hv_syndbg(struct kvm_vcpu *vcpu) >> +{ >> + return &vcpu->kvm->arch.hyperv.hv_syndbg; >> +} >> + >> int kvm_hv_set_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host); >> int kvm_hv_get_msr_common(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata, bool host); >> >> diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h >> index f194dd058470..5fd600916fd4 100644 >> --- a/arch/x86/kvm/trace.h >> +++ b/arch/x86/kvm/trace.h >> @@ -1515,6 +1515,31 @@ TRACE_EVENT(kvm_nested_vmenter_failed, >> __print_symbolic(__entry->err, VMX_VMENTER_INSTRUCTION_ERRORS)) >> ); >> >> +/* >> + * Tracepoint for syndbg_set_msr. >> + */ >> +TRACE_EVENT(kvm_hv_syndbg_set_msr, >> + TP_PROTO(int vcpu_id, u32 vp_index, u32 msr, u64 data), >> + TP_ARGS(vcpu_id, vp_index, msr, data), >> + >> + TP_STRUCT__entry( >> + __field(int, vcpu_id) >> + __field(u32, vp_index) >> + __field(u32, msr) >> + __field(u64, data) >> + ), >> + >> + TP_fast_assign( >> + __entry->vcpu_id = vcpu_id; >> + __entry->vp_index = vp_index; >> + __entry->msr = msr; >> + __entry->data = data; >> + ), >> + >> + TP_printk("vcpu_id %d vp_index %u msr 0x%x data 0x%llx", >> + __entry->vcpu_id, __entry->vp_index, __entry->msr, >> + __entry->data) >> +); > >To be consistent, do we also want a kvm_hv_syndbg_get_msr tracepoint? > Done. >> #endif /* _TRACE_KVM_H */ >> >> #undef TRACE_INCLUDE_PATH >> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c >> index 5de200663f51..619c24bac79e 100644 >> --- a/arch/x86/kvm/x86.c >> +++ b/arch/x86/kvm/x86.c >> @@ -1214,6 +1214,10 @@ static const u32 emulated_msrs_all[] = { >> HV_X64_MSR_VP_ASSIST_PAGE, >> HV_X64_MSR_REENLIGHTENMENT_CONTROL, HV_X64_MSR_TSC_EMULATION_CONTROL, >> HV_X64_MSR_TSC_EMULATION_STATUS, >> + HV_X64_MSR_SYNDBG_OPTIONS, >> + HV_X64_MSR_SYNDBG_CONTROL, HV_X64_MSR_SYNDBG_STATUS, >> + HV_X64_MSR_SYNDBG_SEND_BUFFER, HV_X64_MSR_SYNDBG_RECV_BUFFER, >> + HV_X64_MSR_SYNDBG_PENDING_BUFFER, >> >> MSR_KVM_ASYNC_PF_EN, MSR_KVM_STEAL_TIME, >> MSR_KVM_PV_EOI_EN, >> @@ -2906,6 +2910,8 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) >> */ >> break; >> case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15: >> + case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER: >> + case HV_X64_MSR_SYNDBG_OPTIONS: >> case HV_X64_MSR_CRASH_P0 ... HV_X64_MSR_CRASH_P4: >> case HV_X64_MSR_CRASH_CTL: >> case HV_X64_MSR_STIMER0_CONFIG ... HV_X64_MSR_STIMER3_COUNT: >> @@ -3151,6 +3157,8 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) >> msr_info->data = 0x20000000; >> break; >> case HV_X64_MSR_GUEST_OS_ID ... HV_X64_MSR_SINT15: >> + case HV_X64_MSR_SYNDBG_CONTROL ... HV_X64_MSR_SYNDBG_PENDING_BUFFER: >> + case HV_X64_MSR_SYNDBG_OPTIONS: >> case HV_X64_MSR_CRASH_P0 ... HV_X64_MSR_CRASH_P4: >> case HV_X64_MSR_CRASH_CTL: >> case HV_X64_MSR_STIMER0_CONFIG ... HV_X64_MSR_STIMER3_COUNT: >> @@ -3323,6 +3331,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) >> case KVM_CAP_HYPERV_TLBFLUSH: >> case KVM_CAP_HYPERV_SEND_IPI: >> case KVM_CAP_HYPERV_CPUID: >> + case KVM_CAP_HYPERV_DEBUGGING: >> case KVM_CAP_PCI_SEGMENT: >> case KVM_CAP_DEBUGREGS: >> case KVM_CAP_X86_ROBUST_SINGLESTEP: >> diff --git a/include/uapi/linux/kvm.h b/include/uapi/linux/kvm.h >> index 9b4d449f4d20..ca28ea04d1d5 100644 >> --- a/include/uapi/linux/kvm.h >> +++ b/include/uapi/linux/kvm.h >> @@ -188,6 +188,7 @@ struct kvm_s390_cmma_log { >> struct kvm_hyperv_exit { >> #define KVM_EXIT_HYPERV_SYNIC 1 >> #define KVM_EXIT_HYPERV_HCALL 2 >> +#define KVM_EXIT_HYPERV_SYNDBG 3 >> __u32 type; >> union { >> struct { >> @@ -202,6 +203,14 @@ struct kvm_hyperv_exit { >> __u64 params[2]; >> __u32 pad; >> } hcall; >> + struct { >> + __u32 msr; >> + __u64 control; >> + __u64 status; >> + __u64 send_page; >> + __u64 recv_page; >> + __u64 pending_page; >> + } syndbg; >> } u; >> }; >> >> @@ -1011,6 +1020,7 @@ struct kvm_ppc_resize_hpt { >> #define KVM_CAP_ARM_NISV_TO_USER 177 >> #define KVM_CAP_ARM_INJECT_EXT_DABT 178 >> #define KVM_CAP_S390_VCPU_RESETS 179 >> +#define KVM_CAP_HYPERV_DEBUGGING 180 >> >> #ifdef KVM_CAP_IRQ_ROUTING > >-- >Vitaly >