From nobody Sat Apr 5 15:01:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1743515717; cv=none; d=zohomail.com; s=zohoarc; b=UORR6+AXRtXLSxweSJF3fXqTQyxBjFZSggAM0sFVC8vFiMjPtBVAql8m2IVnYZDci12oyJUUhr7MNeFdgFUSkMsg+MaOkYZ2xC1WlZhXHlZYeyyeM7l2yaf1WklU3tABCdktDYXDhTXCyfbnAsCS/DS4nBzdzgrjb/hto3PJe3A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1743515717; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=7i/5Etv54DES3sFnimLV2ppjYzXcgog2BH3Uuah94+4=; b=GK5EICrOPAt7AqOa2lQraxiNnke1FFv1sN8+oqfLjbQ+1n+kEYTgTecC4JLBx1NktnNus8s3g/eMbqcsYRNa9qZJP6tjjHBaWnU/crhXKikrjmtzcYj3yMpuN6WIhrNbnWyj3Q4/zjf5VGKB3RTv/gzisSmfmUwIRqCQzomklV0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1743515717514146.08181582518648; Tue, 1 Apr 2025 06:55:17 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tzbz5-0006b1-Vu; Tue, 01 Apr 2025 09:48:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tzbvA-0001Z1-4j for qemu-devel@nongnu.org; Tue, 01 Apr 2025 09:44:53 -0400 Received: from mgamail.intel.com ([192.198.163.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tzbv8-0006ZP-27 for qemu-devel@nongnu.org; Tue, 01 Apr 2025 09:44:51 -0400 Received: from fmviesa008.fm.intel.com ([10.60.135.148]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Apr 2025 06:43:17 -0700 Received: from lxy-clx-4s.sh.intel.com ([10.239.48.52]) by fmviesa008.fm.intel.com with ESMTP; 01 Apr 2025 06:43:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1743515090; x=1775051090; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=JKMlucssmDcGsanH6kb+uP0DlL1BGA8NocL5uyi4aSQ=; b=DxhoRu/n/t5pjBnSlNRaQoLtHE0admoU0CqfvtnVXqBGw4nSHQxvsSgA OywNacpb8l7NNx+jFpdvtRhpao/kQpdhEK9M2Y9AdDD/MT6y9UXU+XeW7 wv6vvGyItmouOHsRN0bfcbSBcfyIO1bU3IT5FuU+O+Y8FraFj5oXk0SMM INR+0i5GSMMCp2ta/tTAnyP/UK897Q21lRd/DUecU2QH48l4LLexJQFBD oDHOOcfnYkeGPRuoGdqNAexhJXX8kxhIKS4+G0pjjIGSqNEnvWfWLDC5G vv/yuAeU4KtYP7n7esWyfYf+iJQ8Mz6evgb+R3mPcdswHque7+hObCWDw Q==; X-CSE-ConnectionGUID: vpNHQca8RfqfSW77BUIeEg== X-CSE-MsgGUID: OJuJFXDTTK6UjYsTAvbShw== X-IronPort-AV: E=McAfee;i="6700,10204,11391"; a="32433572" X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="32433572" X-CSE-ConnectionGUID: soV37tHIRrqHZ3XcBXxZZw== X-CSE-MsgGUID: kODZuYubSb+ZnGe13hBtWA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.14,293,1736841600"; d="scan'208";a="126640269" From: Xiaoyao Li To: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Cc: "Michael S. Tsirkin" , Markus Armbruster , Francesco Lavra , Marcelo Tosatti , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Rick Edgecombe , Xiaoyao Li Subject: [PATCH v8 50/55] i386/cgs: Introduce x86_confidential_guest_check_features() Date: Tue, 1 Apr 2025 09:02:00 -0400 Message-Id: <20250401130205.2198253-51-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250401130205.2198253-1-xiaoyao.li@intel.com> References: <20250401130205.2198253-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=192.198.163.16; envelope-from=xiaoyao.li@intel.com; helo=mgamail.intel.com X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.997, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HK_RANDOM_ENVFROM=0.001, HK_RANDOM_FROM=0.999, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1743515720513019100 Content-Type: text/plain; charset="utf-8" To do cgs specific feature checking. Note the feature checking in x86_cpu_filter_features() is valid for non-cgs VMs. For cgs VMs like TDX, what features can be supported has more restrictions. Signed-off-by: Xiaoyao Li --- target/i386/confidential-guest.h | 13 +++++++++++++ target/i386/kvm/kvm.c | 8 ++++++++ 2 files changed, 21 insertions(+) diff --git a/target/i386/confidential-guest.h b/target/i386/confidential-gu= est.h index 777d43cc9688..48b88dbd3130 100644 --- a/target/i386/confidential-guest.h +++ b/target/i386/confidential-guest.h @@ -42,6 +42,7 @@ struct X86ConfidentialGuestClass { void (*cpu_instance_init)(X86ConfidentialGuest *cg, CPUState *cpu); uint32_t (*adjust_cpuid_features)(X86ConfidentialGuest *cg, uint32_t f= eature, uint32_t index, int reg, uint32_t va= lue); + int (*check_features)(X86ConfidentialGuest *cg, CPUState *cs); }; =20 /** @@ -91,4 +92,16 @@ static inline int x86_confidential_guest_adjust_cpuid_fe= atures(X86ConfidentialGu } } =20 +static inline int x86_confidential_guest_check_features(X86ConfidentialGue= st *cg, + CPUState *cs) +{ + X86ConfidentialGuestClass *klass =3D X86_CONFIDENTIAL_GUEST_GET_CLASS(= cg); + + if (klass->check_features) { + return klass->check_features(cg, cs); + } + + return 0; +} + #endif diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 17d7bf6ae9aa..27b4a069d194 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -2092,6 +2092,14 @@ int kvm_arch_init_vcpu(CPUState *cs) int r; Error *local_err =3D NULL; =20 + if (current_machine->cgs) { + r =3D x86_confidential_guest_check_features( + X86_CONFIDENTIAL_GUEST(current_machine->cgs), cs); + if (r < 0) { + return r; + } + } + memset(&cpuid_data, 0, sizeof(cpuid_data)); =20 cpuid_i =3D 0; --=20 2.34.1