DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AC0FC81E01
Subject: Re: [PATCH] KVM: VMX: check match table
To: Josh Triplett <josh@joshtriplett.org>,
        Nick Desaulniers <nick.desaulniers@gmail.com>
Cc: kay@vrfy.org, avi@redhat.com, Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
        x86@kernel.org, =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= <rkrcmar@redhat.com>,
        linux-kernel@vger.kernel.org, kvm@vger.kernel.org
References: <CAH7mPvgYREBRHY=2=HXOAg=v2SfLMCdO8gDkYTPsY+oRMCKMBA@mail.gmail.com>
 <20170926042540.10100-1-nick.desaulniers@gmail.com>
 <20170926171219.ulnknakiohm2whpd@x>
From: Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <498ed7dc-41b2-a075-cdce-e63a80842d39@redhat.com>
Date: Wed, 27 Sep 2017 14:36:03 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.3.0
MIME-Version: 1.0
In-Reply-To: <20170926171219.ulnknakiohm2whpd@x>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 865
Lines: 30

On 26/09/2017 19:12, Josh Triplett wrote:
>> diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
>> index 6970249c09fc..e1a00b130935 100644
>> --- a/arch/x86/kvm/vmx.c
>> +++ b/arch/x86/kvm/vmx.c
>> @@ -12074,7 +12074,12 @@ static struct kvm_x86_ops vmx_x86_ops __ro_after_init = {
>>  
>>  static int __init vmx_init(void)
>>  {
>> -	int r = kvm_init(&vmx_x86_ops, sizeof(struct vcpu_vmx),
>> +	int r;
>> +
>> +	if (!x86_match_cpu(vmx_cpu_id))
>> +		return -ENODEV;
> Does this make any other checks redundant and removable?

It would make sense to place it in cpu_has_kvm_support instead, and the
same in svm.c's has_svm.

But there's a lot of pointless indirection to clean up there...

Paolo

>> +
>> +	r = kvm_init(&vmx_x86_ops, sizeof(struct vcpu_vmx),
>>                       __alignof__(struct vcpu_vmx), THIS_MODULE);
>>  	if (r)
>>  		return r;
>> --