From nobody Sat May 30 11:15:55 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; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1778151346; cv=pass; d=zohomail.com; s=zohoarc; b=lYXhb2h7Br0QDxx40dvGryoQ6EXxbdgGwlpc0LAwvTbX1z/VHCXB0ca3GOij2zdc7WzISXS2vZXNHxmT6h5TBlYpK1OifR33CHhJbkBKeLDsEAZvlOZYOKBTQ1wRzAhV4v7sZVJ9686y5WubTPs0Atp52SnkeTWb7vdiD1AL9lc= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778151346; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KvcyAkenR48qSLtBoZxitzffCgvZelNVs/f82QPSUT8=; b=Wf5f5duy7TMVsaZj/Uf4MVPtA0IM2EbQTYl0JCs2FyyVjnaNCoLrzHqtcXHIC9dGj4s8wYP6oFffmsBXTWqVhcipfL76ymgkg/TvVDn8Gxx8sWfzQGFjayTPLwgRWi3g/MSTRnz2E1L4xh8zzEyrAXeRqi+Io7N7DreBK8baLt0= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); 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 1778151346234652.9693335793205; Thu, 7 May 2026 03:55:46 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1302573.1576457 (Exim 4.92) (envelope-from ) id 1wKwO7-0003jw-EX; Thu, 07 May 2026 10:55:27 +0000 Received: by outflank-mailman (output) from mailman id 1302573.1576457; Thu, 07 May 2026 10:55:27 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKwO7-0003jp-At; Thu, 07 May 2026 10:55:27 +0000 Received: by outflank-mailman (input) for mailman id 1302573; Thu, 07 May 2026 10:55:26 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKwO6-0003ja-MT for xen-devel@lists.xenproject.org; Thu, 07 May 2026 10:55:26 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wKwO6-003OgN-2y for xen-devel@lists.xenproject.org; Thu, 07 May 2026 12:55:26 +0200 Received: from [10.42.69.5] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69fc6f8b-5cb7-0a2a0a5109dd-0a2a4505e784-38 for ; Thu, 07 May 2026 12:55:25 +0200 Received: from [52.101.61.45] (helo=DM1PR04CU001.outbound.protection.outlook.com) by tlsNG-c201ff.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 69fc6f9c-aaa8-0a2a45050019-34653d2dad8e-3 for ; Thu, 07 May 2026 12:55:25 +0200 Received: from CH8PR03MB8274.namprd03.prod.outlook.com (2603:10b6:610:2ba::5) by DS3PR03MB989145.namprd03.prod.outlook.com (2603:10b6:8:39b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.15; Thu, 7 May 2026 10:55:23 +0000 Received: from CH8PR03MB8274.namprd03.prod.outlook.com ([fe80::ebe2:32c1:d2be:a096]) by CH8PR03MB8274.namprd03.prod.outlook.com ([fe80::ebe2:32c1:d2be:a096%7]) with mapi id 15.20.9891.017; Thu, 7 May 2026 10:55:23 +0000 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KgblRAlhqfq5pWmnp9Lmal2yUHFx62ZeCIaR7ZSjTWo+HAJNsw9VAaZ5JQxZ4jjN/l3SiiM6b6AwRTcdsobRw3bMK66Seh0xAyCNyYwd5/ZhkA7zh/ZmHYlIcGpxN6TJZcLJS8iFbX2t/m4nf84be2jr+hh2xEpmEhYXfGboC3QRfjakrWLASTwxVAIPgpmVFKk6/ZfwfrjBP2znsDHiD7K7Q2jhsdDlw+yYgaf8wO+uwhVWxh2SA9u3COgBN+cM0hO+b1e8i1t3VyxPoV4QNncS1EX5XSs6e/jebh0YUCc2JnO7XlsisKvzUFjZXbL5iwI0zmXY4I/2LyyR1Oha7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=KvcyAkenR48qSLtBoZxitzffCgvZelNVs/f82QPSUT8=; b=aWpETBmUbRplB8UdtImrQ2D0xIr3vKN8lcRHWsSX1TMMVO7vNMbVpNFNMm2nz/KuneI7dIlrOFaPEfdHcTUihmWMMvawo7fDd91D/1cOg/66d1BaTRQwOL5ZtyACFNeOrbA74HlYNJVWW29u/XnMYL5CwufXqWnbpwrODeCfC5CnLPcqVLmJ8+FRNp7s/AQxr0/2fCIcOz6B8rvdgmWGDd/SltcuAO5x8r0uvjFVgO9rArpNnc1775GpieaXHb91VrArNvzFljfIKDT3fX9AooJqFJVvJmFzuZc72X2hB6mvamHPrJF++6dKbAvPmtR6+YNT24cLeJkDMiVWyJpo+w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KvcyAkenR48qSLtBoZxitzffCgvZelNVs/f82QPSUT8=; b=kioCf1ZyR446B3oPZ+IDdDWPf3bcm4Wk70ykpTL9Pe91leyBARwjujGv8ryyZu+S4+i6If1S0PQVU5u1WxUGBa7sSejtoCE5/5I7WemJNyUGCruc/iQ2JwGi4vhNoR243+o3/tQqPdmYIEyX8Y63nU7b0OH+FmBvPvgABQUh0r8= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Ross Lagerwall To: xen-devel@lists.xenproject.org Cc: Ross Lagerwall , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Jason Andryuk , Teddy Astie Subject: [PATCH v2 1/2] x86/svm: Don't toggle local event delivery on stgi/clgi Date: Thu, 7 May 2026 11:55:06 +0100 Message-ID: <20260507105507.2078971-2-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260507105507.2078971-1-ross.lagerwall@citrix.com> References: <20260507105507.2078971-1-ross.lagerwall@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0580.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:276::16) To CH8PR03MB8274.namprd03.prod.outlook.com (2603:10b6:610:2ba::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH8PR03MB8274:EE_|DS3PR03MB989145:EE_ X-MS-Office365-Filtering-Correlation-Id: b15cbc55-825b-4f77-8317-08deac2723c9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: LmHNSPcReO6R/DgypCNwTZ12q6+OP7hz0SWTBwu9Sx6uwEU8Jg9LczqYyrxN3zJvNcehxwn9rqdPlC93ES8wy/wwqYX6m70FQUCra1HrNKP5+LxJH/Qhi/raWAppVhZCUQCE6ErptMPe5BVVn+EqUNiOgvc2LtAx2Rbp1vnTMJAy7bZ79aylYKsR8suB/OGz1W0fTtYZj8kbT+Pk7P9QNwL1opa7s4TOoNztvTqwixAE4jDyokL5tjqz88dMJHZRk/IeB9+30/bB0CuuhOE9sSDpi5WihxrOMxUm67vwtElPO1LmSIWVdv2gtmrpD5xrhYHm7jWDDlULRIsVP9sWWi0xFN60J/VHEpj0P8Dre7FXgKQgZXx/zRM798gwwfYEs+Up5qrSeHTlzT4+ir4u0guFCc+icpoyEPFAQKo5j9f7y4ePvmr7P7T1lw+g2rOElop9VSgq4o7exmMuxLhSgjjEzdiTfOLzHsUhKOWBuBFcN3sbtw8ZaiOit6Q7ymQMKGzOrdV377R+BTpYL+WOeK9BK5MCM7UzsQRvnG7FEiUyXeF6iroojXlvgT/aIDVPzZDkrBVlIeArWIfT//u8TBoNkA4wQtbKwsJQThwBQBVtFGLcIUD4UKsogaRloZAV3YITVyo5aD1lsQzJ73Lfm4YL9+LSwrFSchpYE71TL0oLniKN9raXABWe8gSPrkvo X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH8PR03MB8274.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?9FqnXTRoPRYwp6wuM5ljfCOLfeC+2OTnoZLEMNoOc9j6bAEDpi7fDpQuCvGN?= =?us-ascii?Q?hFaXwzYLatAJRtTomY1UgSfzx6yirBsQSwtXdoiACrRuKomA4OHrZy4IK1S6?= =?us-ascii?Q?PBLuUuvD27K5DDQDYVTXR9Hd9cbeqb7vX4utb5ZeYuWFoT88y+36FFxhoOP1?= =?us-ascii?Q?UGkYcRZhzlRJ8KuPoB9k6VnoIRE6uqXMWVq14QFxPbeZqjjVVKa78jLw8wpo?= =?us-ascii?Q?cgaKZhKIp6PwtOuyrJ2Fu/dNz+4k763Gq4pTjv0yClUb0JdrMNqJWuBfEKyP?= =?us-ascii?Q?gRZ9qgqMuLTCXZafd8OZvkya8r/E1s0eJXxX+pUfUVGcQEmN9W8/KwQASk3f?= =?us-ascii?Q?WfwoVwnKYh1VU9VGHEsbCCx61MDRUncX/3ki49jTy0VOVdKxcCX9PawUUfX8?= =?us-ascii?Q?VV28nMVBf2tYtosxjtI1spdm3uhi1GzliklcgsxWt03GyvJV+cEQsCPuEd6M?= =?us-ascii?Q?CkP+L2QzXcSAx32n75V0Ue6TVKLGHYtLU/EoqVeZA5jAfQQGmFiQ8NZENijw?= =?us-ascii?Q?O32hRHETr9i+NBO052CjcosWdI/EkgXDkkPfE96DEFgICNH0QFtYoEwplMd7?= =?us-ascii?Q?Hk0wDnKGgLGS2ao44uWTf5OEj5iphefibHWNcF1k8H0ffq3MdtAUWF1QgSlA?= =?us-ascii?Q?tblR5o/jGaZ6pZ6DX7mfQTH6WZG0Nd0JzUYumgjrmH7tGl90rbPazKIWbBBX?= =?us-ascii?Q?Qo6R1RIOhvtgP1qYfSZPFaaCwgfgOq5tYNeR6tWyR8ugocXDmC7tCDIJmSEz?= =?us-ascii?Q?k7V7NHfGB9obsHzZpRZQdAUrJkrJy7qKzIGG9GICXZR1256zDjQgyA7laSf7?= =?us-ascii?Q?fGuRThteeKRYLErXTSCgfI3h50oN+1OWYW/XG/GJxt8upgwDcQCK9SZ/YrPi?= =?us-ascii?Q?ib0scREdOLqGGBhDou29/lvhx2cRVJyb9MOuZ0VJeYsXn5gkmQ5r7vh7yUqK?= =?us-ascii?Q?iZ21CmCnSRqxGRlE7qKUseV6IxX8Tv0kF1IX6NJXaF9X2J9rlei50oA10xfn?= =?us-ascii?Q?zw7mzyGar6Q2JLTuS/uY+mQ4Yis9ZoFsN9FeSjasIyFFvcj7lQAW8FkL5Q/A?= =?us-ascii?Q?1a7TRwYfTE4mzDV0gVsx8GT6Gwr5DpDcQe2/sq2mwm/POj3Z2PtL2g/hAGH7?= =?us-ascii?Q?U5SZ+TJy3OMlW/tPli/2MXwbCTz3TCXIB2PDxTCavyG1jYq2H0LUrBPpTyl3?= =?us-ascii?Q?rY+6X8rREhiNDCuLqgVwrheIeUHyYT03U3NV1gtjgRe1XxhNjKXLbP4i3zhV?= =?us-ascii?Q?9J09wBZ7xeypZOpp27xoQ2441+ossP+gxKCDdq7MrNcMsd97B47+SM/sw55O?= =?us-ascii?Q?n/S0OfZXlaEy1whBRS6XZ6RlkROWPSwzWfMQzPIQk0yhJEDT9sl7zUjPIbWO?= =?us-ascii?Q?+F+bgK16TFEE4SjBHPvnAzXO+v3OAW8LNejIncAz0c911KvzBL6uMzJLJWt8?= =?us-ascii?Q?5J0PEA1grFtOLczNyhEOrxM0N96KjtEgpAVrZCM9Ag6yzjbQtxGnxne0XMF1?= =?us-ascii?Q?IDqRQEW4aPjR/94OFIMRKT8ksGNzlM8s6+JTDUwt9dLDkDxeJu3vO3KClduH?= =?us-ascii?Q?mODTG4hiZ+OLNMcv1BxVGTAw1k0UyriM2nYWaBsmunxJnV8DaYDafJ8KaR3Y?= =?us-ascii?Q?2cTqKt61AGv9FICVNS0oBS4PZaIGvxjLkvUVbHgSiYzkM01/7JlL3Z+LWdUh?= =?us-ascii?Q?kT+uslbKu+WSYQ6qo735VvvNoKAtKJHkdd4y5OgGmFvitjcY8HtEGdzSixfP?= =?us-ascii?Q?3zN5wvTBYlVFT+C6AgmjCjBzemwff8o=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: b15cbc55-825b-4f77-8317-08deac2723c9 X-MS-Exchange-CrossTenant-AuthSource: CH8PR03MB8274.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2026 10:55:23.7938 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h+YCtLZ8rOPW2guT5siIe+nFS1vX4j2Ctg+5H/rDmX/An2vPsqWghkPKCV8v0kVrC1DbrLRfoZYQdFC+R3FD8uvTNGSXGBNTMvjnJr6VpIQ= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS3PR03MB989145 X-purgate-ID: tlsNG-c201ff/1778151325-E2B96443-743B0F5E/0/0 X-purgate-type: clean X-purgate-size: 2650 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1778151348956158500 Content-Type: text/plain; charset="utf-8" There is no need to explicitly enable/disable local event delivery on stgi/clgi since HVM event delivery already takes into account the state of the GIF (and IF). This ensures the behaviour is consistent regardless of whether vGIF is used. Fold the functions into the callers since they are now only a single assignment. Signed-off-by: Ross Lagerwall --- New in v2. xen/arch/x86/hvm/svm/nestedsvm.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nested= svm.c index ef6fa5d23b67..64fbfe8fa71f 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -19,22 +19,6 @@ #define NSVM_ERROR_VVMCB 1 #define NSVM_ERROR_VMENTRY 2 =20 -static void -nestedsvm_vcpu_clgi(struct vcpu *v) -{ - /* clear gif flag */ - vcpu_nestedsvm(v).ns_gif =3D 0; - local_event_delivery_disable(); /* mask events for PV drivers */ -} - -static void -nestedsvm_vcpu_stgi(struct vcpu *v) -{ - /* enable gif flag */ - vcpu_nestedsvm(v).ns_gif =3D 1; - local_event_delivery_enable(); /* unmask events for PV drivers */ -} - int nestedsvm_vmcb_map(struct vcpu *v, uint64_t vmcbaddr) { struct nestedvcpu *nv =3D &vcpu_nestedhvm(v); @@ -161,7 +145,7 @@ int cf_check nsvm_vcpu_reset(struct vcpu *v) =20 svm->ns_iomap =3D NULL; =20 - nestedsvm_vcpu_stgi(v); + svm->ns_gif =3D 1; return 0; } =20 @@ -667,7 +651,7 @@ nsvm_vcpu_vmentry(struct vcpu *v, struct cpu_user_regs = *regs, return ret; } =20 - nestedsvm_vcpu_stgi(v); + svm->ns_gif =3D 1; return 0; } =20 @@ -1214,7 +1198,7 @@ nestedsvm_vmexit_defer(struct vcpu *v, if ( vmcb->_vintr.fields.vgif_enable ) vmcb->_vintr.fields.vgif =3D 0; else - nestedsvm_vcpu_clgi(v); + svm->ns_gif =3D 0; =20 svm->ns_vmexit.exitcode =3D exitcode; svm->ns_vmexit.exitinfo1 =3D exitinfo1; @@ -1502,7 +1486,7 @@ void svm_vmexit_do_stgi(struct cpu_user_regs *regs, s= truct vcpu *v) if ( (inst_len =3D svm_get_insn_len(v, INSTR_STGI)) =3D=3D 0 ) return; =20 - nestedsvm_vcpu_stgi(v); + vcpu_nestedsvm(v).ns_gif =3D 1; =20 __update_guest_eip(regs, inst_len); } @@ -1523,7 +1507,7 @@ void svm_vmexit_do_clgi(struct cpu_user_regs *regs, s= truct vcpu *v) if ( (inst_len =3D svm_get_insn_len(v, INSTR_CLGI)) =3D=3D 0 ) return; =20 - nestedsvm_vcpu_clgi(v); + vcpu_nestedsvm(v).ns_gif =3D 0; =20 /* After a CLGI no interrupts should come */ intr =3D vmcb_get_vintr(vmcb); --=20 2.53.0 From nobody Sat May 30 11:15:55 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; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=2; a=rsa-sha256; t=1778151354; cv=pass; d=zohomail.com; s=zohoarc; b=BYB4OxFkT5aUedHGjqH0V+bSRw/ZN755nz1KL3t1hcjQJwm5HJcwksDGiaILTi0ZHvTjHPMydX3T3E8JPxB8QLwuPTkyF4cq+ZyhMU1bbaHUzP+mpi2qDyqI9azp8gyrqjkJcZmUeP6IR8h++/dFhKnmCtq+gQyONbl7U6zy+mw= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1778151354; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=LJPgfvfHsAx+3DSvYAonI3+tuzu/fv903d4CjWROgaM=; b=S4GYYVmENlnUiFpOvy8Cm949Cvu9cjDUovCt7fE4FQNVUB67QUNhbFMmsfNrz3aN4f7hGWgZmX7HnC0PEZYud7dI4vC5E923eFJRQVbjNjU8ZkXTh9ERCYWqet6MKz3hP1eN62VX9GOYkQYPYH5Wkfuc40UbadnhLSqvV4xQgRE= ARC-Authentication-Results: i=2; 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; arc=pass (i=1 dmarc=pass fromdomain=citrix.com); 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 1778151354722990.5694972414984; Thu, 7 May 2026 03:55:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1302575.1576465 (Exim 4.92) (envelope-from ) id 1wKwOE-00041Z-Ll; Thu, 07 May 2026 10:55:34 +0000 Received: by outflank-mailman (output) from mailman id 1302575.1576465; Thu, 07 May 2026 10:55:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKwOE-00041S-IW; Thu, 07 May 2026 10:55:34 +0000 Received: by outflank-mailman (input) for mailman id 1302575; Thu, 07 May 2026 10:55:33 +0000 Received: from mx.expurgate.net ([195.190.135.10]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1wKwOD-00040R-E2 for xen-devel@lists.xenproject.org; Thu, 07 May 2026 10:55:33 +0000 Received: from mx.expurgate.net (helo=localhost) by mx.expurgate.net with esmtp id 1wKwOB-00Afc1-9E for xen-devel@lists.xenproject.org; Thu, 07 May 2026 12:55:32 +0200 Received: from [10.42.69.3] (helo=localhost) by localhost with ESMTP (eXpurgate MTA 0.9.1) (envelope-from ) id 69fc6fa0-bab6-0a2a0a5309dd-0a2a4503c8fa-12 for ; Thu, 07 May 2026 12:55:32 +0200 Received: from [40.107.208.5] (helo=PH0PR06CU001.outbound.protection.outlook.com) by tlsNG-33051d.mxtls.expurgate.net with ESMTPS (eXpurgate 4.56.1) (envelope-from ) id 69fc6fa3-672d-0a2a45030019-286bd005ae35-3 for ; Thu, 07 May 2026 12:55:32 +0200 Received: from CH8PR03MB8274.namprd03.prod.outlook.com (2603:10b6:610:2ba::5) by DS3PR03MB989145.namprd03.prod.outlook.com (2603:10b6:8:39b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.15; Thu, 7 May 2026 10:55:29 +0000 Received: from CH8PR03MB8274.namprd03.prod.outlook.com ([fe80::ebe2:32c1:d2be:a096]) by CH8PR03MB8274.namprd03.prod.outlook.com ([fe80::ebe2:32c1:d2be:a096%7]) with mapi id 15.20.9891.017; Thu, 7 May 2026 10:55:29 +0000 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" Authentication-Results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gqxiFNqEJ4uaHrJN7IehzlCR4pHthuLiqb/KClcgLaOW5PlgfjP+0P0x4tARyftfoYyp/Yjjoa+1/y1w7IIj3vRZjr091yQlCzqU9IRNu47llEmU7y5vcPenHfmJdf0QIlks1LILd9bE0gCrmuZ4YHbsjAwkoIg8pU1by8/Vd62Z0Z5kzC0L/3aU0iQjvoxiQ+IsoMKamzVcuMZsK5JwdM3xk5LaE9KdB9oe/I8Wcx6hxUyYsIDN3Q5QmvNWJ/0hP4u+jwtL1I8+f+7TpsThSumSY+ujYOg8xThFuLC5kxvHu94jjnW9CGliJf7OFiQoAkoPKWTB0km8bYcV5ppaiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LJPgfvfHsAx+3DSvYAonI3+tuzu/fv903d4CjWROgaM=; b=rObXxuRmc7P4d5KXr1A4SQWKLQNxeb7/z8A983rAmRECMn0zj8ZN9+9nSmdBaSf4MxoHJ637JxTaexifkPkTzAyQIUHeaa4A3K/5Npt7YtTo6TuA5e1fhpipq6AXL1AefIWYTr4OAt3lGi7wiZUlUq5DnfHbqwLSNGiteruOzuSw5z6GElkHTgQ3uT8VCGG+2u4u58X7E1joPiniE7sUQHUIeX7uFLQAkvwmPwupbzO5G1m6M/OD/Qjvs/4gpcxrWNkrRpodd935qOYhb7RudCRS5UnIZhURLqXgsTB1LNtezKGIP8dC6jJbGPsJFofEKuXmaUru0alzTTJYf3h1dA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LJPgfvfHsAx+3DSvYAonI3+tuzu/fv903d4CjWROgaM=; b=sz3ow7cL+K7Zfib1ABcD2SfN6flJ2OZTBwuYjsrZFgRQ7K/IfKi13ZSox/j1iMT0q2Sst0AG1HXKcjXBXl4dWPBa37gEC5RRJWY4WM3/AKy9tVUw6K9yAVcXbBmanBmDLXk6QdGLfTH65XB7dutR5DjBko+TmKlaG6O2V9ojc6o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com; From: Ross Lagerwall To: xen-devel@lists.xenproject.org Cc: Ross Lagerwall , Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Jason Andryuk , Teddy Astie Subject: [PATCH v2 2/2] nestedsvm: Clear GIF when injecting VMEXIT Date: Thu, 7 May 2026 11:55:07 +0100 Message-ID: <20260507105507.2078971-3-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260507105507.2078971-1-ross.lagerwall@citrix.com> References: <20260507105507.2078971-1-ross.lagerwall@citrix.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: LO4P123CA0522.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:272::8) To CH8PR03MB8274.namprd03.prod.outlook.com (2603:10b6:610:2ba::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH8PR03MB8274:EE_|DS3PR03MB989145:EE_ X-MS-Office365-Filtering-Correlation-Id: c5b1f35e-0b4d-4024-68fe-08deac272751 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|376014|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: NM42Xncv/Z+RUnXL9nq830iFjeAKzDmi12MaWgLCTulLfogOX+4eGVC+11ItmV13P6sXEsE6N5A0ddNxPXxASv2mkTziuwUtaRXfT1srmuKZRnC+vzW9SAX6sAR/JQXLqU/Edhv4Nn6CinT7766cWieZvMmb52Cy1jsNN9e4sYbNGen8IiNI86zvG63dG9wAw56lmpwGbfaWVW9Sl/7WQxHHls7g+tUJ09fsUVQ/1HNtqNOQeLM14klTzluYVMVN76IDRCNE3W64TZqSu0hKGczLWb8P2sQhSrfy4vcyJ0bO2Uj0F6DXGCA+7jut4nkI0IeBTcAutZw0O2bQnVFraeA56IJ/GQGv4ASbWl1CUiRa0hMCGBb34OZZLeAlpxB3VTnDMVVZeOTSl5PQMBX50ySnzZJmo1GkJk8logyq+kV+1b/G/5Cvk+Vo6HpXeZo4K3Th1NBmnHPfoqKg0KCspYlmqi8dUNyvniZ5HTmIgUf0lxplg54nP/OxEojGhieL+H8UjEz6GPLsodPMIJBfLHR7pRRDyrFnzQUSNQWUvWG7nznJgPggSxu0mZXSxBBBE3+reSrLa1+DXRRFhXHb3JyJWlSmZf4dYXjAIj6fzu5OQAbRu23Lz1zgouBWoqvbVimGvCbdxvjvKjeHbBF7ctHOMWa5tEnM0dBGINuNR7YZ+K/DTDaQr1yLDE1brrKE X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH8PR03MB8274.namprd03.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(1800799024)(376014)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?xvxX2uL6pFt8EJnws1hJlDGzVefpSzCq1KRcHgl/x4bN+Jg8q6qerZxbhwaV?= =?us-ascii?Q?0XNFJnPc4Bb/HLCigdZvx4hLhUOX9Zj7yQItvNry1HR0TXJK4nePjlE81Jb5?= =?us-ascii?Q?+JcprlxiAOCF8KDb/sE8p9uUo0+j9xD9ZBjZfsE7LsUNkYlzZfXNFb8JWqYH?= =?us-ascii?Q?yCOusq/j39tLi7jwu4OHdBwys8O51bfK9wAazqWaYdI8InAHGcCQDe4xjGfE?= =?us-ascii?Q?vXumNpc98700HqY8aFejZcrjHdg/HhNfjHlBImzvI4V+L1E/ixqhpXnP5EME?= =?us-ascii?Q?HScWu1/S4b7x08rjjvkb5sLDoNsk+zj831i+prqwvEKdvCqn+3SsYXHN86QB?= =?us-ascii?Q?G3cJ8/C8E4LAffR7RFtJMtedpPHcpjg7UnvcGIhfT/8hogK5lMQwQ6WTrqaU?= =?us-ascii?Q?bFp6ZKo/90udYdy6lHdEiJ7V1iqe+kEqvX5/NFniHrPquCrQCboLgXQfIDrW?= =?us-ascii?Q?nayDpl1rmPwlk1hJ+/HdXOg/wtoyjLd3Do+0+1vOlxu+72ZjEuB7mL2/9ise?= =?us-ascii?Q?+d7meiK8AiH+n5+MS8ogDnNjKoz8NOUTw1yi59pOC60w/VBVqVqXD2gqfJzO?= =?us-ascii?Q?5W7n2syzDedGxFuauP5bANy2O6wYp667zs+JZovnueYRGWu8qScolCuMXo76?= =?us-ascii?Q?nvpTADN+Sosh6X/wKPzKYvl6I280Jwalucd5h5ZCkO8YMVtIIOYsdfK2Ided?= =?us-ascii?Q?dY+F3fxpm2BDSx8FD5041eiNtaFHdH+Z2e5kaXcdJDMTHywg6eR1pum4zYrq?= =?us-ascii?Q?n6znfmLj72KvpBm4NcUMhpMdWTkh5Bz55NMiKl02Eld/FvXj7i6VoxdonLZD?= =?us-ascii?Q?G6NHloB1KOlRHqcDGaADVBulmA3xDnNzN03rBfjGUqFy+dqlZL194IFVgCPW?= =?us-ascii?Q?iNG8fITLgaXLYuDTn1qFTetXGIadWDFwzsryLPxga4A43661YTeAY/BETZ6K?= =?us-ascii?Q?Md857ZT6qbAoppQH3C08JOVFM4y378qPB/BNwSO4cImiS3nkniVdoQozZ6ox?= =?us-ascii?Q?WDL/3HLLNUYOz/EDtFhaobk+PvQL+4mZbdLKgMvmuroJo3U34WwTvxZYuqoc?= =?us-ascii?Q?XVKFpzNKaOMt4nB79tK1FlYmgEEvLdbbnqA9wSL1N91J8Hq+y0T4dq6vIJeQ?= =?us-ascii?Q?2TUraGfqWmG0urm17DWs/UKq7f2DRu6d6VzeKPh5B8okzFzjsiTy73kCV7Gn?= =?us-ascii?Q?GRz0Y63di0lb673IpdeRO+W9k7J1hI0eED6FvYDd+IFRLQa8sDgCwvxT3WW+?= =?us-ascii?Q?FGa2H9hd1LeY438bE8PEtComngJOFgxkPssymwjnqDpmBP+TlFgm1bqiQmRu?= =?us-ascii?Q?BpSQao31OU9NyFoq8fv5HVFMK6+3qgaCUFWqgdqEKzkbwtwMr7Iso6TDM6M4?= =?us-ascii?Q?2lc48e9jj/3bcxW00cuvVnmCSEaHrhioKhSkb3QRZ/JDvwv5hhuuQZhJAsHL?= =?us-ascii?Q?VU4zOr7QPruLCE1n/6eBQeQe9CibisQjrSVN7J4T/4Cs2U6bqXb0FbKsYKPT?= =?us-ascii?Q?Ob5NbIRmYD3CyHYSFhLcnDkZn/9vEU9qaUG19GU6V/4FL91n1hEnUYFPIEd4?= =?us-ascii?Q?vbZZWif3PrAXU1Lo0//weggt237mZ22vhFkluTlTMfOSbURnj4WnINbZPy9v?= =?us-ascii?Q?Tqtnvm+x4TblpBe7/fLUZeBG7+dzsyb9WkfNoZZFvue0zNRhRY9JB+RMWWn3?= =?us-ascii?Q?A/d/lkS7NZPjeN5E+Mv3HDLKQ28SmKS6uZ+x97s26/ZR+p3GgV5g+Ua0D+BI?= =?us-ascii?Q?4qKy68I2u8+xg/ALIzYBViQl9s5IiDQ=3D?= X-OriginatorOrg: citrix.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5b1f35e-0b4d-4024-68fe-08deac272751 X-MS-Exchange-CrossTenant-AuthSource: CH8PR03MB8274.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 May 2026 10:55:29.7160 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 335836de-42ef-43a2-b145-348c2ee9ca5b X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: QBnLDOF4pYSf2us2oJU4HdpcOJ6dI9KjkxnSdjPMzrkR6Ipv/CbRxp99w5J/di/5VB+u+fPpv+brOmvAxC6o01M49/2blmurfglQiZYMmkY= X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS3PR03MB989145 X-purgate-ID: tlsNG-33051d/1778151332-4066C938-075DBE38/0/0 X-purgate-type: clean X-purgate-size: 1131 X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1778151356651158500 Content-Type: text/plain; charset="utf-8" If L1 executes VMRUN with the GIF set and it fails consistency checks, Xen will inject a VMEXIT and fail the assert checking the GIF is cleared. Instead, clear the GIF when injecting a VMEXIT to match what hardware does. Fixes: 9a779e4fc161 ("Implement SVM specific part for Nested Virtualization= ") Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper --- In v2: Adjusted for the preceding cleanup patch. xen/arch/x86/hvm/svm/nestedsvm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nested= svm.c index 64fbfe8fa71f..9899cb2147b1 100644 --- a/xen/arch/x86/hvm/svm/nestedsvm.c +++ b/xen/arch/x86/hvm/svm/nestedsvm.c @@ -717,9 +717,9 @@ nsvm_vcpu_vmexit_inject(struct vcpu *v, struct cpu_user= _regs *regs, struct vmcb_struct *vmcb =3D v->arch.hvm.svm.vmcb; =20 if ( vmcb->_vintr.fields.vgif_enable ) - ASSERT(vmcb->_vintr.fields.vgif =3D=3D 0); + vmcb->_vintr.fields.vgif =3D 0; else - ASSERT(svm->ns_gif =3D=3D 0); + svm->ns_gif =3D 0; =20 ns_vmcb =3D nv->nv_vvmcx; =20 --=20 2.53.0