On 23/04/20 21:46, Sean Christopherson wrote: >> >> + /* The guest is not woken up from HLT, unlike Intel. Fix that up. */ > The comment about "unlike Intel" isn't correct, or at least it's not always > correct. Intercept NMIs/interrupts don't affect vmcs.GUEST_ACTIVITY, i.e. > if the guest was in HLT before the exit then that's what will be recorded > in the VMCS. > > https://lkml.kernel.org/r/20190509204838.GC12810@xxxxxxxxxxxxxxx Ok, I'll change it to "The guest is not woken up from HLT and RIP still points to it". On Intel indeed it is not woken up either but vmx_tests.c has if (vmx_get_test_stage() >= 2) vmcs_write(GUEST_ACTV_STATE, ACTV_ACTIVE); Then it's not surprising that, when I fixed a bunch of nested AMD things to behave the same as in vmx/vmx.c, SVM broke and needed this patch. Paolo