Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <82fbc53e-be3e-b516-2420-dc27e5b811e8@gmail.com>
Date:   Thu, 5 Jan 2023 10:38:08 +0000
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101
 Thunderbird/102.6.1
Subject: Re: [PATCH v6 1/2] KVM: x86/cpuid: generalize
 kvm_update_kvm_cpuid_base() and also capture limit
To:     Sean Christopherson <seanjc@google.com>,
        Paul Durrant <pdurrant@amazon.com>
Cc:     x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org,
        Paolo Bonzini <pbonzini@redhat.com>,
        Thomas Gleixner <tglx@linutronix.de>,
        Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
        Dave Hansen <dave.hansen@linux.intel.com>,
        David Woodhouse <dwmw2@infradead.org>
References: <20221220134053.15591-1-pdurrant@amazon.com>
 <20221220134053.15591-2-pdurrant@amazon.com> <Y7XU2R0f3pCYF9uz@google.com>
Content-Language: en-US
From:   Paul Durrant <xadimgnik@gmail.com>
In-Reply-To: <Y7XU2R0f3pCYF9uz@google.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 04/01/2023 19:34, Sean Christopherson wrote:
> On Tue, Dec 20, 2022, Paul Durrant wrote:
>> A sunsequent patch will need to acquire the CPUID leaf range for emulated
>> Xen so explicitly pass the signature of the hypervisor we're interested in
>> to the new function. Also introduce a new kvm_hypervisor_cpuid structure
>> so we can neatly store both the base and limit leaf indices.
>>
>> Signed-off-by: Paul Durrant <pdurrant@amazon.com>
>> ---
>> Cc: Sean Christopherson <seanjc@google.com>
>> Cc: Paolo Bonzini <pbonzini@redhat.com>
>> Cc: Thomas Gleixner <tglx@linutronix.de>
>> Cc: Ingo Molnar <mingo@redhat.com>
>> Cc: Borislav Petkov <bp@alien8.de>
>> Cc: Dave Hansen <dave.hansen@linux.intel.com>
>> Cc: David Woodhouse <dwmw2@infradead.org>
>>
>> v6:
>>   - New in this version
>> ---
>>   arch/x86/include/asm/kvm_host.h |  7 ++++++-
>>   arch/x86/kvm/cpuid.c            | 15 ++++++++-------
>>   2 files changed, 14 insertions(+), 8 deletions(-)
>>
>> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
>> index f35f1ff4427b..ff201ad35551 100644
>> --- a/arch/x86/include/asm/kvm_host.h
>> +++ b/arch/x86/include/asm/kvm_host.h
>> @@ -710,6 +710,11 @@ struct kvm_queued_exception {
>>   	bool has_payload;
>>   };
>>   
>> +struct kvm_hypervisor_cpuid {
>> +	u32 base;
>> +	u32 limit;
>> +};
> 
> Probably makes sense to place this above "struct kvm_vcpu_xen" right away to
> avoid the (very minor) churn.
> 

Sure.

>>   struct kvm_vcpu_arch {
>>   	/*
>>   	 * rip and regs accesses must go through
>> @@ -826,7 +831,7 @@ struct kvm_vcpu_arch {
>>   
>>   	int cpuid_nent;
>>   	struct kvm_cpuid_entry2 *cpuid_entries;
>> -	u32 kvm_cpuid_base;
>> +	struct kvm_hypervisor_cpuid kvm_cpuid;
>>   
>>   	u64 reserved_gpa_bits;
>>   	int maxphyaddr;
>> diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
>> index 0b5bf013fcb8..2468720f8d84 100644
>> --- a/arch/x86/kvm/cpuid.c
>> +++ b/arch/x86/kvm/cpuid.c
>> @@ -180,12 +180,13 @@ static int kvm_cpuid_check_equal(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2
>>   	return 0;
>>   }
>>   
>> -static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu)
>> +static void kvm_update_hypervisor_cpuid(struct kvm_vcpu *vcpu, const char *hypervisor_signature,
> 
> Please wrap.  The 80 char limit is a soft limit, but should still be honored unless
> there's a good reason to run over.

Ok.

> 
> I also vote to name the param "sig" to keep line lengths short.
> 
>> +					struct kvm_hypervisor_cpuid *hypervisor_cpuid)
> 
> Since the struct is a 64-bit value, what about making this a pure getter that
> returns a copy?
> 
> static struct kvm_hypervisor_cpuid kvm_get_hypervisor_cpuid(struct kvm_vcpu *vcpu,
> 							    const char *sig)
> {
> 	struct kvm_hypervisor_cpuid cpuid = {};
> 	struct kvm_cpuid_entry2 *entry;
> 	u32 function;
> 
> 	for_each_possible_hypervisor_cpuid_base(cpuid.base) {
> 		entry = kvm_find_cpuid_entry(vcpu, function);
> 
> 		if (entry) {
> 			u32 signature[3];
> 
> 			signature[0] = entry->ebx;
> 			signature[1] = entry->ecx;
> 			signature[2] = entry->edx;
> 
> 			if (!memcmp(signature, sig, sizeof(signature))) {
> 				cpuid.base = function;
> 				cpuid.limit = entry->eax;
> 				break;
> 			}
> 		}
> 	}
> 
> 	return cpuid;
> }
> 
> 
> 	vcpu->arch.kvm_cpuid = kvm_get_hypervisor_cpuid(vcpu, KVM_SIGNATURE);
> 	vcpu->arch.xen.cpuid = kvm_get_hypervisor_cpuid(vcpu, XEN_SIGNATURE);

Yes, if that's preferable then no problem.

   Paul