From nobody Mon Feb 9 03:52:00 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=1768562484; cv=none; d=zohomail.com; s=zohoarc; b=OVEJPsAlgdGasMSMo+KAvAmK441rKTm4y6P3yVFoPPE4KleOh5Xhvf7Bl4twkZIav8FhP95+LvcmL7KjB3PV6rccC7zZdRwjQgQ+Jfk9Ys7j8cMXFcEdWBDElqSlMZUxVfeTYu9wh5FLbCD6ZK4ORxAOTKGM+WNUv93kSDmQa6E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768562484; 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=aRMKdOegR9TAtg6WXTn5Wxg1PnV20QrVFX34e8Mfs8A=; b=ZGj+Bp46Dh5DB1rhxIs+6/RGpWo5H7ZC3oJmyF48vm4kkSS60EEh8ELR/OkrzhhXicjxlQ4N0OAFfM752l3AzjgDCMBdqD/Ms8rkndTe2/aguwUkvFkAHo8JkxGdFzKQPIP8PfigHWcpE3ZNe2L1UMXIajl4OQX+PmCSXFCEsOE= 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 1768562484792757.0878381991561; Fri, 16 Jan 2026 03:21:24 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vghsW-0002Aw-7w; Fri, 16 Jan 2026 06:20:37 -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 1vghrt-0001ig-Se for qemu-devel@nongnu.org; Fri, 16 Jan 2026 06:19:58 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vghrr-0006Sx-Ax for qemu-devel@nongnu.org; Fri, 16 Jan 2026 06:19:52 -0500 Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-47ee2715254so8954675e9.3 for ; Fri, 16 Jan 2026 03:19:50 -0800 (PST) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47f429071besm92492975e9.10.2026.01.16.03.19.48 for (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 16 Jan 2026 03:19:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1768562389; x=1769167189; 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=aRMKdOegR9TAtg6WXTn5Wxg1PnV20QrVFX34e8Mfs8A=; b=KnqG888pJbfOrrz0fowMwDV4DzdonM1pg/zqsl+LJmR7103+9fJvW+zmq6O5r6lF4n rgyN4DUEwKt134lOkSWuwf0A5KmNlhBLojATBchPlywg1HgX1hT2K6OKGi9bSLfKjtfY qiMmKekFYY+oqvNKUgNun4Mtc0iC3gwPK3TStB3jM2ibQyI0rK8taCenmzh07isemmE8 32xPaW1qolzC1qPkmLc2gg0IN16Tti+yl9VInVNnqw75zsRnPDqNbPOACvHOyXLAL1OJ 2Cpdpk49esUvf55TKpCFliKDQVwUyFcaXyQQxMqqaLpH9DcCam+OJ7HI1u8UuCxiHWqo 1mgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1768562389; x=1769167189; 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=aRMKdOegR9TAtg6WXTn5Wxg1PnV20QrVFX34e8Mfs8A=; b=JAvQqZt3iUcyv88BuSmGP22A6eu+ZloB5IXlmVvfQ5lCSNLFSKKudVR01Sz8yEEeBz lBKvDJNDPpsN0tilDurewtvDJ6WSrNjQCjKijQRlXlc3WQdcl1/Zu7A5/yE8eh3kEJHe ne650ZybLWO/KJ44Ii5a0lWpfPgyuuG5S/JJiBt5oCKuX40Zc1G8CWZCJdtaRPVy0V8I 5YcZDIrJ/uHJuwfbhbYCURufMjYlpeqxw3Qm5tG9PGWCfA8CAYLuSDSS3LdXwmgLBArt Pkmw5riu+kxRhonCU9NugHe5Vwx/VubuCeeZoOGWSiL34/4z5F3dooZ4CfkU+xUmkbbR ft5Q== X-Gm-Message-State: AOJu0Yz37I1HsiPVOZAxQR1xLT3battCejnC8Cqp6Pxspw6C2QsFL0bW VtfzzEGXPfHrb3nkW6HRmtKAFOXSOGQpikymQbkniMjuyIVFbnuyf2Ir3SwefJa6rojN/Pv/rwW YOlqtr/M= X-Gm-Gg: AY/fxX6RMOXluC3/cE1UnY8HS6olotiv51ELm6w2sSbXvpJgBS42n21RfdNJVHOwuLy fj9P9HgnDBPuAIPTStYxnmROgwLMbQ0R0+cKoAfLitNgrfvF8q7hJhSVXt6xBKyKI1g3u6nmkcq H6pNyd82AKdFGo8/tDzDiGvJk+w5oMavkKKvWSISx72piPjIIVwN58ly0Qrl/YdGhwMPuB6vle8 Wi5E/ee7klo3m/HeyfoxfurvuLNXiGDKXan1b2gvsJgk+fwZHiTbJTcpajmFrZQa8cLWMqEKHaC 3xH2S1ua/2r7JWsgLUcr9ldDVhV8aw9ZegaqBoqaqvbOhfGdBMLQBePjprTCrVkuuw5d/2sW305 3KczAQr9QuEJCNj6TdnaPPWETLFfgRX/bempQVXv17ou/FgJ7zWvbIUkFec4Ll761DXe8OjOxAG Kop+R3tBtYSLseZO7mOEqF30YQYDKCmNwoaLoGcwT3QhlGF9lAmbD63I+6oY4Y X-Received: by 2002:a05:600c:1daa:b0:477:7991:5d1e with SMTP id 5b1f17b1804b1-4801e3468f0mr32429545e9.25.1768562389360; Fri, 16 Jan 2026 03:19:49 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 15/30] accel/hvf: Simplify hvf_set_phys_mem Date: Fri, 16 Jan 2026 12:17:52 +0100 Message-ID: <20260116111807.36053-16-philmd@linaro.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260116111807.36053-1-philmd@linaro.org> References: <20260116111807.36053-1-philmd@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 (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::334; envelope-from=philmd@linaro.org; helo=mail-wm1-x334.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: 1768562486902158500 From: Richard Henderson All of the complicated parts of updating the address space are handled by address_space_update_topology_pass. Do not create or use hvf_slot structures. Signed-off-by: Richard Henderson Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Akihiko Odaki Message-ID: <20260112103034.65310-9-philmd@linaro.org> --- accel/hvf/hvf-all.c | 111 +++++++------------------------------------- 1 file changed, 17 insertions(+), 94 deletions(-) diff --git a/accel/hvf/hvf-all.c b/accel/hvf/hvf-all.c index 3b6b9d6ea6a..dd9ea641ea5 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -87,45 +87,16 @@ void hvf_unprotect_dirty_range(hwaddr addr, size_t size) HV_MEMORY_READ | HV_MEMORY_WRITE | HV_MEMORY_EXEC); } =20 -static int do_hvf_set_memory(hvf_slot *slot, hv_memory_flags_t flags) -{ - struct mac_slot *macslot; - hv_return_t ret; - - macslot =3D &mac_slots[slot->slot_id]; - - if (macslot->present) { - if (macslot->size !=3D slot->size) { - macslot->present =3D 0; - trace_hvf_vm_unmap(macslot->gpa_start, macslot->size); - ret =3D hv_vm_unmap(macslot->gpa_start, macslot->size); - assert_hvf_ok(ret); - } - } - - if (!slot->size) { - return 0; - } - - macslot->present =3D 1; - macslot->gpa_start =3D slot->start; - macslot->size =3D slot->size; - trace_hvf_vm_map(slot->start, slot->size, slot->mem, flags, - flags & HV_MEMORY_READ ? 'R' : '-', - flags & HV_MEMORY_WRITE ? 'W' : '-', - flags & HV_MEMORY_EXEC ? 'X' : '-'); - ret =3D hv_vm_map(slot->mem, slot->start, slot->size, flags); - assert_hvf_ok(ret); - return 0; -} - static void hvf_set_phys_mem(MemoryRegionSection *section, bool add) { - hvf_slot *mem; MemoryRegion *area =3D section->mr; bool writable =3D !area->readonly && !area->rom_device; hv_memory_flags_t flags; uint64_t page_size =3D qemu_real_host_page_size(); + uint64_t gpa =3D section->offset_within_address_space; + uint64_t size =3D int128_get64(section->size); + hv_return_t ret; + void *mem; =20 if (!memory_region_is_ram(area)) { if (writable) { @@ -139,69 +110,28 @@ static void hvf_set_phys_mem(MemoryRegionSection *sec= tion, bool add) } } =20 - if (!QEMU_IS_ALIGNED(int128_get64(section->size), page_size) || - !QEMU_IS_ALIGNED(section->offset_within_address_space, page_size))= { + if (!QEMU_IS_ALIGNED(size, page_size) || + !QEMU_IS_ALIGNED(gpa, page_size)) { /* Not page aligned, so we can not map as RAM */ add =3D false; } =20 - mem =3D hvf_find_overlap_slot( - section->offset_within_address_space, - int128_get64(section->size)); - - if (mem && add) { - if (mem->size =3D=3D int128_get64(section->size) && - mem->start =3D=3D section->offset_within_address_space && - mem->mem =3D=3D (memory_region_get_ram_ptr(area) + - section->offset_within_region)) { - return; /* Same region was attempted to register, go away. */ - } - } - - /* Region needs to be reset. set the size to 0 and remap it. */ - if (mem) { - mem->size =3D 0; - if (do_hvf_set_memory(mem, 0)) { - error_report("Failed to reset overlapping slot"); - abort(); - } - } - if (!add) { + trace_hvf_vm_unmap(gpa, size); + ret =3D hv_vm_unmap(gpa, size); + assert_hvf_ok(ret); return; } =20 - if (area->readonly || - (!memory_region_is_ram(area) && memory_region_is_romd(area))) { - flags =3D HV_MEMORY_READ | HV_MEMORY_EXEC; - } else { - flags =3D HV_MEMORY_READ | HV_MEMORY_WRITE | HV_MEMORY_EXEC; - } + flags =3D HV_MEMORY_READ | HV_MEMORY_EXEC | (writable ? HV_MEMORY_WRIT= E : 0); + mem =3D memory_region_get_ram_ptr(area) + section->offset_within_regio= n; =20 - /* Now make a new slot. */ - int x; - - for (x =3D 0; x < hvf_state->num_slots; ++x) { - mem =3D &hvf_state->slots[x]; - if (!mem->size) { - break; - } - } - - if (x =3D=3D hvf_state->num_slots) { - error_report("No free slots"); - abort(); - } - - mem->size =3D int128_get64(section->size); - mem->mem =3D memory_region_get_ram_ptr(area) + section->offset_within_= region; - mem->start =3D section->offset_within_address_space; - mem->region =3D area; - - if (do_hvf_set_memory(mem, flags)) { - error_report("Error registering new memory slot"); - abort(); - } + trace_hvf_vm_map(gpa, size, mem, flags, + flags & HV_MEMORY_READ ? 'R' : '-', + flags & HV_MEMORY_WRITE ? 'W' : '-', + flags & HV_MEMORY_EXEC ? 'X' : '-'); + ret =3D hv_vm_map(mem, gpa, size, flags); + assert_hvf_ok(ret); } =20 static void hvf_log_start(MemoryListener *listener, @@ -260,7 +190,6 @@ static MemoryListener hvf_memory_listener =3D { =20 static int hvf_accel_init(AccelState *as, MachineState *ms) { - int x; hv_return_t ret; HVFState *s =3D HVF_STATE(as); int pa_range =3D 36; @@ -281,12 +210,6 @@ static int hvf_accel_init(AccelState *as, MachineState= *ms) } assert_hvf_ok(ret); =20 - s->num_slots =3D ARRAY_SIZE(s->slots); - for (x =3D 0; x < s->num_slots; ++x) { - s->slots[x].size =3D 0; - s->slots[x].slot_id =3D x; - } - QTAILQ_INIT(&s->hvf_sw_breakpoints); =20 hvf_state =3D s; --=20 2.52.0