From nobody Mon Feb 9 21:37:11 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=unpredictable.fr ARC-Seal: i=1; a=rsa-sha256; t=1769714599; cv=none; d=zohomail.com; s=zohoarc; b=lysRXXcIXGvPpDnwW6y+70Y/p8HKPDu8l4ePYWHVL5woiMJ+I0hgyabmoN0dBbfnD+9mZ1Wfum4PIxgqORf5DmtmAEzAhQ46tdrnUtAXd83wjOPjBuU7QwqCvVEoKGMQQ4kNsQoaIEERSW9ach4hiboHBfWGf8LubM9Ac17DtUc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769714599; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=KaQ368BT2+kXLDF2JjCqdQWANc+K5Nc/lcLx70881Os=; b=PV6bOfKvHSVehkKT0sEmRFer56kcGUVVnanB7o9hq+KYXrJGg9Mtl5irJgEoWrsiRTxIjx95dCVTcsJ01nXlVAIbBsVMuK78EqSwogybds6PSjScDPiWj26Jyq7Nlq9QA1JBlIV4RL0jnklxEjm9V6c0RgR1UwlJrtb0K/duib8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769714599001801.3193129062945; Thu, 29 Jan 2026 11:23:19 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vlXaW-0000GB-UP; Thu, 29 Jan 2026 14:21:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vlXa0-0006f4-UK for qemu-devel@nongnu.org; Thu, 29 Jan 2026 14:21:28 -0500 Received: from ci-2002f-snip4-11.eps.apple.com ([57.103.88.191] helo=outbound.ci.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vlXZu-00069b-9W for qemu-devel@nongnu.org; Thu, 29 Jan 2026 14:21:23 -0500 Received: from outbound.ci.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-central-1k-100-percent-2 (Postfix) with ESMTPS id 3F49A1802012; Thu, 29 Jan 2026 19:21:01 +0000 (UTC) Received: from localhost.localdomain (unknown [17.57.156.36]) by p00-icloudmta-asmtp-us-central-1k-100-percent-2 (Postfix) with ESMTPSA id 037F31800335; Thu, 29 Jan 2026 19:20:57 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; t=1769714464; x=1772306464; bh=KaQ368BT2+kXLDF2JjCqdQWANc+K5Nc/lcLx70881Os=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:x-icloud-hme; b=gyFYFUDCP0QIaGlXj1nO6Fo7DuR5prP9I7ba/iWA3uXEZ5a8uYXrrI73ImYXGsdY8D1txoBlv47Xozx5aHQOdkYzezgIyCDQ1rKkKCOdbJyZL1oOZi06ejt/5CIF1Zo8qobOOI8Lx6w/rPSggKGgzkxkoIg3D2Ds9TXJKL8f644g96TLXq2S2zdtiH12k+FQNbH+R+2iURMWZsszST3TyYHcBLRqERXbQ3Wk4K18hv12jgmVqYZOEUWL0Hf6ToZX6oH9VRhDsJ8lss+MmKGvlpGwGovj48DTfYRCZi1KHEWNlIU2q8C+3lnvcr6dBpg5QJ07+fOQcGF5C3oJBvqGEg== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Pierrick Bouvier , Akihiko Odaki , Phil Dennis-Jordan , Shannon Zhao , Zhao Liu , Eduardo Habkost , Igor Mammedov , Richard Henderson , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Cameron Esfahani , "Michael S. Tsirkin" , qemu-arm@nongnu.org, Alexander Graf , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Pedro Barbuda , Peter Maydell , Marcel Apfelbaum Subject: [PATCH v19 15/22] whpx: change memory management logic Date: Thu, 29 Jan 2026 20:20:00 +0100 Message-ID: <20260129192009.14707-16-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260129192009.14707-1-mohamed@unpredictable.fr> References: <20260129192009.14707-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Proofpoint-ORIG-GUID: xMWZHRP7tQ8RBzgIMkdpY7iemaEqBEtI X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTI5MDEzOCBTYWx0ZWRfX4iMa4VPdBBGc ZfwPZ3ZHrAEKF9sUxbuVUQu3hYf3drh2o3FiYTJaj2YPqW3jPGmwPdDVxS9yMiWg0wLJnK8cX10 qO/BY0T7NWT0WMWzXTPVYXNRkxH69CVOUWs4CqTfWgzRW8CPy5YuvQikwi48oeeVdc2QanGDtvl +ZdoWOoHhFpz+0HUnuMLPwFmaDJd8ujsHWJNi2OOwbUrAWBhHF360pL/Od60nZaD56+5GLkETBS URYJhJreOGwwKRUw6mfACEBZ0ome2i7uHnVUTsVjcaRCyKZqmwBIEyNhnRk6yKmHcsRpWoW2QM2 zWKOkySfaaFBF6bi+vc43iSJVx6LFCazZwDnsK0oLzLNo08M8gTpukVJ/fvarE= X-Authority-Info-Out: v=2.4 cv=FoAIPmrq c=1 sm=1 tr=0 ts=697bb31f cx=c_apl:c_apl_out:c_pps a=2G65uMN5HjSv0sBfM2Yj2w==:117 a=2G65uMN5HjSv0sBfM2Yj2w==:17 a=IkcTkHD0fZMA:10 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=KKAkSRfTAAAA:8 a=Wq2Hhhcarr-WV7vA_m4A:9 a=3ZKOabzyN94A:10 a=QEXdDO2ut3YA:10 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: xMWZHRP7tQ8RBzgIMkdpY7iemaEqBEtI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-01-29_03,2026-01-29_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 bulkscore=0 spamscore=0 adultscore=0 lowpriorityscore=0 clxscore=1030 malwarescore=0 phishscore=0 mlxscore=0 mlxlogscore=999 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2601150000 definitions=main-2601290138 X-JNJ: AAAAAAABmHcgY3XPkurqwwlse9DvSFRZS+LapP7deIjrx8O0epRk2V9jJ4zeNmo3jY9QfvXWkwotEfGVjcP+OeRBezbxbq3NxnRjwTmQ0ugmnmrGykMVYko0gbs73aauze9+wqV2K/16ZXUlEm1/ME70wp4BBvpn54TY/ayopDiSfhhI1ZJQ0+fCJzRzc3bQqG1Hhrb1lWrZDl9GkJmtzd6BjSjYRshVTqThcoo+wzTAIbKdNZNHNWKci7CQGhPkW4JZBIyt/IoAI3sOE2D8B7tlKFIJd6xEwHo3a4mPyTPWpxzwlErunGXK5yogLSHkTWOUAo3PgHMI5FgEw6WQdmeuRYnrFnynSvh5T1HIBT3jOFW2ZYqASi3lGX06bq8EsDqOX28zTqLuLGHYNdBvT8pgXBTW7dap5sIE5KReO39+bNE1UQ9ddQedJCIcVP1i4CKs9G2FPupywxLeTpG8VxpuEh6IpfgKB1enXVYBPqWHt7ofnT2AuG3Hi5SGl+j2KPiU860tp2sHPcZ2W31GIf98OYZ8e43yLl+Sfd1K3C1knWGC3N2+Mi7lGCMK+J6o6k4EaI4QK17HXQTWGBl1kf7kaK9c3S85/VnW9Icu7r4MmA/gqMpIHNVCvWMevg7h3yEZbsfpzQUSqywdxtpfvwzxBjd07PvTDbuz/KGBviFWr2OzMsrQo6Iqo5ziW/d7YLv5VuJP9561GE0pL/t8N6aV/vtgQYoTWKgQT+3Xp+qcqmF37yHWg1+Cv55jYMKSg3MaSa3Kh14lU6rWCN+FQVKC3OPx8V4jGj+cwu+OiTY5nHBhG8Iq6Qu0jwcHxPtCaEGVDcuGer7UHGHkTr8OSnNv27TZCp2vnDCUc6VJsM6WYa57dAoGJrx7cyRHD64= Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=57.103.88.191; envelope-from=mohamed@unpredictable.fr; helo=outbound.ci.icloud.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @unpredictable.fr) X-ZM-MESSAGEID: 1769714600340158500 This allows edk2 to work on Arm, although u-boot is still not functional. Signed-off-by: Mohamed Mediouni Reviewed-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Akihiko Odaki --- accel/whpx/whpx-common.c | 97 +++++++++++++++------------------------- 1 file changed, 36 insertions(+), 61 deletions(-) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index 827f50f3e0..f018a8f5c7 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -255,89 +255,64 @@ void whpx_vcpu_kick(CPUState *cpu) * Memory support. */ =20 -static void whpx_update_mapping(hwaddr start_pa, ram_addr_t size, - void *host_va, int add, int rom, - const char *name) +static void whpx_set_phys_mem(MemoryRegionSection *section, bool add) { struct whpx_state *whpx =3D &whpx_global; + MemoryRegion *area =3D section->mr; + bool writable =3D !area->readonly && !area->rom_device; + WHV_MAP_GPA_RANGE_FLAGS flags; + uint64_t page_size =3D qemu_real_host_page_size(); + uint64_t gva =3D section->offset_within_address_space; + uint64_t size =3D int128_get64(section->size); HRESULT hr; + void *mem; =20 - /* - if (add) { - printf("WHPX: ADD PA:%p Size:%p, Host:%p, %s, '%s'\n", - (void*)start_pa, (void*)size, host_va, - (rom ? "ROM" : "RAM"), name); - } else { - printf("WHPX: DEL PA:%p Size:%p, Host:%p, '%s'\n", - (void*)start_pa, (void*)size, host_va, name); - } - */ - - if (add) { - hr =3D whp_dispatch.WHvMapGpaRange(whpx->partition, - host_va, - start_pa, - size, - (WHvMapGpaRangeFlagRead | - WHvMapGpaRangeFlagExecute | - (rom ? 0 : WHvMapGpaRangeFlagWri= te))); - } else { - hr =3D whp_dispatch.WHvUnmapGpaRange(whpx->partition, - start_pa, - size); - } - - if (FAILED(hr)) { - error_report("WHPX: Failed to %s GPA range '%s' PA:%p, Size:%p byt= es," - " Host:%p, hr=3D%08lx", - (add ? "MAP" : "UNMAP"), name, - (void *)(uintptr_t)start_pa, (void *)size, host_va, h= r); + if (!memory_region_is_ram(area)) { + if (writable) { + return; + } else if (!memory_region_is_romd(area)) { + add =3D false; + } } -} - -static void whpx_process_section(MemoryRegionSection *section, int add) -{ - MemoryRegion *mr =3D section->mr; - hwaddr start_pa =3D section->offset_within_address_space; - ram_addr_t size =3D int128_get64(section->size); - unsigned int delta; - uint64_t host_va; =20 - if (!memory_region_is_ram(mr)) { - return; + if (!QEMU_IS_ALIGNED(size, page_size) || + !QEMU_IS_ALIGNED(gva, page_size)) { + /* Not page aligned, so we can not map as RAM */ + add =3D false; } =20 - delta =3D qemu_real_host_page_size() - (start_pa & ~qemu_real_host_pag= e_mask()); - delta &=3D ~qemu_real_host_page_mask(); - if (delta > size) { - return; - } - start_pa +=3D delta; - size -=3D delta; - size &=3D qemu_real_host_page_mask(); - if (!size || (start_pa & ~qemu_real_host_page_mask())) { + if (!add) { + hr =3D whp_dispatch.WHvUnmapGpaRange(whpx->partition, + gva, size); + if (FAILED(hr)) { + error_report("WHPX: failed to unmap GPA range"); + abort(); + } return; } =20 - host_va =3D (uintptr_t)memory_region_get_ram_ptr(mr) - + section->offset_within_region + delta; + flags =3D WHvMapGpaRangeFlagRead | WHvMapGpaRangeFlagExecute + | (writable ? WHvMapGpaRangeFlagWrite : 0); + mem =3D memory_region_get_ram_ptr(area) + section->offset_within_regio= n; =20 - whpx_update_mapping(start_pa, size, (void *)(uintptr_t)host_va, add, - memory_region_is_rom(mr), mr->name); + hr =3D whp_dispatch.WHvMapGpaRange(whpx->partition, + mem, gva, size, flags); + if (FAILED(hr)) { + error_report("WHPX: failed to map GPA range"); + abort(); + } } =20 static void whpx_region_add(MemoryListener *listener, MemoryRegionSection *section) { - memory_region_ref(section->mr); - whpx_process_section(section, 1); + whpx_set_phys_mem(section, true); } =20 static void whpx_region_del(MemoryListener *listener, MemoryRegionSection *section) { - whpx_process_section(section, 0); - memory_region_unref(section->mr); + whpx_set_phys_mem(section, false); } =20 static void whpx_transaction_begin(MemoryListener *listener) --=20 2.50.1 (Apple Git-155)