From nobody Tue Feb 10 21:40:06 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1770731590; cv=none; d=zohomail.com; s=zohoarc; b=OCS6Myh7ld1ecGTObhJ6tcQRd0CZwF0FC6svnHLO6tHWXw9RpT1MhpfF1U/R6HmLI0GnN4X2UOqCB8vUkM3BXIxqCp51l2Qtx1HH22yIYabB5G21FAc+aTeU1RCQ3eB1IMG+CpQXV7cGpiNj84iOhSHMDMrqMvSCf8xKdfjFLcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770731590; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=73Gszeg/ABaJHBRXvm523fWNFo3Mo1lJgEc7Wi/TY9M=; b=QhZFdaAfbeVHhIaUD9CesAqNEK2b+kKjDKo3QGII5YYLJlmZAN3q+Biez5PCQ8anoGmTEwx+/z9X6VeB8bDqvtnZmR9NQotQseeYldZlomtBr2fsnpp6k2iXfCweoiHqUa5iNcozUoJs+4nFvMDXl+K+PRWACUX3tk+lfEUmWFI= 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=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1770731590548607.0156929272995; Tue, 10 Feb 2026 05:53:10 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vpoAD-00026O-Ot; Tue, 10 Feb 2026 08:52:25 -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 1vpoAC-00022p-Ts for qemu-devel@nongnu.org; Tue, 10 Feb 2026 08:52:24 -0500 Received: from mail-wm1-x333.google.com ([2a00:1450:4864:20::333]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vpoAB-0006Lp-9S for qemu-devel@nongnu.org; Tue, 10 Feb 2026 08:52:24 -0500 Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-4801c2fae63so46995605e9.2 for ; Tue, 10 Feb 2026 05:52:21 -0800 (PST) Received: from lanath.. (wildly.archaic.org.uk. [81.2.115.145]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4834d5d77f9sm64344875e9.3.2026.02.10.05.52.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Feb 2026 05:52:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1770731541; x=1771336341; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=73Gszeg/ABaJHBRXvm523fWNFo3Mo1lJgEc7Wi/TY9M=; b=H7ZFiOXlf6v7R5KUS3avqXKuCAzCcw6qNOqoBvAGF3d6JHNw0EuIRh6zyHk2AlssPr zNPCyFFEbNAKfzwczRE2EDd82O+StZ4PvH2hsEv6AiTkRyi43cfDlWERwz7VDXGCxw5a kldNqapabjNMO3BD/0Hmw11akIo9boGfxSJuvSEF/UqbPl6k4v/uno+onNbvJl5efwY9 MaRTCv1kK8MT+5ysdW9KAtZZgP+q/mvouAiE3MqSFR+EYN3URT4ZMZOV9pb0urc/tf11 MLYJ1XEESRhiH4WgiD2xP/mvAAxyRn/ns/rBbEjWzwN3416GDGZVpNxlr1BZCqgOJzej jpmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770731541; x=1771336341; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=73Gszeg/ABaJHBRXvm523fWNFo3Mo1lJgEc7Wi/TY9M=; b=BEEdWbr741bjVePZScFCeXeY7EXqKb9iQhicI4ZjflzSmVDEfZ885+KwNZbYF9t8be eWkUZBT0Rn4hL4KJodIvbFxo1lwhKPuqXWdY3UPOLqb7VcqCtulf9SWVJlYGyqpqXh+u KnyZ6fj5ZnsmM7IwhOiphgCJY5oM3RQb6TucjeTbjCG8sd6GY/rZs5oeVNhXvX2BjkhF g2h7hVgvLKGCB3HBPAf7w8v93baHeEphe8+vB2i5ACJP19oUvtrtkPNP4NH0whNFqBns G5fcsBr0glyBlFJ/oam0qhH+x1m35qqWX7X1PzLpmmnFVTNI4UGt7wgErO+wgUT7+EIy bXVA== X-Gm-Message-State: AOJu0YyCdHpGLJ6nPXXdk4G16siaFhg0nA/V31ROxZ26CuwS4q7KyPz5 6bOwa2jD27f/zDmhk1ybDlTAr9NTipGskMY4IH1DaTwuGr8Dtm6e1FFaDjryPiMGXg0YTxHSuQN BJQeK X-Gm-Gg: AZuq6aLf6QMjdzZR1TO0b9919p7U3wCXsqLNClSKxs2qVl2oOX56/jKjqJZDskrEpat d7WKZZLGntaPfkB3xnN/q2mZaGy9lCqNyZaZqPxWd/qS4CIsbkV+ZinvinW55k+UJ1iTVhWR4Iu PNOvwj1xkG0Y3oGsPZBi3sNd0iLmE4T91nebunjLGQ9t9gbUbcFjtR3iGipTk99eH3+u5sBMP+t 0pPnFQyV6p5jn+KwoSCASd9aiJsNigPR2rsAIiO9aVgDK4SLCw4Pr31q7+BnMHKLRY4+6spkkYG JEWsAhseA/xEt7BQls0wU73lfVXcPKorO3IzPLl8vlwwdB+HUtlH6/0Bb518EzE41a0+zQPfcuZ TiOJbcMm6xQG3pH41dwBLhQdiphOHu1Nl4rBwqF/Qji08tdTZ44w4SagNoXLC7Sv08ULuP+pKHF QFBb9QW4iiu8YlySdFBHERkl7/QbAfLNLFyAng805SZM11XYfTGnopPPu4s8ncszH2lxbKAvSL/ b5MpJvuqm8BdLPsmWbnt+nYQxBn+l4= X-Received: by 2002:a05:600c:8b12:b0:480:4be7:4f53 with SMTP id 5b1f17b1804b1-4835083392dmr35903785e9.31.1770731540462; Tue, 10 Feb 2026 05:52:20 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 15/26] whpx: change memory management logic Date: Tue, 10 Feb 2026 13:51:55 +0000 Message-ID: <20260210135206.229528-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260210135206.229528-1-peter.maydell@linaro.org> References: <20260210135206.229528-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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=2a00:1450:4864:20::333; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x333.google.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_DNSWL_NONE=-0.0001, SPF_HELO_NONE=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: 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 @linaro.org) X-ZM-MESSAGEID: 1770731591430158500 From: Mohamed Mediouni 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 Signed-off-by: Peter Maydell --- accel/whpx/whpx-common.c | 99 +++++++++++++++------------------------- 1 file changed, 37 insertions(+), 62 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 (!memory_region_is_ram(area)) { + if (writable) { + return; + } else if (!memory_region_is_romd(area)) { + add =3D false; + } } - */ =20 - if (add) { - hr =3D whp_dispatch.WHvMapGpaRange(whpx->partition, - host_va, - start_pa, - size, - (WHvMapGpaRangeFlagRead | - WHvMapGpaRangeFlagExecute | - (rom ? 0 : WHvMapGpaRangeFlagWri= te))); - } else { + 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; + } + + if (!add) { hr =3D whp_dispatch.WHvUnmapGpaRange(whpx->partition, - start_pa, - size); + gva, size); + if (FAILED(hr)) { + error_report("WHPX: failed to unmap GPA range"); + abort(); + } + return; } =20 + flags =3D WHvMapGpaRangeFlagRead | WHvMapGpaRangeFlagExecute + | (writable ? WHvMapGpaRangeFlagWrite : 0); + mem =3D memory_region_get_ram_ptr(area) + section->offset_within_regio= n; + + hr =3D whp_dispatch.WHvMapGpaRange(whpx->partition, + mem, gva, size, flags); 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); + error_report("WHPX: failed to map GPA range"); + abort(); } } =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; - } - - 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())) { - return; - } - - host_va =3D (uintptr_t)memory_region_get_ram_ptr(mr) - + section->offset_within_region + delta; - - whpx_update_mapping(start_pa, size, (void *)(uintptr_t)host_va, add, - memory_region_is_rom(mr), mr->name); -} - 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.43.0