From nobody Wed Nov 19 01:57:06 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; 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763032125; cv=none; d=zohomail.com; s=zohoarc; b=BbidjbQWbFQwdXhK9QS0GFPUgQ8u+1R0iI0KuMFX09vFJpyPohtR7+KedlKAa2p9U/HpjUL7rRRR/GvuBKSh4xpMXWjSW8E8WtKklS4tZqE+4JYq2xiFpf+O72FPgSA3DHT/dY892c+PgxPUygJn6FBVfhV95aba5bX2Rbg0TBQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763032125; h=Content-Type: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=S2UYFN6yYiokysvt0u9vsy7o90dfh/ypuxlmafL+NtQ=; b=M4QEpBTfLvGV/Y2S2d5Ploj6ud0P+SPPyt/QL2s8GT8UzYOzsdmHTYyQRo5GUNHUtA6YErhz4o95d30XczMIbKtLUZPZ1NN1y20/uAQkaGAZHj9ZX1x1FJ6YApu0OBAntFXySeV5RKX7e9N7py90xvgRA18TsmHv1n8w80cWG0s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763032125189263.89094427187035; Thu, 13 Nov 2025 03:08:45 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1160986.1489009 (Exim 4.92) (envelope-from ) id 1vJVBg-0006Vy-EM; Thu, 13 Nov 2025 11:08:24 +0000 Received: by outflank-mailman (output) from mailman id 1160986.1489009; Thu, 13 Nov 2025 11:08:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJVBg-0006Vr-BL; Thu, 13 Nov 2025 11:08:24 +0000 Received: by outflank-mailman (input) for mailman id 1160986; Thu, 13 Nov 2025 11:08:23 +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 1vJVBe-0006Vc-VW for xen-devel@lists.xenproject.org; Thu, 13 Nov 2025 11:08:22 +0000 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [2a00:1450:4864:20::536]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 10ba1ad9-c081-11f0-980a-7dc792cee155; Thu, 13 Nov 2025 12:08:21 +0100 (CET) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-640b4a52950so977620a12.1 for ; Thu, 13 Nov 2025 03:08:21 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6433a3d82cfsm1218407a12.2.2025.11.13.03.08.19 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Nov 2025 03:08:20 -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: 10ba1ad9-c081-11f0-980a-7dc792cee155 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1763032101; x=1763636901; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=S2UYFN6yYiokysvt0u9vsy7o90dfh/ypuxlmafL+NtQ=; b=GqXYFQh15PdQTex46f/7bWAY36/P3DGuA1mpq2+GvubjZzdPom6NQ1j7LQwyDxxiAQ dMPb3U8A6qj3bElOJroSK+S4EzcCQ5c2IOtfAuqdYAG7FFyBmMaqWND0dlsx1zSpd18f ppVTf0Ji0cmu7KPvzD8ieSWbCf4j1jsoKcl/PgKJiDh/CvjnUkZK0gZYpQlZs7sDXyp1 qes7EjA31WBILNai4+cxeGaU75YBHV8H78KagDJBN/A+KXGeoUPuCE55DffUwDMN2Ajw nD8XajVIftxtkjR+5HF4wTthix1UpNQTBCVl5q33WXuwGtOX4zDN7qNzKrpgYwDrLfKO 83PA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763032101; x=1763636901; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=S2UYFN6yYiokysvt0u9vsy7o90dfh/ypuxlmafL+NtQ=; b=le+CW0eJScbVJxeFnfNrJfcLwnfqSfZ56T/tXgmGpLBo2V5qj5jtCcgEMIOgHNAt3v fKSHk+vzVaUWFYnwKzVEximCwgIGqHzZx6KaZon+BYpRmFALLjr8Wxz9MCYYun1kN2M9 7hPj08uBeufK8OqrtTTMv1eh1VEcsR42h2OPGa+gj8aLhiv6kCaGBq7cn3kQsREzLJ+h GOgbt1kIurRB6wvhYAoyTCmEAcIFFrOTDp+vOo6DeBaCV3leCYIwtGJlvFMw4Fg29wON /Y3lT2BYdKJbNnr5HVBZ0zyyq4xxQxHhfi8oeZAtwDSoeBNX2x/bADUxxgssZRInfpZQ PJOA== X-Gm-Message-State: AOJu0YzqIla6MDmHRip5kCMPWFWAv97+VLIKKzjpdoa2q49P9uUEnQRc /mppMoKEGJtloue8nk6eUZZVIIKXfZKK7W9ps3oDy+9WZjcGb9VNE/OPs1xS9LXPSdUJm/7vZaV bjvc= X-Gm-Gg: ASbGncvNMii/ROtH2XyAvww4tjeGA18fZfAC6HQF3Cl6nQJZ0r3VLAKnLK6IWwLBiaA cV+28sjznrPuv1QrTtxi5XHvTSb0ddb/ditAmk1mEeEz9rIqQXBH41+yEG+idSvoH3lkPOQxd+3 ZoeTSXQA6kLx7A68bhdR9EZ0RRTMHhkYRFStIbVnzj4Fm/I5gORTAQXacY+Xc4swipMtrIAZDLv UCLhlZ5eG2jTgA4Lq4UjrbvC8t4myRkBlltXCz/2KVANswur7mSMKYgZroklEYk75A4URBcfHao Bx/XNiuftjvpndRnR+5e0XTqn/o5advlH6eqeXq9vSjrVEz7P67q6dtR8QUPBb7bFtpyoDm/XL8 68bhnZ3fG9YOphGSyKem/xbq4Z0LcpHV/td3ox/ZjVCu3FF/lPCRKUuEr9kcUR1b76aoE8Pr1b7 aWxEMKaF9IzdXTfELtA5Uw2MtoA+kQahsQUxJ4gH8P8upEY7h9K+0h927bx+YbfwG/JPUCYj2ki bk= X-Google-Smtp-Source: AGHT+IHk2TCKhIrULeEnrNiaqVuyU9XRrPVMRnp6fZo9vR8OYv1AHu3OIULBKyqagSa0MVz/72/Bew== X-Received: by 2002:a05:6402:518d:b0:640:cc76:ae35 with SMTP id 4fb4d7f45d1cf-6431a53071dmr5609782a12.21.1763032100740; Thu, 13 Nov 2025 03:08:20 -0800 (PST) Message-ID: <7a3eb7f3-db3e-4c2f-a231-cdf05a14be26@suse.com> Date: Thu, 13 Nov 2025 12:08:18 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 1/3] x86: introduce "brk" allocator From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763032128256153000 Content-Type: text/plain; charset="utf-8" ... to replace ebmalloc(), and then to find further use(s) to allow recovering memory which is needed very early (and hence needs setting up statically), but may not fully be used (or not used at all). Note that unlike free_ebmalloc_unused_mem(), brk_free_unused() (once other code is converted) will be able to free part of the BRK space even in the xen.efi case. That would happen if BRK space extends across a 2Mb boundary, and actual use stops before that boundary. Signed-off-by: Jan Beulich --- Changing setup.c's reserve_e820_ram() uses would be cumbersome when done right here. That'll be done when ebmalloc() is replaced, and hence what's there can also simply be replaced. The xen.efi detection may want separating out into a helper. When linking xen.efi, ld produces a base relocation for the reference to __subsystem__, which is wrong (that's an absolute symbol, after all). While that will need fixing there, it does no harm for our purposes. --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -1,4 +1,5 @@ obj-bin-y +=3D head.o +obj-bin-y +=3D brk.init.o obj-bin-y +=3D built-in-32.o obj-bin-y +=3D $(obj64) =20 --- /dev/null +++ b/xen/arch/x86/boot/brk.c @@ -0,0 +1,72 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include +#include +#include +#include + +#include + +extern char __brk_start[]; +extern const char __bss_end[]; + +static unsigned long __initdata allocated; +static bool __initdata finished; + +void *__init brk_alloc(size_t size) +{ + void *ptr =3D __brk_start + allocated; + + if ( finished ) + return NULL; + + /* Allocations PAGE_SIZE and up will be page-aligned. */ + if ( size >=3D PAGE_SIZE ) + allocated =3D ROUNDUP(allocated, PAGE_SIZE); + + allocated +=3D ROUNDUP(size, sizeof(void *)); + + if ( allocated > __bss_end - __brk_start ) + return NULL; + + return ptr; +} + +unsigned long __init brk_get_unused_start(void) +{ + finished =3D true; + + allocated =3D ROUNDUP(allocated, PAGE_SIZE); + + return (unsigned long)__brk_start + allocated; +} + +void __init brk_free_unused(void) +{ + unsigned long start =3D brk_get_unused_start(), + end =3D (unsigned long)__bss_end; + unsigned int subsys; + + /* + * Only xen.efi will have the symbol __subsystem__ available, and it'll + * be non-zero (10) there. In ELF the symbol will be undefined, and + * hence zero will be loaded into the register. + */ + asm ( ".weak __subsystem__; mov $__subsystem__, %0" : "=3Dr" (subsys) = ); + + /* using_2M_mapping() isn't available here. */ + if ( IS_ENABLED(CONFIG_XEN_ALIGN_2M) || subsys ) + start =3D PAGE_ALIGN_2M(start); + + if ( start >=3D end ) + return; + + destroy_xen_mappings(start, PAGE_ALIGN_2M(end)); + + /* + * By reserving needed space early in the E820 map, excess space gets = freed + * way before we make it here. Don't free the range a 2nd time. + */ + + printk(XENLOG_INFO "Freed %lukB unused BRK memory\n", (end - start) >>= 10); +} --- /dev/null +++ b/xen/arch/x86/include/asm/brk.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#include + +void *brk_alloc(size_t size); +unsigned long brk_get_unused_start(void); +void brk_free_unused(void); --- a/xen/arch/x86/xen.lds.S +++ b/xen/arch/x86/xen.lds.S @@ -331,7 +331,11 @@ SECTIONS __bss_start =3D .; *(.bss.page_aligned*) PERCPU_BSS - *(.bss .bss.*) + *(.bss .bss.[a-zA-Z0-9_]*) + . =3D ALIGN(PAGE_SIZE); + __brk_start =3D .; + *(.bss..brk.page_aligned*) + *(.bss..brk*) . =3D ALIGN(POINTER_ALIGN); __bss_end =3D .; } PHDR(text) --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -112,6 +112,7 @@ #include #include =20 +#include #include #include #include @@ -337,6 +338,8 @@ void __init arch_init_memory(void) =20 efi_init_memory(); =20 + brk_free_unused(); + #ifndef NDEBUG if ( highmem_start ) { From nobody Wed Nov 19 01:57:06 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; 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763032195; cv=none; d=zohomail.com; s=zohoarc; b=BFWZG2nJueUAVO0Bqkh676Qy5Rq0PCflOzZPJQqc6sQEOEUpMjCoZBHS4Qoc7bTXLPBUZ2ZqHjpu9p7GbJIZ+uGbZbncxYAeTJZ9BoI1pfPKCJ9UuoS/I469VwJyj+X3f37QhhA7gZgC0Anx7mLlS6ejN1DS0iHzm5Vdrh5WXGc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763032195; h=Content-Type: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=FL0FICzmakeWQSwiOt+QBkhmyqz6vTIP8is0c/IB2xQ=; b=Zd1uYEh8+kxtF7WbwleBwxrNxxW5u5aTrhiFWx8FbIrUakcvo3qjBUamM/Ca9xiEUWEZRNB/IZ1ZmgYOMnLdiabcwz3ZwYwXrbA4EIgNFzQDPWcVr8FUHFLMouwhqNMvtNauGcEMlbRGiCGMMA2hcUYXaEXa/3kFFv1fmYyNkmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763032195675518.3474431541979; Thu, 13 Nov 2025 03:09:55 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1160998.1489021 (Exim 4.92) (envelope-from ) id 1vJVCw-00071O-Nx; Thu, 13 Nov 2025 11:09:42 +0000 Received: by outflank-mailman (output) from mailman id 1160998.1489021; Thu, 13 Nov 2025 11:09:42 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJVCw-00071H-K0; Thu, 13 Nov 2025 11:09:42 +0000 Received: by outflank-mailman (input) for mailman id 1160998; Thu, 13 Nov 2025 11:09:41 +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 1vJVCv-00071B-21 for xen-devel@lists.xenproject.org; Thu, 13 Nov 2025 11:09:41 +0000 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [2a00:1450:4864:20::52a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 3f821288-c081-11f0-9d18-b5c5bf9af7f9; Thu, 13 Nov 2025 12:09:39 +0100 (CET) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-6419e6dab7fso999838a12.2 for ; Thu, 13 Nov 2025 03:09:39 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-6433a3d7335sm1220401a12.4.2025.11.13.03.09.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Nov 2025 03:09:38 -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: 3f821288-c081-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1763032179; x=1763636979; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=FL0FICzmakeWQSwiOt+QBkhmyqz6vTIP8is0c/IB2xQ=; b=f1kSr+jvoCD/ycTzJk2OQk9n2YEYYI3NW7WZfN2+Q6EK2rDB14BvCTFwqWG7vmrKQG J5cvxwrvtP1RBN5Q+N89D2a6w+wXceXC0vw+pDx9Syh3ywOBZQ1scWhklINFC69dLh7S Dzot59J2qSv1Sa6+yKnd/bJSlDyvRtt2FeIu0UYjyEfOaahpnWwuYdlqUZODwGLb8/sO bsrlXl66DSmcF6viGbMnRjtEhbPDRt+XCQiig3LQuQnnp9tcBqqdZhpFhhDcakJI0LyW zMtks4dDz8sM4ZnrmiGT1TVQ9GMXPdlP9hwcwQ2n5aEtQMiFtDo5An4vG5L1O8cXVPBn 6c+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763032179; x=1763636979; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=FL0FICzmakeWQSwiOt+QBkhmyqz6vTIP8is0c/IB2xQ=; b=tItKeUVnikXsxGJHtIlNs+8Ug2GT3HRZkdubecqmk+Oh6RShorttFMvzKxssan0RzR qzsNMJTjKcNJCkPTkHrMj8qpOcQnrGesrJtB5vb9+6SwAmiqQCbiaKGQ/Gj4GJVLUV2x q3qfPJHuSy+DWGYpNfekDnMzPgt4isTcTVFr5zx+ftbSH/jmWkQCTGlbInBJepqpEH5x NC0m0I9XhAYB6QaYWM6ciINNfbscqCPfFqnJEbDTs2OgziEHCq3yGeF32FVWmL9UJPtE AiB98lavZCNBrTztqnQKtAOjiQOUamwgDdSuJNfhrWPebFJsFTEn5r8cec+lIORuD63j 8I4A== X-Gm-Message-State: AOJu0YzKoP/MA/XO6f0w+F2bVQDudMZN10F0dXZV41UgWW9GR1/vaoiB t4yZg1E8eFMFfP8J9ZvIWh5aRNuFL2Xt5reMQRwbPA58larAm6aZRywzXKltdw4REYxTPMlMsck Rt7s= X-Gm-Gg: ASbGncvLYqCuiotSth/+IIPkRJRE4OXFS5uGjDgZbhKTM+Z9+RYLgulSvvdW6r31Rh/ OtCgV7KDOkk35j1gFMmxZvDLl/WPZlWSv7skB2/exZgXMLBbIGk61oTypE89y4pfCPxHKV47vwK ELBuzN5BoK5tsNepL+XM7SVMx5JVLtIAfs9AlU0dSYJhuUXUMRvoVRmH7jMML/mJ9VnkAA3qqIJ M0i56fBvB75t5cg/4q7EGUk0lV1z3mi8Accs719MaWBr4LBZG0WKTB5E79g+4griB9GGolbH9JC gCemUl9RhDK3HMaqjHs+V/kA841IM/IU0VfRMqKS4JQrFd+W5i616NK8WUYn6jQ+q7XSEPB3K/I WZ041MUbfH8Xmen9duF0e6Gop60uJgqOVkuOu7wz/h/EjXJbjjYLCKzYKfk/V8BHPRa2F5w32FG rRgWVFShQivxb3nx7BBRnehNGMXWbbQoh29GfF7qiYSh/g7fcXihkimDc0QwPd0NC1Kd/VES1kg kE= X-Google-Smtp-Source: AGHT+IGg7q/D9GwuBWGMxPhUPl54zwC+G92GrsPaapBaSO0AO/HKdqIgTALzi0uYCvztJsOYAccPvg== X-Received: by 2002:a05:6402:2707:b0:640:bd90:350d with SMTP id 4fb4d7f45d1cf-6431a4c014fmr5547928a12.1.1763032179224; Thu, 13 Nov 2025 03:09:39 -0800 (PST) Message-ID: <452fdf1f-646a-4bb1-83ea-ac4c998a096b@suse.com> Date: Thu, 13 Nov 2025 12:09:37 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 2/3] x86/EFI: replace ebmalloc() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Marek Marczykowski , Daniel Smith , Andrew Cooper , Julien Grall , Stefano Stabellini , Anthony PERARD , Michal Orzel , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763032196715153000 Content-Type: text/plain; charset="utf-8" Use the new brk_alloc() instead, with ebmalloc() merely being a thin wrapper. Signed-off-by: Jan Beulich Reviewed-by: Marek Marczykowski-G=C3=B3recki --- I'm not quite certain whether we ought to permit non-page-granular reservations. The in-memory image being somewhat larger due to possibly excessive padding isn't really a big problem, I think. --- a/xen/Rules.mk +++ b/xen/Rules.mk @@ -262,7 +262,7 @@ quiet_cmd_obj_init_o =3D INIT_O $@ define cmd_obj_init_o $(OBJDUMP) -h $< | while read idx name sz rest; do \ case "$$name" in \ - .*.local) ;; \ + .*.local|.bss..brk*) ;; \ .text|.text.*|.data|.data.*|.bss|.bss.*) \ test $$(echo $$sz | sed 's,00*,0,') !=3D 0 || continue; \ echo "Error: size of $<:$$name is 0x$$sz" >&2; \ --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -10,6 +10,7 @@ #include =20 #include +#include #include #include #include @@ -119,6 +120,18 @@ static void __init relocate_trampoline(u reloc_trampoline64(); } =20 +DEFINE_BRK(efi, MB(1)); + +static void *__init ebmalloc(size_t size) +{ + void *ptr =3D brk_alloc(size); + + if ( !ptr ) + blexit(L"Out of BRK memory\r\n"); + + return ptr; +} + static void __init place_string(u32 *addr, const char *s) { char *alloc =3D NULL; --- a/xen/arch/x86/efi/stub.c +++ b/xen/arch/x86/efi/stub.c @@ -41,12 +41,4 @@ void __init noreturn efi_multiboot2(EFI_ =20 void __init efi_init_memory(void) { } =20 -bool efi_boot_mem_unused(unsigned long *start, unsigned long *end) -{ - /* FIXME: Simplify once the call here with two NULLs goes away. */ - if ( start || end ) - *start =3D *end =3D (unsigned long)_end; - return false; -} - void efi_update_l4_pgtable(unsigned int l4idx, l4_pgentry_t l4e) { } --- a/xen/arch/x86/include/asm/brk.h +++ b/xen/arch/x86/include/asm/brk.h @@ -2,6 +2,10 @@ =20 #include =20 +#define DEFINE_BRK(var, size) \ + static char __section(".bss..brk.page_aligned") __aligned(PAGE_SIZE) \ + __used var ## _brk_[size] + void *brk_alloc(size_t size); unsigned long brk_get_unused_start(void); void brk_free_unused(void); --- a/xen/arch/x86/include/asm/setup.h +++ b/xen/arch/x86/include/asm/setup.h @@ -9,6 +9,8 @@ extern const char __2M_rodata_start[], _ extern char __2M_init_start[], __2M_init_end[]; extern char __2M_rwdata_start[], __2M_rwdata_end[]; =20 +extern unsigned long brk_end; + extern unsigned long xenheap_initial_phys_start; extern uint64_t boot_tsc_stamp; =20 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -163,6 +164,8 @@ cpumask_t __read_mostly cpu_present_map; =20 unsigned long __read_mostly xen_phys_start; =20 +unsigned long __ro_after_init brk_end; + /* Only used in asm code and within this source file */ char asmlinkage __section(".init.bss.stack_aligned") __aligned(STACK_SIZE) cpu0_stack[STACK_SIZE]; @@ -1109,7 +1112,6 @@ void asmlinkage __init noreturn __start_ struct boot_info *bi; unsigned long nr_pages, raw_max_page; int i, j, bytes =3D 0; - unsigned long eb_start, eb_end; bool acpi_boot_table_init_done =3D false, relocated =3D false; bool vm_init_done =3D false; int ret; @@ -1473,7 +1475,7 @@ void asmlinkage __init noreturn __start_ /* * This needs to remain in sync with remove_xen_ranges() and the * respective reserve_e820_ram() invocation below. No need to - * query efi_boot_mem_unused() here, though. + * query brk_get_unused_start() here, though. */ xen->start =3D virt_to_maddr(_stext); xen->size =3D __2M_rwdata_end - _stext; @@ -1616,18 +1618,11 @@ void asmlinkage __init noreturn __start_ if ( !xen_phys_start ) panic("Not enough memory to relocate Xen\n"); =20 - /* FIXME: Putting a hole in .bss would shatter the large page mapping.= */ - if ( using_2M_mapping() ) - efi_boot_mem_unused(NULL, NULL); - /* This needs to remain in sync with remove_xen_ranges(). */ - if ( efi_boot_mem_unused(&eb_start, &eb_end) ) - { - reserve_e820_ram(&boot_e820, __pa(_stext), __pa(eb_start)); - reserve_e820_ram(&boot_e820, __pa(eb_end), __pa(__2M_rwdata_end)); - } - else - reserve_e820_ram(&boot_e820, __pa(_stext), __pa(__2M_rwdata_end)); + brk_end =3D brk_get_unused_start(); + if ( using_2M_mapping() ) + brk_end =3D PAGE_ALIGN_2M(brk_end); + reserve_e820_ram(&boot_e820, __pa(_stext), __pa(brk_end)); =20 /* Late kexec reservation (dynamic start address). */ kexec_reserve_area(); @@ -2231,7 +2226,6 @@ __initcall(init_xen_cap_info); =20 int __hwdom_init remove_xen_ranges(struct rangeset *r) { - paddr_t start, end; int rc; =20 /* S3 resume code (and other real mode trampoline code) */ @@ -2253,26 +2247,10 @@ int __hwdom_init remove_xen_ranges(struc return rc; =20 /* hypervisor .data + .bss */ - if ( efi_boot_mem_unused(&start, &end) ) - { - ASSERT(__pa(start) >=3D __pa(&__2M_rwdata_start)); - rc =3D rangeset_remove_range(r, PFN_DOWN(__pa(&__2M_rwdata_start)), - PFN_DOWN(__pa(start) - 1)); - if ( rc ) - return rc; - ASSERT(__pa(end) <=3D __pa(&__2M_rwdata_end)); - rc =3D rangeset_remove_range(r, PFN_DOWN(__pa(end)), - PFN_DOWN(__pa(&__2M_rwdata_end) - 1)); - if ( rc ) - return rc; - } - else - { - rc =3D rangeset_remove_range(r, PFN_DOWN(__pa(&__2M_rwdata_start)), - PFN_DOWN(__pa(&__2M_rwdata_end) - 1)); - if ( rc ) - return rc; - } + rc =3D rangeset_remove_range(r, PFN_DOWN(__pa(&__2M_rwdata_start)), + PFN_DOWN(__pa(brk_end) - 1)); + if ( rc ) + return rc; =20 return 0; } --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -321,8 +321,6 @@ void tboot_shutdown(uint32_t shutdown_ty /* if this is S3 then set regions to MAC */ if ( shutdown_type =3D=3D TB_SHUTDOWN_S3 ) { - unsigned long s, e; - /* * Xen regions for tboot to MAC. This needs to remain in sync with * remove_xen_ranges(). @@ -336,16 +334,8 @@ void tboot_shutdown(uint32_t shutdown_ty g_tboot_shared->mac_regions[1].size =3D __2M_rodata_end - _stext; /* hypervisor .data + .bss */ g_tboot_shared->mac_regions[2].start =3D (uint64_t)__pa(&__2M_rwda= ta_start); - g_tboot_shared->mac_regions[2].size =3D __2M_rwdata_end - __2M_rwd= ata_start; - if ( efi_boot_mem_unused(&s, &e) ) - { - g_tboot_shared->mac_regions[2].size =3D - s - (unsigned long)__2M_rwdata_start; - g_tboot_shared->mac_regions[3].start =3D __pa(e); - g_tboot_shared->mac_regions[3].size =3D - (unsigned long)__2M_rwdata_end - e; - g_tboot_shared->num_mac_regions =3D 4; - } + g_tboot_shared->mac_regions[2].size =3D + brk_end - (unsigned long)__2M_rwdata_start; =20 /* * MAC domains and other Xen memory --- a/xen/common/efi/boot.c +++ b/xen/common/efi/boot.c @@ -1788,8 +1788,6 @@ void __init efi_init_memory(void) pte_attr_t prot; } *extra, *extra_head =3D NULL; =20 - free_ebmalloc_unused_mem(); - if ( !efi_enabled(EFI_BOOT) ) return; =20 --- a/xen/common/efi/ebmalloc.c +++ /dev/null @@ -1,74 +0,0 @@ -#include "efi.h" -#include -#include - -#ifdef CONFIG_ARM -/* - * TODO: Enable EFI boot allocator on ARM. - * This code can be common for x86 and ARM. - * Things TODO on ARM before enabling ebmalloc: - * - estimate required EBMALLOC_SIZE value, - * - where (in which section) ebmalloc_mem[] should live; if in - * .bss.page_aligned, as it is right now, then whole BSS zeroing - * have to be disabled in xen/arch/arm/arm64/head.S; though BSS - * should be initialized somehow before use of variables living there, - * - use ebmalloc() in ARM/common EFI boot code, - * - call free_ebmalloc_unused_mem() somewhere in init code. - */ -#define EBMALLOC_SIZE MB(0) -#else -#define EBMALLOC_SIZE MB(1) -#endif - -static char __section(".bss.page_aligned") __aligned(PAGE_SIZE) - ebmalloc_mem[EBMALLOC_SIZE]; -static unsigned long __read_mostly ebmalloc_allocated; - -/* EFI boot allocator. */ -void __init *ebmalloc(size_t size) -{ - void *ptr =3D ebmalloc_mem + ebmalloc_allocated; - - ebmalloc_allocated +=3D ROUNDUP(size, sizeof(void *)); - - if ( ebmalloc_allocated > sizeof(ebmalloc_mem) ) - blexit(L"Out of static memory\r\n"); - - return ptr; -} - -bool efi_boot_mem_unused(unsigned long *start, unsigned long *end) -{ - /* FIXME: Drop once the call here with two NULLs goes away. */ - if ( !start && !end ) - { - ebmalloc_allocated =3D sizeof(ebmalloc_mem); - return false; - } - - *start =3D (unsigned long)ebmalloc_mem + PAGE_ALIGN(ebmalloc_allocated= ); - *end =3D (unsigned long)ebmalloc_mem + sizeof(ebmalloc_mem); - - return *start < *end; -} - -void __init free_ebmalloc_unused_mem(void) -{ - unsigned long start, end; - - if ( !efi_boot_mem_unused(&start, &end) ) - return; - - destroy_xen_mappings(start, end); - -#ifdef CONFIG_X86 - /* - * By reserving the space early in the E820 map, it gets freed way bef= ore - * we make it here. Don't free the range a 2nd time. - */ -#else - init_xenheap_pages(__pa(start), __pa(end)); -#endif - - printk(XENLOG_INFO "Freed %lukB unused BSS memory\n", (end - start) >>= 10); -} --- a/xen/common/efi/efi-common.mk +++ b/xen/common/efi/efi-common.mk @@ -1,4 +1,4 @@ -EFIOBJ-y :=3D boot.init.o pe.init.o ebmalloc.o runtime.o +EFIOBJ-y :=3D boot.init.o pe.init.o runtime.o EFIOBJ-$(CONFIG_COMPAT) +=3D compat.o =20 CFLAGS-y +=3D -fshort-wchar --- a/xen/common/efi/efi.h +++ b/xen/common/efi/efi.h @@ -48,10 +48,6 @@ void noreturn blexit(const CHAR16 *str); =20 const CHAR16 *wmemchr(const CHAR16 *s, CHAR16 c, UINTN n); =20 -/* EFI boot allocator. */ -void *ebmalloc(size_t size); -void free_ebmalloc_unused_mem(void); - const void *pe_find_section(const void *image, const UINTN image_size, const CHAR16 *section_name, UINTN *size_out); =20 --- a/xen/include/xen/efi.h +++ b/xen/include/xen/efi.h @@ -39,7 +39,6 @@ static inline bool efi_enabled(unsigned extern bool efi_secure_boot; =20 void efi_init_memory(void); -bool efi_boot_mem_unused(unsigned long *start, unsigned long *end); bool efi_rs_using_pgtables(void); unsigned long efi_get_time(void); void efi_halt_system(void); From nobody Wed Nov 19 01:57:06 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; 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; dmarc=pass(p=quarantine dis=none) header.from=suse.com ARC-Seal: i=1; a=rsa-sha256; t=1763032235; cv=none; d=zohomail.com; s=zohoarc; b=V4Fr0biQkAtPgST8buKYcMJQt0LMYt4W4hB36sN9VANB49R5DsO1YVM+SFdLT1XxxHenGpYVUKKTKs2BmAiLaVetstGQuR+DFbs2zxp1oh2d8lvuiT3qQ2ur2UF/wim+bQceLhNltOkkdmMu//zV7V3G4kUa3gqebhSJ+T7USK8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1763032235; h=Content-Type: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=L0v3DkxT0rMrBP+phTdGWD9D4HrfyHtMTjxGYVRGi64=; b=dlRNRobLc7eeIjD6jHK8eLU6y5+SBLQLWumZN5dEc2Iu5f2gTeYCl4guYjgiG83huO1+4+jvCvpDW5D9wGUFafopbDp7+DAy68HfK2CpckyzRxpfiXTpCnfW56SsG8nzPMCNUNUbFwdmNuLxZFAkDxlWnrpzNiY51qc3IwnmfNA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1763032235639233.76131357146835; Thu, 13 Nov 2025 03:10:35 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.1161008.1489030 (Exim 4.92) (envelope-from ) id 1vJVDY-0008Tv-0U; Thu, 13 Nov 2025 11:10:20 +0000 Received: by outflank-mailman (output) from mailman id 1161008.1489030; Thu, 13 Nov 2025 11:10:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1vJVDX-0008Tm-SA; Thu, 13 Nov 2025 11:10:19 +0000 Received: by outflank-mailman (input) for mailman id 1161008; Thu, 13 Nov 2025 11:10:18 +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 1vJVDW-00071B-Po for xen-devel@lists.xenproject.org; Thu, 13 Nov 2025 11:10:18 +0000 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [2a00:1450:4864:20::629]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 565afd64-c081-11f0-9d18-b5c5bf9af7f9; Thu, 13 Nov 2025 12:10:18 +0100 (CET) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-b472842981fso81494066b.1 for ; Thu, 13 Nov 2025 03:10:18 -0800 (PST) Received: from [10.156.60.236] (ip-037-024-206-209.um08.pools.vodafone-ip.de. [37.24.206.209]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-b734fed80f0sm138517166b.66.2025.11.13.03.10.16 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 13 Nov 2025 03:10:17 -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: 565afd64-c081-11f0-9d18-b5c5bf9af7f9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1763032218; x=1763637018; darn=lists.xenproject.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=L0v3DkxT0rMrBP+phTdGWD9D4HrfyHtMTjxGYVRGi64=; b=azkMXHmthTNSE0JtAmQvjX/gZCm1wHvtfeJRgrPvz8Q/BAE5/vOuZhDOxRxXyPH3aA ONQ4ri0B+AZSsJadrxewwEqHGW7bHQq+Zsls9XI4U2d8HuI650JHGS+2SRVpUG1zP4B7 yAk0nmuapOidv+owkDWda8DSRve2v3+mtfN04NHKftUG8J5o3Z0j6ikxV6bsKWMWinXR AImuyGpSFVFgJIQPA+XYyG3k1QdvxeNBZ23lfpCgZkmSa12Lcga4+FKt9Q5BU5uo2O+c p2oojfhlcf/UZR5Qt3tgrOZ40vhC7K8JE7p853IJBf0y7wbrm+uMaUlR2N9iiJ+lmqUT DCEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763032218; x=1763637018; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :references:cc:to:from:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=L0v3DkxT0rMrBP+phTdGWD9D4HrfyHtMTjxGYVRGi64=; b=iRA96084bRMM3tCUVYV0bQRsbc+ErRZ4R/2WIcyXDfz1Rzk5bnTIvda15C4BbQNnyL a0zDpPN2MrEs4tcuj0HwGBYOY3EYBBCstm1sMHAscvPDbemhtiDExb8gI0ZVX3mjVh2j ywquzyoh4KIC/NTNloWoemn3VbZxP/nbDae7QFG3vAOcDMZgIXTDZxvaPsp/OKiU2Je1 6GYgi4xkOftDz8UCeQSZ2VIxTjnH3J9ux5PHc8SQXO9YqPD4FcrgilOQZaUBMECvrODU 5HB3e8J6oh7zjGljAJMdVnsvu9XWQlSoWSSB1Vi5i99CPtBe1HwcRdpmnP28GeTDa+M+ iF5w== X-Gm-Message-State: AOJu0Yxw8rdoAu20S0DO5bWJXeqkFCpEwV3cz8IrJij3r/O/5E/jHhD2 o650xibp3oec97NkBz/SnLLrFGWYrTah7CEzDGsluHwaShf1qGR3TnHlSRbaQp9baS7O0s53CjE 8pdY= X-Gm-Gg: ASbGncs///Am+kRKPw6rF6KAi+hNpH5rl4oNZysyg3NIFnaGw9WLVUX5UVCFe/4RTJq J7XXZFqa/zTMmHWY59a2I/Vs2+PlH1JRJv3DtY72oU6SsxIYkjifzBDaqijHFHsyTLn1lsXBZcX mPov2WTS0jkJUcadlMh1MZslOz6a8+hl4Tc6pDFntp1L3suLnxKSiv9dGXyziLmJWBr4+EZrALg TplGZl4q0FoJpM6Lez7q2lqIjr31aNU2uSQGJDfonDyAEpfRpnw2R4iP3GPBCEumXhy9frTFhBN 4jh40SryS4yYQAgthqEhu+iuuQrkCNN/toiaqA69B58ph42JHlV1FPP2vDuuFMNlLqnM17+Jsdu y1sA4+cS0tnP+glYA8Drpl/oO3EpjW1R0RT+KA8/N/aucpqttD7YIvDfzJiwkMAI4IRxHSfO25r TRmpv7ts4pJgTIUv/R1tdRwSRS64TJLwLqrtMJbogNFGey979hy9xJqvn5kuUQNYJTMfzfPxO7p dY= X-Google-Smtp-Source: AGHT+IFYExKU88g8Yz6PKEyLXWcACOU6b/Klwd/BLxiJMRvN18WS/41F60lg5t9Fl3F8UF/+Q81JaA== X-Received: by 2002:a17:907:2d06:b0:b72:a40e:d10 with SMTP id a640c23a62f3a-b7331a6b9e5mr691249866b.40.1763032217422; Thu, 13 Nov 2025 03:10:17 -0800 (PST) Message-ID: Date: Thu, 13 Nov 2025 12:10:16 +0100 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: [PATCH 3/3] xhci-dbc: use brk_alloc() From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Andrew Cooper , Julien Grall , Stefano Stabellini , Anthony PERARD , Michal Orzel , =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Marek Marczykowski References: Content-Language: en-US Autocrypt: addr=jbeulich@suse.com; keydata= xsDiBFk3nEQRBADAEaSw6zC/EJkiwGPXbWtPxl2xCdSoeepS07jW8UgcHNurfHvUzogEq5xk hu507c3BarVjyWCJOylMNR98Yd8VqD9UfmX0Hb8/BrA+Hl6/DB/eqGptrf4BSRwcZQM32aZK 7Pj2XbGWIUrZrd70x1eAP9QE3P79Y2oLrsCgbZJfEwCgvz9JjGmQqQkRiTVzlZVCJYcyGGsD /0tbFCzD2h20ahe8rC1gbb3K3qk+LpBtvjBu1RY9drYk0NymiGbJWZgab6t1jM7sk2vuf0Py O9Hf9XBmK0uE9IgMaiCpc32XV9oASz6UJebwkX+zF2jG5I1BfnO9g7KlotcA/v5ClMjgo6Gl MDY4HxoSRu3i1cqqSDtVlt+AOVBJBACrZcnHAUSuCXBPy0jOlBhxPqRWv6ND4c9PH1xjQ3NP nxJuMBS8rnNg22uyfAgmBKNLpLgAGVRMZGaGoJObGf72s6TeIqKJo/LtggAS9qAUiuKVnygo 3wjfkS9A3DRO+SpU7JqWdsveeIQyeyEJ/8PTowmSQLakF+3fote9ybzd880fSmFuIEJldWxp Y2ggPGpiZXVsaWNoQHN1c2UuY29tPsJgBBMRAgAgBQJZN5xEAhsDBgsJCAcDAgQVAggDBBYC AwECHgECF4AACgkQoDSui/t3IH4J+wCfQ5jHdEjCRHj23O/5ttg9r9OIruwAn3103WUITZee e7Sbg12UgcQ5lv7SzsFNBFk3nEQQCACCuTjCjFOUdi5Nm244F+78kLghRcin/awv+IrTcIWF hUpSs1Y91iQQ7KItirz5uwCPlwejSJDQJLIS+QtJHaXDXeV6NI0Uef1hP20+y8qydDiVkv6l IreXjTb7DvksRgJNvCkWtYnlS3mYvQ9NzS9PhyALWbXnH6sIJd2O9lKS1Mrfq+y0IXCP10eS FFGg+Av3IQeFatkJAyju0PPthyTqxSI4lZYuJVPknzgaeuJv/2NccrPvmeDg6Coe7ZIeQ8Yj t0ARxu2xytAkkLCel1Lz1WLmwLstV30g80nkgZf/wr+/BXJW/oIvRlonUkxv+IbBM3dX2OV8 AmRv1ySWPTP7AAMFB/9PQK/VtlNUJvg8GXj9ootzrteGfVZVVT4XBJkfwBcpC/XcPzldjv+3 HYudvpdNK3lLujXeA5fLOH+Z/G9WBc5pFVSMocI71I8bT8lIAzreg0WvkWg5V2WZsUMlnDL9 mpwIGFhlbM3gfDMs7MPMu8YQRFVdUvtSpaAs8OFfGQ0ia3LGZcjA6Ik2+xcqscEJzNH+qh8V m5jjp28yZgaqTaRbg3M/+MTbMpicpZuqF4rnB0AQD12/3BNWDR6bmh+EkYSMcEIpQmBM51qM EKYTQGybRCjpnKHGOxG0rfFY1085mBDZCH5Kx0cl0HVJuQKC+dV2ZY5AqjcKwAxpE75MLFkr wkkEGBECAAkFAlk3nEQCGwwACgkQoDSui/t3IH7nnwCfcJWUDUFKdCsBH/E5d+0ZnMQi+G0A nAuWpQkjM1ASeQwSHEeAWPgskBQL In-Reply-To: Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @suse.com) X-ZM-MESSAGEID: 1763032236462153000 Content-Type: text/plain; charset="utf-8" This way the relatively large chunk of DMA buffers can be freed when the driver isn't in use. Signed-off-by: Jan Beulich Reviewed-by: Marek Marczykowski-G=C3=B3recki --- a/xen/drivers/char/xhci-dbc.c +++ b/xen/drivers/char/xhci-dbc.c @@ -27,6 +27,8 @@ #include #include #include + +#include #include #include #include @@ -1321,7 +1323,7 @@ static struct uart_driver dbc_uart_drive }; =20 /* Those are accessed via DMA. */ -struct dbc_dma_bufs { +struct __aligned(PAGE_SIZE) dbc_dma_bufs { struct xhci_trb evt_trb[DBC_TRB_RING_CAP]; struct xhci_trb out_trb[DBC_TRB_RING_CAP]; struct xhci_trb in_trb[DBC_TRB_RING_CAP]; @@ -1335,8 +1337,7 @@ struct dbc_dma_bufs { * DMA-reachable by the USB controller. */ }; -static struct dbc_dma_bufs __section(".bss.page_aligned") __aligned(PAGE_S= IZE) - dbc_dma_bufs; +DEFINE_BRK(xhci, sizeof(struct dbc_dma_bufs)); =20 static int __init cf_check xhci_parse_dbgp(const char *opt_dbgp) { @@ -1413,24 +1414,33 @@ void __init xhci_dbc_uart_init(void) { struct dbc_uart *uart =3D &dbc_uart; struct dbc *dbc =3D &uart->dbc; + struct dbc_dma_bufs *dma_bufs; =20 if ( !dbc->enable ) return; =20 - dbc->dbc_ctx =3D &dbc_dma_bufs.ctx; - dbc->dbc_erst =3D &dbc_dma_bufs.erst; - dbc->dbc_ering.trb =3D dbc_dma_bufs.evt_trb; - dbc->dbc_oring.trb =3D dbc_dma_bufs.out_trb; - dbc->dbc_iring.trb =3D dbc_dma_bufs.in_trb; - dbc->dbc_owork.buf =3D dbc_dma_bufs.out_wrk_buf; - dbc->dbc_iwork.buf =3D dbc_dma_bufs.in_wrk_buf; - dbc->dbc_str =3D dbc_dma_bufs.str_buf; + dma_bufs =3D brk_alloc(sizeof(*dma_bufs)); + if ( !dma_bufs ) + { + dbc->enable =3D false; + printk(XENLOG_ERR "XHCI: not enough BRK space available\n"); + return; + } + + dbc->dbc_ctx =3D &dma_bufs->ctx; + dbc->dbc_erst =3D &dma_bufs->erst; + dbc->dbc_ering.trb =3D dma_bufs->evt_trb; + dbc->dbc_oring.trb =3D dma_bufs->out_trb; + dbc->dbc_iring.trb =3D dma_bufs->in_trb; + dbc->dbc_owork.buf =3D dma_bufs->out_wrk_buf; + dbc->dbc_iwork.buf =3D dma_bufs->in_wrk_buf; + dbc->dbc_str =3D dma_bufs->str_buf; =20 if ( dbc_open(dbc) ) { iommu_add_extra_reserved_device_memory( - PFN_DOWN(virt_to_maddr(&dbc_dma_bufs)), - PFN_UP(sizeof(dbc_dma_bufs)), + PFN_DOWN(virt_to_maddr(dma_bufs)), + PFN_DOWN(sizeof(*dma_bufs)), uart->dbc.sbdf, "XHCI console"); serial_register_uart(SERHND_XHCI, &dbc_uart_driver, &dbc_uart);