From nobody Mon Jan 26 07:40:44 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; 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=1769017427; cv=none; d=zohomail.com; s=zohoarc; b=ObzCUq3PJHhbZjJLBtRhHZyo7ztDktHaNgaFQNn0EGwQbb9b+d/FrPIOLoeLbyFWeezmKOlKisHokMej1FQj3+XHFGpkBo4+ganFAWwHESGtdVQAWjCbHqwmDCWxyN6koI47nWBtaKP0fXaGjTj6LoaxCvglAx1bc5C4ktkIRP0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769017427; 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=v9y2S3cd3EBdIWGtGldmEHVozUbvuRK7dO8V2IFvzEI=; b=ayI35bgJnX/vGe44hcRx3Qcaqt0+0ekB5MK99Ro0uMTbNun79Ywo/Y8oIrstfjskBquosL7xwV/W3P9Rba1r/1n7keTlkiRtERHZQuN7SOYVVExSA1TOQG6MYZecLvViI2XNdPi4l1G5Jr5bms67yEJXRvXzY33w4nWXMzg31YM= 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 1769017426973272.2489280244414; Wed, 21 Jan 2026 09:43:46 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1210104.1521927 (Exim 4.92) (envelope-from ) id 1vicEm-00077z-3T; Wed, 21 Jan 2026 17:43:24 +0000 Received: by outflank-mailman (output) from mailman id 1210104.1521927; Wed, 21 Jan 2026 17:43:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vicEm-00077s-0P; Wed, 21 Jan 2026 17:43:24 +0000 Received: by outflank-mailman (input) for mailman id 1210104; Wed, 21 Jan 2026 17:43:23 +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 1vicEl-00077K-8s for xen-devel@lists.xenproject.org; Wed, 21 Jan 2026 17:43:23 +0000 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [2a00:1450:4864:20::430]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id abf3666b-f6f0-11f0-9ccf-f158ae23cfc8; Wed, 21 Jan 2026 18:43:19 +0100 (CET) Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-43246af170aso56414f8f.0 for ; Wed, 21 Jan 2026 09:43:18 -0800 (PST) Received: from localhost.localdomain (host-92-26-102-188.as13285.net. [92.26.102.188]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43596b62700sm9702651f8f.42.2026.01.21.09.43.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jan 2026 09:43:16 -0800 (PST) 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: abf3666b-f6f0-11f0-9ccf-f158ae23cfc8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1769017398; x=1769622198; 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=v9y2S3cd3EBdIWGtGldmEHVozUbvuRK7dO8V2IFvzEI=; b=HMdl6zrpoyMmisPGBFI6jxw1bGFY/54uk65Gi92+iwdOsPq/3OnfKQmIgq5BjXRZze asKAdAOgknjx5ka3izp2Eczdv2R5aPnKCbM8mu6AtgkDbtaP0gHiYpDlz7Z+NFlawUzh 4Srp7UArknOMk02iWopB3mHCV5LJicOPAGczI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769017398; x=1769622198; 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=v9y2S3cd3EBdIWGtGldmEHVozUbvuRK7dO8V2IFvzEI=; b=u0Nd5gaTYTxhz4rUfpnWcvUxuVl61sXSa7TQWyEZRhFVFw4WX2iyteeAv6+NC3Rs7J MHGMw4D70ViIp0K2yLPigXNYB6B1hJXsmpIZKjK9A2XfGLgktrjyCbZ/hEF+S2G5CEHU QJYKf0S/hvjv02gMZk+zbYmt8tArKDybrHmlgz6LUKylpWaoVxeHqtCfzTedQOP97Say e5D6sEi7jR/ov6Jkj6jMVvbw+vLPSWprMhzgOAzELFgIMYQ81DtRYxVJPUSuLOH1rEp1 DzPRfPdob5G69vCDXMiiddcCu0GFwSkMYL9gzRw8CwaS8rzalY9v1vf82L1Gl4NiD6eW xduw== X-Gm-Message-State: AOJu0YwQcyBfjzNif5mOrYY9Bexqj6pK/cO4QB2/tpMlmYTCgalIFZHh mXDKcV+ZKvR1g4XuDQzFqjVXwG/ncA08fAA9p4wXPNehOGp2v/85HXQpJKH0JepDzwfUsa3L9Um boDa/ X-Gm-Gg: AZuq6aL0WZs4TdjkeEGkFIHNhGmRawE4pdF/AZ2Kj0Z0Jx3fDHMYpPkiENNBXkup0kO WgWctuB4Nk+7ahT0p4cbHV8cO5xB9LBnPG/hYsRbtEmb4U09Yz6vvUdBjcyg/LGY0DVEvAWDsZE rrv3v4R+3nCnClkcdHFwyD8zsjzJgVWDkYiD1zENrpHNrCB5lsMh3l7aPh1m9HieBHIu+GAIvlX ifZHjilC8nlT1Mk6fnmjcUXS7+U2jmL5Rk5kAITsauDS5BW+lyG8PH2/n46c41taL0Vv6frtTR8 pXECSpeFMmC7K2EkjTAqf5qB3IN3ss+Nb+1LTquaughPoSfBPQxFeHkzxpWExxHxkD7NrUZb7sn dZUuMk1mAB8Aav9vkzk0fFUETarkQ7NeYh78vHXUkkbRLJ8Z/BPEPFKPlU/mMOq8R61vE0TeNWO bpBEbZ+RDyoAGBQQkBUwKUdRmfF6ICG0/Ir2uV9SWRGDA9FkeN4zmpOKG6T6fkH3/DZOzfYbo2 X-Received: by 2002:a05:6000:2502:b0:430:f593:aa34 with SMTP id ffacd0b85a97d-435a5fd0604mr461458f8f.17.1769017397088; Wed, 21 Jan 2026 09:43:17 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Alejandro Vallejo Subject: [PATCH] x86/svm: Adjust VMCB comments Date: Wed, 21 Jan 2026 17:43:14 +0000 Message-Id: <20260121174314.1465759-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: 1769017429176158500 The Intercept comments provide no value whatsoever. For the VMCB, label the Control area and State Save area, which are the names given by the APM. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 CC: Alejandro Vallejo --- xen/arch/x86/hvm/svm/vmcb.c | 4 ++++ xen/arch/x86/hvm/svm/vmcb.h | 8 ++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index cbee10d0463d..72173c8fdd6a 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -430,9 +430,13 @@ static void __init __maybe_unused build_assertions(voi= d) =20 /* Build-time check of the VMCB layout. */ BUILD_BUG_ON(sizeof(vmcb) !=3D PAGE_SIZE); + + /* Control area */ BUILD_BUG_ON(offsetof(typeof(vmcb), _pause_filter_thresh) !=3D 0x03c); BUILD_BUG_ON(offsetof(typeof(vmcb), _vintr) !=3D 0x060); BUILD_BUG_ON(offsetof(typeof(vmcb), event_inj) !=3D 0x0a8); + + /* State Save area */ BUILD_BUG_ON(offsetof(typeof(vmcb), es) !=3D 0x400); BUILD_BUG_ON(offsetof(typeof(vmcb), _cpl) !=3D 0x4cb); BUILD_BUG_ON(offsetof(typeof(vmcb), _cr4) !=3D 0x548); diff --git a/xen/arch/x86/hvm/svm/vmcb.h b/xen/arch/x86/hvm/svm/vmcb.h index ba554a964487..c64386e7ef85 100644 --- a/xen/arch/x86/hvm/svm/vmcb.h +++ b/xen/arch/x86/hvm/svm/vmcb.h @@ -8,7 +8,6 @@ =20 struct vcpu; =20 -/* general 1 intercepts */ enum GenericIntercept1bits { GENERAL1_INTERCEPT_INTR =3D 1 << 0, @@ -45,7 +44,6 @@ enum GenericIntercept1bits GENERAL1_INTERCEPT_SHUTDOWN_EVT =3D 1u << 31 }; =20 -/* general 2 intercepts */ enum GenericIntercept2bits { GENERAL2_INTERCEPT_VMRUN =3D 1 << 0, @@ -65,8 +63,6 @@ enum GenericIntercept2bits GENERAL2_INTERCEPT_RDPRU =3D 1 << 14, }; =20 - -/* control register intercepts */ enum CRInterceptBits { CR_INTERCEPT_CR0_READ =3D 1 << 0, @@ -103,8 +99,6 @@ enum CRInterceptBits CR_INTERCEPT_CR15_WRITE =3D 1u << 31, }; =20 - -/* debug register intercepts */ enum DRInterceptBits { DR_INTERCEPT_DR0_READ =3D 1 << 0, @@ -400,6 +394,7 @@ typedef union #define MSRPM_SIZE (8 * 1024) =20 struct vmcb_struct { + /* Control area */ u32 _cr_intercepts; /* offset 0x00 - cleanbit 0 */ u32 _dr_intercepts; /* offset 0x04 - cleanbit 0 */ u32 _exception_intercepts; /* offset 0x08 - cleanbit 0 */ @@ -491,6 +486,7 @@ struct vmcb_struct { u8 guest_ins[15]; /* offset 0xD1 */ u64 res10a[100]; /* offset 0xE0 pad to save area */ =20 + /* State Save area */ union { struct segment_register sreg[6]; struct { --=20 2.39.5