From nobody Thu Jan 30 17:34:34 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 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=1731676968; cv=pass; d=zohomail.com; s=zohoarc; b=eJN14L7YN4/VZvea+Q+1uMxZ61CqDH/MZ9bXwsOUefPwee3OtzaJDpNLmzIAHNt2S6eMWItQAdpVyNwfhwO6iY/aZfTkpJqDEvqPM5o3S54g3ex4CJYczZr/y8s8nS2CxCjeD199A8jUWeIwSfp8hiCl24vQNCuQSBz4nZTk0aM= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731676968; 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=bhl7E1mvlo9SO98XxLqZrhL5BHZQCoyp4nD+tEiZihE=; b=APs6B4MKRPq+GEYuOfJP5QxlB2GWVxtp85mXbBt1loJeMuG6Ldr/RMXCvO1KXQ8uwBIt+sgKwDBWO6EgojLqPcoywIR7D7vxygpkJ6fphf0suuvZqePvwWOBLXworUA8bUqF7FccZnvumdAvHf9EC1FJTPJAYgIETrysojG3qGk= 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 1731676968881472.26242800709224; Fri, 15 Nov 2024 05:22:48 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.837621.1253548 (Exim 4.92) (envelope-from ) id 1tBwHN-0004ov-7P; Fri, 15 Nov 2024 13:22:29 +0000 Received: by outflank-mailman (output) from mailman id 837621.1253548; Fri, 15 Nov 2024 13:22:29 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tBwHN-0004oo-4x; Fri, 15 Nov 2024 13:22:29 +0000 Received: by outflank-mailman (input) for mailman id 837621; Fri, 15 Nov 2024 13:22:27 +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 1tBw8R-0006v7-Un for xen-devel@lists.xenproject.org; Fri, 15 Nov 2024 13:13:15 +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 5d1fae5f-a353-11ef-99a3-01e77a169b0f; Fri, 15 Nov 2024 14:13:12 +0100 (CET) Received: by mx.zohomail.com with SMTPS id 1731676338126593.7092805148436; Fri, 15 Nov 2024 05:12:18 -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: 5d1fae5f-a353-11ef-99a3-01e77a169b0f X-Custom-Connection: eyJyZW1vdGVpcCI6IjEzNi4xNDMuMTg4LjUxIiwiaGVsbyI6InNlbmRlcjQtb2YtbzUxLnpvaG8uY29tIn0= X-Custom-Transaction: eyJpZCI6IjVkMWZhZTVmLWEzNTMtMTFlZi05OWEzLTAxZTc3YTE2OWIwZiIsInRzIjoxNzMxNjc2MzkzLjAxNzQ0Mywic2VuZGVyIjoiZHBzbWl0aEBhcGVydHVzc29sdXRpb25zLmNvbSIsInJlY2lwaWVudCI6Inhlbi1kZXZlbEBsaXN0cy54ZW5wcm9qZWN0Lm9yZyJ9 ARC-Seal: i=1; a=rsa-sha256; t=1731676340; cv=none; d=zohomail.com; s=zohoarc; b=Z9e/3YKyb3RRCE5tGYsc88W9Ea4/y5BTZ3oXrdZPV627uueOKJIfQoXWXCMFUnWuXJRaa93jnkV9iCbSDdwMEp+7CAxy6JpkBkwNlu69osdrJvwNWSTgc8rdfaAQLpdZKWJ36LbgRPKDrIsb+JskwhwfK9kMQcncr5LUSqGYSNE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1731676340; 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=bhl7E1mvlo9SO98XxLqZrhL5BHZQCoyp4nD+tEiZihE=; b=FLoJOgt4hMA0q6Qlkfk9BtOgxbNr2Q/7Mi6U2D1u83AIhqewpzbY5EFu7L5IEQWLMGb1lZEb2EM7c8296cVe+eHc8woy+PfGaqno6B8oJGeQGQ/TBbDQre2Wg9WQHUWiOY2tYq/BfPwYa+NKbm6Mqoj+ukZLmgWoUfBmeok4x0s= 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=1731676340; 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=bhl7E1mvlo9SO98XxLqZrhL5BHZQCoyp4nD+tEiZihE=; b=kFxRu0P+j0A0IlvOO+Yih4j31JT3Is7P4+aOLfP+U96Cgq7qeuOazqT5niKeuB5I NY50+/gFKw8lxmNq+Lcw3oOe+h353PAGYNrcZr1dXptrundY8ScC/Jko8M/r3/gJFYK f0nNnMAukrhe2xQmleQ3BeowE/ChvTlmxdC1cS5M= 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?= Subject: [PATCH v9 5/6] x86/boot: introduce domid field to struct boot_domain Date: Fri, 15 Nov 2024 08:12:03 -0500 Message-Id: <20241115131204.32135-6-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241115131204.32135-1-dpsmith@apertussolutions.com> References: <20241115131204.32135-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: 1731676969803116600 Content-Type: text/plain; charset="utf-8" Add a domid field to struct boot_domain to hold the assigned domain id for = the domain. During initialization, ensure all instances of struct boot_domain h= ave the invalid domid to ensure that the domid must be set either by convention= or configuration. Signed-off-by: Daniel P. Smith Reviewed-by: Jason Andryuk --- xen/arch/x86/include/asm/bootdomain.h | 2 ++ xen/arch/x86/setup.c | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/xen/arch/x86/include/asm/bootdomain.h b/xen/arch/x86/include/a= sm/bootdomain.h index 12c19ab37bd8..3873f916f854 100644 --- a/xen/arch/x86/include/asm/bootdomain.h +++ b/xen/arch/x86/include/asm/bootdomain.h @@ -12,6 +12,8 @@ struct boot_module; struct domain; =20 struct boot_domain { + domid_t domid; + struct boot_module *kernel; struct boot_module *ramdisk; =20 diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 2ccaa7dc965b..533a1e2bbe05 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -339,6 +339,9 @@ static struct boot_info *__init multiboot_fill_boot_inf= o( /* Variable 'i' should be one entry past the last module. */ bi->mods[i].type =3D BOOTMOD_XEN; =20 + for ( i =3D 0; i < MAX_NR_BOOTDOMS; i++ ) + bi->domains[i].domid =3D DOMID_INVALID; + return bi; } =20 @@ -977,7 +980,6 @@ static struct domain *__init create_dom0(struct boot_in= fo *bi) }; struct boot_domain *bd =3D &bi->domains[0]; struct domain *d; - domid_t domid; =20 if ( opt_dom0_pvh ) { @@ -993,15 +995,15 @@ static struct domain *__init create_dom0(struct boot_= info *bi) dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; =20 /* Create initial domain. Not d0 for pvshim. */ - domid =3D get_initial_domain_id(); - d =3D domain_create(domid, &dom0_cfg, pv_shim ? 0 : CDF_privileged); + 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", domid, PTR_ERR(d)); + panic("Error creating d%u: %ld\n", bd->domid, PTR_ERR(d)); =20 init_dom0_cpuid_policy(d); =20 if ( alloc_dom0_vcpu0(d) =3D=3D NULL ) - panic("Error creating d%uv0\n", domid); + panic("Error creating d%uv0\n", bd->domid); =20 /* Grab the DOM0 command line. */ if ( bd->kernel->cmdline_pa || bi->kextra ) --=20 2.30.2