linux-kernel - Re: [PATCH v6 1/2] KVM: x86/cpuid: generalize kvm_update_kvm_cpuid

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <42df94c1661c2ece94d51e4ffcf68651887189db.camel@infradead.org>
Date:   Tue, 03 Jan 2023 16:20:18 +0000
From:   David Woodhouse <dwmw2@...radead.org>
To:     Paul Durrant <pdurrant@...zon.com>, x86@...nel.org,
        kvm@...r.kernel.org, linux-kernel@...r.kernel.org
Cc:     Sean Christopherson <seanjc@...gle.com>,
        Paolo Bonzini <pbonzini@...hat.com>,
        Thomas Gleixner <tglx@...utronix.de>,
        Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
        Dave Hansen <dave.hansen@...ux.intel.com>
Subject: Re: [PATCH v6 1/2] KVM: x86/cpuid: generalize
 kvm_update_kvm_cpuid_base() and also capture limit

On Tue, 2022-12-20 at 13:40 +0000, 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@...zon.com>
> ---

Reviewed-by: David Woodhouse <dwmw@...zon.co.uk>

> Cc: Sean Christopherson <seanjc@...gle.com>
> Cc: Paolo Bonzini <pbonzini@...hat.com>
> Cc: Thomas Gleixner <tglx@...utronix.de>
> Cc: Ingo Molnar <mingo@...hat.com>
> Cc: Borislav Petkov <bp@...en8.de>
> Cc: Dave Hansen <dave.hansen@...ux.intel.com>
> Cc: David Woodhouse <dwmw2@...radead.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;
> +};
> +
>  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,
> +                                       struct kvm_hypervisor_cpuid *hypervisor_cpuid)
>  {
>         u32 function;
>         struct kvm_cpuid_entry2 *entry;
>  
> -       vcpu->arch.kvm_cpuid_base = 0;
> +       memset(hypervisor_cpuid, 0, sizeof(*hypervisor_cpuid));
>  
>         for_each_possible_hypervisor_cpuid_base(function) {
>                 entry = kvm_find_cpuid_entry(vcpu, function);
> @@ -197,9 +198,9 @@ static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu)
>                         signature[1] = entry->ecx;
>                         signature[2] = entry->edx;
>  
> -                       BUILD_BUG_ON(sizeof(signature) > sizeof(KVM_SIGNATURE));
> -                       if (!memcmp(signature, KVM_SIGNATURE, sizeof(signature))) {
> -                               vcpu->arch.kvm_cpuid_base = function;
> +                       if (!memcmp(signature, hypervisor_signature, sizeof(signature))) {
> +                               hypervisor_cpuid->base = function;
> +                               hypervisor_cpuid->limit = entry->eax;
>                                 break;
>                         }
>                 }
> @@ -209,7 +210,7 @@ static void kvm_update_kvm_cpuid_base(struct kvm_vcpu *vcpu)
>  static struct kvm_cpuid_entry2 *__kvm_find_kvm_cpuid_features(struct kvm_vcpu *vcpu,
>                                               struct kvm_cpuid_entry2 *entries, int nent)
>  {
> -       u32 base = vcpu->arch.kvm_cpuid_base;
> +       u32 base = vcpu->arch.kvm_cpuid.base;
>  
>         if (!base)
>                 return NULL;
> @@ -439,7 +440,7 @@ static int kvm_set_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid_entry2 *e2,
>         vcpu->arch.cpuid_entries = e2;
>         vcpu->arch.cpuid_nent = nent;
>  
> -       kvm_update_kvm_cpuid_base(vcpu);
> +       kvm_update_hypervisor_cpuid(vcpu, KVM_SIGNATURE, &vcpu->arch.kvm_cpuid);
>         kvm_vcpu_after_set_cpuid(vcpu);
>  
>         return 0;


Download attachment "smime.p7s" of type "application/pkcs7-signature" (5965 bytes)