From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68796126F12 for ; Fri, 23 Feb 2024 16:51:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708707073; cv=none; b=n0F36TTprtMPT3lyFDSOkHwtazXXbAeUOc/9k63uuCnDuB/LCGlzI8XAJgpo8OuSvESJHTSD0gF9AmqFCAo/mMxu3zaKOn2jlr687pESgQMUuAxi/+MIKhHGQvM9FLZW8rcTwcUa3ajPPc0ruzfl9WYEWUblRj7mdjy3wUtZVCw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708707073; c=relaxed/simple; bh=K86n2PLe4V7ZstD7p0ayJ/X5fiWcYxjh3elhoSAYw8o=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Qjuktu0PxXxxaVBuaLVK9SXugW0n5DXqxKYf+MYeDUOsN5Ydl1dimBohlrfOJLyiMXc0oqiYNnMkkuoStDZ41iuVPI5B1W3Bt4Z0q21Qn3flTm9dgEjrMFw6QDDKscO+E52lbZoaG5HaZ8wv0RRScEaAMPGOQx5PnpG6V4tIcag= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=p8e0znP5; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="p8e0znP5" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6b2682870so847482276.0 for ; Fri, 23 Feb 2024 08:51:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1708707070; x=1709311870; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=H982CKrjEM3zVkjSPU+J+WNizEP2QCcAVQV6QKucHL8=; b=p8e0znP5v9Vlcz1f9owEuDKkdfJkzqvVysaERciumbLtXADC6fMst7pJRwoZAHrucO 1MtGF8/K0ehegb+1PCcxv4paW11JWPVpvXUIzG8wkZLpgt5sDxQ3NqCsfpx0l0O840Pf /QfcHxBKktu0OqMGqXmZNWLRquDEyl0UlzpHnFudkYIurwvBVuZNOkv0AlZMA1lcWPas Bqdk2q/JBBMW6Jz5cljmTJkNC5qzX9Ceh983wFGahmLNvSFZ82E0fq3aDGVa2UvUGPCI SPkvEYfEOrqD4+z0Q4HZwCr1g7qNe8PRbhvuTYYwrNcFTtvmMnS7ihHu/2Ln+DhUOCKJ AY3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708707070; x=1709311870; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=H982CKrjEM3zVkjSPU+J+WNizEP2QCcAVQV6QKucHL8=; b=h6KzHQn8WKwwUboIWG9YYs46Ua7XjUXItyiv8z+dMgu3JMHMRZaQK/k9kjzs6bSEKo EMx5OLMC798A3fu+6zpl5dglkMD1VxpYTqysdMuGU/kzACqLpP9QbJ0+zuWL4iisBGBR E70tAudNooyvrv/Yyrm/UKPldJ8rVQujfY2aBpU+G3EeEOkioC1CkR63Cn5NMak2Pu2/ oDpI5AogbRFEDBx02Ap3Tm8C/mZOxhsFxZRx/THQCFltWW6mYGu5bnBRo4sUSNMbKOP6 Z05PxITmsraQ4AIDIIfUM6zHURmv0KjFdk6ZPkJ+TK+Zp6LKzVr3vfh7WMlLq3DBF88+ GCiA== X-Gm-Message-State: AOJu0YznrbVa5vj73aZ2hmE8ZRawKFj3EOHmJniJQCCQyPNpEUKhhhTG 9X5phPh3O9Xf/TbDKt6Xaqxc61ypGT4btyqz5r7TyXfqw2jaw2RtF2VvfgT5UvAhMBrKUartb1Y sMQ== X-Google-Smtp-Source: AGHT+IEmIJAxnTmijGvjXk4dw64jZqXiQZkaHJtqJKekCM5z3bHw1FpJVJI13Rhw8+eqpimDRwCPT+6sr0k= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a05:6902:1108:b0:dc6:fec4:1c26 with SMTP id o8-20020a056902110800b00dc6fec41c26mr91952ybu.1.1708707070439; Fri, 23 Feb 2024 08:51:10 -0800 (PST) Date: Fri, 23 Feb 2024 08:51:08 -0800 In-Reply-To: <20240223104009.632194-9-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240223104009.632194-1-pbonzini@redhat.com> <20240223104009.632194-9-pbonzini@redhat.com> Message-ID: Subject: Re: [PATCH v2 08/11] KVM: x86: Add is_vm_type_supported callback From: Sean Christopherson To: Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, michael.roth@amd.com, aik@amd.com Content-Type: text/plain; charset="us-ascii" On Fri, Feb 23, 2024, Paolo Bonzini wrote: > Allow the backend to specify which VM types are supported. Hmm, rather than another kvm_x86_ops hook, I vote to add kvm_caps.supported_vm_types, and use the existing harware_setup() hook to fill in the vendor specific types. As a very incomplete stub: diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3bc69b0c9822..bb7d979db2df 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4576,17 +4576,9 @@ static int kvm_ioctl_get_supported_hv_cpuid(struct kvm_vcpu *vcpu, } #endif -static inline bool __kvm_is_vm_type_supported(unsigned long type) -{ - return type == KVM_X86_DEFAULT_VM || - (type == KVM_X86_SW_PROTECTED_VM && - IS_ENABLED(CONFIG_KVM_SW_PROTECTED_VM) && tdp_mmu_enabled); -} - static bool kvm_is_vm_type_supported(unsigned long type) { - return __kvm_is_vm_type_supported(type) || - static_call(kvm_x86_is_vm_type_supported)(type); + return kvm_caps.supported_vm_types & BIT(type); } int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) @@ -4787,13 +4779,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = kvm_caps.has_notify_vmexit; break; case KVM_CAP_VM_TYPES: - r = BIT(KVM_X86_DEFAULT_VM); - if (kvm_is_vm_type_supported(KVM_X86_SW_PROTECTED_VM)) - r |= BIT(KVM_X86_SW_PROTECTED_VM); - if (kvm_is_vm_type_supported(KVM_X86_SEV_VM)) - r |= BIT(KVM_X86_SEV_VM); - if (kvm_is_vm_type_supported(KVM_X86_SEV_ES_VM)) - r |= BIT(KVM_X86_SEV_ES_VM); + r = kvm_caps.supported_vm_types; break; default: break; diff --git a/arch/x86/kvm/x86.h b/arch/x86/kvm/x86.h index 2f7e19166658..802ac1ead055 100644 --- a/arch/x86/kvm/x86.h +++ b/arch/x86/kvm/x86.h @@ -29,6 +29,8 @@ struct kvm_caps { u64 supported_xcr0; u64 supported_xss; u64 supported_perf_cap; + + u32 supported_vm_types; }; void kvm_spurious_fault(void);