From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409726840824.8224291124113; Thu, 21 Jul 2022 06:22:06 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372752.604689 (Exim 4.92) (envelope-from ) id 1oEW7Y-0001zk-Mx; Thu, 21 Jul 2022 13:21:40 +0000 Received: by outflank-mailman (output) from mailman id 372752.604689; Thu, 21 Jul 2022 13:21:40 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7Y-0001zb-Jq; Thu, 21 Jul 2022 13:21:40 +0000 Received: by outflank-mailman (input) for mailman id 372752; Thu, 21 Jul 2022 13:21:38 +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 1oEW7W-0001je-BN for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:38 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id 0c2d2859-08f8-11ed-924f-1f966e50362f; Thu, 21 Jul 2022 15:21:37 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D567713D5; Thu, 21 Jul 2022 06:21:36 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 223733F73D; Thu, 21 Jul 2022 06:21:33 -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: 0c2d2859-08f8-11ed-924f-1f966e50362f From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH v6 1/9] xen/arm: introduce static shared memory Date: Thu, 21 Jul 2022 21:21:07 +0800 Message-Id: <20220721132115.3015761-2-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409728947100001 Content-Type: text/plain; charset="utf-8" From: Penny Zheng This patch series introduces a new feature: setting up static shared memory on a dom0less system, through device tree configuration. This commit parses shared memory node at boot-time, and reserve it in bootinfo.reserved_mem to avoid other use. This commits proposes a new Kconfig CONFIG_STATIC_SHM to wrap static-shm-related codes, and this option depends on static memory( CONFIG_STATIC_MEMORY). That's because that later we want to reuse a few helpers, guarded with CONFIG_STATIC_MEMORY, like acquire_staticmem_pages, e= tc, on static shared memory. Signed-off-by: Penny Zheng --- v6 change: - when host physical address is ommited, output the error message since xen doesn't support it at the moment - add the following check: 1) The shm ID matches and the region exactly mat= ch 2) The shm ID doesn't match and the region doesn't overlap - change it to "unsigned int" to be aligned with nr_banks - check the len of the property to confirm is it big enough to contain "paddr", "size", and "gaddr" - shm_id defined before nr_shm_domain, so we could re-use the existing hole= and avoid increasing the size of the structure. - change "nr_shm_domain" to "nr_shm_borrowers", to not increment if the role is owner in parsing code - make "xen,shm_id" property as arbitrary string, with a strict limit on the number of characters, MAX_SHM_ID_LENGTH --- v5 change: - no change --- v4 change: - nit fix on doc --- v3 change: - make nr_shm_domain unsigned int --- v2 change: - document refinement - remove bitmap and use the iteration to check - add a new field nr_shm_domain to keep the number of shared domain --- docs/misc/arm/device-tree/booting.txt | 124 ++++++++++++++++++++ xen/arch/arm/Kconfig | 6 + xen/arch/arm/bootfdt.c | 157 ++++++++++++++++++++++++++ xen/arch/arm/include/asm/setup.h | 9 ++ 4 files changed, 296 insertions(+) diff --git a/docs/misc/arm/device-tree/booting.txt b/docs/misc/arm/device-t= ree/booting.txt index 98253414b8..8013fb98fe 100644 --- a/docs/misc/arm/device-tree/booting.txt +++ b/docs/misc/arm/device-tree/booting.txt @@ -378,3 +378,127 @@ device-tree: =20 This will reserve a 512MB region starting at the host physical address 0x30000000 to be exclusively used by DomU1. + +Static Shared Memory +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D + +The static shared memory device tree nodes allow users to statically set up +shared memory on dom0less system, enabling domains to do shm-based +communication. + +- compatible + + "xen,domain-shared-memory-v1" + +- xen,shm-id + + An arbitrary string that represents the unique identifier of the shared + memory region, with a strict limit on the number of characters(\0 incl= uded), + `MAX_SHM_ID_LENGTH(16)`. e.g. "xen,shm-id =3D "my-shared-mem-1"". + +- xen,shared-mem + + An array takes a physical address, which is the base address of the + shared memory region in host physical address space, a size, and a gue= st + physical address, as the target address of the mapping. + e.g. xen,shared-mem =3D < [host physical address] [size] [guest addres= s] > + + The number of cells for the host address (and size) is the same as the + guest pseudo-physical address and they are inherited from the parent n= ode. + + +- role (Optional) + + A string property specifying the ownership of a shared memory region, + the value must be one of the following: "owner", or "borrower" + A shared memory region could be explicitly backed by one domain, which= is + called "owner domain", and all the other domains who are also sharing + this region are called "borrower domain". + If not specified, the default value is "borrower" and owner is + DOMID_IO, a system domain. + +As an example: + +chosen { + #address-cells =3D <0x1>; + #size-cells =3D <0x1>; + xen,xen-bootargs =3D "console=3Ddtuart dtuart=3Dserial0 bootscrub=3D0"; + + ...... + + /* this is for Dom0 */ + dom0-shared-mem@10000000 { + compatible =3D "xen,domain-shared-memory-v1"; + role =3D "owner"; + xen,shm-id =3D "my-shared-mem-0"; + xen,shared-mem =3D <0x10000000 0x10000000 0x10000000>; + } + + domU1 { + compatible =3D "xen,domain"; + #address-cells =3D <0x1>; + #size-cells =3D <0x1>; + memory =3D <0 131072>; + cpus =3D <2>; + vpl011; + + /* + * shared memory region identified as 0x0(xen,shm-id =3D <0x0>) + * is shared between Dom0 and DomU1. + */ + domU1-shared-mem@10000000 { + compatible =3D "xen,domain-shared-memory-v1"; + role =3D "borrower"; + xen,shm-id =3D "my-shared-mem-0"; + xen,shared-mem =3D <0x10000000 0x10000000 0x50000000>; + } + + /* + * shared memory region identified as 0x1(xen,shm-id =3D <0x1>) + * is shared between DomU1 and DomU2. + */ + domU1-shared-mem@50000000 { + compatible =3D "xen,domain-shared-memory-v1"; + xen,shm-id =3D "my-shared-mem-1"; + xen,shared-mem =3D <0x50000000 0x20000000 0x60000000>; + } + + ...... + + }; + + domU2 { + compatible =3D "xen,domain"; + #address-cells =3D <0x1>; + #size-cells =3D <0x1>; + memory =3D <0 65536>; + cpus =3D <1>; + + /* + * shared memory region identified as 0x1(xen,shm-id =3D <0x1>) + * is shared between domU1 and domU2. + */ + domU2-shared-mem@50000000 { + compatible =3D "xen,domain-shared-memory-v1"; + xen,shm-id =3D "my-shared-mem-1"; + xen,shared-mem =3D <0x50000000 0x20000000 0x70000000>; + } + + ...... + }; +}; + +This is an example with two static shared memory regions. + +For the static shared memory region identified as "my-shared-mem-0", host +physical address starting at 0x10000000 of 256MB will be reserved to be +shared between Dom0 and DomU1. It will get mapped at 0x10000000 in Dom0 gu= est +physical address space, and at 0x50000000 in DomU1 guest physical address = space. +Dom0 is explicitly defined as the owner domain, and DomU1 is the borrower = domain. + +For the static shared memory region identified as "my-shared-mem-1", host +physical address starting at 0x50000000 of 512MB will be reserved to be +shared between DomU1 and DomU2. It will get mapped at 0x60000000 in DomU1 = guest +physical address space, and at 0x70000000 in DomU2 guest physical address = space. +DomU1 and DomU2 are both the borrower domain, the owner domain is the defa= ult +owner domain DOMID_IO. diff --git a/xen/arch/arm/Kconfig b/xen/arch/arm/Kconfig index be9eff0141..7321f47c0f 100644 --- a/xen/arch/arm/Kconfig +++ b/xen/arch/arm/Kconfig @@ -139,6 +139,12 @@ config TEE =20 source "arch/arm/tee/Kconfig" =20 +config STATIC_SHM + bool "Statically shared memory on a dom0less system" if UNSUPPORTED + depends on STATIC_MEMORY + help + This option enables statically shared memory on a dom0less system. + endmenu =20 menu "ARM errata workaround via the alternative framework" diff --git a/xen/arch/arm/bootfdt.c b/xen/arch/arm/bootfdt.c index ec81a45de9..c62d8867ec 100644 --- a/xen/arch/arm/bootfdt.c +++ b/xen/arch/arm/bootfdt.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include #include @@ -361,6 +362,158 @@ static int __init process_domain_node(const void *fdt= , int node, size_cells, &bootinfo.reserved_mem, tru= e); } =20 +#ifdef CONFIG_STATIC_SHM +static int __init process_shm_node(const void *fdt, int node, + u32 address_cells, u32 size_cells) +{ + const struct fdt_property *prop, *prop_id, *prop_role; + const __be32 *cell; + paddr_t paddr, size; + struct meminfo *mem =3D &bootinfo.reserved_mem; + unsigned int i; + int len; + bool owner =3D false; + const char *shm_id; + + if ( address_cells < 1 || size_cells < 1 ) + { + printk("fdt: invalid #address-cells or #size-cells for static shar= ed memory node.\n"); + return -EINVAL; + } + + /* + * "xen,shm-id" property holds an arbitrary string with a strict limit + * on the number of characters, MAX_SHM_ID_LENGTH + */ + prop_id =3D fdt_get_property(fdt, node, "xen,shm-id", NULL); + if ( !prop_id ) + return -ENOENT; + shm_id =3D (const char *)prop_id->data; + if ( strnlen(shm_id, MAX_SHM_ID_LENGTH) =3D=3D MAX_SHM_ID_LENGTH ) + { + printk("fdt: invalid xen,shm-id %s, it must be limited to %d chara= cters\n", + shm_id, MAX_SHM_ID_LENGTH); + return -EINVAL; + } + + /* + * "role" property is optional and if it is defined explicitly, + * it must be either `owner` or `borrower`. + */ + prop_role =3D fdt_get_property(fdt, node, "role", NULL); + if ( prop_role ) + { + if ( !strcmp(prop_role->data, "owner") ) + owner =3D true; + else if ( strcmp(prop_role->data, "borrower") ) + { + printk("fdt: invalid `role` property for static shared memory = node.\n"); + return -EINVAL; + } + } + + /* + * xen,shared-mem =3D ; + * Memory region starting from physical address #paddr of #size shall + * be mapped to guest physical address #gaddr as static shared memory + * region. + */ + prop =3D fdt_get_property(fdt, node, "xen,shared-mem", &len); + if ( !prop ) + return -ENOENT; + + if ( len !=3D dt_cells_to_size(address_cells + size_cells + address_ce= lls) ) + { + /* TODO: physical address is optional. */ + if ( len =3D=3D dt_cells_to_size(size_cells + address_cells) ) + printk("fdt: host physical address must be chosen by users at = the moment.\n"); + + printk("fdt: invalid `xen,shared-mem` property.\n"); + return -EINVAL; + } + + cell =3D (const __be32 *)prop->data; + device_tree_get_reg(&cell, address_cells, size_cells, &paddr, &size); + + if ( !size ) + { + printk("fdt: the size for static shared memory region can not be z= ero\n"); + return -EINVAL; + } + + for ( i =3D 0; i < mem->nr_banks; i++ ) + { + /* + * Meet the following check: + * 1) The shm ID matches and the region exactly match + * 2) The shm ID doesn't match and the region doesn't overlap + * with an existing one + */ + if ( paddr =3D=3D mem->bank[i].start && size =3D=3D mem->bank[i].s= ize ) + { + if ( strncmp(shm_id, mem->bank[i].shm_id, MAX_SHM_ID_LENGTH) = =3D=3D 0 ) + break; + else + { + printk("fdt: xen,shm-id %s does not match for all the node= s using the same region.\n", + shm_id); + return -EINVAL; + } + } + else + { + paddr_t end =3D paddr + size; + paddr_t bank_end =3D mem->bank[i].start + mem->bank[i].size; + + if ( (end <=3D mem->bank[i].start) || (paddr >=3D bank_end) ) + { + if ( strncmp(shm_id, mem->bank[i].shm_id, + MAX_SHM_ID_LENGTH) !=3D 0 ) + continue; + else + { + printk("fdt: different shared memory region could not = share the same shm ID %s\n", + shm_id); + return -EINVAL; + } + } + else + { + printk("fdt: shared memory region overlap with an existing= entry %#"PRIpaddr" - %#"PRIpaddr"\n", + mem->bank[i].start, bank_end); + return -EINVAL; + } + } + } + + if ( i =3D=3D mem->nr_banks ) + { + if ( i < NR_MEM_BANKS ) + { + /* Static shared memory shall be reserved from any other use. = */ + safe_strcpy(mem->bank[mem->nr_banks].shm_id, shm_id); + mem->bank[mem->nr_banks].start =3D paddr; + mem->bank[mem->nr_banks].size =3D size; + mem->bank[mem->nr_banks].xen_domain =3D true; + mem->nr_banks++; + } + else + { + printk("Warning: Max number of supported memory regions reache= d.\n"); + return -ENOSPC; + } + } + /* + * keep a count of the number of borrowers, which later may be used + * to calculate the reference count. + */ + if ( !owner ) + mem->bank[i].nr_shm_borrowers++; + + return 0; +} +#endif + static int __init early_scan_node(const void *fdt, int node, const char *name, int depth, u32 address_cells, u32 size_cells, @@ -386,6 +539,10 @@ static int __init early_scan_node(const void *fdt, process_chosen_node(fdt, node, name, address_cells, size_cells); else if ( depth =3D=3D 2 && device_tree_node_compatible(fdt, node, "xe= n,domain") ) rc =3D process_domain_node(fdt, node, name, address_cells, size_ce= lls); +#ifdef CONFIG_STATIC_SHM + else if ( depth <=3D 3 && device_tree_node_compatible(fdt, node, "xen,= domain-shared-memory-v1") ) + rc =3D process_shm_node(fdt, node, address_cells, size_cells); +#endif =20 if ( rc < 0 ) printk("fdt: node `%s': parsing failed\n", name); diff --git a/xen/arch/arm/include/asm/setup.h b/xen/arch/arm/include/asm/se= tup.h index 2bb01ecfa8..39d4e93b8b 100644 --- a/xen/arch/arm/include/asm/setup.h +++ b/xen/arch/arm/include/asm/setup.h @@ -23,10 +23,19 @@ typedef enum { } bootmodule_kind; =20 =20 +#ifdef CONFIG_STATIC_SHM +/* Indicates the maximum number of characters(\0 included) for shm_id */ +#define MAX_SHM_ID_LENGTH 16 +#endif + struct membank { paddr_t start; paddr_t size; bool xen_domain; /* whether the memory bank is bound to a Xen domain. = */ +#ifdef CONFIG_STATIC_SHM + char shm_id[MAX_SHM_ID_LENGTH]; + unsigned int nr_shm_borrowers; +#endif }; =20 struct meminfo { --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409741399479.70212640851514; Thu, 21 Jul 2022 06:22:21 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372753.604701 (Exim 4.92) (envelope-from ) id 1oEW7b-0002Hs-5v; Thu, 21 Jul 2022 13:21:43 +0000 Received: by outflank-mailman (output) from mailman id 372753.604701; Thu, 21 Jul 2022 13:21:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7b-0002Hj-1z; Thu, 21 Jul 2022 13:21:43 +0000 Received: by outflank-mailman (input) for mailman id 372753; Thu, 21 Jul 2022 13:21:42 +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 1oEW7a-0002GA-AN for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:42 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 0e6ac250-08f8-11ed-bd2d-47488cf2e6aa; Thu, 21 Jul 2022 15:21:40 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AA81523A; Thu, 21 Jul 2022 06:21:40 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D95CC3F73D; Thu, 21 Jul 2022 06:21:36 -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: 0e6ac250-08f8-11ed-bd2d-47488cf2e6aa From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Andrew Cooper , George Dunlap , Jan Beulich , Wei Liu Subject: [PATCH v6 2/9] xen/arm: allocate static shared memory to the default owner dom_io Date: Thu, 21 Jul 2022 21:21:08 +0800 Message-Id: <20220721132115.3015761-3-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409742832100003 Content-Type: text/plain; charset="utf-8" From: Penny Zheng This commit introduces process_shm to cope with static shared memory in domain construction. DOMID_IO will be the default owner of memory pre-shared among multiple doma= ins at boot time, when no explicit owner is specified. This commit only considers allocating static shared memory to dom_io when owner domain is not explicitly defined in device tree, all the left, including the "borrower" code path, the "explicit owner" code path, shall be introduced later in the following patches. Signed-off-by: Penny Zheng --- v6 change: - use if-array to check psize, pbase and gbase are suitably aligned and valid - use mfn_valid to check (pbase, pbase + psize) - check d->max_pages will not overflow - refine acquire_shared_memory_bank to not reuse acquire_static_memory_bank, then input pbase and psize do not need to be used as a pointer. - use if-array to check if page owner is dom_io - in-code comment refinement --- v5 change: - refine in-code comment --- v4 change: - no changes --- v3 change: - refine in-code comment --- v2 change: - instead of introducing a new system domain, reuse the existing dom_io - make dom_io a non-auto-translated domain, then no need to create P2M for it - change dom_io definition and make it wider to support static shm here too - introduce is_shm_allocated_to_domio to check whether static shm is allocated yet, instead of using shm_mask bitmap - add in-code comment --- xen/arch/arm/domain_build.c | 155 ++++++++++++++++++++++++++++++++++++ xen/common/domain.c | 3 + 2 files changed, 158 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 3fd1186b53..ff2aebaf28 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -759,6 +759,155 @@ static void __init assign_static_memory_11(struct dom= ain *d, panic("Failed to assign requested static memory for direct-map domain = %pd.", d); } + +#ifdef CONFIG_STATIC_SHM +/* + * This function checks whether the static shared memory region is + * already allocated to dom_io. + */ +static bool __init is_shm_allocated_to_domio(paddr_t pbase) +{ + struct page_info *page; + + page =3D maddr_to_page(pbase); + if ( page_get_owner(page) =3D=3D NULL ) + return false; + + if ( page_get_owner(page) !=3D dom_io ) + { + printk(XENLOG_ERR + "shm memory node has already been allocated to a specific o= wner %pd, Please check your configuration\n", + page_get_owner(page)); + return false; + } + + return true; +} + +static mfn_t __init acquire_shared_memory_bank(struct domain *d, + paddr_t pbase, paddr_t psiz= e) +{ + mfn_t smfn; + unsigned long nr_pfns; + int res; + + /* + * Pages of statically shared memory shall be included + * into domain_tot_pages(). + */ + nr_pfns =3D PFN_DOWN(psize); + if ( (UINT_MAX - d->max_pages) < nr_pfns ) + { + printk(XENLOG_ERR "%pd: Over-allocation for d->max_pages: %lu.\n", + d, nr_pfns); + return INVALID_MFN; + } + d->max_pages +=3D nr_pfns; + + smfn =3D maddr_to_mfn(pbase); + res =3D acquire_domstatic_pages(d, smfn, nr_pfns, 0); + if ( res ) + { + printk(XENLOG_ERR + "%pd: failed to acquire static memory: %d.\n", d, res); + return INVALID_MFN; + } + + return smfn; +} + +static int __init allocate_shared_memory(struct domain *d, + u32 addr_cells, u32 size_cells, + paddr_t pbase, paddr_t psize) +{ + mfn_t smfn; + + dprintk(XENLOG_INFO, + "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpa= ddr".\n", + d, pbase, pbase + psize); + + smfn =3D acquire_shared_memory_bank(d, pbase, psize); + if ( mfn_eq(smfn, INVALID_MFN) ) + return -EINVAL; + + /* + * DOMID_IO is the domain, like DOMID_XEN, that is not auto-translated. + * It sees RAM 1:1 and we do not need to create P2M mapping for it + */ + ASSERT(d =3D=3D dom_io); + return 0; +} + +static int __init process_shm(struct domain *d, + const struct dt_device_node *node) +{ + struct dt_device_node *shm_node; + + dt_for_each_child_node(node, shm_node) + { + const struct dt_property *prop; + const __be32 *cells; + uint32_t addr_cells, size_cells; + paddr_t gbase, pbase, psize; + int ret =3D 0; + unsigned int i; + + if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-= v1") ) + continue; + + /* + * xen,shared-mem =3D ; + * TODO: pbase is optional. + */ + addr_cells =3D dt_n_addr_cells(shm_node); + size_cells =3D dt_n_size_cells(shm_node); + prop =3D dt_find_property(shm_node, "xen,shared-mem", NULL); + ASSERT(prop); + cells =3D (const __be32 *)prop->value; + device_tree_get_reg(&cells, addr_cells, size_cells, &pbase, &psize= ); + gbase =3D dt_read_number(cells, addr_cells); + if ( !IS_ALIGNED(pbase, PAGE_SIZE) || !IS_ALIGNED(gbase, PAGE_SIZE= ) ) + { + printk("%pd: physical address 0x%"PRIpaddr", or guest address = 0x%"PRIpaddr" is not suitably aligned.\n", + d, pbase, gbase); + return -EINVAL; + } + if ( !IS_ALIGNED(psize, PAGE_SIZE) ) + { + printk("%pd: size 0x%"PRIpaddr" is not suitably aligned\n", + d, psize); + return -EINVAL; + } + + for ( i =3D 0; i < PFN_DOWN(psize); i++ ) + if ( !mfn_valid(mfn_add(maddr_to_mfn(pbase), i)) ) + { + printk("%pd: invalid physical address 0x%"PRI_mfn"\n", + d, mfn_x(mfn_add(maddr_to_mfn(pbase), i))); + return -EINVAL; + } + + /* TODO: Consider owner domain is not the default dom_io. */ + /* + * Per static shared memory region could be shared between multiple + * domains. + * In case re-allocating the same shared memory region, we check + * if it is already allocated to the default owner dom_io before + * the actual allocation. + */ + if ( !is_shm_allocated_to_domio(pbase) ) + { + /* Allocate statically shared pages to the default owner dom_i= o. */ + ret =3D allocate_shared_memory(dom_io, addr_cells, size_cells, + pbase, psize); + if ( ret ) + return ret; + } + } + + return 0; +} +#endif /* CONFIG_STATIC_SHM */ #else static void __init allocate_static_memory(struct domain *d, struct kernel_info *kinfo, @@ -3236,6 +3385,12 @@ static int __init construct_domU(struct domain *d, else assign_static_memory_11(d, &kinfo, node); =20 +#ifdef CONFIG_STATIC_SHM + rc =3D process_shm(d, node); + if ( rc < 0 ) + return rc; +#endif + /* * Base address and irq number are needed when creating vpl011 device * tree node in prepare_dtb_domU, so initialization on related variabl= es diff --git a/xen/common/domain.c b/xen/common/domain.c index 618410e3b2..c8564113e9 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -780,6 +780,9 @@ void __init setup_system_domains(void) * This domain owns I/O pages that are within the range of the page_in= fo * array. Mappings occur at the priv of the caller. * Quarantined PCI devices will be associated with this domain. + * + * DOMID_IO is also the default owner of memory pre-shared among multi= ple + * domains at boot time. */ dom_io =3D domain_create(DOMID_IO, NULL, 0); if ( IS_ERR(dom_io) ) --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409723863585.894202589581; Thu, 21 Jul 2022 06:22:03 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372755.604712 (Exim 4.92) (envelope-from ) id 1oEW7e-0002as-D5; Thu, 21 Jul 2022 13:21:46 +0000 Received: by outflank-mailman (output) from mailman id 372755.604712; Thu, 21 Jul 2022 13:21:46 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7e-0002aj-A8; Thu, 21 Jul 2022 13:21:46 +0000 Received: by outflank-mailman (input) for mailman id 372755; Thu, 21 Jul 2022 13:21:44 +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 1oEW7c-0001je-K1 for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:44 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id 102246cb-08f8-11ed-924f-1f966e50362f; Thu, 21 Jul 2022 15:21:43 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 883EB23A; Thu, 21 Jul 2022 06:21:43 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id A4B6E3F73D; Thu, 21 Jul 2022 06:21:40 -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: 102246cb-08f8-11ed-924f-1f966e50362f From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Penny Zheng Subject: [PATCH v6 3/9] xen/arm: allocate static shared memory to a specific owner domain Date: Thu, 21 Jul 2022 21:21:09 +0800 Message-Id: <20220721132115.3015761-4-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409725047100001 Content-Type: text/plain; charset="utf-8" If owner property is defined, then owner domain of a static shared memory region is not the default dom_io anymore, but a specific domain. This commit implements allocating static shared memory to a specific domain when owner property is defined. Coding flow for dealing borrower domain will be introduced later in the following commits. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v6 change: - fix coding-style - role_str and owner_dom_io shall be defined within the loop --- v5 change: - no change --- v4 change: - no changes --- v3 change: - simplify the code since o_gbase is not used if the domain is dom_io --- v2 change: - P2M mapping is restricted to normal domain - in-code comment fix --- xen/arch/arm/domain_build.c | 44 +++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 11 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index ff2aebaf28..a7e95c34a7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -818,9 +818,11 @@ static mfn_t __init acquire_shared_memory_bank(struct = domain *d, =20 static int __init allocate_shared_memory(struct domain *d, u32 addr_cells, u32 size_cells, - paddr_t pbase, paddr_t psize) + paddr_t pbase, paddr_t psize, + paddr_t gbase) { mfn_t smfn; + int ret =3D 0; =20 dprintk(XENLOG_INFO, "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpa= ddr".\n", @@ -834,8 +836,18 @@ static int __init allocate_shared_memory(struct domain= *d, * DOMID_IO is the domain, like DOMID_XEN, that is not auto-translated. * It sees RAM 1:1 and we do not need to create P2M mapping for it */ - ASSERT(d =3D=3D dom_io); - return 0; + if ( d !=3D dom_io ) + { + ret =3D guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, + PFN_DOWN(psize)); + if ( ret ) + { + printk(XENLOG_ERR "Failed to map shared memory to %pd.\n", d); + return ret; + } + } + + return ret; } =20 static int __init process_shm(struct domain *d, @@ -851,6 +863,8 @@ static int __init process_shm(struct domain *d, paddr_t gbase, pbase, psize; int ret =3D 0; unsigned int i; + const char *role_str; + bool owner_dom_io =3D true; =20 if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-= v1") ) continue; @@ -887,19 +901,27 @@ static int __init process_shm(struct domain *d, return -EINVAL; } =20 - /* TODO: Consider owner domain is not the default dom_io. */ + /* + * "role" property is optional and if it is defined explicitly, + * then the owner domain is not the default "dom_io" domain. + */ + if ( dt_property_read_string(shm_node, "role", &role_str) =3D=3D 0= ) + owner_dom_io =3D false; + /* * Per static shared memory region could be shared between multiple * domains. - * In case re-allocating the same shared memory region, we check - * if it is already allocated to the default owner dom_io before - * the actual allocation. + * So when owner domain is the default dom_io, in case re-allocati= ng + * the same shared memory region, we check if it is already alloca= ted + * to the default owner dom_io before the actual allocation. */ - if ( !is_shm_allocated_to_domio(pbase) ) + if ( (owner_dom_io && !is_shm_allocated_to_domio(pbase)) || + (!owner_dom_io && strcmp(role_str, "owner") =3D=3D 0) ) { - /* Allocate statically shared pages to the default owner dom_i= o. */ - ret =3D allocate_shared_memory(dom_io, addr_cells, size_cells, - pbase, psize); + /* Allocate statically shared pages to the owner domain. */ + ret =3D allocate_shared_memory(owner_dom_io ? dom_io : d, + addr_cells, size_cells, + pbase, psize, gbase); if ( ret ) return ret; } --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409730611466.916705190215; Thu, 21 Jul 2022 06:22:10 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372757.604723 (Exim 4.92) (envelope-from ) id 1oEW7h-0002vT-MZ; Thu, 21 Jul 2022 13:21:49 +0000 Received: by outflank-mailman (output) from mailman id 372757.604723; Thu, 21 Jul 2022 13:21:49 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7h-0002vK-Il; Thu, 21 Jul 2022 13:21:49 +0000 Received: by outflank-mailman (input) for mailman id 372757; Thu, 21 Jul 2022 13:21:48 +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 1oEW7f-0001je-Ro for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:47 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id 120ceba8-08f8-11ed-924f-1f966e50362f; Thu, 21 Jul 2022 15:21:46 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B30E723A; Thu, 21 Jul 2022 06:21:46 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 93A0A3F73D; Thu, 21 Jul 2022 06:21:43 -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: 120ceba8-08f8-11ed-924f-1f966e50362f From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Penny Zheng , Julien Grall Subject: [PATCH v6 4/9] xen/arm: introduce put_page_nr and get_page_nr Date: Thu, 21 Jul 2022 21:21:10 +0800 Message-Id: <20220721132115.3015761-5-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409732766100002 Content-Type: text/plain; charset="utf-8" Later, we need to add the right amount of references, which should be the number of borrower domains, to the owner domain. Since we only have get_page() to increment the page reference by 1, a loop is needed per page, which is inefficient and time-consuming. To save the loop time, this commit introduces a set of new helpers put_page_nr() and get_page_nr() to increment/drop the page reference by nr. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Reviewed-by: Julien Grall --- v6 change: - no change --- v5 change: - no change --- v4 changes: - fix the assert about checking overflow to make sure that the right equati= on return is at least equal to nr - simplify the assert about checking the underflow --- v3 changes: - check overflow with "n" - remove spurious change - bring back the check that we enter the loop only when count_info is greater than 0 --- v2 change: - new commit --- xen/arch/arm/include/asm/mm.h | 4 ++++ xen/arch/arm/mm.c | 42 +++++++++++++++++++++++++++-------- 2 files changed, 37 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/include/asm/mm.h b/xen/arch/arm/include/asm/mm.h index c4bc3cd1e5..f1ab0fd030 100644 --- a/xen/arch/arm/include/asm/mm.h +++ b/xen/arch/arm/include/asm/mm.h @@ -343,6 +343,10 @@ void free_init_memory(void); int guest_physmap_mark_populate_on_demand(struct domain *d, unsigned long = gfn, unsigned int order); =20 +extern bool get_page_nr(struct page_info *page, const struct domain *domai= n, + unsigned long nr); +extern void put_page_nr(struct page_info *page, unsigned long nr); + extern void put_page_type(struct page_info *page); static inline void put_page_and_type(struct page_info *page) { diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 009b8cd9ef..d654980706 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1587,21 +1587,29 @@ long arch_memory_op(int op, XEN_GUEST_HANDLE_PARAM(= void) arg) return 0; } =20 -struct domain *page_get_owner_and_reference(struct page_info *page) +static struct domain *page_get_owner_and_nr_reference(struct page_info *pa= ge, + unsigned long nr) { unsigned long x, y =3D page->count_info; struct domain *owner; =20 + /* Restrict nr to avoid "double" overflow */ + if ( nr >=3D PGC_count_mask ) + { + ASSERT_UNREACHABLE(); + return NULL; + } + do { x =3D y; /* * Count =3D=3D 0: Page is not allocated, so we cannot take a ref= erence. * Count =3D=3D -1: Reference count would wrap, which is invalid. */ - if ( unlikely(((x + 1) & PGC_count_mask) <=3D 1) ) + if ( unlikely(((x + nr) & PGC_count_mask) <=3D nr) ) return NULL; } - while ( (y =3D cmpxchg(&page->count_info, x, x + 1)) !=3D x ); + while ( (y =3D cmpxchg(&page->count_info, x, x + nr)) !=3D x ); =20 owner =3D page_get_owner(page); ASSERT(owner); @@ -1609,14 +1617,19 @@ struct domain *page_get_owner_and_reference(struct = page_info *page) return owner; } =20 -void put_page(struct page_info *page) +struct domain *page_get_owner_and_reference(struct page_info *page) +{ + return page_get_owner_and_nr_reference(page, 1); +} + +void put_page_nr(struct page_info *page, unsigned long nr) { unsigned long nx, x, y =3D page->count_info; =20 do { - ASSERT((y & PGC_count_mask) !=3D 0); + ASSERT((y & PGC_count_mask) >=3D nr); x =3D y; - nx =3D x - 1; + nx =3D x - nr; } while ( unlikely((y =3D cmpxchg(&page->count_info, x, nx)) !=3D x) ); =20 @@ -1626,19 +1639,30 @@ void put_page(struct page_info *page) } } =20 -bool get_page(struct page_info *page, const struct domain *domain) +void put_page(struct page_info *page) +{ + put_page_nr(page, 1); +} + +bool get_page_nr(struct page_info *page, const struct domain *domain, + unsigned long nr) { - const struct domain *owner =3D page_get_owner_and_reference(page); + const struct domain *owner =3D page_get_owner_and_nr_reference(page, n= r); =20 if ( likely(owner =3D=3D domain) ) return true; =20 if ( owner !=3D NULL ) - put_page(page); + put_page_nr(page, nr); =20 return false; } =20 +bool get_page(struct page_info *page, const struct domain *domain) +{ + return get_page_nr(page, domain, 1); +} + /* Common code requires get_page_type and put_page_type. * We don't care about typecounts so we just do the minimum to make it * happy. */ --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409732663715.2143152998835; Thu, 21 Jul 2022 06:22:12 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372759.604734 (Exim 4.92) (envelope-from ) id 1oEW7j-0003GG-VF; Thu, 21 Jul 2022 13:21:51 +0000 Received: by outflank-mailman (output) from mailman id 372759.604734; Thu, 21 Jul 2022 13:21:51 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7j-0003G5-Rh; Thu, 21 Jul 2022 13:21:51 +0000 Received: by outflank-mailman (input) for mailman id 372759; Thu, 21 Jul 2022 13:21:51 +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 1oEW7i-0002GA-T0 for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:51 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 13c9acc9-08f8-11ed-bd2d-47488cf2e6aa; Thu, 21 Jul 2022 15:21:49 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 97C9923A; Thu, 21 Jul 2022 06:21:49 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B0A363F73D; Thu, 21 Jul 2022 06:21:46 -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: 13c9acc9-08f8-11ed-bd2d-47488cf2e6aa From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Penny Zheng Subject: [PATCH v6 5/9] xen/arm: Add additional reference to owner domain when the owner is allocated Date: Thu, 21 Jul 2022 21:21:11 +0800 Message-Id: <20220721132115.3015761-6-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409735103100001 Content-Type: text/plain; charset="utf-8" Borrower domain will fail to get a page ref using the owner domain during allocation, when the owner is created after borrower. So here, we decide to get and add the right amount of reference, which is the number of borrowers, when the owner is allocated. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini Acked-by: Julien Grall --- v6 change: - adapt to the change of "nr_shm_borrowers" - add in-code comment to explain if the borrower is created first, we inten= d to add pages in the P2M without reference. --- v5 change: - no change --- v4 changes: - no change --- v3 change: - printk rather than dprintk since it is a serious error --- v2 change: - new commit --- xen/arch/arm/domain_build.c | 60 +++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index a7e95c34a7..e891e800a7 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -761,6 +761,30 @@ static void __init assign_static_memory_11(struct doma= in *d, } =20 #ifdef CONFIG_STATIC_SHM +static int __init acquire_nr_borrower_domain(struct domain *d, + paddr_t pbase, paddr_t psize, + unsigned long *nr_borrowers) +{ + unsigned long bank; + + /* Iterate reserved memory to find requested shm bank. */ + for ( bank =3D 0 ; bank < bootinfo.reserved_mem.nr_banks; bank++ ) + { + paddr_t bank_start =3D bootinfo.reserved_mem.bank[bank].start; + paddr_t bank_size =3D bootinfo.reserved_mem.bank[bank].size; + + if ( (pbase =3D=3D bank_start) && (psize =3D=3D bank_size) ) + break; + } + + if ( bank =3D=3D bootinfo.reserved_mem.nr_banks ) + return -ENOENT; + + *nr_borrowers =3D bootinfo.reserved_mem.bank[bank].nr_shm_borrowers; + + return 0; +} + /* * This function checks whether the static shared memory region is * already allocated to dom_io. @@ -823,6 +847,8 @@ static int __init allocate_shared_memory(struct domain = *d, { mfn_t smfn; int ret =3D 0; + unsigned long nr_pages, nr_borrowers, i; + struct page_info *page; =20 dprintk(XENLOG_INFO, "%pd: allocate static shared memory BANK %#"PRIpaddr"-%#"PRIpa= ddr".\n", @@ -836,6 +862,7 @@ static int __init allocate_shared_memory(struct domain = *d, * DOMID_IO is the domain, like DOMID_XEN, that is not auto-translated. * It sees RAM 1:1 and we do not need to create P2M mapping for it */ + nr_pages =3D PFN_DOWN(psize); if ( d !=3D dom_io ) { ret =3D guest_physmap_add_pages(d, gaddr_to_gfn(gbase), smfn, @@ -847,6 +874,39 @@ static int __init allocate_shared_memory(struct domain= *d, } } =20 + /* + * Get the right amount of references per page, which is the number of + * borrower domains. + */ + ret =3D acquire_nr_borrower_domain(d, pbase, psize, &nr_borrowers); + if ( ret ) + return ret; + + /* + * Instead of letting borrower domain get a page ref, we add as many + * additional reference as the number of borrowers when the owner + * is allocated, since there is a chance that owner is created + * after borrower. + * So if the borrower is created first, it will cause adding pages + * in the P2M without reference. + */ + page =3D mfn_to_page(smfn); + for ( i =3D 0; i < nr_pages; i++ ) + { + if ( !get_page_nr(page + i, d, nr_borrowers) ) + { + printk(XENLOG_ERR + "Failed to add %lu references to page %"PRI_mfn".\n", + nr_borrowers, mfn_x(smfn) + i); + goto fail; + } + } + + return 0; + + fail: + while ( --i >=3D 0 ) + put_page_nr(page + i, nr_borrowers); return ret; } =20 --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 165840973123988.31019333767551; Thu, 21 Jul 2022 06:22:11 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372763.604745 (Exim 4.92) (envelope-from ) id 1oEW7m-0003bY-6j; Thu, 21 Jul 2022 13:21:54 +0000 Received: by outflank-mailman (output) from mailman id 372763.604745; Thu, 21 Jul 2022 13:21:54 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7m-0003bD-3J; Thu, 21 Jul 2022 13:21:54 +0000 Received: by outflank-mailman (input) for mailman id 372763; Thu, 21 Jul 2022 13:21:53 +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 1oEW7l-0001je-Gv for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:53 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id 15668b03-08f8-11ed-924f-1f966e50362f; Thu, 21 Jul 2022 15:21:52 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 6B85123A; Thu, 21 Jul 2022 06:21:52 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 8C23F3F73D; Thu, 21 Jul 2022 06:21:49 -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: 15668b03-08f8-11ed-924f-1f966e50362f From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Penny Zheng Subject: [PATCH v6 6/9] xen/arm: set up shared memory foreign mapping for borrower domain Date: Thu, 21 Jul 2022 21:21:12 +0800 Message-Id: <20220721132115.3015761-7-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409732738100001 Content-Type: text/plain; charset="utf-8" This commit sets up shared memory foreign mapping for borrower domain. If owner domain is the default dom_io, all shared domain are treated as borrower domain. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v6 change: - no change --- v5 change: - no change --- v4 changes: - no change --- v3 change: - use map_regions_p2mt instead --- v2 change: - remove guest_physmap_add_shm, since for borrower domain, we only do P2M foreign memory mapping now. --- xen/arch/arm/domain_build.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index e891e800a7..f76fbbc644 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -985,6 +985,15 @@ static int __init process_shm(struct domain *d, if ( ret ) return ret; } + + if ( owner_dom_io || (strcmp(role_str, "borrower") =3D=3D 0) ) + { + /* Set up P2M foreign mapping for borrower domain. */ + ret =3D map_regions_p2mt(d, _gfn(PFN_UP(gbase)), PFN_DOWN(psiz= e), + _mfn(PFN_UP(pbase)), p2m_map_foreign_rw= ); + if ( ret ) + return ret; + } } =20 return 0; --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409736506666.8975321439949; Thu, 21 Jul 2022 06:22:16 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372766.604756 (Exim 4.92) (envelope-from ) id 1oEW7q-00046V-OW; Thu, 21 Jul 2022 13:21:58 +0000 Received: by outflank-mailman (output) from mailman id 372766.604756; Thu, 21 Jul 2022 13:21:58 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7q-00046G-Kz; Thu, 21 Jul 2022 13:21:58 +0000 Received: by outflank-mailman (input) for mailman id 372766; Thu, 21 Jul 2022 13:21:56 +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 1oEW7o-0002GA-Jw for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:56 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 1731edf1-08f8-11ed-bd2d-47488cf2e6aa; Thu, 21 Jul 2022 15:21:55 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 497A723A; Thu, 21 Jul 2022 06:21:55 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 66B953F73D; Thu, 21 Jul 2022 06:21:52 -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: 1731edf1-08f8-11ed-bd2d-47488cf2e6aa From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk , Penny Zheng Subject: [PATCH v6 7/9] xen/arm: create shared memory nodes in guest device tree Date: Thu, 21 Jul 2022 21:21:13 +0800 Message-Id: <20220721132115.3015761-8-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409736856100003 Content-Type: text/plain; charset="utf-8" We expose the shared memory to the domU using the "xen,shared-memory-v1" reserved-memory binding. See Documentation/devicetree/bindings/reserved-memory/xen,shared-memory.txt in Linux for the corresponding device tree binding. To save the cost of re-parsing shared memory device tree configuration when creating shared memory nodes in guest device tree, this commit adds new fie= ld "shm_mem" to store shm-info per domain. For each shared memory region, a range is exposed under the /reserved-memory node as a child node. Each range sub-node is named xen-shmem@
and has the following properties: - compatible: compatible =3D "xen,shared-memory-v1" - reg: the base guest physical address and size of the shared memory region - xen,id: a string that identifies the shared memory region. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v6 change: - change "struct meminfo *mem" to "const struct meminfo *mem" - change "unsigned long i" to "unsigned int i" to match the type of nr_bank= s. - accroding to the Linux binding, "xen,id" is meant to be a string, not an integer --- v5 change: - no change --- v4 change: - no change --- v3 change: - move field "shm_mem" to kernel_info --- v2 change: - using xzalloc - shm_id should be uint8_t - make reg a local variable - add #address-cells and #size-cells properties - fix alignment --- xen/arch/arm/domain_build.c | 146 +++++++++++++++++++++++++++++- xen/arch/arm/include/asm/kernel.h | 1 + 2 files changed, 145 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index f76fbbc644..8d2c465c99 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -910,7 +910,22 @@ static int __init allocate_shared_memory(struct domain= *d, return ret; } =20 -static int __init process_shm(struct domain *d, +static int __init append_shm_bank_to_domain(struct kernel_info *kinfo, + paddr_t start, paddr_t size, + const char *shm_id) +{ + if ( (kinfo->shm_mem.nr_banks + 1) > NR_MEM_BANKS ) + return -ENOMEM; + + kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].start =3D start; + kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].size =3D size; + safe_strcpy(kinfo->shm_mem.bank[kinfo->shm_mem.nr_banks].shm_id, shm_i= d); + kinfo->shm_mem.nr_banks++; + + return 0; +} + +static int __init process_shm(struct domain *d, struct kernel_info *kinfo, const struct dt_device_node *node) { struct dt_device_node *shm_node; @@ -924,6 +939,7 @@ static int __init process_shm(struct domain *d, int ret =3D 0; unsigned int i; const char *role_str; + const char *shm_id; bool owner_dom_io =3D true; =20 if ( !dt_device_is_compatible(shm_node, "xen,domain-shared-memory-= v1") ) @@ -968,6 +984,9 @@ static int __init process_shm(struct domain *d, if ( dt_property_read_string(shm_node, "role", &role_str) =3D=3D 0= ) owner_dom_io =3D false; =20 + dt_property_read_string(shm_node, "xen,shm-id", &shm_id); + ASSERT((strlen(shm_id) > 0) && (strlen(shm_id) < MAX_SHM_ID_LENGTH= )); + /* * Per static shared memory region could be shared between multiple * domains. @@ -994,6 +1013,14 @@ static int __init process_shm(struct domain *d, if ( ret ) return ret; } + + /* + * Record static shared memory region info for later setting + * up shm-node in guest device tree. + */ + ret =3D append_shm_bank_to_domain(kinfo, gbase, psize, shm_id); + if ( ret ) + return ret; } =20 return 0; @@ -1324,6 +1351,116 @@ static int __init make_memory_node(const struct dom= ain *d, return res; } =20 +#ifdef CONFIG_STATIC_SHM +static int __init make_shm_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + const struct meminfo *mem) +{ + unsigned int i =3D 0; + int res =3D 0; + + if ( mem->nr_banks =3D=3D 0 ) + return -ENOENT; + + /* + * For each shared memory region, a range is exposed under + * the /reserved-memory node as a child node. Each range sub-node is + * named xen-shmem@
. + */ + dt_dprintk("Create xen-shmem node\n"); + + for ( ; i < mem->nr_banks; i++ ) + { + uint64_t start =3D mem->bank[i].start; + uint64_t size =3D mem->bank[i].size; + /* Placeholder for xen-shmem@ + a 64-bit number + \0 */ + char buf[27]; + const char compat[] =3D "xen,shared-memory-v1"; + __be32 reg[addrcells + sizecells]; + __be32 *cells; + unsigned int len =3D (addrcells + sizecells) * sizeof(__be32); + + snprintf(buf, sizeof(buf), "xen-shmem@%"PRIx64, mem->bank[i].start= ); + res =3D fdt_begin_node(fdt, buf); + if ( res ) + return res; + + res =3D fdt_property(fdt, "compatible", compat, sizeof(compat)); + if ( res ) + return res; + + cells =3D reg; + dt_child_set_range(&cells, addrcells, sizecells, start, size); + + res =3D fdt_property(fdt, "reg", reg, len); + if ( res ) + return res; + + dt_dprintk("Shared memory bank %u: %#"PRIx64"->%#"PRIx64"\n", + i, start, start + size); + + res =3D fdt_property_string(fdt, "xen,id", mem->bank[i].shm_id); + if ( res ) + return res; + + res =3D fdt_end_node(fdt); + if ( res ) + return res; + } + + return res; +} +#else +static int __init make_shm_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + struct meminfo *mem) +{ + ASSERT_UNREACHABLE(); +} +#endif + +static int __init make_resv_memory_node(const struct domain *d, + void *fdt, + int addrcells, int sizecells, + struct meminfo *mem) +{ + int res =3D 0; + /* Placeholder for reserved-memory\0 */ + char resvbuf[16] =3D "reserved-memory"; + + if ( mem->nr_banks =3D=3D 0 ) + /* No shared memory provided. */ + return 0; + + dt_dprintk("Create reserved-memory node\n"); + + res =3D fdt_begin_node(fdt, resvbuf); + if ( res ) + return res; + + res =3D fdt_property(fdt, "ranges", NULL, 0); + if ( res ) + return res; + + res =3D fdt_property_cell(fdt, "#address-cells", addrcells); + if ( res ) + return res; + + res =3D fdt_property_cell(fdt, "#size-cells", sizecells); + if ( res ) + return res; + + res =3D make_shm_memory_node(d, fdt, addrcells, sizecells, mem); + if ( res ) + return res; + + res =3D fdt_end_node(fdt); + + return res; +} + static int __init add_ext_regions(unsigned long s, unsigned long e, void *= data) { struct meminfo *ext_regions =3D data; @@ -3101,6 +3238,11 @@ static int __init prepare_dtb_domU(struct domain *d,= struct kernel_info *kinfo) if ( ret ) goto err; =20 + ret =3D make_resv_memory_node(d, kinfo->fdt, addrcells, sizecells, + &kinfo->shm_mem); + if ( ret ) + goto err; + /* * domain_handle_dtb_bootmodule has to be called before the rest of * the device tree is generated because it depends on the value of @@ -3477,7 +3619,7 @@ static int __init construct_domU(struct domain *d, assign_static_memory_11(d, &kinfo, node); =20 #ifdef CONFIG_STATIC_SHM - rc =3D process_shm(d, node); + rc =3D process_shm(d, &kinfo, node); if ( rc < 0 ) return rc; #endif diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/k= ernel.h index c4dc039b54..2cc506b100 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -19,6 +19,7 @@ struct kernel_info { void *fdt; /* flat device tree */ paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ struct meminfo mem; + struct meminfo shm_mem; =20 /* kernel entry point */ paddr_t entry; --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409738832205.50102139376202; Thu, 21 Jul 2022 06:22:18 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372769.604767 (Exim 4.92) (envelope-from ) id 1oEW7t-0004aj-3s; Thu, 21 Jul 2022 13:22:01 +0000 Received: by outflank-mailman (output) from mailman id 372769.604767; Thu, 21 Jul 2022 13:22:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7s-0004aX-Vu; Thu, 21 Jul 2022 13:22:00 +0000 Received: by outflank-mailman (input) for mailman id 372769; Thu, 21 Jul 2022 13:21:59 +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 1oEW7r-0002GA-2h for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:21:59 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 18a15023-08f8-11ed-bd2d-47488cf2e6aa; Thu, 21 Jul 2022 15:21:57 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D98A723A; Thu, 21 Jul 2022 06:21:57 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 42AF63F73D; Thu, 21 Jul 2022 06:21:55 -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: 18a15023-08f8-11ed-bd2d-47488cf2e6aa From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Stefano Stabellini , Julien Grall , Bertrand Marquis , Volodymyr Babchuk Subject: [PATCH v6 8/9] xen/arm: enable statically shared memory on Dom0 Date: Thu, 21 Jul 2022 21:21:14 +0800 Message-Id: <20220721132115.3015761-9-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409740815100001 Content-Type: text/plain; charset="utf-8" From: Penny Zheng To add statically shared memory nodes in Dom0, user shall put according static shared memory configuration under /chosen node. This commit adds shm-processing function process_shm in construct_dom0 to enable statically shared memory on Dom0. Signed-off-by: Penny Zheng Reviewed-by: Stefano Stabellini --- v6 change: - no change --- v5 change: - no change --- v4 change: - no change --- v3 change: - no change --- v2 change: - no change --- xen/arch/arm/domain_build.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 8d2c465c99..7c592d63ab 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -2684,6 +2684,11 @@ static int __init handle_node(struct domain *d, stru= ct kernel_info *kinfo, if ( res ) return res; } + + res =3D make_resv_memory_node(d, kinfo->fdt, addrcells, sizecells, + &kinfo->shm_mem); + if ( res ) + return res; } =20 res =3D fdt_end_node(kinfo->fdt); @@ -3756,6 +3761,9 @@ static int __init construct_dom0(struct domain *d) { struct kernel_info kinfo =3D {}; int rc; +#ifdef CONFIG_STATIC_SHM + const struct dt_device_node *chosen =3D dt_find_node_by_path("/chosen"= ); +#endif =20 /* Sanity! */ BUG_ON(d->domain_id !=3D 0); @@ -3790,6 +3798,12 @@ static int __init construct_dom0(struct domain *d) allocate_memory_11(d, &kinfo); find_gnttab_region(d, &kinfo); =20 +#ifdef CONFIG_STATIC_SHM + rc =3D process_shm(d, &kinfo, chosen); + if ( rc < 0 ) + return rc; +#endif + /* Map extra GIC MMIO, irqs and other hw stuffs to dom0. */ rc =3D gic_map_hwdom_extra_mappings(d); if ( rc < 0 ) --=20 2.25.1 From nobody Wed May 1 22:18:21 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; 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=fail(p=none dis=none) header.from=arm.com Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1658409744552360.1460344589125; Thu, 21 Jul 2022 06:22:24 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.372773.604778 (Exim 4.92) (envelope-from ) id 1oEW7v-00053k-Ik; Thu, 21 Jul 2022 13:22:03 +0000 Received: by outflank-mailman (output) from mailman id 372773.604778; Thu, 21 Jul 2022 13:22:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1oEW7v-000522-En; Thu, 21 Jul 2022 13:22:03 +0000 Received: by outflank-mailman (input) for mailman id 372773; Thu, 21 Jul 2022 13:22:02 +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 1oEW7u-0002GA-EW for xen-devel@lists.xenproject.org; Thu, 21 Jul 2022 13:22:02 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 1ac2f87d-08f8-11ed-bd2d-47488cf2e6aa; Thu, 21 Jul 2022 15:22:01 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 61CB823A; Thu, 21 Jul 2022 06:22:01 -0700 (PDT) Received: from a011292.shanghai.arm.com (a011292.shanghai.arm.com [10.169.190.94]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id E11B63F73D; Thu, 21 Jul 2022 06:21:57 -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: 1ac2f87d-08f8-11ed-bd2d-47488cf2e6aa From: Penny Zheng To: xen-devel@lists.xenproject.org Cc: Penny Zheng , Andrew Cooper , George Dunlap , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , Penny Zheng Subject: [PATCH v6 9/9] xen: Add static memory sharing in SUPPORT.md Date: Thu, 21 Jul 2022 21:21:15 +0800 Message-Id: <20220721132115.3015761-10-Penny.Zheng@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220721132115.3015761-1-Penny.Zheng@arm.com> References: <20220721132115.3015761-1-Penny.Zheng@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1658409744929100001 Content-Type: text/plain; charset="utf-8" on ARM, static memory sharing is tech preview, which shall be documented in SUPPORT.md Signed-off-by: Penny Zheng --- v6 change: - new commit --- SUPPORT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/SUPPORT.md b/SUPPORT.md index 8e040d1c1e..3dfe6d2fbe 100644 --- a/SUPPORT.md +++ b/SUPPORT.md @@ -299,6 +299,12 @@ Allow sharing of identical pages between guests =20 Status, x86 HVM: Experimental =20 +### Static Memory Sharing + +Allow memory pre-shared among multiple domains at boot time through device= tree configuration + + Status, ARM: Tech Preview + ### Memory Paging =20 Allow pages belonging to guests to be paged to disk --=20 2.25.1