From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754557AbbCBP0F (ORCPT <rfc822;w@1wt.eu>);
	Mon, 2 Mar 2015 10:26:05 -0500
Received: from mx1.redhat.com ([209.132.183.28]:43326 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753372AbbCBP0C convert rfc822-to-8bit (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Mon, 2 Mar 2015 10:26:02 -0500
From: Bandan Das <bsd@redhat.com>
To: Radim =?utf-8?B?S3LEjW3DocWZ?= <rkrcmar@redhat.com>
Cc: Joel Schopp <joel.schopp@amd.com>, Gleb Natapov <gleb@kernel.org>,
        Paolo Bonzini <pbonzini@redhat.com>, kvm@vger.kernel.org,
        David Kaplan <David.Kaplan@amd.com>, Joerg Roedel <joro@8bytes.org>,
        Marcelo Tosatti <mtosatti@redhat.com>, linux-kernel@vger.kernel.org,
        Borislav Petkov <bp@alien8.de>
Subject: Re: [PATCH] x86: svm: make wbinvd faster
References: <20150228001917.15247.41063.stgit@joelvmguard2.amd.com>
	<jpg4mq45dyn.fsf@redhat.com>
	<20150302135925.GA26739@potion.brq.redhat.com>
Date: Mon, 02 Mar 2015 10:25:34 -0500
In-Reply-To: <20150302135925.GA26739@potion.brq.redhat.com> ("Radim
 \=\?utf-8\?B\?S3LEjW3DocWZIidz\?\=
	message of "Mon, 2 Mar 2015 14:59:25 +0100")
Message-ID: <jpgmw3v2zgx.fsf@redhat.com>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8BIT
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Radim Krčmář <rkrcmar@redhat.com> writes:

> 2015-03-01 21:29-0500, Bandan Das:
>> Joel Schopp <joel.schopp@amd.com> writes:
>> 
>> > From: David Kaplan <David.Kaplan@amd.com>
>> > No need to re-decode WBINVD since we know what it is from the intercept.
>> >
>> > Signed-off-by: David Kaplan <David.Kaplan@amd.com>
>> > [extracted from larger unlrelated patch, forward ported, tested]
>> > Signed-off-by: Joel Schopp <joel.schopp@amd.com>
>> > ---
>> > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
>> > +static int wbinvd_interception(struct vcpu_svm *svm)
>> > +{
>> > +	kvm_emulate_wbinvd(&svm->vcpu);
>> > +	skip_emulated_instruction(&svm->vcpu);
>> > +	return 1;
>> > +}
>> > +
>> > +
>> Can't we merge this to kvm_emulate_wbinvd, and just call that function
>> directly for both vmx and svm ?
>
> kvm_emulate_wbinvd() lives in x86.c and skip_emulated_instruction() is
> from svm.c/vmx.c:  so we'd have to create a new x86 op and change the
> emulator code as well ... it's probably better like this.

There's already one - kvm_x86_ops->skip_emulated_instruction

>> >  static int xsetbv_interception(struct vcpu_svm *svm)
>> >  {
>> >  	u64 new_bv = kvm_read_edx_eax(&svm->vcpu);
>> > @@ -3376,7 +3384,7 @@ static int (*const svm_exit_handlers[])(struct vcpu_svm *svm) = {
>> >  	[SVM_EXIT_STGI]				= stgi_interception,
>> >  	[SVM_EXIT_CLGI]				= clgi_interception,
>> >  	[SVM_EXIT_SKINIT]			= skinit_interception,
>> > -	[SVM_EXIT_WBINVD]                       = emulate_on_interception,
>> So, this means x86_emulate_insn() in emulate.c has no callers left for the
>> wbinvd case ? vmx calls kvm_emulate_wbinvd directly too..
>
> I think that invalid state emulation might still hit wbinvd.