From nobody Sat Dec 28 19:44:37 2024 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 header.i=dpsmith@apertussolutions.com; 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=apertussolutions.com) ARC-Seal: i=2; a=rsa-sha256; t=1735232431; cv=pass; d=zohomail.com; s=zohoarc; b=Y3C406Tr1fSByGKqCmX1iOPLqassnmGCbZ/D3U4zvpD6Hj+LrIHIF5yM9Ed6AZahc1LEINj4KVOetz6zQ3goadtQt9aeLi/PDu/JZtUrdYILv94CC5m3qnNpDoQuLQTdoQeo1pIw8+Q8kaX8F55Y8ikU85iYlwyAjZFfC0aY1zo= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735232431; h=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=+3VU4l/0ipLKSYE0pW048JWQkTZXYcfFfQtanDIG30U=; b=XGpWTBBAgwxQ31yKfBN9tab3kgnoRmrHTEHNOpza9Rpm/K7+KHqgYXZxzNUAh6BOfnM66P7jpZMmRg/yFJT5UYVZ/iXwa/jmU0mKIl9PeAg4XDBsC2rLQUiefj2X8QidZfEbKEyJ74+leCcVw6QVsrZw2kPRk40sFp+G8PrhNec= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass header.i=dpsmith@apertussolutions.com; 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=apertussolutions.com) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1735232431112384.61702605496305; Thu, 26 Dec 2024 09:00:31 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.863269.1274707 (Exim 4.92) (envelope-from ) id 1tQrDX-0005xo-Vf; Thu, 26 Dec 2024 17:00:11 +0000 Received: by outflank-mailman (output) from mailman id 863269.1274707; Thu, 26 Dec 2024 17:00:11 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tQrDX-0005xh-SW; Thu, 26 Dec 2024 17:00:11 +0000 Received: by outflank-mailman (input) for mailman id 863269; Thu, 26 Dec 2024 17:00:10 +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 1tQrDW-0004jO-KQ for xen-devel@lists.xenproject.org; Thu, 26 Dec 2024 17:00:10 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dbdf9205-c3aa-11ef-99a3-01e77a169b0f; Thu, 26 Dec 2024 18:00:08 +0100 (CET) Received: by mx.zohomail.com with SMTPS id 1735232285226312.33226760964567; Thu, 26 Dec 2024 08:58:05 -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: dbdf9205-c3aa-11ef-99a3-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; t=1735232289; cv=none; d=zohomail.com; s=zohoarc; b=alYzYrV8sfRXiHHUPlqhlhrlh6i/cb6wtqTfUkTWwlrqacFGbx2fSB9+rC3IF5RJ9z3szvw9Sob4cKBzpn7FgQ0xHT77KpxNcdSqsc3zLjbX9NEjZ6a+KPkVnfVMj87IYjzE3p9RFoYTJQ1Grr8fdGBL9eud6TNbr4HEYN0MRhM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735232289; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=+3VU4l/0ipLKSYE0pW048JWQkTZXYcfFfQtanDIG30U=; b=nzRcXdI0vSxNjSz+XvFb4lTgtxnF56fEYDLlLt2L6GfLarDvp1U09DFjjJydtaRiZhGJXrD2X0Rzo8AgS9T+bzckdArJvZGokoYi4W0HykuvybNw1kWT2xgkUvtoZ99G/FG5z+tkhyAJCXzxVc56uaTGI/gHb+FsEZYdRCF7N4o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1735232289; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=+3VU4l/0ipLKSYE0pW048JWQkTZXYcfFfQtanDIG30U=; b=QD1XEnj7i2BhFh19jpZHoN32WCt8CZZs4DmM0CwPG6uQUaOrBCBENwbskRjNUXXO r5rqxyMagDb/7vZthgGgmOpT2Pc1E/6m8GMMIJWfMpiNGW5GoGZKG663rLTTi3Pn8FJ lzm49s/eAo38pFIEDJMEytHwvAmPB9+TBKhlWan8= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org Cc: "Daniel P. Smith" , jason.andryuk@amd.com, christopher.w.clark@gmail.com, stefano.stabellini@amd.com, Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel Subject: [PATCH v2 11/15] x86/hyperlaunch: add domain id parsing to domain config Date: Thu, 26 Dec 2024 11:57:36 -0500 Message-Id: <20241226165740.29812-12-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241226165740.29812-1-dpsmith@apertussolutions.com> References: <20241226165740.29812-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External X-ZohoMail-DKIM: pass (identity dpsmith@apertussolutions.com) X-ZM-MESSAGEID: 1735232433238116600 Content-Type: text/plain; charset="utf-8" Introduce the ability to specify the desired domain id for the domain definition. The domain id will be populated in the domid property of the do= main node in the device tree configuration. Signed-off-by: Daniel P. Smith --- Changes since v1 - coding style changes - moved comment with code movement - updated warning message - unrolled match_fdt_property() --- xen/arch/x86/domain-builder/fdt.c | 63 ++++++++++++++++++++++++++++- xen/arch/x86/setup.c | 5 ++- xen/include/xen/libfdt/libfdt-xen.h | 9 +++++ 3 files changed, 73 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/domain-builder/fdt.c b/xen/arch/x86/domain-builde= r/fdt.c index 27bc37ad45c9..efce0927c645 100644 --- a/xen/arch/x86/domain-builder/fdt.c +++ b/xen/arch/x86/domain-builder/fdt.c @@ -8,6 +8,7 @@ #include =20 #include +#include #include #include =20 @@ -61,10 +62,40 @@ static int __init dom0less_module_index( static int __init process_domain_node( struct boot_info *bi, void *fdt, int dom_node) { - int node; + int node, property; struct boot_domain *bd =3D &bi->domains[bi->nr_domains]; const char *name =3D fdt_get_name(fdt, dom_node, NULL) ?: "unknown"; =20 + fdt_for_each_property_offset(property, fdt, dom_node) + { + const struct fdt_property *prop; + const char *prop_name; + int name_len; + + prop =3D fdt_get_property_by_offset(fdt, property, NULL); + if ( !prop ) + continue; /* silently skip */ + + prop_name =3D fdt_get_string(fdt, fdt32_to_cpu(prop->nameoff), &na= me_len); + + if ( strncmp(prop_name, "domid", name_len) =3D=3D 0 ) + { + uint32_t val =3D DOMID_INVALID; + if ( fdt_prop_as_u32(prop, &val) !=3D 0 ) + { + printk(" failed processing domain id for domain %s\n", na= me); + return -EINVAL; + } + if ( val >=3D DOMID_FIRST_RESERVED ) + { + printk(" invalid domain id for domain %s\n", name); + return -EINVAL; + } + bd->domid =3D (domid_t)val; + printk(" domid: %d\n", bd->domid); + } + } + fdt_for_each_subnode(node, fdt, dom_node) { if ( fdt_node_check_compatible(fdt, node, "multiboot,kernel") =3D= =3D 0 ) @@ -125,7 +156,29 @@ static int __init process_domain_node( else if ( fdt_node_check_compatible(fdt, node, "multiboot,ramdisk") =3D= =3D 0 ) { - int idx =3D dom0less_module_node(fdt, node, size_size, address= _size); + unsigned int idx; + int ret =3D 0; + + if ( bd->ramdisk ) + { + printk(XENLOG_ERR "Duplicate ramdisk module for domain %s)= \n", + name); + continue; + } + + /* Try hyperlaunch property, fall back to dom0less property. */ + if ( hl_module_index(fdt, node, &idx) < 0 ) + { + int address_size =3D fdt_address_cells(fdt, dom_node); + int size_size =3D fdt_size_cells(fdt, dom_node); + + if ( address_size < 0 || size_size < 0 ) + ret =3D -EINVAL; + else + ret =3D dom0less_module_index( + fdt, node, size_size, address_size, &idx); + } + if ( idx < 0 ) { printk(" failed processing ramdisk module for domain %s\n= ", @@ -154,6 +207,12 @@ static int __init process_domain_node( return -EFAULT; } =20 + if ( bd->domid =3D=3D DOMID_INVALID ) + bd->domid =3D get_initial_domain_id(); + else if ( bd->domid !=3D get_initial_domain_id() ) + printk(XENLOG_WARNING + "WARN: Booting without initial domid not supported.\n"); + return 0; } =20 diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 25ff029ecdda..027b224151d1 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1029,8 +1029,9 @@ static struct domain *__init create_dom0(struct boot_= info *bi) if ( iommu_enabled ) dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; =20 - /* Create initial domain. Not d0 for pvshim. */ - bd->domid =3D get_initial_domain_id(); + if ( bd->domid =3D=3D DOMID_INVALID ) + /* Create initial domain. Not d0 for pvshim. */ + bd->domid =3D get_initial_domain_id(); d =3D domain_create(bd->domid, &dom0_cfg, pv_shim ? 0 : CDF_privileged= ); if ( IS_ERR(d) ) panic("Error creating d%u: %ld\n", bd->domid, PTR_ERR(d)); diff --git a/xen/include/xen/libfdt/libfdt-xen.h b/xen/include/xen/libfdt/l= ibfdt-xen.h index 0e54aeeb6cc2..2057030dda45 100644 --- a/xen/include/xen/libfdt/libfdt-xen.h +++ b/xen/include/xen/libfdt/libfdt-xen.h @@ -28,6 +28,15 @@ static inline int __init fdt_cell_as_u64(const fdt32_t *= cell, uint64_t *val) return 0; } =20 +static inline int __init fdt_prop_as_u32( + const struct fdt_property *prop, uint32_t *val) +{ + if ( !prop || fdt32_to_cpu(prop->len) < sizeof(u32) ) + return -EINVAL; + + return fdt_cell_as_u32((fdt32_t *)prop->data, val); +} + static inline int __init fdt_get_prop_by_offset( const void *fdt, int node, const char *name, unsigned long *offset) { --=20 2.30.2