From patchwork Thu Mar 16 09:09:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiamei Xie X-Patchwork-Id: 13177242 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CC345C6FD1F for ; Thu, 16 Mar 2023 09:10:50 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.510398.787992 (Exim 4.92) (envelope-from ) id 1pcjd3-0005d1-ON; Thu, 16 Mar 2023 09:10:33 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 510398.787992; Thu, 16 Mar 2023 09:10:33 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1pcjd3-0005cs-LR; Thu, 16 Mar 2023 09:10:33 +0000 Received: by outflank-mailman (input) for mailman id 510398; Thu, 16 Mar 2023 09:10:32 +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 1pcjd2-0005Lc-BD for xen-devel@lists.xenproject.org; Thu, 16 Mar 2023 09:10:32 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-flk1.inumbo.com (Halon) with ESMTP id 661632eb-c3da-11ed-b464-930f4c7d94ae; Thu, 16 Mar 2023 10:10:30 +0100 (CET) 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 79FCC2F4; Thu, 16 Mar 2023 02:11:13 -0700 (PDT) Received: from comhpcalt.shanghai.arm.com (comhpcalt.shanghai.arm.com [10.169.190.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 212E83F67D; Thu, 16 Mar 2023 02:10:27 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 661632eb-c3da-11ed-b464-930f4c7d94ae From: "jiamei.xie" To: xen-devel@lists.xenproject.org Cc: wei.chen@arm.com, jiamei.xie@arm.com, sstabellini@kernel.org Subject: [ImageBuilder][PATCH v2 1/2] uboot-script-gen: Add XEN_STATIC_HEAP Date: Thu, 16 Mar 2023 09:09:20 +0000 Message-Id: <20230316090921.338472-2-jiamei.xie@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230316090921.338472-1-jiamei.xie@arm.com> References: <20230316090921.338472-1-jiamei.xie@arm.com> MIME-Version: 1.0 From: jiamei Xie Add a new config parameter to configure Xen static heap. XEN_STATIC_HEAP="baseaddr1 size1 ... baseaddrN sizeN" if specified, indicates the host physical address regions [baseaddr, baseaddr + size) to be reserved as Xen static heap. For instance, XEN_STATIC_HEAP="0x50000000 0x30000000", if specified, indicates the host memory region starting from paddr 0x50000000 with a size of 0x30000000 to be reserved as static heap. Signed-off-by: jiamei Xie Reviewed-by: Michal Orzel Acked-by: Stefano Stabellini --- Changes from v1: - Rename STATIC_HEAP to XEN_STATIC_HEAP and move it right after XEN_CMD documentation. - Use split_value function instead of opencoding it. --- README.md | 4 ++++ scripts/uboot-script-gen | 20 ++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/README.md b/README.md index 814a004..78b83f1 100644 --- a/README.md +++ b/README.md @@ -97,6 +97,10 @@ Where: - XEN_CMD specifies the command line arguments used for Xen. If not set, the default one will be used. +- XEN_STATIC_HEAP="baseaddr1 size1 ... baseaddrN sizeN" + if specified, indicates the host physical address regions + [baseaddr, baseaddr + size) to be reserved as Xen static heap. + - PASSTHROUGH_DTS_REPO specifies the git repository and/or the directory which contains the partial device trees. This is optional. However, if this is specified, then DOMU_PASSTHROUGH_PATHS[number] need to be specified. diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index f07e334..cca3e59 100755 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -189,6 +189,21 @@ function add_device_tree_static_mem() dt_set "$path" "xen,static-mem" "hex" "${cells[*]}" } +function add_device_tree_xen_static_heap() +{ + local path=$1 + local regions=$2 + local cells=() + local val + + for val in ${regions[@]} + do + cells+=("$(split_value $val)") + done + + dt_set "$path" "xen,static-heap" "hex" "${cells[*]}" +} + function add_device_tree_cpupools() { local cpu @@ -344,6 +359,11 @@ function xen_device_tree_editing() then add_device_tree_cpupools fi + + if test "${XEN_STATIC_HEAP}" + then + add_device_tree_xen_static_heap "/chosen" "${XEN_STATIC_HEAP}" + fi } function linux_device_tree_editing() From patchwork Thu Mar 16 09:09:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiamei Xie X-Patchwork-Id: 13177243 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 989CDC6FD19 for ; Thu, 16 Mar 2023 09:10:59 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.510399.788002 (Exim 4.92) (envelope-from ) id 1pcjdC-0005wy-VZ; Thu, 16 Mar 2023 09:10:42 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 510399.788002; Thu, 16 Mar 2023 09:10: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 1pcjdC-0005wp-Rs; Thu, 16 Mar 2023 09:10:42 +0000 Received: by outflank-mailman (input) for mailman id 510399; Thu, 16 Mar 2023 09:10: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 1pcjdB-0005vk-1H for xen-devel@lists.xenproject.org; Thu, 16 Mar 2023 09:10:41 +0000 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by se1-gles-sth1.inumbo.com (Halon) with ESMTP id 6af451cc-c3da-11ed-87f5-c1b5be75604c; Thu, 16 Mar 2023 10:10:38 +0100 (CET) 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 AF7332F4; Thu, 16 Mar 2023 02:11:21 -0700 (PDT) Received: from comhpcalt.shanghai.arm.com (comhpcalt.shanghai.arm.com [10.169.190.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 56CE23F67D; Thu, 16 Mar 2023 02:10:36 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 6af451cc-c3da-11ed-87f5-c1b5be75604c From: "jiamei.xie" To: xen-devel@lists.xenproject.org Cc: wei.chen@arm.com, jiamei.xie@arm.com, sstabellini@kernel.org Subject: [ImageBuilder][PATCH v2 2/2] uboot-script-gen: add support for static shared memory Date: Thu, 16 Mar 2023 09:09:21 +0000 Message-Id: <20230316090921.338472-3-jiamei.xie@arm.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230316090921.338472-1-jiamei.xie@arm.com> References: <20230316090921.338472-1-jiamei.xie@arm.com> MIME-Version: 1.0 Introduce support for creating shared-mem node for dom0less domUs in the device tree. Add the following option: - DOMU_SHARED_MEM[number]="SHM-ID HPA GPA size" if specified, indicate the unique identifier of the shared memory region is SHM-ID, the host physical address HPA will get mapped at guest address GPA in domU and the memory of size will be reserved to be shared memory. The static shared memory is used between two dom0less domUs. Below is an example: NUM_DOMUS=2 DOMU_SHARED_MEM[0]="my-shared-mem-0 0x50000000 0x6000000 0x10000000" DOMU_SHARED_MEM[1]="my-shared-mem-0 0x50000000 0x6000000 0x10000000" This static shared memory region is identified as "my-shared-mem-0", host physical address starting at 0x50000000 of 256MB will be reserved to be shared between two domUs. It will get mapped at 0x6000000 in both guest physical address space. Both DomUs are the borrower domain, the owner domain is the default owner domain DOMID_IO. Signed-off-by: jiamei.xie --- Changes from v1: - Rather than two separate properties and just use one like follows: Change DOMU_SHARED_MEM[0]="0x50000000 0x6000000 0x10000000" DOMU_SHARED_MEM_ID[0]="my-shared-mem-0" to DOMU_SHARED_MEM[0]="my-shared-mem-0 0x50000000 0x6000000 0x10000000" - Use split_value function instead of opencoding it. --- README.md | 17 +++++++++++++++++ scripts/uboot-script-gen | 27 +++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/README.md b/README.md index 78b83f1..fe5d205 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,23 @@ Where: if specified, indicates the host physical address regions [baseaddr, baseaddr + size) to be reserved to the VM for static allocation. +- DOMU_SHARED_MEM[number]="SHM-ID HPA GPA size" + if specified, indicate SHM-ID represents the unique identifier of the shared + memory region, the host physical address HPA will get mapped at guest + address GPA in domU and the memory of size will be reserved to be shared + memory. The shared memory is used between two dom0less domUs. + + Below is an example: + NUM_DOMUS=2 + DOMU_SHARED_MEM[0]="my-shared-mem-0 0x50000000 0x6000000 0x10000000" + DOMU_SHARED_MEM[1]="my-shared-mem-0 0x50000000 0x6000000 0x10000000" + + This static shared memory region is identified as "my-shared-mem-0", host + physical address starting at 0x50000000 of 256MB will be reserved to be + shared between two domUs. It will get mapped at 0x6000000 in both guest + physical address space. Both DomUs are the borrower domain, the owner + domain is the default owner domain DOMID_IO. + - DOMU_DIRECT_MAP[number] can be set to 1 or 0. If set to 1, the VM is direct mapped. The default is 1. This is only applicable when DOMU_STATIC_MEM is specified. diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen index cca3e59..46ea7e5 100755 --- a/scripts/uboot-script-gen +++ b/scripts/uboot-script-gen @@ -204,6 +204,28 @@ function add_device_tree_xen_static_heap() dt_set "$path" "xen,static-heap" "hex" "${cells[*]}" } +function add_device_tree_static_shared_mem() +{ + local path=$1 + local domid=$2 + local shared_mem=$3 + local SHARED_MEM_ID=${shared_mem%% *} + local regions="${shared_mem#* }" + local cells=() + local SHARED_MEM_HOST=${regions%% *} + + dt_mknode "${path}" "domU${domid}-shared-mem@${SHARED_MEM_HOST}" + + for val in ${regions[@]} + do + cells+=("$(split_value $val)") + done + + dt_set "${path}/domU${domid}-shared-mem@${SHARED_MEM_HOST}" "compatible" "str" "xen,domain-shared-memory-v1" + dt_set "${path}/domU${domid}-shared-mem@${SHARED_MEM_HOST}" "xen,shm-id" "str" "${SHARED_MEM_ID}" + dt_set "${path}/domU${domid}-shared-mem@${SHARED_MEM_HOST}" "xen,shared-mem" "hex" "${cells[*]}" +} + function add_device_tree_cpupools() { local cpu @@ -329,6 +351,11 @@ function xen_device_tree_editing() dt_set "/chosen/domU$i" "xen,enhanced" "str" "enabled" fi + if test -n "${DOMU_SHARED_MEM[i]}" + then + add_device_tree_static_shared_mem "/chosen/domU${i}" "${i}" "${DOMU_SHARED_MEM[i]}" + fi + if test "${DOMU_COLORS[$i]}" then local startcolor=$(echo "${DOMU_COLORS[$i]}" | cut -d "-" -f 1)