From nobody Fri Oct 31 09:34:02 2025 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=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1751399694; cv=none; d=zohomail.com; s=zohoarc; b=QJPD/I5GDj/TLVL3lkTGI+Mi+q3SYWsmOzYldHnSKzDF2VtrKHDaNrDvCVwvze0Vk/ejUhZMCsQu/93UFTAqsSOgyaQ5eKie6ylhJqvJKKoZvppWYQTzE2rmR49aO/bn9thDKQH90uW8SDlfyeyLkTQwPa8IrupWyhpuFXHgaI0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1751399694; 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=h7PeFG4j0+6wg/8x4w0BGJXrwiGp05DFafVuw1va9HQ=; b=HuUNYg5qWcVtvecoDD8eQdxWkfPdo373ctg3z3hGkOHhtfGtOsVg2syCQIbomA5S10tXRK+6P/GnAKyg7KHQ2RJLUEsG0JD10wx+qqZMoMMAjwVpxpmA4DlwkK5vyLreSOxn67Av3CRp2sj7+8xrvuclCkm1gnjZn4FxzxFUm+o= 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1751399694546673.3225723934152; Tue, 1 Jul 2025 12:54:54 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1029943.1403652 (Exim 4.92) (envelope-from ) id 1uWh3x-0000Dd-Va; Tue, 01 Jul 2025 19:54:41 +0000 Received: by outflank-mailman (output) from mailman id 1029943.1403652; Tue, 01 Jul 2025 19:54:41 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uWh3x-0000DV-Sq; Tue, 01 Jul 2025 19:54:41 +0000 Received: by outflank-mailman (input) for mailman id 1029943; Tue, 01 Jul 2025 19:54:41 +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 1uWh3x-0000D0-79 for xen-devel@lists.xenproject.org; Tue, 01 Jul 2025 19:54:41 +0000 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [2a00:1450:4864:20::333]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 38d8a3f5-56b5-11f0-b894-0df219b8e170; Tue, 01 Jul 2025 21:54:39 +0200 (CEST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-45362642f3bso8203555e9.2 for ; Tue, 01 Jul 2025 12:54:39 -0700 (PDT) Received: from lab.home (dynamic-2a00-1028-83a4-4bca-c0bb-96ff-feed-9d50.ipv6.o2.cz. [2a00:1028:83a4:4bca:c0bb:96ff:feed:9d50]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a88c7e9d1csm14291644f8f.13.2025.07.01.12.54.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jul 2025 12:54:37 -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: 38d8a3f5-56b5-11f0-b894-0df219b8e170 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751399678; x=1752004478; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=h7PeFG4j0+6wg/8x4w0BGJXrwiGp05DFafVuw1va9HQ=; b=ECeRJY62+x9nWP83c41llj4YFl4IM4+WFXr3X2Dd+8EdjSFM1Kqexascw13qJMWrV3 +I/dZdxUanmuRMvVNJ/K6spMiodOxRGGkildHNfk7FHjA5XKhq6N9GehyS9saz0XNKRD zgMRZpo7yY2Gb8+/O6B/nhKaCpiOJcmx8xOSd10j2eKCbvCRCkDC9/L/41GlzFt068FQ cV9nl0x5cB9FPRNVeoesO+EoSpD71vY5IqsGyQmCxfSstxUWlgVAj8J/a8zzMNPekk6J QtZFyRsY9L2Ct8go0Qbx2zcQrcIECOaJ27F11c6s4qdnw+4UvYkAeORhXP4VsJETKk+0 Ub4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751399678; x=1752004478; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=h7PeFG4j0+6wg/8x4w0BGJXrwiGp05DFafVuw1va9HQ=; b=gwMfQQFjET/GtX2Cf1A1psx7Ie3fJE64KypQVAiF4w04GXHzlrzwhWn1tdJ+A8ahUt uZjb5XFj4nV9B6+ZpFkBOkZ+o22KntInmHpaQnfwuWokaLY90z4mUYUkInHaw6wOOoHg 6W7+LTER9Ua9iHOZo5+hADxRXaTS4wz3iXeXf4/Zpu3vVLUl8hiRh3Brg3fFoT4E1ZIy ccKk5b33FJ6d1Y2/7MJkKX513bSbZ8cTohI9pVu+CeJwFaqE2oN40O3WQmVF24U/LNqa iNiLHrfkA+/eZrOfgSUZXHSLI9h2VEp+pE2cpfQYO70N7mdxaewMipf0cip+CSQcRV5m H69g== X-Gm-Message-State: AOJu0YwHvkkizHHGLa8wabOKNlLnDMKxbLjQEC2odyPOE8t3fpABEVIP +0k50R8P05Bxf98AZG+CcajwMwDpyBPHJ1CnUr18lF7pbay0C4/Pb/SZD6RG0A== X-Gm-Gg: ASbGnctyQXQhEuKEj39cM1lNWo3+4u4kw3ZrV94c+4O0ra0Oj893qU2dRHsbuEjdh8E g60nn8iNEKaCJ1D+Ptx10XRo4a2wpp1MZQLdAIz30txuDGEzyHcvlBYSet7j/jSs40m+Ho+7/KY rzEGNq53Tdqt7QfEMcHzd0pjZlwbK3vpmdJyVv+mVbQFrZiZ35folRfzv8Y+/aD7yPA41IK5F4Y vm+i6o1WA/i624qqD3633ciiJNEWogjn6XI7uDrlT3PvgIGKmYu3GnI/tD9qT8gnV0y/ABboc/J 48qEyi0SSvVxj3I83onMyInfIoJqpFHKy8+7cAeOjFOsqxfp/LCttq3dt5N8IHK6n8l3zXsRq26 styWDYMTympeBrRCso2FWdQoRHQ93iEH8o8/sJTRSeNq3zk3cxhQC0rIjPb8jqQ== X-Google-Smtp-Source: AGHT+IFmZWVWUaqiRen1DgrZdhU0MlS1yST6+M+EjNqhMxIAw+nMfyfVsHuzAkH1f5VXRnCrd7HKrg== X-Received: by 2002:a05:6000:18a9:b0:3a5:3399:51b1 with SMTP id ffacd0b85a97d-3af24e18458mr1776818f8f.6.1751399678131; Tue, 01 Jul 2025 12:54:38 -0700 (PDT) From: "=?UTF-8?q?Petr=20Bene=C5=A1?=" X-Google-Original-From: =?UTF-8?q?Petr=20Bene=C5=A1?= To: xen-devel@lists.xenproject.org Cc: =?UTF-8?q?Petr=20Bene=C5=A1?= , Anthony PERARD , Juergen Gross , Andrew Cooper , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Christian Lindig , David Scott , Bertrand Marquis , Volodymyr Babchuk , Christian Lindig , Julien Grall Subject: [PATCH v7 1/7] xen: Refactor altp2m options into a structured format Date: Tue, 1 Jul 2025 19:54:23 +0000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1751399696398116600 From: Petr Bene=C5=A1 Encapsulate the altp2m options within a struct. This change is preparatory and sets the groundwork for introducing additional parameter in subsequent commit. Signed-off-by: Petr Bene=C5=A1 Acked-by: Christian Lindig Acked-by: Anthony PERARD Acked-by: Julien Grall # arm Reviewed-by: Jan Beulich # hypervisor --- tools/libs/light/libxl_create.c | 6 +++--- tools/ocaml/libs/xc/xenctrl_stubs.c | 4 +++- xen/arch/arm/domain.c | 2 +- xen/arch/x86/domain.c | 4 ++-- xen/arch/x86/hvm/hvm.c | 2 +- xen/include/public/domctl.h | 4 +++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/tools/libs/light/libxl_create.c b/tools/libs/light/libxl_creat= e.c index 9525d22312..8a85fba1cf 100644 --- a/tools/libs/light/libxl_create.c +++ b/tools/libs/light/libxl_create.c @@ -622,17 +622,17 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_co= nfig *d_config, LOG(DETAIL, "altp2m: %s", libxl_altp2m_mode_to_string(b_info->altp= 2m)); switch(b_info->altp2m) { case LIBXL_ALTP2M_MODE_MIXED: - create.altp2m_opts |=3D + create.altp2m.opts |=3D XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_mixed); break; =20 case LIBXL_ALTP2M_MODE_EXTERNAL: - create.altp2m_opts |=3D + create.altp2m.opts |=3D XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_external); break; =20 case LIBXL_ALTP2M_MODE_LIMITED: - create.altp2m_opts |=3D + create.altp2m.opts |=3D XEN_DOMCTL_ALTP2M_mode(XEN_DOMCTL_ALTP2M_limited); break; =20 diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenc= trl_stubs.c index 863ab3c778..b51fd66788 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -225,7 +225,9 @@ CAMLprim value stub_xc_domain_create(value xch_val, val= ue wanted_domid, value co .max_maptrack_frames =3D Int_val(VAL_MAX_MAPTRACK_FRAMES), .grant_opts =3D XEN_DOMCTL_GRANT_version(Int_val(VAL_MAX_GRANT_VERSION)), - .altp2m_opts =3D Int32_val(VAL_ALTP2M_OPTS), + .altp2m =3D { + .opts =3D Int32_val(VAL_ALTP2M_OPTS), + }, .vmtrace_size =3D vmtrace_size, .cpupool_id =3D Int32_val(VAL_CPUPOOL_ID), }; diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index be58a23dd7..79a144e61b 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -693,7 +693,7 @@ int arch_sanitise_domain_config(struct xen_domctl_creat= edomain *config) return -EINVAL; } =20 - if ( config->altp2m_opts ) + if ( config->altp2m.opts ) { dprintk(XENLOG_INFO, "Altp2m not supported\n"); return -EINVAL; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index b67342797f..56c3816187 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -622,7 +622,7 @@ int arch_sanitise_domain_config(struct xen_domctl_creat= edomain *config) bool hap =3D config->flags & XEN_DOMCTL_CDF_hap; bool nested_virt =3D config->flags & XEN_DOMCTL_CDF_nested_virt; unsigned int max_vcpus; - unsigned int altp2m_mode =3D MASK_EXTR(config->altp2m_opts, + unsigned int altp2m_mode =3D MASK_EXTR(config->altp2m.opts, XEN_DOMCTL_ALTP2M_mode_mask); =20 if ( hvm ? !hvm_enabled : !IS_ENABLED(CONFIG_PV) ) @@ -709,7 +709,7 @@ int arch_sanitise_domain_config(struct xen_domctl_creat= edomain *config) return -EINVAL; } =20 - if ( config->altp2m_opts & ~XEN_DOMCTL_ALTP2M_mode_mask ) + if ( config->altp2m.opts & ~XEN_DOMCTL_ALTP2M_mode_mask ) { dprintk(XENLOG_INFO, "Invalid altp2m options selected: %#x\n", config->flags); diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index 056360d5fe..56c7de3977 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -665,7 +665,7 @@ int hvm_domain_initialise(struct domain *d, d->arch.hvm.params[HVM_PARAM_TRIPLE_FAULT_REASON] =3D SHUTDOWN_reboot; =20 /* Set altp2m based on domctl flags. */ - switch ( MASK_EXTR(config->altp2m_opts, XEN_DOMCTL_ALTP2M_mode_mask) ) + switch ( MASK_EXTR(config->altp2m.opts, XEN_DOMCTL_ALTP2M_mode_mask) ) { case XEN_DOMCTL_ALTP2M_mixed: d->arch.hvm.params[HVM_PARAM_ALTP2M] =3D XEN_ALTP2M_mixed; diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index be19ab5e26..a69dd96084 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -99,6 +99,7 @@ struct xen_domctl_createdomain { =20 uint32_t grant_opts; =20 + struct { /* * Enable altp2m mixed mode. * @@ -115,7 +116,8 @@ struct xen_domctl_createdomain { /* Altp2m mode signaling uses bits [0, 1]. */ #define XEN_DOMCTL_ALTP2M_mode_mask (0x3U) #define XEN_DOMCTL_ALTP2M_mode(m) ((m) & XEN_DOMCTL_ALTP2M_mode_mask) - uint32_t altp2m_opts; + uint32_t opts; + } altp2m; =20 /* Per-vCPU buffer size in bytes. 0 to disable. */ uint32_t vmtrace_size; --=20 2.34.1