KVM: x86: clflushopt should be treated as a no-op by emulation (51b958e5) · Commits · 戴 / test

The instruction emulator ignores clflush instructions, yet fails to support clflushopt. Treat both similarly. Fixes: ("KVM: x86: Emulator does not decode clflush well") Signed-off-by:

David Edmondson <david.edmondson@oracle.com> Message-Id: <20201103120400.240882-1-david.edmondson@oracle.com> Reviewed-by:

Joao Martins <joao.m.martins@oracle.com> Signed-off-by:

Paolo Bonzini <pbonzini@redhat.com>

arch/x86/kvm/emulate.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -4046,6 +4046,12 @@ static int em_clflush(struct x86_emulate_ctxt *ctxt)
		return X86EMUL_CONTINUE;
		}

		static int em_clflushopt(struct x86_emulate_ctxt *ctxt)
		{
		/* emulating clflushopt regardless of cpuid */
		return X86EMUL_CONTINUE;
		}

		static int em_movsxd(struct x86_emulate_ctxt *ctxt)
		{
		ctxt->dst.val = (s32) ctxt->src.val;
		@@ -4585,7 +4591,7 @@ static const struct opcode group11[] = {
		};

		static const struct gprefix pfx_0f_ae_7 = {
		I(SrcMem \| ByteOp, em_clflush), N, N, N,
		I(SrcMem \| ByteOp, em_clflush), I(SrcMem \| ByteOp, em_clflushopt), N, N,
		};

		static const struct group_dual group15 = { {

Admin message