Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3CA8CF9D0D5 for ; Tue, 14 Apr 2026 15:56:06 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCg6Q-0004nI-HC; Tue, 14 Apr 2026 11:55:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wCg6O-0004k3-DT for qemu-devel@nongnu.org; Tue, 14 Apr 2026 11:55:00 -0400 Received: from linux.microsoft.com ([13.77.154.182]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wCg6M-0000HF-OA for qemu-devel@nongnu.org; Tue, 14 Apr 2026 11:55:00 -0400 Received: from DESKTOP-TUU1E5L.localdomain (unknown [167.220.208.32]) by linux.microsoft.com (Postfix) with ESMTPSA id 36E1020B6F08; Tue, 14 Apr 2026 08:54:56 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 36E1020B6F08 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1776182097; bh=BfKDb+dVA/asufHlSsXXPnkczeWKZmJTJrXtuB6+16s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=F2E2a8iaocZKu5bIIXpqqTYhAYsEirhibmmBKTgKv1Tj0nMHaBSQrXZNeAWDd1dJY xd68yc3e3aTfy0thIaHvsZz4WCLEmH0FX/Tuoii+psSasYqAg8ffhTXrAMm8M00esS 7Ppo/b67CoB8ncP1GddKvlr+mFd2Hm9Z7q+rQ2Wg= From: Magnus Kulke To: qemu-devel@nongnu.org Cc: Wei Liu , Wei Liu , Magnus Kulke , Magnus Kulke , Zhao Liu , Paolo Bonzini Subject: [PATCH v4 8/9] target/i386/mshv: filter out CET bits in cpuid Date: Tue, 14 Apr 2026 17:54:32 +0200 Message-Id: <20260414155433.483186-9-magnuskulke@linux.microsoft.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260414155433.483186-1-magnuskulke@linux.microsoft.com> References: <20260414155433.483186-1-magnuskulke@linux.microsoft.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=13.77.154.182; envelope-from=magnuskulke@linux.microsoft.com; helo=linux.microsoft.com X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org e46dcef1d0 introduced CET_U/CET_S xstate bits in the ExtSaveArea. The response in EBX of a 0x4,1 cpuid query will contain a size contingent on what the guest enabled in the IA32_XSS MSR (compacted xsave size). Since the MSHV accelerator currently responds with static answers to 0x4d cpuid queries, we'll have to disable those bits, even if the host supports them. Signed-off-by: Magnus Kulke Reviewed-by: Anirudh Rayabharam (Microsoft) --- target/i386/mshv/mshv-cpu.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/target/i386/mshv/mshv-cpu.c b/target/i386/mshv/mshv-cpu.c index ee25eb5f6f..2c66a52709 100644 --- a/target/i386/mshv/mshv-cpu.c +++ b/target/i386/mshv/mshv-cpu.c @@ -1663,6 +1663,25 @@ uint32_t mshv_get_supported_cpuid(uint32_t func, uint32_t idx, int reg) if (func == 0x01 && reg == R_ECX) { ret &= ~CPUID_EXT_VMX; } + + /* + * MSHV currently uses static CPUID intercept results for leaf 0xD. + * However there are feature-responses that are dynamic based on what a + * guest enables in XCR0 and XSS, such as CET shadow stack. + * + * A guest which doesn't know about those features yet would encounter an + * unexpcted CPUID[0xD,1].EBX (compactes XSAVE size) and either fail + * or gracefully degrade by not using XSAVE at all. + * + * To avoid this, we filter out supervisor xstate features. + */ + if (func == 0x07 && idx == 0 && reg == R_ECX) { + ret &= ~CPUID_7_0_ECX_CET_SHSTK; + } + if (func == 0x07 && idx == 0 && reg == R_EDX) { + ret &= ~CPUID_7_0_EDX_CET_IBT; + } + return ret; } -- 2.34.1