From nobody Fri Nov 14 18:05:07 2025 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=1760636644; cv=none; d=zohomail.com; s=zohoarc; b=k+LJUfhMI4NxQlvv0ZMggHPnN9E6XFXlxvQ+iF1Jv+TyV+5q46VmAgE2CfrktGuZiZ1C8xmTQ12oNMktMxH9gdOOgMPokMdSP9ze318flQRXnOKYy5VDERApVMzb1zAVianl0cpp8M/6eI4up8DUAvRpPticbEOblBs3VK6m0pc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1760636644; h=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=82UyicUDYmPvjVI7F//cuPe+s0EfvftNMhuinirR7JM=; b=egkaeSZVR/OKFfeyhB4uA330TjFHUCbAvctQgqX6LHexdLuW5Ek9Fg9h0w/DpOreGSmD4whGMnfmhrb6pIER39mr8ZhuUsY/t2BN51lAZ17W3YsZwYxUoZoilIQM8sRBoDKM+sXuuKt5jDx8Y6Xf/RqDWgyJKGL5VWqRX1iM9Sk= 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 1760636644300988.9564139146762; Thu, 16 Oct 2025 10:44:04 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v9Rwa-0006mj-CT; Thu, 16 Oct 2025 13:39:17 -0400 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 1v9RwV-0006k4-MP for qemu-devel@nongnu.org; Thu, 16 Oct 2025 13:39:11 -0400 Received: from p-east2-cluster4-host6-snip4-3.eps.apple.com ([57.103.78.204] helo=outbound.st.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v9RwL-0007j7-2u for qemu-devel@nongnu.org; Thu, 16 Oct 2025 13:39:11 -0400 Received: from outbound.st.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-east-1a-100-percent-6 (Postfix) with ESMTPS id 8C5701800178; Thu, 16 Oct 2025 17:38:53 +0000 (UTC) Received: from localhost.localdomain (unknown [17.42.251.67]) by p00-icloudmta-asmtp-us-east-1a-100-percent-6 (Postfix) with ESMTPSA id 9740C180009D; Thu, 16 Oct 2025 17:38:49 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=82UyicUDYmPvjVI7F//cuPe+s0EfvftNMhuinirR7JM=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=bKthQqDsYnu5LsI7ILj38DNSSupusq5zAnHGCVp4ISpY0LiFPnIjgVc9HtCnm5hyuI0ftJtux9O6NM9hnRNap6vNdXSnTwz32t/y7fPr6KdDlxMPfvaZjdJvOwg/v+NmQrS1GFPI4jx4MKydm1q0bhbx0b+9J8NzQrF7FuD3KGKVdxapO9x5wmby8tWLnnwoCnPhP/j6wKE0hOIhaqcsfo3PNUvi9lWWvJVIjkPK65Ls8CYG2jgtO73PDDFpOVYz3ng6jw6l+O8Zreun8fx+frWN6FfGxHsufbnIR+pX5ydba5TR+Eimlx2zrJU3/uxsyk6ChepOqnmruzGSxtEr/Q== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, kvm@vger.kernel.org, Richard Henderson , Sunil Muthuswamy , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , Igor Mammedov , Yanan Wang , Ani Sinha , Shannon Zhao , Cameron Esfahani , Mads Ynddal , Zhao Liu , Phil Dennis-Jordan , Roman Bolshakov , Peter Maydell , Marcel Apfelbaum , Mohamed Mediouni , Paolo Bonzini , Alexander Graf , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Pedro Barbuda Subject: [PATCH v8 13/24] whpx: change memory management logic Date: Thu, 16 Oct 2025 19:37:52 +0200 Message-ID: <20251016173803.65764-14-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251016173803.65764-1-mohamed@unpredictable.fr> References: <20251016173803.65764-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMDE2MDEyOCBTYWx0ZWRfX38ZlQHx7hEDZ dOGp6eLTl3YWrMxZUhhH40ahLxaChVM/5E1I+FNgFqdoaR1dQ5jyGbYlQGhrqDerOv0dGl4kJuM ErcjAO6AbIqYt0EmiFdRpFRQzAJa4kX9GQZffq+51bT6lwWwkOzYylUNdQUHx86l9/jFdka9h30 DoxPLg7/LtILvmx244HEWsKxj+O5caem2dRmL41tAjA0MrjYMUHTofAPFib/zhgHmW3947fX1Xw HkmfYtAcNwSks3iCDXJqFY4lPi+jMi7xrn01c/d+RaKMRzb1b5P01Jdplhg8tBi5dXDdJP5kM= X-Proofpoint-GUID: KWZ7rnSZgz3kIevxdj-my4kU95fNqWhD X-Proofpoint-ORIG-GUID: KWZ7rnSZgz3kIevxdj-my4kU95fNqWhD X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.80.40 definitions=2025-10-16_03,2025-10-13_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 phishscore=0 suspectscore=0 clxscore=1030 bulkscore=0 mlxscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.22.0-2506270000 definitions=main-2510160128 X-JNJ: AAAAAAAB/NfokEn246SdWICx7kLD1xmWFX/4amWxU6gRcPHcwmOET0p2KHrmAu6v0zwOTJPAKjLHPr083vunzpzxvtDrRjRg1r/kqYi2N0fgMj7nWVsf5vV/pADk6Ua86DTOB65JhvUufskVorN7q7p3UkzokYkv4YdjJf/9bXydwV0eudTetzORUGfaw5Zh0x0eKUskUwGKdYTaqe+WijDwpAlGqslHBeSx3SgPLYGPKVaQLMejvhEkKXBmY9dRvJKZ5LuS+8KBWhASrFd9Qepd9Bv0F/tpdMjLChxZOQ3m/jliRb03t7UdxjOHI+mtamYshan/WfFmNvcYPIU81BU2pGHBst3onirXzN4mV/iPHejkyPtUFKoelVW0rXNJcYtvxiLmBbjYJlEomPTm077VUV6xc40S6L6DmH0xZ5VJ6bYarISJmp9MNYIgAvvX62gCNW71E+Gy2b4nGRj2/jK6M8b//xw6ZrrBETAX9VnK9+LyqIjRZd5iXit6xKyJEBup/o7KsiXh2BLM812SyNsBT4q3Y5KG19HGenVfu8yp84fzkdRQ1XR3oouWQJbRawV4RfZYhE1dsaElFplxI3IDsY8+b9NDKrs4KwJmtpko/dm9V5A2//lW3oskIomlrN+BuxW4S26B90FkPprGOQQHTgBNaPgx+jHgc8umDjnt+N93ynJQOiFkfjuFwrq3IU/vxZ4cok88ncBUACVggqohaAnhbzOx29eZm+KcqLeE+iCDoPBU4vK08L5FxqWxfKsMzn/gdQzphFrTXKvuAd2BKtJPaedD4R7tqdS8RTT/xd4btGHWZqYA568eC6t3EFC00REiJIIh5atueOmYyw/j2ds6PfOxjRGOoebuIyvx+21LfkDrq+EXHdf9yOObxADHA9bB80ZNB3H17xnI 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.78.204; envelope-from=mohamed@unpredictable.fr; helo=outbound.st.icloud.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: 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: 1760636648272158500 Content-Type: text/plain; charset="utf-8" This allows edk2 to work on Arm, although u-boot is still not functional. Signed-off-by: Mohamed Mediouni --- accel/whpx/whpx-common.c | 97 ++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 63 deletions(-) diff --git a/accel/whpx/whpx-common.c b/accel/whpx/whpx-common.c index c69792e638..afc325aa28 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -258,89 +258,60 @@ 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; - HRESULT hr; - - /* - 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); + 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 res; + void *mem; + + if (!memory_region_is_ram(area)) { + if (writable) { + return; + } else if (!memory_region_is_romd(area)) { + add =3D false; + } } -} =20 -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; - - 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) { + res =3D whp_dispatch.WHvUnmapGpaRange(whpx->partition, + gva, size); 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); + res =3D whp_dispatch.WHvMapGpaRange(whpx->partition, + mem, gva, size, flags); + if (!SUCCEEDED(res)) { + 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)