On Mon, Jan 13, 2020 at 03:16:54PM -0800, Oliver Upton wrote:
> On Mon, Jan 13, 2020 at 02:52:10PM -0800, Sean Christopherson wrote:
> > On Mon, Jan 13, 2020 at 02:10:51PM -0800, Oliver Upton wrote:
> > > VMX and SVM differ slightly in the handling of #DB debug-trap exceptions
> > > upon VM-entry. VMX defines the 'pending debug exceptions' field in the
> > > VMCS for hardware to inject the event and update debug register state
> > > upon VM-entry.
> > >
> > > SVM provides no such mechanism for maintaining the state of a pending
> > > debug exception, as the debug register state is updated before delivery
> > > of #VMEXIT.
> > >
> > > Lastly, while KVM defines the exception payload for debug-trap
> > > exceptions as compatible with the 'pending debug exceptions' VMCS field,
> > > it is not compatible with the DR6 register across both vendors.
> > >
> > > Split the #DB payload delivery between SVM and VMX to capture the
> > > nuanced differences in instruction emulation. Utilize the 'pending debug
> > > exceptions' field on VMX to deliver the payload. On SVM, directly update
> > > register state with the appropriate requested bits from the exception
> > > payload.
> > >
> > > Fixes: f10c729ff965 ("kvm: vmx: Defer setting of DR6 until #DB delivery")
> >
> > Without even looking at the code, I recommend splitting this into two
> > patches: first fix SVM without introducing any functional changes to VMX,
> > and then change VMX to use the PENDING_DBG field. That way the SVM code
> > isn't affected if for some reason the VMX patch needs to be reverted.
>
> Alright, I'll split this between vendors in the SVM patch, but keep the
> existing DR6 magic in both. I'll also mask BIT(12) in the SVM patch.
>
> > Not that I doubt the correctness of the VMX change, I just expect problems
> > by default whenever anything so much as breathes on dr6 :-)
>
> Hah. I'll muck with VMX afterwards :)
>
> As always, thanks for the great, prompt review Sean.
>
> > > Signed-off-by: Oliver Upton <oupton@xxxxxxxxxx>
> > > Reviewed-by: Peter Shier <pshier@xxxxxxxxxx>
> > > Reviewed-by: Jim Mattson <jmattson@xxxxxxxxxx>
> > > ---
> > > arch/x86/include/asm/kvm_host.h | 1 +
> > > arch/x86/kvm/svm.c | 20 ++++++++++++++++++++
> > > arch/x86/kvm/vmx/vmx.c | 20 +++++++++++++++++++-
> > > arch/x86/kvm/x86.c | 21 +--------------------
> > > 4 files changed, 41 insertions(+), 21 deletions(-)
> > >
> > > diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> > > index b79cd6aa4075..4739ca11885d 100644
> > > --- a/arch/x86/include/asm/kvm_host.h
> > > +++ b/arch/x86/include/asm/kvm_host.h
> > > @@ -1100,6 +1100,7 @@ struct kvm_x86_ops {
> > > void (*set_nmi)(struct kvm_vcpu *vcpu);
> > > void (*queue_exception)(struct kvm_vcpu *vcpu);
> > > void (*cancel_injection)(struct kvm_vcpu *vcpu);
> > > + void (*deliver_db_payload)(struct kvm_vcpu *vcpu,
> > > + unsigned long payload);
> > > int (*interrupt_allowed)(struct kvm_vcpu *vcpu);
> > > int (*nmi_allowed)(struct kvm_vcpu *vcpu);
> > > bool (*get_nmi_mask)(struct kvm_vcpu *vcpu);
> > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
> > > index 122d4ce3b1ab..16ded16af997 100644
> > > --- a/arch/x86/kvm/svm.c
> > > +++ b/arch/x86/kvm/svm.c
> > > @@ -5615,6 +5615,25 @@ static void svm_cancel_injection(struct kvm_vcpu *vcpu)
> > > svm_complete_interrupts(svm);
> > > }
> > >
> > > +static void svm_deliver_db_payload(struct kvm_vcpu *vcpu, unsigned long payload)
> > > +{
> > > + /*
> > > + * The exception payload is defined as compatible with the 'pending
> > > + * debug exceptions' field in VMX, not the DR6 register. Clear bit 12
> > > + * (enabled breakpoint) in the payload, which is reserved MBZ in DR6.
> > > + */
> > > + payload &= ~BIT(12);
> > > +
> > > + /*
> > > + * The processor updates bits 3:0 according to the matched breakpoint
> > > + * conditions on every debug breakpoint or general-detect condition.
> > > + * Hardware will not clear any other bits in DR6. Clear bits 3:0 and set
> > > + * the bits requested in the exception payload.
> > > + */
> > > + vcpu->arch.dr6 &= ~DR_TRAP_BITS;
> > > + vcpu->arch.dr6 |= payload;
> > > +}
> > > +
> > > static void svm_vcpu_run(struct kvm_vcpu *vcpu)
> > > {
> > > struct vcpu_svm *svm = to_svm(vcpu);
> > > @@ -7308,6 +7327,7 @@ static struct kvm_x86_ops svm_x86_ops __ro_after_init = {
> > > .set_nmi = svm_inject_nmi,
> > > .queue_exception = svm_queue_exception,
> > > .cancel_injection = svm_cancel_injection,
> > > + .deliver_db_payload = svm_deliver_db_payload,
> > > .interrupt_allowed = svm_interrupt_allowed,
> > > .nmi_allowed = svm_nmi_allowed,
> > > .get_nmi_mask = svm_get_nmi_mask,
> > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> > > index e3394c839dea..148696199c88 100644
> > > --- a/arch/x86/kvm/vmx/vmx.c
> > > +++ b/arch/x86/kvm/vmx/vmx.c
> > > @@ -1613,6 +1613,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu)
> > > struct vcpu_vmx *vmx = to_vmx(vcpu);
> > > unsigned nr = vcpu->arch.exception.nr;
> > > bool has_error_code = vcpu->arch.exception.has_error_code;
> > > + bool has_payload = vcpu->arch.exception.has_payload;
> > > u32 error_code = vcpu->arch.exception.error_code;
> > > u32 intr_info = nr | INTR_INFO_VALID_MASK;
> > >
> > > @@ -1640,7 +1641,13 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu)
> > > } else
> > > intr_info |= INTR_TYPE_HARD_EXCEPTION;
> > >
> > > - vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, intr_info);
> > > + /*
> > > + * Debug-trap exceptions are injected into the guest via the 'pending
> > > + * debug exceptions' vmcs field and thus should not be injected into the
> > > + * guest using the general event injection mechanism.
> > > + */
> > > + if (nr != DB_VECTOR || !has_payload)
> > > + vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, intr_info);
> > >
> > > vmx_clear_hlt(vcpu);
> > > }
> > > @@ -6398,6 +6405,16 @@ static void vmx_cancel_injection(struct kvm_vcpu *vcpu)
> > > vmcs_write32(VM_ENTRY_INTR_INFO_FIELD, 0);
> > > }
> > >
> > > +static void vmx_deliver_db_payload(struct kvm_vcpu *vcpu, unsigned long payload)
> > > +{
> > > + /*
> > > + * Synthesized debug exceptions that have an associated payload must be
> > > + * traps, and thus the 'pending debug exceptions' field can be used to
> > > + * allow hardware to inject the event upon VM-entry.
> > > + */
> >
> > I'm confused by this, probably because I don't understand what you mean by
> > "Synthesized debug exceptions". E.g. code #DBs are fault-like and update
> > dr6.
Yeah, this comment could benefit from being cleaned up. By 'synthesized'
I meant to imply exceptions that we are going to inject resulting from
instruction emulation.
AFAIK, KVM only emulates single step #DBs during instruction emulation,
and as such we should never reach this with a software #DB (I tested
this in the kvm-unit-tests patch). I think that software #DBs should get
reinjected by handle_exception_nmi(), which manipulates DR6 and calls
kvm_queue_exception() (i.e. no payload).
Regardless, I need to expand this comment to ensure it is abundantly
clear what is happening.
Sean, given my above comments, do you still see any issues with this
change (beyond comment fix)?
Sorry I missed this in the first mail, thank you for bringing attention
to this.
> >
> > > + vmcs_writel(GUEST_PENDING_DBG_EXCEPTIONS, payload);
> > > +}
> > > +
> > > static void atomic_switch_perf_msrs(struct vcpu_vmx *vmx)
> > > {
> > > int i, nr_msrs;
> > > @@ -7821,6 +7838,7 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
> > > .set_nmi = vmx_inject_nmi,
> > > .queue_exception = vmx_queue_exception,
> > > .cancel_injection = vmx_cancel_injection,
> > > + .deliver_db_payload = vmx_deliver_db_payload,
> > > .interrupt_allowed = vmx_interrupt_allowed,
> > > .nmi_allowed = vmx_nmi_allowed,
> > > .get_nmi_mask = vmx_get_nmi_mask,
> > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> > > index cf917139de6b..c14174c033e4 100644
> > > --- a/arch/x86/kvm/x86.c
> > > +++ b/arch/x86/kvm/x86.c
> > > @@ -415,26 +415,7 @@ void kvm_deliver_exception_payload(struct kvm_vcpu *vcpu)
> > >
> > > switch (nr) {
> > > case DB_VECTOR:
> > > - /*
> > > - * "Certain debug exceptions may clear bit 0-3. The
> > > - * remaining contents of the DR6 register are never
> > > - * cleared by the processor".
> > > - */
> > > - vcpu->arch.dr6 &= ~DR_TRAP_BITS;
> > > - /*
> > > - * DR6.RTM is set by all #DB exceptions that don't clear it.
> > > - */
> > > - vcpu->arch.dr6 |= DR6_RTM;
> > > - vcpu->arch.dr6 |= payload;
> > > - /*
> > > - * Bit 16 should be set in the payload whenever the #DB
> > > - * exception should clear DR6.RTM. This makes the payload
> > > - * compatible with the pending debug exceptions under VMX.
> > > - * Though not currently documented in the SDM, this also
> > > - * makes the payload compatible with the exit qualification
> > > - * for #DB exceptions under VMX.
> > > - */
> > > - vcpu->arch.dr6 ^= payload & DR6_RTM;
> > > + kvm_x86_ops->deliver_db_payload(vcpu, payload);
> > > break;
> > > case PF_VECTOR:
> > > vcpu->arch.cr2 = payload;
> > > --
> > > 2.25.0.rc1.283.g88dfdc4193-goog
> > >
