From nobody Mon Nov 3 18:12:39 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=1728251833; cv=pass; d=zohomail.com; s=zohoarc; b=kga3nQ4EIFXt+0kB+04kI2WvoZ5gRxo/M5iOCvqVx5oX2gjONi4r7fPDuTNOT3yB9TQQPIRIxyCLgrPYFo1M59wiI9V0U4DsI5M9b64f0jo21Br62QUv1g37meRigd0e1zz5bJaWmMqa+JLPJTJvs6yU+6ZXc09dCrASrH0m6Cg= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728251833; 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=LLrOReDmzknWCbN9N+hIkJRPFFBTEgW6Ul0tsXA+CWE=; b=l5I9BxvbpQycmr9OHZns2IYKNYFIp3RrI/Mja20Ug1qV3RzTWLqdeIZ5EHWhxd3j99I6e9XzBPbX0/FrRvH5HYi2QaIfqcoz/s9Oh7Gp+7zkhD0lBvKRGOlpfUwUghHGUgaEnUfR+d6bP6ZiWHgj+ME65ubwKD9UeQ1iRvSkP9c= 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 172825183381260.53203604404257; Sun, 6 Oct 2024 14:57:13 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.811378.1224087 (Exim 4.92) (envelope-from ) id 1sxZFA-00076m-5h; Sun, 06 Oct 2024 21:56:48 +0000 Received: by outflank-mailman (output) from mailman id 811378.1224087; Sun, 06 Oct 2024 21:56:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sxZFA-00076U-1L; Sun, 06 Oct 2024 21:56:48 +0000 Received: by outflank-mailman (input) for mailman id 811378; Sun, 06 Oct 2024 21:56:46 +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 1sxZA8-00051E-6z for xen-devel@lists.xenproject.org; Sun, 06 Oct 2024 21:51:36 +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 26c117ce-842d-11ef-99a2-01e77a169b0f; Sun, 06 Oct 2024 23:51:34 +0200 (CEST) Received: by mx.zohomail.com with SMTPS id 172825141593795.75148855391808; Sun, 6 Oct 2024 14:50:15 -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: 26c117ce-842d-11ef-99a2-01e77a169b0f ARC-Seal: i=1; a=rsa-sha256; t=1728251418; cv=none; d=zohomail.com; s=zohoarc; b=VyLnwAqb497h0jJeT27j0q1Yat7Xzb8keCeAJTth3TBPQxTDXAvYDpzDYOKZ8bQ/KoNYcMEA4RFc7E+LK2+UzqospI2GJterGyuBLiwuZd1pIAhCFqSi+ehlJ/TbQPtKvyYkun94tGktUFyR9r3S8K3M8gbGJta9wDDtu0IecPg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1728251418; 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=LLrOReDmzknWCbN9N+hIkJRPFFBTEgW6Ul0tsXA+CWE=; b=e0kwamlqbiuM9scBH+TRRfT+uWH6AHfbLsmJ5gSg33fgjR/wS0NoZGmFfzEGFEodFOdFcn1tL+KulhnW4pWxxMxUJEO1hiVHIfXeDCmEzJW+EJZHOELAeLnX27Kijvoge/H/2mbtyOKh5+kLjXBiDOu/aZ6VYOGLTlMhSoOkjCs= 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=1728251418; 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=LLrOReDmzknWCbN9N+hIkJRPFFBTEgW6Ul0tsXA+CWE=; b=rBN8lRutmggRr/zlKN4avoLiM5bxkeFnquIdN8NtgvLXT7jZzuDxs4yxEkHTheJU CjQv+n5LMJCpT07tKRIh058llxRJvEaj2BC1IwWioA9lKv9/uxDvLb6Rs5AGyX9OMi2 YbU7/kkvVuvQK2N3zqdtbk2j4zEijEZUJYUmEYP0= 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 v5 10/44] x86/boot: introduce boot module flags Date: Sun, 6 Oct 2024 17:49:21 -0400 Message-Id: <20241006214956.24339-11-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241006214956.24339-1-dpsmith@apertussolutions.com> References: <20241006214956.24339-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: 1728251835893116600 Content-Type: text/plain; charset="utf-8" The existing startup code employs various ad-hoc state tracking about certa= in boot module types by each area of the code. A boot module flags is added to enable tracking these different states. The first state to be transition by this commit is module relocation. Signed-off-by: Daniel P. Smith Acked-by: Jan Beulich Reviewed-by: Jason Andryuk --- xen/arch/x86/include/asm/bootinfo.h | 4 ++++ xen/arch/x86/setup.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm= /bootinfo.h index 6941a8975ea6..021ff0d93643 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -31,6 +31,10 @@ struct boot_module { */ unsigned long headroom; enum bootmod_type type; + + uint32_t flags; +#define BOOTMOD_FLAG_X86_RELOCATED (1U << 0) + }; =20 /* diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 69c45f115523..161415a8e667 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1354,7 +1354,6 @@ void asmlinkage __init noreturn __start_xen(unsigned = long mbi_p) panic("Bootloader didn't honor module alignment request\n"); bi->mods[i].mod->mod_end -=3D bi->mods[i].mod->mod_start; bi->mods[i].mod->mod_start >>=3D PAGE_SHIFT; - bi->mods[i].mod->reserved =3D 0; } =20 /* @@ -1470,7 +1469,7 @@ void asmlinkage __init noreturn __start_xen(unsigned = long mbi_p) =20 size =3D PAGE_ALIGN(bm->headroom + bm->mod->mod_end); =20 - if ( bi->mods[j].mod->reserved ) + if ( bi->mods[j].flags & BOOTMOD_FLAG_X86_RELOCATED ) continue; =20 /* Don't overlap with other modules (or Xen itself). */ @@ -1489,7 +1488,7 @@ void asmlinkage __init noreturn __start_xen(unsigned = long mbi_p) bm->mod->mod_end); bm->mod->mod_start =3D (end - size) >> PAGE_SHIFT; bm->mod->mod_end +=3D bm->headroom; - bm->mod->reserved =3D 1; + bm->flags |=3D BOOTMOD_FLAG_X86_RELOCATED; } } =20 @@ -1515,7 +1514,8 @@ void asmlinkage __init noreturn __start_xen(unsigned = long mbi_p) #endif } =20 - if ( bi->mods[0].headroom && !bi->mods[0].mod->reserved ) + if ( bi->mods[0].headroom && + !(bi->mods[0].flags & BOOTMOD_FLAG_X86_RELOCATED) ) panic("Not enough memory to relocate the dom0 kernel image\n"); for ( i =3D 0; i < bi->nr_modules; ++i ) { --=20 2.30.2