On Tue, Apr 11, 2023, Paolo Bonzini wrote:
> On 4/5/23 02:23, Sean Christopherson wrote:
> > Fixes: 07721feee46b ("KVM: nVMX: Don't emulate instructions in guest mode")
> > Cc: Mathias Krause <minipli@xxxxxxxxxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx
> > Signed-off-by: Sean Christopherson <seanjc@xxxxxxxxxx>
> > ---
> > arch/x86/kvm/vmx/vmx.c | 15 +++++++++++++++
> > 1 file changed, 15 insertions(+)
> >
> > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c
> > index 9ae4044f076f..1e560457bf9a 100644
> > --- a/arch/x86/kvm/vmx/vmx.c
> > +++ b/arch/x86/kvm/vmx/vmx.c
> > @@ -7898,6 +7898,21 @@ static int vmx_check_intercept(struct kvm_vcpu *vcpu,
> > /* FIXME: produce nested vmexit and return X86EMUL_INTERCEPTED. */
> > break;
> > + case x86_intercept_pause:
> > + /*
> > + * PAUSE is a single-byte NOP with a REPE prefix, i.e. collides
> > + * with vanilla NOPs in the emulator. Apply the interception
> > + * check only to actual PAUSE instructions. Don't check
> > + * PAUSE-loop-exiting, software can't expect a given PAUSE to
> > + * exit, i.e. KVM is within its rights to allow L2 to execute
> > + * the PAUSE.
> > + */
> > + if ((info->rep_prefix != REPE_PREFIX) ||
> > + !nested_cpu_has2(vmcs12, CPU_BASED_PAUSE_EXITING))
> > + return X86EMUL_CONTINUE;
> > +
> > + break;
> > +
> > /* TODO: check more intercepts... */
> > default:
> > break;
> >
> > base-commit: 27d6845d258b67f4eb3debe062b7dacc67e0c393
>
> Reviewed-by: Paolo Bonzini <pbonzini@xxxxxxxxxx>
>
> Would you like me to apply this for 6.3?
Nah, I don't think there's a good risk vs. reward ratio. KVM doesn't enable PLE
for L2, never enables PAUSE-exiting, and won't emulate NOP without forced emulation
or TLB shenanigans from L2. So other than tests, this really shouldn't matter.
Actually, typing that out is making me rethink the stable tag...
