From patchwork Mon Oct 21 00:46:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel P. Smith" X-Patchwork-Id: 13843466 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5B2C3D3C935 for ; Mon, 21 Oct 2024 00:57:44 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.823038.1237122 (Exim 4.92) (envelope-from ) id 1t2gjd-00011W-Ry; Mon, 21 Oct 2024 00:57:25 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 823038.1237122; Mon, 21 Oct 2024 00:57:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t2gjd-0000zk-Ky; Mon, 21 Oct 2024 00:57:25 +0000 Received: by outflank-mailman (input) for mailman id 823038; Mon, 21 Oct 2024 00:57:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t2gcg-0001i1-8a for xen-devel@lists.xenproject.org; Mon, 21 Oct 2024 00:50:14 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 6d7b8930-8f46-11ef-a0be-8be0dac302b0; Mon, 21 Oct 2024 02:50:13 +0200 (CEST) Received: by mx.zohomail.com with SMTPS id 1729471618610716.8532469184576; Sun, 20 Oct 2024 17:46:58 -0700 (PDT) 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: 6d7b8930-8f46-11ef-a0be-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; t=1729471620; cv=none; d=zohomail.com; s=zohoarc; b=FbmgV0ezgOaZfoTNAr14nsADmTTI4W2l6IfmMrxqv7fZZKXzsUEzOl5yMjdawq9lc4ARJ6RxXFMC0W0ivtfppHqoG0rhWa0h3p9WIB0tXVf9COnD/uo+1HbfLQMS+Gq+jlHlT3OvUvcOKKtNKYIEl8Ish+/BwgTJ06kIyhsMeWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729471620; 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=GK3STJ5aZqEuHy+kekMK2JZrWAG/l3wNbP6L7AEea2o=; b=WOIp4AnExr9s0FuhE8pQQyfzHxS42zDXg8ARsNhYfFsoMl792+QVpMjiHt4qgpJybCjPcL4yfR9fTeivhMgqOso8/sOYBg4zflKTUzScbTCLGHjofQKkGAIlmmtAhfsdzJAa0/CA6hHWlg3qKGUfTLmsI2iI7tP9BIXzicnviNo= 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=1729471620; 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=GK3STJ5aZqEuHy+kekMK2JZrWAG/l3wNbP6L7AEea2o=; b=oE3W/Ky24xtuIXw4iJhxF7Lfi3zRKAbUkmzBs3n+VBuhi9yfoQ3CqIhY2ly+GI83 +0C0omcIB7u9zFNNXXB4Urw+q1hWTo7fREWQr1snuTlHTak6KuAynDvyK60He+/Uwcd qrW0A0K6V2Gv+WYKrn5tzUgqe5NF8T/7MQQfFREE= 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_Pau_Monn=C3=A9?= Subject: [PATCH v7 30/38] x86/boot: remove remaining module_t references Date: Sun, 20 Oct 2024 20:46:05 -0400 Message-Id: <20241021004613.18793-31-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241021004613.18793-1-dpsmith@apertussolutions.com> References: <20241021004613.18793-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 X-ZohoMailClient: External Any direct usages of module_t have been transitioned, remove the remaining references to the mod field. This also removes any external use of bootstrap_map(), dropping from setup.h and making it static. Signed-off-by: Daniel P. Smith --- Changes since v6: - drop efi exclusion check for module memory alignment validation Changes since v5: - commit message rewrite - coding style change - remove export of bootstrap_map() --- xen/arch/x86/include/asm/setup.h | 1 - xen/arch/x86/setup.c | 29 ++++++++++------------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/xen/arch/x86/include/asm/setup.h b/xen/arch/x86/include/asm/setup.h index 72d183e8a4de..f7958b56eab6 100644 --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -35,7 +35,6 @@ extern struct boot_info xen_boot_info; unsigned long initial_images_nrpages(nodeid_t node); void discard_initial_images(void); -void *bootstrap_map(const module_t *mod); void *bootstrap_map_bm(const struct boot_module *bm); int remove_xen_ranges(struct rangeset *r); diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 67e72459170a..2102923cd510 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -350,8 +350,8 @@ unsigned long __init initial_images_nrpages(nodeid_t node) for ( nr = i = 0; i < bi->nr_modules; ++i ) { - unsigned long start = bi->mods[i].mod->mod_start; - unsigned long end = start + PFN_UP(bi->mods[i].mod->mod_end); + unsigned long start = bi->mods[i].start; + unsigned long end = start + PFN_UP(bi->mods[i].size); if ( end > node_start && node_end > start ) nr += min(node_end, end) - max(node_start, start); @@ -488,7 +488,7 @@ static void *__init bootstrap_map_addr(paddr_t start, paddr_t end) return ret; } -void *__init bootstrap_map(const module_t *mod) +static void *__init bootstrap_map(const module_t *mod) { if ( !mod ) return bootstrap_map_addr(0, 0); @@ -678,8 +678,8 @@ static uint64_t __init consider_modules( for ( i = 0; i < nr_mods ; ++i ) { - uint64_t start = pfn_to_paddr(mods[i].mod->mod_start); - uint64_t end = start + PAGE_ALIGN(mods[i].mod->mod_end); + uint64_t start = (uint64_t)mods[i].start; + uint64_t end = start + PAGE_ALIGN(mods[i].size); if ( i == this_mod ) continue; @@ -1399,12 +1399,10 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) set_kexec_crash_area_size((u64)nr_pages << PAGE_SHIFT); kexec_reserve_area(); - for ( i = 0; !efi_enabled(EFI_LOADER) && i < bi->nr_modules; i++ ) + for ( i = 0; i < bi->nr_modules; i++ ) { - if ( bi->mods[i].mod->mod_start & (PAGE_SIZE - 1) ) + if ( bi->mods[i].start & (PAGE_SIZE - 1) ) panic("Bootloader didn't honor module alignment request\n"); - bi->mods[i].mod->mod_end -= bi->mods[i].mod->mod_start; - bi->mods[i].mod->mod_start >>= PAGE_SHIFT; } /* @@ -1425,16 +1423,11 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) */ bi->mods[xen].start = virt_to_maddr(_stext); bi->mods[xen].size = __2M_rwdata_end - _stext; - - bi->mods[xen].mod->mod_start = paddr_to_pfn(bi->mods[xen].start); - bi->mods[xen].mod->mod_end = bi->mods[xen].size; } - bi->mods[0].headroom = - bzimage_headroom(bootstrap_map(bi->mods[0].mod), - bi->mods[0].mod->mod_end); - - bootstrap_map(NULL); + bi->mods[0].headroom = bzimage_headroom( + bootstrap_map_bm(&bi->mods[0]), bi->mods[0].size); + bootstrap_map_bm(NULL); #ifndef highmem_start /* Don't allow split below 4Gb. */ @@ -1535,9 +1528,7 @@ void asmlinkage __init noreturn __start_xen(unsigned long mbi_p) { move_memory(end - size + bm->headroom, bm->start, bm->size); bm->start = (end - size); - bm->mod->mod_start = paddr_to_pfn(bm->start); bm->size += bm->headroom; - bm->mod->mod_end = bm->size; bm->relocated = true; } }