From mboxrd@z Thu Jan 1 00:00:00 1970 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 473FCC3DA6D for ; Thu, 15 May 2025 13:20:49 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.985338.1371267 (Exim 4.92) (envelope-from ) id 1uFYVq-00057o-KI; Thu, 15 May 2025 13:20:38 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 985338.1371267; Thu, 15 May 2025 13:20:38 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uFYVq-00057h-Fs; Thu, 15 May 2025 13:20:38 +0000 Received: by outflank-mailman (input) for mailman id 985338; Thu, 15 May 2025 13:20:37 +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 1uFYV7-00017p-4P for xen-devel@lists.xenproject.org; Thu, 15 May 2025 13:19:53 +0000 Received: from sender4-of-o50.zoho.com (sender4-of-o50.zoho.com [136.143.188.50]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 47941257-318f-11f0-9ffb-bf95429c2676; Thu, 15 May 2025 15:19:51 +0200 (CEST) Received: by mx.zohomail.com with SMTPS id 1747315098202984.3426957289753; Thu, 15 May 2025 06:18:18 -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: 47941257-318f-11f0-9ffb-bf95429c2676 ARC-Seal: i=1; a=rsa-sha256; t=1747315100; cv=none; d=zohomail.com; s=zohoarc; b=DDaCQpNU5vXVFWmAPsXgXr4Op2rq11veWQkILgSuI+APThUUvQL+8dtU5ZfHcJEWpzqedT63S0sq1aSH5M54gmSdIVZOG5SO8md9UyANTuu1VuvOjJTqufL9Ifbv22CnEjhLFZ7EGfH7gID56LmkaD2SXPGHNSos0w9IToArXo8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1747315100; 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=NCBJ/pAlIVIbNcyeaOcg2oqbWODaJtv/R9aCM8gYWrY=; b=XG1JkUj2yccNEHiRFSBPfG+OXHhFWUb2FzQdVWtPQVFEUs4QTqNBMkQLhTByNmTL3dd2Va+ZnSySsj6s8F7pp8MBaTpXqSfowUEi3NrsVZVdwIl7MA1CDhDJwVA8TbtdyM7K4ZyQvhiaCmPVpAEZqIKm4abenYqxKt/M+mg8BUg= 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=1747315099; 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=NCBJ/pAlIVIbNcyeaOcg2oqbWODaJtv/R9aCM8gYWrY=; b=kO7n4vFyt7X419lIYOKxbXNAYpEgZAQwkUnevJNn102FDSr4S65SWafbNbMSZpOf O5eLXzuDH5+XCxUlnBX8D75OBYSdkTSRYeyLmfk9UxKCcoHQzfjZ/PKu0o5MGDYflWs LbPguoDQFYRpYee3TafUr+0M7lUX6wQpQJL51OJI= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org Cc: "Daniel P. Smith" , jason.andryuk@amd.com, stefano.stabellini@amd.com, agarciav@amd.com, Jan Beulich , Andrew Cooper , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [RFCv2 12/38] x86/hyperlaunch: move page computation to domain builder Date: Thu, 15 May 2025 09:17:18 -0400 Message-Id: <20250515131744.3843-13-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20250515131744.3843-1-dpsmith@apertussolutions.com> References: <20250515131744.3843-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-ZohoMailClient: External The function dom_compute_nr_pages() is being moved to the domain builder. For this to happen, the variable dom0_nodes, and the functions calculate_dom0_pages() and dom0_pv_restrict_pages() must be exported. Signed-off-by: Daniel P. Smith --- xen/arch/x86/dom0_build.c | 75 +---------------------- xen/arch/x86/domain-builder/domain.c | 71 +++++++++++++++++++++ xen/arch/x86/include/asm/dom0_build.h | 4 +- xen/arch/x86/include/asm/domain-builder.h | 4 ++ 4 files changed, 81 insertions(+), 73 deletions(-) diff --git a/xen/arch/x86/dom0_build.c b/xen/arch/x86/dom0_build.c index 2a22cd4e125e..75969887b933 100644 --- a/xen/arch/x86/dom0_build.c +++ b/xen/arch/x86/dom0_build.c @@ -209,7 +209,7 @@ static int __init cf_check parse_dom0_nodes(const char *s) custom_param("dom0_nodes", parse_dom0_nodes); cpumask_t __initdata dom0_cpus; -static nodemask_t __initdata dom0_nodes; +nodemask_t __initdata dom0_nodes; unsigned int __init dom0_max_vcpus(void) { @@ -315,8 +315,7 @@ static unsigned long __init default_nr_pages(unsigned long avail) : min(avail / 16, 128UL << (20 - PAGE_SHIFT))); } -static void __init calculate_dom0_pages( - struct boot_domain *bd, unsigned long avail) +void __init calculate_dom0_pages(struct boot_domain *bd, unsigned long avail) { unsigned long nr_pages = bd->mem_pages ?: default_nr_pages(avail); @@ -338,7 +337,7 @@ static void __init calculate_dom0_pages( bd->mem_pages = nr_pages; } -static void __init dom0_pv_restrict_pages( +void __init dom0_pv_restrict_pages( struct boot_domain *bd, struct elf_dom_parms *parms) { if ( (parms->p2m_base == UNSET_ADDR) && !memsize_gt_zero(&dom0_size) && @@ -377,74 +376,6 @@ static void __init dom0_pv_restrict_pages( } } -unsigned long __init dom_compute_nr_pages( - struct boot_domain *bd, struct elf_dom_parms *parms) -{ - nodeid_t node; - nodemask_t nodes = { 0 }; - struct domain *d = bd->d; - unsigned long avail = 0, iommu_pages = 0; - - nodes_or(nodes, nodes, node_online_map); - - /* If building dom0 or hwdom, apply command line restriction. */ - if ( has_dom0_caps(bd) ) - nodes_and(nodes, nodes, dom0_nodes); - - ASSERT(nodes_weight(nodes) != 0); - - for_each_node_mask ( node, nodes ) - avail += avail_domheap_pages_region(node, 0, 0) + - initial_images_nrpages(node); - - /* Reserve memory for further dom0 vcpu-struct allocations... */ - avail -= (d->max_vcpus - 1UL) - << get_order_from_bytes(sizeof(struct vcpu)); - /* ...and compat_l4's, if needed. */ - if ( is_pv_32bit_domain(d) ) - avail -= d->max_vcpus - 1; - - /* Reserve memory for iommu_dom0_init() (rough estimate). */ - if ( is_hardware_domain(d) && is_iommu_enabled(d) - && !iommu_hwdom_passthrough ) - { - unsigned int s; - - for ( s = 9; s < BITS_PER_LONG; s += 9 ) - iommu_pages += max_pdx >> s; - - avail -= iommu_pages; - } - - if ( paging_mode_enabled(d) || opt_dom0_shadow || opt_pv_l1tf_hwdom ) - { - unsigned long cpu_pages; - - /* - * Clamp according to min/max limits and available memory - * (preliminary). - */ - calculate_dom0_pages(bd, avail); - - cpu_pages = dom_paging_pages(bd, bd->mem_pages); - - if ( !iommu_use_hap_pt(d) ) - avail -= cpu_pages; - else if ( cpu_pages > iommu_pages ) - avail -= cpu_pages - iommu_pages; - } - - /* Clamp according to min/max limits and available memory (final). */ - calculate_dom0_pages(bd, avail); - - if ( is_pv_domain(d) ) - dom0_pv_restrict_pages(bd, parms); - - d->max_pages = min_t(unsigned long, bd->max_pages, UINT_MAX); - - return bd->mem_pages; -} - static void __init process_dom0_ioports_disable(struct domain *dom0) { unsigned long io_from, io_to; diff --git a/xen/arch/x86/domain-builder/domain.c b/xen/arch/x86/domain-builder/domain.c index a2e5807b60a5..258f777cd9ee 100644 --- a/xen/arch/x86/domain-builder/domain.c +++ b/xen/arch/x86/domain-builder/domain.c @@ -6,6 +6,9 @@ #include #include #include +#include /* get types.h for libefl.h */ +#include +#include #include #include @@ -60,6 +63,74 @@ unsigned long __init dom_paging_pages( return DIV_ROUND_UP(memkb, 1024) << (20 - PAGE_SHIFT); } +unsigned long __init dom_compute_nr_pages( + struct boot_domain *bd, struct elf_dom_parms *parms) +{ + nodeid_t node; + nodemask_t nodes = { 0 }; + struct domain *d = bd->d; + unsigned long avail = 0, iommu_pages = 0; + + nodes_or(nodes, nodes, node_online_map); + + /* If building dom0 or hwdom, apply command line restriction. */ + if ( has_dom0_caps(bd) ) + nodes_and(nodes, nodes, dom0_nodes); + + ASSERT(nodes_weight(nodes) != 0); + + for_each_node_mask ( node, nodes ) + avail += avail_domheap_pages_region(node, 0, 0) + + initial_images_nrpages(node); + + /* Reserve memory for further dom0 vcpu-struct allocations... */ + avail -= (d->max_vcpus - 1UL) + << get_order_from_bytes(sizeof(struct vcpu)); + /* ...and compat_l4's, if needed. */ + if ( is_pv_32bit_domain(d) ) + avail -= d->max_vcpus - 1; + + /* Reserve memory for iommu_dom0_init() (rough estimate). */ + if ( is_hardware_domain(d) && is_iommu_enabled(d) + && !iommu_hwdom_passthrough ) + { + unsigned int s; + + for ( s = 9; s < BITS_PER_LONG; s += 9 ) + iommu_pages += max_pdx >> s; + + avail -= iommu_pages; + } + + if ( paging_mode_enabled(d) || opt_dom0_shadow || opt_pv_l1tf_hwdom ) + { + unsigned long cpu_pages; + + /* + * Clamp according to min/max limits and available memory + * (preliminary). + */ + calculate_dom0_pages(bd, avail); + + cpu_pages = dom_paging_pages(bd, bd->mem_pages); + + if ( !iommu_use_hap_pt(d) ) + avail -= cpu_pages; + else if ( cpu_pages > iommu_pages ) + avail -= cpu_pages - iommu_pages; + } + + /* Clamp according to min/max limits and available memory (final). */ + calculate_dom0_pages(bd, avail); + + if ( is_pv_domain(d) ) + dom0_pv_restrict_pages(bd, parms); + + d->max_pages = min_t(unsigned long, bd->max_pages, UINT_MAX); + + return bd->mem_pages; +} + /* * Local variables: * mode: C diff --git a/xen/arch/x86/include/asm/dom0_build.h b/xen/arch/x86/include/asm/dom0_build.h index 7275bcf9ba6b..43a402af15b7 100644 --- a/xen/arch/x86/include/asm/dom0_build.h +++ b/xen/arch/x86/include/asm/dom0_build.h @@ -7,13 +7,15 @@ #include extern unsigned int dom0_memflags; +extern nodemask_t dom0_nodes; void dom0_set_affinity(struct domain *dom0); int dom0_setup_permissions(struct domain *d); struct boot_domain; -unsigned long dom_compute_nr_pages( +void calculate_dom0_pages(struct boot_domain *bd, unsigned long avail); +void dom0_pv_restrict_pages( struct boot_domain *bd, struct elf_dom_parms *parms); int dom0_construct_pv(struct boot_domain *bd); diff --git a/xen/arch/x86/include/asm/domain-builder.h b/xen/arch/x86/include/asm/domain-builder.h index c5a71fae5ccb..243ca09c045a 100644 --- a/xen/arch/x86/include/asm/domain-builder.h +++ b/xen/arch/x86/include/asm/domain-builder.h @@ -2,10 +2,14 @@ #define __XEN_X86_DOMBUILDER_H__ struct boot_domain; +struct elf_dom_parms; unsigned long dom_paging_pages( const struct boot_domain *d, unsigned long nr_pages); +unsigned long dom_compute_nr_pages( + struct boot_domain *bd, struct elf_dom_parms *parms); + int dom_construct_pvh(struct boot_domain *bd); #endif -- 2.30.2