From nobody Mon Feb 9 14:18:36 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1748016385; cv=none; d=zohomail.com; s=zohoarc; b=ARioRh4nONEGSbC5wL2TnTFdDJ3U6MkrsFNwkTW/BxqtDhfvVEgIITz5xaXcQ3kJ1u7V9u/hdmai0O1cgMDIS+F9xEORziO4nMZ35UW9ne8Wa6G6nId2Gc4wsmI5Cp0CivHy6GF1I3aSUJC5HLyjwO32FStgwWxYuyfdOSOlh6I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1748016385; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cKRGcqOB4K7R/otJOmMfsqC3TxSzOnxP7UoS9tqRNfk=; b=EUxsQwporlh1pnFd5TlR9G7DxHDuH6vPWbXQDzOB+RPs84v+gYxYy4zr5C8RSwIH+M4uLeKWPfIK0twj3ZmiBdReyP9yctYn5A7VHfv/P/M4RcUgQSyZvLKEV0Worpev/yqMRGYjlxV+K0/WP8OIWr4OGGZKq31HWGYaTRY33OA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1748016385198997.8977853195594; Fri, 23 May 2025 09:06:25 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.995944.1378014 (Exim 4.92) (envelope-from ) id 1uIUuL-0002Az-NF; Fri, 23 May 2025 16:06:05 +0000 Received: by outflank-mailman (output) from mailman id 995944.1378014; Fri, 23 May 2025 16:06:05 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uIUuL-0002As-JG; Fri, 23 May 2025 16:06:05 +0000 Received: by outflank-mailman (input) for mailman id 995944; Fri, 23 May 2025 16:06:04 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uIUuJ-0002Am-V8 for xen-devel@lists.xenproject.org; Fri, 23 May 2025 16:06:04 +0000 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [2a00:1450:4864:20::431]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id d251b4b6-37ef-11f0-b892-0df219b8e170; Fri, 23 May 2025 18:06:01 +0200 (CEST) Received: by mail-wr1-x431.google.com with SMTP id ffacd0b85a97d-3a3673e12c4so57227f8f.2 for ; Fri, 23 May 2025 09:06:01 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a35ca4d2ddsm26749906f8f.7.2025.05.23.09.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 May 2025 09:06:00 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: d251b4b6-37ef-11f0-b892-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1748016361; x=1748621161; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=cKRGcqOB4K7R/otJOmMfsqC3TxSzOnxP7UoS9tqRNfk=; b=Fhqala2VzIEoou5vCl7m8hTIWPtsNQZAinNc1kEhWzMm/lwpEiyLCqiFoDY/J4BXZ3 WuAzuZFy1Ja7JHa4klcXMngf9XtxM53+jXnWiqES+mValXb54tffqEpl4e+eAYPuKOFu lyG/8MvNUyxiwq5bbmG1ATpT/DsxvVB1RrDZ8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748016361; x=1748621161; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=cKRGcqOB4K7R/otJOmMfsqC3TxSzOnxP7UoS9tqRNfk=; b=ssyXHfI2lO6/tLuwOrsWTn9xY7owdT0wYSI9G7KIUErM5j8wDkkCaUca8kDCCFPSga ybj7g1AmaPrbTSgXHrX+dBATdrn4Fl3bAFqufeqAL4AfslQxPZHDnd+V83rYnn4DszqU O2gVSEN78mu/Qo2yKuMqOEprr482h3AH6gHAf5sQ3ZOXLbaRK0345F4ckOd508sFitmp BCjOg+yZ+pdEjkGT1wa+j65R8I/8/SyP7yMFoWH91wDpYyGseoc6WtamrB+Pdr0u2/Fd WDjgXaWA5fho+/wTqTG/WQdt4gu+UTn35vqnJ0vYTAzbLzcloehtoYwsTNgCk6MKiNf4 IXCg== X-Gm-Message-State: AOJu0Yxqgui2jIgYsC+/LYr4EgrjseE9ii//Zg80/9IgAPwFmM0Rp2tn nYgIujUdSD4XBvVrASWp58y5pVb71aWMBCS0RvJpOYge7cgR0LVqx1MXdOscyT1Vt6HNHpAa/id WIXUQ X-Gm-Gg: ASbGncvWxJCsiJgYPgVs+3UWI+l98HX5tycVpuMyIGFUeJQSL9+A/eTij5rwICrX5yG /MmKhMcwfwus/vQIPksQ1SF8tWmbptLRDzVdXecyDwAch2jVP0YYajmBUGiKOuOlRQPsg04y7n1 DnywKBrdONE9zs2+DWdhSN+x7opzJb6w3pJGaWG3ogRybEdH+ZSk3uwoY6NmGSFZEKFvlaNLCk3 EkLqMM7B+1NJvBYcB4obke/0TkuskfdbFv4zf977XhYAA2j4rvh9bkvSE1fLDC0kY2OXbt1xorj mn0Q5EoPHYcPKbo3V2d4TZgh7nbRksy+ou0JerM9r7mMtQ/i9Fv33f/HQu3eGS/n/aM+75/3W1h uh3Yl1Z+gUYjGp/mRax3qZxYi X-Google-Smtp-Source: AGHT+IGmLLWJsOobbgnRwrrAYeL7Wcsod6zD75J7hJ6LkhurtLXwRxr8Achj60krJmZW+TqCZIwmHw== X-Received: by 2002:a05:6000:2892:b0:3a4:c2e4:11b with SMTP id ffacd0b85a97d-3a4c2e40151mr3483242f8f.51.1748016360670; Fri, 23 May 2025 09:06:00 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , =?UTF-8?q?Petr=20Bene=C5=A1?= , Tamas K Lengyel , =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Subject: [PATCH] x86/vmx: Fix VMEntry failure on ADL/SPR with shadow guests Date: Fri, 23 May 2025 17:05:58 +0100 Message-Id: <20250523160558.593849-1-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1748016387852116600 Paging Writeable depends on EPT, so must disabled in non-EPT guests like the other EPT dependent features. Otherwise, VMEntry fails with bad control state. Drop a piece of trailing whitepsace in context. Fixes: ff10aa9d8f90 ("x86: Add Support for Paging-Write Feature") Signed-off-by: Andrew Cooper Reviewed-by: Roger Pau Monn=C3=A9 --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Petr Bene=C5=A1 CC: Tamas K Lengyel CC: Marek Marczykowski-G=C3=B3recki This is the cause of the XTF Shadow failures in Gitlab CI. Working run: https://gitlab.com/xen-project/hardware/xen-staging/-/jobs/10133481327 --- xen/arch/x86/hvm/vmx/vmcs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 59f4d1d86f02..57d49364db56 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -1132,9 +1132,11 @@ static int construct_vmcs(struct vcpu *v) else { v->arch.hvm.vmx.secondary_exec_control &=3D - ~(SECONDARY_EXEC_ENABLE_EPT |=20 + ~(SECONDARY_EXEC_ENABLE_EPT | SECONDARY_EXEC_UNRESTRICTED_GUEST | SECONDARY_EXEC_ENABLE_INVPCID); + v->arch.hvm.vmx.tertiary_exec_control &=3D + ~(TERTIARY_EXEC_EPT_PAGING_WRITE); vmexit_ctl &=3D ~(VM_EXIT_SAVE_GUEST_PAT | VM_EXIT_LOAD_HOST_PAT); vmentry_ctl &=3D ~VM_ENTRY_LOAD_GUEST_PAT; --=20 2.39.5