From nobody Sat Dec 28 19:52:03 2024 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=1735232312; cv=pass; d=zohomail.com; s=zohoarc; b=KQTBUGJJyP/1EkRkFesyKtW6xY4zAqVKgMoWXcm6FPPjF4WGjxPgz60eE7o2pF/swv62eopRvY1VUB2KBErzifJJGmoDAZo+vtNDAZKuJyYY7YTF/LOLm9nCLtK5sQiUe3Y6QE2BhlHVCRgkhGfB1ySqJBbpwrlgXvD6kSwzueI= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735232312; 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=fG1DwHOuY1y8Qw7V1e8eHce6xg4PlNOOzNk4YL76snY=; b=T6fFWeu4G5W0u39b8CCVApWYC3KZadlb3zIY0VrezdFjHbBAePkpw6OHz5zKq8SqWG1q48Fy8A4Gk4k7RTOV2pb/S//FD40EkQCcqDigxo0x7DdtIe6ScdXQ2NASM7fgrqHGaZ0fSUxCKjedUNLvTuxhtTVARkyAvvgsDrMJocs= 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 1735232312102394.6900344280517; Thu, 26 Dec 2024 08:58:32 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.863245.1274676 (Exim 4.92) (envelope-from ) id 1tQrBl-00039X-62; Thu, 26 Dec 2024 16:58:21 +0000 Received: by outflank-mailman (output) from mailman id 863245.1274676; Thu, 26 Dec 2024 16:58:21 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tQrBl-00039K-3C; Thu, 26 Dec 2024 16:58:21 +0000 Received: by outflank-mailman (input) for mailman id 863245; Thu, 26 Dec 2024 16:58:19 +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 1tQrBj-00026T-AB for xen-devel@lists.xenproject.org; Thu, 26 Dec 2024 16:58:19 +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 9a53d519-c3aa-11ef-a0da-8be0dac302b0; Thu, 26 Dec 2024 17:58:18 +0100 (CET) Received: by mx.zohomail.com with SMTPS id 1735232273654381.53674337156747; Thu, 26 Dec 2024 08:57:53 -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: 9a53d519-c3aa-11ef-a0da-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; t=1735232276; cv=none; d=zohomail.com; s=zohoarc; b=UqsHOLVe0cuGQXX8CRglyebO2vkr0qM81gyNDvroZvGJAhAbpnl9HB2xtS1Gr3Tw2DOwRzFA2MGIUa3H9/nUutGmUQQ1Nu9FTffwlowtu8iqFTQrwhgiJq+A/RGmbt9mungBVp3gM8yCzPtemZjJNaEjcfGf4gujxRjQ9nVO3Wo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1735232276; 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=fG1DwHOuY1y8Qw7V1e8eHce6xg4PlNOOzNk4YL76snY=; b=cq6IaJCpcBseYLliQ/itw048FRybGhXj8IoV/Z7Jz0AZR9O9BaORPKRtob4pkIqEAoWnJ+28a4t8U/gkW5Nqm/M4FdKh/RPRFy+dAmWoub4e4hhEclRjHTRbSBBlP1jrjGGxfY7lGB4SuTQcRjlEBVDqMpGgN07MJXa3ZOR4/1M= 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=1735232276; 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=fG1DwHOuY1y8Qw7V1e8eHce6xg4PlNOOzNk4YL76snY=; b=bZi0Q7nPT4qm7Ep7EOvW44uuj9xjEN8bb/YxnbLSzSVMcbUedatZcvWh7ZYp2GL2 uvKzw94t4Rd4LLQzFngAanRxOmVAcLJrT9rdWbULsldZHFXROBUFaoWk/eCkTS/xKnR gA+ty1z302carQqk8muwzpng78NnfWgFj3YqrxRA= 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 v2 03/15] x86/boot: add cmdline to struct boot_domain Date: Thu, 26 Dec 2024 11:57:28 -0500 Message-Id: <20241226165740.29812-4-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241226165740.29812-1-dpsmith@apertussolutions.com> References: <20241226165740.29812-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: 1735232312832116600 Content-Type: text/plain; charset="utf-8" Add a container for the "cooked" command line for a domain. This provides f= or the backing memory to be directly associated with the domain being construc= ted. This is done in anticipation that the domain construction path may need to = be invoked multiple times, thus ensuring each instance had a distinct memory allocation. Signed-off-by: Daniel P. Smith --- Changes since dom0 device tree v1: - switched over to bd->cmdline in pvh_load_kernel - moved cmdline processing under if, eliminating goto - zero-ed cmdline_pa for kernel module after cmdline processing Changes since v9 boot modules: - convert pvh_load_kernel to boot domain to directly use cmdline - adjustments to domain_cmdline_size - remove ASSERT and return 0 instead - use strlen() of values instead of hardcoded sizes - update cmdline parsing check to inspect multiboot string and not just poi= nter - add goto to skip cmdline processing if domain_cmdline_size returns 0 - drop updating cmdline_pa with dynamic buffer with change of its last cons= umer pvh_load_kernel Changes since v8: - switch to a dynamically allocated buffer - dropped local cmdline var in pv dom0_construct() Changes since v7: - updated commit message to expand on intent and purpose --- xen/arch/x86/hvm/dom0_build.c | 14 ++--- xen/arch/x86/include/asm/bootdomain.h | 2 + xen/arch/x86/pv/dom0_build.c | 4 +- xen/arch/x86/setup.c | 78 +++++++++++++++++++-------- 4 files changed, 66 insertions(+), 32 deletions(-) diff --git a/xen/arch/x86/hvm/dom0_build.c b/xen/arch/x86/hvm/dom0_build.c index cbc365d678d2..47bc3e9ce858 100644 --- a/xen/arch/x86/hvm/dom0_build.c +++ b/xen/arch/x86/hvm/dom0_build.c @@ -653,7 +653,6 @@ static int __init pvh_load_kernel( void *image_start =3D image_base + image->headroom; unsigned long image_len =3D image->size; unsigned long initrd_len =3D initrd ? initrd->size : 0; - const char *cmdline =3D image->cmdline_pa ? __va(image->cmdline_pa) : = NULL; struct elf_binary elf; struct elf_dom_parms parms; paddr_t last_addr; @@ -717,9 +716,9 @@ static int __init pvh_load_kernel( (initrd ? ROUNDUP(initrd_len, PAGE_SIZE) + sizeof(mod) : 0) + - (cmdline ? ROUNDUP(strlen(cmdline) + 1, - elf_64bit(&elf) ? 8 : 4) - : 0)); + (bd->cmdline ? ROUNDUP(strlen(bd->cmdline) + 1, + elf_64bit(&elf) ? 8 : 4) + : 0)); if ( last_addr =3D=3D INVALID_PADDR ) { printk("Unable to find a memory region to load initrd and metadata= \n"); @@ -759,9 +758,10 @@ static int __init pvh_load_kernel( /* Free temporary buffers. */ free_boot_modules(); =20 - if ( cmdline !=3D NULL ) + if ( bd->cmdline !=3D NULL ) { - rc =3D hvm_copy_to_guest_phys(last_addr, cmdline, strlen(cmdline) = + 1, v); + rc =3D hvm_copy_to_guest_phys( + last_addr, bd->cmdline, strlen(bd->cmdline) + 1, v); if ( rc ) { printk("Unable to copy guest command line\n"); @@ -772,7 +772,7 @@ static int __init pvh_load_kernel( * Round up to 32/64 bits (depending on the guest kernel bitness) = so * the modlist/start_info is aligned. */ - last_addr +=3D ROUNDUP(strlen(cmdline) + 1, elf_64bit(&elf) ? 8 : = 4); + last_addr +=3D ROUNDUP(strlen(bd->cmdline) + 1, elf_64bit(&elf) ? = 8 : 4); } if ( initrd !=3D NULL ) { diff --git a/xen/arch/x86/include/asm/bootdomain.h b/xen/arch/x86/include/a= sm/bootdomain.h index 67be575fe781..101a0c643d74 100644 --- a/xen/arch/x86/include/asm/bootdomain.h +++ b/xen/arch/x86/include/asm/bootdomain.h @@ -11,6 +11,8 @@ #define __XEN_X86_BOOTDOMAIN_H__ =20 struct boot_domain { + const char *cmdline; + domid_t domid; =20 struct boot_module *kernel; diff --git a/xen/arch/x86/pv/dom0_build.c b/xen/arch/x86/pv/dom0_build.c index e0709a1c1a7a..580f2703a154 100644 --- a/xen/arch/x86/pv/dom0_build.c +++ b/xen/arch/x86/pv/dom0_build.c @@ -972,8 +972,8 @@ static int __init dom0_construct(struct boot_domain *bd) } =20 memset(si->cmd_line, 0, sizeof(si->cmd_line)); - if ( image->cmdline_pa ) - strlcpy((char *)si->cmd_line, __va(image->cmdline_pa), sizeof(si->= cmd_line)); + if ( bd->cmdline ) + strlcpy((char *)si->cmd_line, bd->cmdline, sizeof(si->cmd_line)); =20 #ifdef CONFIG_VIDEO if ( !pv_shim && fill_console_start_info((void *)(si + 1)) ) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 27937a7f7aeb..a61131365477 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -975,10 +975,29 @@ static unsigned int __init copy_bios_e820(struct e820= entry *map, unsigned int li return n; } =20 -static struct domain *__init create_dom0(struct boot_info *bi) +static size_t __init domain_cmdline_size( + struct boot_info *bi, struct boot_domain *bd) { - static char __initdata cmdline[MAX_GUEST_CMDLINE]; + size_t s =3D bi->kextra ? strlen(bi->kextra) : 0; + + s +=3D bd->kernel->cmdline_pa ? strlen(__va(bd->kernel->cmdline_pa)) := 0; + + if ( s =3D=3D 0 ) + return s; + + /* + * Certain parameters from the Xen command line may be added to the do= m0 + * command line. Add additional space for the possible cases along wit= h one + * extra char to hold \0. + */ + s +=3D strlen(" noapic") + strlen(" acpi=3D") + sizeof(acpi_param) + 1; =20 + return s; +} + +static struct domain *__init create_dom0(struct boot_info *bi) +{ + char *cmdline =3D NULL; struct xen_domctl_createdomain dom0_cfg =3D { .flags =3D IS_ENABLED(CONFIG_TBOOT) ? XEN_DOMCTL_CDF_s3_integrity = : 0, .max_evtchn_port =3D -1, @@ -1018,39 +1037,52 @@ static struct domain *__init create_dom0(struct boo= t_info *bi) panic("Error creating d%uv0\n", bd->domid); =20 /* Grab the DOM0 command line. */ - if ( bd->kernel->cmdline_pa || bi->kextra ) + if ( (bd->kernel->cmdline_pa && + ((char *)__va(bd->kernel->cmdline_pa))[0]) || + bi->kextra ) { - if ( bd->kernel->cmdline_pa ) - safe_strcpy(cmdline, - cmdline_cook(__va(bd->kernel->cmdline_pa), bi->loa= der)); + size_t cmdline_size =3D domain_cmdline_size(bi, bd); + + if ( cmdline_size ) + { + if ( !(cmdline =3D xzalloc_array(char, cmdline_size)) ) + panic("Error allocating cmdline buffer for %pd\n", d); =20 - if ( bi->kextra ) - /* kextra always includes exactly one leading space. */ - safe_strcat(cmdline, bi->kextra); + if ( bd->kernel->cmdline_pa ) + strlcpy(cmdline, + cmdline_cook(__va(bd->kernel->cmdline_pa), bi->loa= der), + cmdline_size); =20 - /* Append any extra parameters. */ - if ( skip_ioapic_setup && !strstr(cmdline, "noapic") ) - safe_strcat(cmdline, " noapic"); + if ( bi->kextra ) + /* kextra always includes exactly one leading space. */ + strlcat(cmdline, bi->kextra, cmdline_size); =20 - if ( (strlen(acpi_param) =3D=3D 0) && acpi_disabled ) - { - printk("ACPI is disabled, notifying Domain 0 (acpi=3Doff)\n"); - safe_strcpy(acpi_param, "off"); - } + /* Append any extra parameters. */ + if ( skip_ioapic_setup && !strstr(cmdline, "noapic") ) + strlcat(cmdline, " noapic", cmdline_size); =20 - if ( (strlen(acpi_param) !=3D 0) && !strstr(cmdline, "acpi=3D") ) - { - safe_strcat(cmdline, " acpi=3D"); - safe_strcat(cmdline, acpi_param); - } + if ( (strlen(acpi_param) =3D=3D 0) && acpi_disabled ) + { + printk("ACPI is disabled, notifying Domain 0 (acpi=3Doff)\= n"); + safe_strcpy(acpi_param, "off"); + } =20 - bd->kernel->cmdline_pa =3D __pa(cmdline); + if ( (strlen(acpi_param) !=3D 0) && !strstr(cmdline, "acpi=3D"= ) ) + { + strlcat(cmdline, " acpi=3D", cmdline_size); + strlcat(cmdline, acpi_param, cmdline_size); + } + bd->kernel->cmdline_pa =3D 0; + bd->cmdline =3D cmdline; + } } =20 bd->d =3D d; if ( construct_dom0(bd) !=3D 0 ) panic("Could not construct domain 0\n"); =20 + xfree(cmdline); + return d; } =20 --=20 2.30.2