From nobody Fri Jun 12 21:22:24 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18E5D3624D9 for ; Tue, 12 May 2026 15:00:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778598025; cv=none; b=nqvt8oBrfaCBu9oo+Tno7o3P8HmpPxcqT/2+3xusGGvWx9kUbr7MT0mO99RLgq6AIRUTDZXmBcbJeJNuuMyeQdoSZ9n+ISbEuheJ2a7K6nYftWCrgafAUgpMPy2x717zxlcU3PQTfdP7/Em5WDRoKK0rZZvgEKANzaHLbj/y/KU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778598025; c=relaxed/simple; bh=aayhWfa/WCdX+wIsMHbwVFmzp4pR3hbjjy+Med1n8SQ=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=NjK0obR23cLRtw02LSGkAbcKeRC70VbToQjrzNIp+Ptzj6Iihx6G/+do6IAPPoej9t8nPeToos1PJ+h+7p478GBDqihlZbGDGzwx4YLHNjH6qrTj6fkU6cIX5rxGwPLXiF1BttCi24t3V6UP7zKDgxixZxrbGbQDs3GOtx3aRwk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=TwZneeOo; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ltX8nmKQ; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="TwZneeOo"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ltX8nmKQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1778598023; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=RXu/1xV5Fho5X3BEGmaQ3gYe0lRXy6kbmIyYjyV5tkY=; b=TwZneeOoyFutKBy6OWATAjkIv5X/1+a9mpSMotHfiZtnD+Dzls5+AmyCNL3jsdURHn5s+q CamcrQ1YvTv8HsNJ2flHNTxUgmHKIBoBqkOqGWgKkYDFyXUycKxjvNQzOlRdWOrpAqnCF2 tGuvnpd2N/4YI/+FNkMg3AU3zggEW5o= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-279--S6kk3_DPtm5_wd3U0HAdQ-1; Tue, 12 May 2026 11:00:21 -0400 X-MC-Unique: -S6kk3_DPtm5_wd3U0HAdQ-1 X-Mimecast-MFC-AGG-ID: -S6kk3_DPtm5_wd3U0HAdQ_1778598020 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-48eb0da933fso3763415e9.0 for ; Tue, 12 May 2026 08:00:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1778598019; x=1779202819; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=RXu/1xV5Fho5X3BEGmaQ3gYe0lRXy6kbmIyYjyV5tkY=; b=ltX8nmKQBcE29+MedgZxU9Cfe/T8z9JrmGaWptL/gC5Zk0QGTBMlkGrE402yK4xssa pkQ7qLbOpJX+q7ZGa/YKY3KuutPCm6ScGygOBECOz5qVFxlQQbE9/HrADDyaUx+jTrvg JTx7WjCCuzeBDcC2zCOq2OZ0Gup3KtLY3bPZ0sLAQyk5WIYuxMO+Q9/9A0F+UMyrzp41 WqBJsmhKSeLyRS+v7JvHATqSgaC2VRAR6qoMXq5NjqTPVth4WzOyIERLKCgp0Lf4yc1i 2GDircVq6IAaTGQNJDyLhzA3u0U2Tb4pNkXtF4mBf2/c0MJZ51uY/wm8fBkiOyhxp+nM cQfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778598019; x=1779202819; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=RXu/1xV5Fho5X3BEGmaQ3gYe0lRXy6kbmIyYjyV5tkY=; b=Kcoaxmv7XnYF8BjkMHEU1YxhBbgYTcoT8tK6VOi/1N0GfN8mbD0S2BO0/zGkhBKNgZ 5yGuwO4Al5SVmiei1hZReU5SyoP042RZsVAj3/JOPZkDuSrdRjyxZXA1Sp2k/p7Emv/y 78A1j5ORuY0xt3J3Dy+gdjhgNPqzinw03gl/guiKGvqxipF7iTEm/ebbNTcmfkYqLp0u CJiUmNegzhA3dCOKxUWFq9fwmIC9B74x1PxRruANdES+TByjYjfF067h+p3QOX8fwrNT HaVccH6f76Hp861kO8PRpcnBdaRUwoa56G8QXEw82d9zuEQ1EOPJ4/U8Qv1MEXbnQde3 nyzw== X-Gm-Message-State: AOJu0Yw/nddW2+tTelwwr5jswmaeYc5F6xUBLje/Hqtat1BswZgVY6lk uXNP/5hc1yrI6rl0ezdTYcDJKahAFfkV8aNw4HbDRtpPDHt7xNyr+7Km2F9bmbi7ihuUAidftL1 U7AnflAhhIzjqvYYdtWyAYxtoxam/jNHhzVvV9TahKwJ5oQsiyt633ovqF+iytFMs6yfP1u1hUw 5OZ+wfoNDe5d6meBF0YJOF1+MtnK3rme9TpjqDIomf8lBSTybecg== X-Gm-Gg: Acq92OGPR5cALUHscIGl91NjtQ05uPXMP3dIoF7ou8MGkLnLhx7cOFwV6jnTqK6Ay8w caTi5eNheOeypSb3vhANFSLS8p/u3k854XxCM037lhxqBWhtKgsBmhWIayg2HSp/IiTN0D4vkUA HzrZpVelniq+ho1tG0gtYYutNiT60pHJ54HrK8OMVNfIIPUpMt55ajSurjTFczkP6Br057kqZs4 oDGzzPtH3g2Y8PIjG9YK83ehaOtcEQgndXcjnYcrwKj1FnZ7KQRsLezSHFLg9Z5smR06P+7RY62 AlsHrZwoAiax4y+t0n7uEBmew3UFYhdEOHsV53/pmzijTluNHw8aiVa0TPdLyGIGS5R+tBBP51f Ce1Ayzv91fwBWOSkCGdOzF30ShLgpAJBXlF+JNpas6K+RGaTqA3DEPCgu9Ip3UAeSBh8xQca5Cb t7wVhtMujd6vMxx53QY1NdiYpQrGZe X-Received: by 2002:a05:600c:3e0e:b0:48a:52f2:a0f1 with SMTP id 5b1f17b1804b1-48e8fe73355mr55649375e9.18.1778598018898; Tue, 12 May 2026 08:00:18 -0700 (PDT) X-Received: by 2002:a05:600c:3e0e:b0:48a:52f2:a0f1 with SMTP id 5b1f17b1804b1-48e8fe73355mr55648295e9.18.1778598018232; Tue, 12 May 2026 08:00:18 -0700 (PDT) Received: from [192.168.10.48] ([176.206.106.181]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45491e94c0fsm34317426f8f.32.2026.05.12.08.00.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 May 2026 08:00:17 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: David Riley Subject: [PATCH] KVM: VMX: introduce module parameter to disable CET Date: Tue, 12 May 2026 17:00:16 +0200 Message-ID: <20260512150016.2979228-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There have been reports of host hangs caused by CET virtualization. Until these are analyzed further, introduce a module parameter that makes it possible to easily disable it. Link: https://lore.kernel.org/all/85548beb-1486-40f9-beb4-632c78e3360b@prox= mox.com/ Cc: David Riley Signed-off-by: Paolo Bonzini --- arch/x86/kvm/vmx/capabilities.h | 1 + arch/x86/kvm/vmx/vmcs12.c | 2 +- arch/x86/kvm/vmx/vmx.c | 17 +++++++++++++++-- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/vmx/capabilities.h b/arch/x86/kvm/vmx/capabilitie= s.h index 56cacc06225e..31568274d8bb 100644 --- a/arch/x86/kvm/vmx/capabilities.h +++ b/arch/x86/kvm/vmx/capabilities.h @@ -14,6 +14,7 @@ extern bool __read_mostly flexpriority_enabled; extern bool __read_mostly enable_ept; extern bool __read_mostly enable_unrestricted_guest; extern bool __read_mostly enable_ept_ad_bits; +extern bool __read_mostly enable_cet; extern bool __read_mostly enable_pml; extern int __read_mostly pt_mode; =20 diff --git a/arch/x86/kvm/vmx/vmcs12.c b/arch/x86/kvm/vmx/vmcs12.c index 1ebe67c384ad..9f96e21dc1b9 100644 --- a/arch/x86/kvm/vmx/vmcs12.c +++ b/arch/x86/kvm/vmx/vmcs12.c @@ -202,7 +202,7 @@ static __init bool cpu_has_vmcs12_field(unsigned int id= x) case HOST_S_CET: case HOST_SSP: case HOST_INTR_SSP_TABLE: - return cpu_has_load_cet_ctrl(); + return enable_cet; =20 /* KVM always emulates PML and the VMX preemption timer in software. */ case GUEST_PML_INDEX: diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 5c2c33a5f7dc..49feecb286b2 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -108,6 +108,9 @@ module_param_named(unrestricted_guest, bool __read_mostly enable_ept_ad_bits =3D 1; module_param_named(eptad, enable_ept_ad_bits, bool, 0444); =20 +bool __read_mostly enable_cet =3D 1; +module_param_named(cet, enable_cet, bool, 0444); + static bool __read_mostly emulate_invalid_guest_state =3D true; module_param(emulate_invalid_guest_state, bool, 0444); =20 @@ -4476,7 +4479,7 @@ void vmx_set_constant_host_state(struct vcpu_vmx *vmx) * SSP is reloaded from IA32_PL3_SSP. Check SDM Vol.2A/B Chapter * 3 and 4 for details. */ - if (cpu_has_load_cet_ctrl()) { + if (enable_cet) { vmcs_writel(HOST_S_CET, kvm_host.s_cet); vmcs_writel(HOST_SSP, 0); vmcs_writel(HOST_INTR_SSP_TABLE, 0); @@ -4532,6 +4535,10 @@ static u32 vmx_get_initial_vmentry_ctrl(void) if (vmx_pt_mode_is_system()) vmentry_ctrl &=3D ~(VM_ENTRY_PT_CONCEAL_PIP | VM_ENTRY_LOAD_IA32_RTIT_CTL); + + if (!enable_cet) + vmentry_ctrl &=3D ~VM_ENTRY_LOAD_CET_STATE; + /* * IA32e mode, and loading of EFER and PERF_GLOBAL_CTRL are toggled dynam= ically. */ @@ -4546,6 +4553,9 @@ static u32 vmx_get_initial_vmexit_ctrl(void) { u32 vmexit_ctrl =3D vmcs_config.vmexit_ctrl; =20 + if (!enable_cet) + vmexit_ctrl &=3D ~VM_EXIT_LOAD_CET_STATE; + /* * Not used by KVM and never set in vmcs01 or vmcs02, but emulated for * nested virtualization and thus allowed to be set in vmcs12. @@ -8155,7 +8165,7 @@ static __init void vmx_set_cpu_caps(void) * VMX_BASIC[bit56] =3D=3D 0, inject #CP at VMX entry with error code * fails, so disable CET in this case too. */ - if (!cpu_has_load_cet_ctrl() || !enable_unrestricted_guest || + if (!enable_cet || !enable_unrestricted_guest || !cpu_has_vmx_basic_no_hw_errcode_cc()) { kvm_cpu_cap_clear(X86_FEATURE_SHSTK); kvm_cpu_cap_clear(X86_FEATURE_IBT); @@ -8630,6 +8640,9 @@ __init int vmx_hardware_setup(void) !cpu_has_vmx_invept_global()) enable_ept =3D 0; =20 + if (!cpu_has_load_cet_ctrl()) + enable_cet =3D 0; + /* NX support is required for shadow paging. */ if (!enable_ept && !boot_cpu_has(X86_FEATURE_NX)) { pr_err_ratelimited("NX (Execute Disable) not supported\n"); --=20 2.54.0