From nobody Thu Jan 8 13:17:08 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=1766966314; cv=none; d=zohomail.com; s=zohoarc; b=TNhxRjEXCztDWq4MZdYpRAT862Ly/27ET8x0HQyrdkygtkUKd7kfpq7riRZDETj5ucg6Hmnl17gamI7ENP0MOgTDzXcn8ckxJdnWUWYfLztk09+KCQrLU0x6hawdBoMwOTv78QUByW/iHwmUqrcKBPSXnW5fYnN2i226twPiaW0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1766966314; 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=QDXE4BTKz17kv5VTY/i5MP6X8/apcEf7UgecJbK6GMA=; b=MOzvaCJOUhx/72qZRaWUcIjN/a6THU0cRpfHRBcuaYAKFqYIhu9enzQkSAAxoz4sIBoNIgWV0Cxahm04a+m+hwdbLFOfWE86bWJKMdmzPUaH++p4riYkjH3CtSuDDdwD9y7/ebiOTYnbB8FhkgnJ8V1Wf5jIQgpudushS1Gi3xk= 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 1766966314825311.3784354179825; Sun, 28 Dec 2025 15:58:34 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1va0e1-0007h8-22; Sun, 28 Dec 2025 18:57:53 -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 1va0dj-0006k2-Hd for qemu-devel@nongnu.org; Sun, 28 Dec 2025 18:57:36 -0500 Received: from p-west1-cluster1-host12-snip4-8.eps.apple.com ([57.103.64.21] helo=outbound.pv.icloud.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1va0dh-0007Jb-Hb for qemu-devel@nongnu.org; Sun, 28 Dec 2025 18:57:35 -0500 Received: from outbound.pv.icloud.com (unknown [127.0.0.2]) by p00-icloudmta-asmtp-us-west-1a-60-percent-5 (Postfix) with ESMTPS id B574E18000BB; Sun, 28 Dec 2025 23:57:27 +0000 (UTC) Received: from localhost.localdomain (unknown [17.56.9.36]) by p00-icloudmta-asmtp-us-west-1a-60-percent-5 (Postfix) with ESMTPSA id EEEED1800758; Sun, 28 Dec 2025 23:57:20 +0000 (UTC) Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=unpredictable.fr; s=sig1; bh=QDXE4BTKz17kv5VTY/i5MP6X8/apcEf7UgecJbK6GMA=; h=From:To:Subject:Date:Message-ID:MIME-Version:x-icloud-hme; b=go8kJFXlbd3oCXMCA5QEVPJIkISwqMECbV+dns1mbRf4afmykhZT9Vc1cDd7PTfuDsRcrBzUnKJaLSwr+2X5DW0MmXMctRZIAMYD6G0DvXlS6S6ZgAKL0kn/2MDGpA4M7thnWEosiERipmac7teZylZe5GF7ZkOHUuUCfGMp1QX1W2/mt3rdDJWyL24x7IthDWj5Wxtxm+V7ts89kTThUqeQZjwAvT13USVQzkQ7eLGZWSb1Dof4F5RpbsTdTwlv7IyUq6qz3JGY9wTGeK/Foq/pxI68sM8k/KhhRDW5T0yIj3YUq/9E6qKY777ZJWvTq2wljmUUDYjwdBm1khowIQ== mail-alias-created-date: 1752046281608 From: Mohamed Mediouni To: qemu-devel@nongnu.org, mohamed@unpredictable.fr Cc: Alexander Graf , Marcel Apfelbaum , Shannon Zhao , Eduardo Habkost , Phil Dennis-Jordan , Zhao Liu , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini , Richard Henderson , =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , kvm@vger.kernel.org, Roman Bolshakov , Pedro Barbuda , qemu-arm@nongnu.org, Akihiko Odaki , Yanan Wang , Peter Xu , Igor Mammedov , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Ani Sinha , "Michael S. Tsirkin" , Mads Ynddal , Cameron Esfahani Subject: [PATCH v12 17/28] whpx: change memory management logic Date: Mon, 29 Dec 2025 00:54:11 +0100 Message-ID: <20251228235422.30383-18-mohamed@unpredictable.fr> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20251228235422.30383-1-mohamed@unpredictable.fr> References: <20251228235422.30383-1-mohamed@unpredictable.fr> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: NjGh43IiO3Q0R9WKNb4nGe2PdcSijygC X-Proofpoint-ORIG-GUID: NjGh43IiO3Q0R9WKNb4nGe2PdcSijygC X-Authority-Info: v=2.4 cv=V5JwEOni c=1 sm=1 tr=0 ts=6951c3eb cx=c_apl:c_pps a=azHRBMxVc17uSn+fyuI/eg==:117 a=azHRBMxVc17uSn+fyuI/eg==:17 a=wP3pNCr1ah4A:10 a=VkNPw1HP01LnGYTKEx00:22 a=-lUDFlMDQ8UY_jOkuTYA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUxMjI4MDIyMyBTYWx0ZWRfX1KyhiV+ZmKbN 2ANAfsTxBASIw346Ax+DBKaWVzlgt9EjOpSbCdhtL3JqF7oJDeayYB+dayDvZtkOeys0Z/9PFZ5 RehtGUyEcfqSrooorxSD3zAxPlDRsj+ul8xh/+tuBYJcwH33dWFI/vEoCXyGdzWZDKEoIKvHYXQ 2tnacZLgjJRzde3wfcrIkJFWtlVHT9qdEbPQgRpH6P23mHkgmsbwjJu6NirHPgKB8FUxiCooJG9 nvMNfqdyS/Im5xFQkh6RK1COga21v+XJ2xuAakhrcnExt0Itjxi3R5KekUjHRLGR0L0C837JLWo eCPXuNCojytct9HemB6 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.9,FMLib:17.12.100.49 definitions=2025-12-28_07,2025-12-26_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 bulkscore=0 adultscore=0 phishscore=0 clxscore=1030 spamscore=0 malwarescore=0 suspectscore=0 mlxlogscore=999 classifier=spam authscore=0 adjust=0 reason=mlx scancount=1 engine=8.22.0-2510240001 definitions=main-2512280223 X-JNJ: AAAAAAABn9jVyaDDyISAKSriCfnSBElNzoGH/CEj3Y3Y7xOhokuerFwM94+2tCTy1HKL9edtF2Sq/s0mQsLgV7Xgkr1QVm5LEPVPcU5RfTNNBmQdA3k1+0q8RwwpRwKD8NJgjWjhfUMo+8nsJS+iwX9lM3aCQkqmip8oLnBnoRXU78dMLQyTc8+66iEb1fz2/RgozdRpc1HGFgwGUWA8+0tDrYAJnhKlBXL3DbXUEDR+MMyrpKhnUuthnMEk/yytOsDYmUK2fYJZfo5JYZUbatJWAyp0cvz8kWw/IUxVDYnwty6pxiRHEcmdsA0GK3lgfSeDWzNlhUSSmJj3O1rhi67taVPX053R1dnsjcW4teOuiFCugPVWA+9znakqQJPKJ1FRhNExbijtbENEG9qoIF8lNRnhQ8ZLe2S4FKq70N++m0aQg4DIUG8pECV6n/D55ft2SIN08f3Hz/Z8K8pXO8my/uw01HfSDysFHQUpFZ5vaLn6dc2uy3+DlNA51LaMShYRLXFTsYP6n/28LFm1+YWFICebOL6g2KIKutZINHx8lUIv2Qm6UQ1wCQK1uCo8IwVm3Wi/iQ1x/XOvVxiItuWBVCR+o0iwp3AdgP5/jeiVU/ktJfQPC89Pp+Jv2Nien+JmDTO4vMEzbI/9UevPUTbDr7JjSBkciFJFw+dMHBg4BAgj1eJgrbBzBnj85NT8s27GnUnhx8Za3IYVf7MLKQLPGlMukGcT9ZQydfdeTPQG9oNU6Ic75DDcvi5qiJwyER1qhP6zXfeLhwRWIZyCtC38g7Os3kPYrJ08dyzIl7YDCZ6FAOc3mCQnhs6p94tLxLADGx5tDf2GR5u0WkibnOeE3FN44ra66Ey5fYDQx8Zs1jrD4B/riFoxWKLX0BHzuJDPlnMzNlqqvD0ncryMPIH4IjUCnl0ydlJSgxh9pPt+TQIjh15ahKtjSeSno+bC5aUG8+GyJXTmXQJv 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 (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.64.21; envelope-from=mohamed@unpredictable.fr; helo=outbound.pv.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_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: 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: 1766966316598158500 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 Reviewed-by: Pierrick Bouvier --- 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 0d20b1d24c..e0db8ace4a 100644 --- a/accel/whpx/whpx-common.c +++ b/accel/whpx/whpx-common.c @@ -259,89 +259,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)