From nobody Fri Nov 14 19:44:03 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=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1761631814; cv=none; d=zohomail.com; s=zohoarc; b=KUTEyFLpQwoJ/MYZsx0dMKvgX4ixfJcdk3qteQihnGJdMMyiHB5Ebc/JOrFSWgSwe2g1dFIuzyG6yovIkWe+7z/yFMaIl7kuNJXVMk75jeiwBkm8nnyOZDVK1cVm77f1PnP42DOtIlZ1rX+HdDfturB+2wd6JZJaOTrmDJMuUgk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761631814; 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=6ZU5Y5jdxtTfJM7VLLaWii+65USNcK5SXMjuuGQStsM=; b=L84OhVn70pP8xe/JlRJrrKpJK5J2Rm5oiGZ1O/U3Qsz6EgIHPd+D3HlqbqYeTmsJVmAK+EzBeAxzxNVHzga6skPAk73UeQvCgveLkr+2Ar5nwgVD950+RjhkPsCclwuU9/3OLzeXb0bDlk6AFpETwogKQ1NEFcOq1su1bKLHA3w= 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 1761631814620253.89493242835965; Mon, 27 Oct 2025 23:10:14 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDcu5-00009Z-8A; Tue, 28 Oct 2025 02:09:57 -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 1vDcu0-0008Pw-FU for qemu-devel@nongnu.org; Tue, 28 Oct 2025 02:09:53 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDcty-0006E3-Gl for qemu-devel@nongnu.org; Tue, 28 Oct 2025 02:09:52 -0400 Received: by mail-wr1-x42c.google.com with SMTP id ffacd0b85a97d-427015003eeso4909036f8f.0 for ; Mon, 27 Oct 2025 23:09:50 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-429952cb7e8sm18669147f8f.19.2025.10.27.23.09.47 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Oct 2025 23:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761631788; x=1762236588; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6ZU5Y5jdxtTfJM7VLLaWii+65USNcK5SXMjuuGQStsM=; b=IlaJxUPmNC2FM2eKxEibD0ABaP10wOTCKEwiNfB+bux2htfafRt6UsX/Yg3+zgaiZB 8hpHapfbyMp3ZxUvvwlaHvvEtGwMIDZ1H0e0fZRQYADCH/PIsV3C22ZU6/a/N/IyiTXy Km572LS0D0dZvdpr9ySMsnX9BeI3DiERgpUeQvL+x4c8MrvASaOK4p5WhGXut7esHH+m w5FaGRNzaVFTN2+Cl9xpreweiZdNvnrxjYrMM7YNRPfL/1hINi/SQYnVA6Ia24kJYDkk h8Y0YZAE0s1kgafFmJM4qgu9fMzjU9oIb4sx9V3B4fz4h9Z5B56T/RyvJa0qp9FrW0Ob nkmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761631788; x=1762236588; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ZU5Y5jdxtTfJM7VLLaWii+65USNcK5SXMjuuGQStsM=; b=D8Pk6ec8eA9FvGSFVc8fcFYO+1EnwtNaOwAFowKT9fg0auetFiEHIURYtL1+GchU8G 9MPikZy21Kx4IsXMWmKGA/hekxxUSKeaAgLrHwhs3yiG9C/GIMKTeX2gZzcHe/3egOsz TRY1cgzTXRJvhBIZKBI5hRh6jeM+DvXPanxJ90jXPUN4Za9KbasArumGjoJqv/tgO8vi jOOOY5cVYJkipchHr9AkuKjFcwum4SPLiOpTlapGfl8EdSGQMyHKVXWGfkUBJfnvVWmZ A+2yKrKxHne+3Vp+NLUnTtY3S0WXN2vjiBtTYoX+/2gJDNqPBSLfo5VM7rFo6p2PHh3n pLEw== X-Gm-Message-State: AOJu0Yxn02pcIkA+aiFFRIgh8dQz+Jtk3aBqtfgkOza8GYNNuHmkvpyw x4cPH77nCF7NpdrSD+Pv4xT8H+MoLUH3k08YWudJ6InrI4qYq52seinnU7ylwwyIWBs/sAQ/ALn UbaSXTsM= X-Gm-Gg: ASbGncs+hgTai+5HqPZw9buqWEZwLfTsEUyWV2kDGEAXS0OqKx2WDtbZFedQ5+7ceB1 Y5z9ayp4OnzuHIkhnEsWZw3R8uzn73UBAJRWEfiqzwz7sA1g7VSR1JAUV1Da0Y2apnxyudrIsJj ukpa9TnVCf8+oOzwU2Gx7emvwS7LqlvgPZi7fl/dZfo9pprAqQrxmLvkKBA5v5NHgedAx8c7TVv bvfC1f7oEsO9JJqmYv7FpRWmK1ec/B6gU9jwfZixj9IxNiNDsdeeNxHdG/od/WpEOKyMqVDw+FQ K+RTePjV9hlGDddQ+YCpizPr3yz5Lh9OKKJyJWSaj2nWR83SlEj/urNnytndrg7LzapjSyA7Mgx 3g9DdmzZ4yJbSxndbuQmY6rUZAzceav4sTjorNHCgtzwLrr93i3KuY9L7KS9iVDKyA2O5tRUN7V skJlKrndk83OXSZBzE2341PvyNl12qu3cyKSvZL+FqfA6ibF3qHGL/Wqc= X-Google-Smtp-Source: AGHT+IGcQBpziHy8WQwIlSWWs40B2V1U8bpaNmxq9myLSa8B4GckMQu2wCzE7MMtqkWKFjY7Z7YDbw== X-Received: by 2002:a5d:5d87:0:b0:3e9:ee54:af71 with SMTP id ffacd0b85a97d-429a7e52c4cmr1653753f8f.12.1761631788394; Mon, 27 Oct 2025 23:09:48 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mads Ynddal , Cameron Esfahani , qemu-arm@nongnu.org, Roman Bolshakov , Akihiko Odaki , Phil Dennis-Jordan , Mohamed Mediouni , Peter Collingbourne , Peter Maydell , Alexander Graf , Richard Henderson , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 38/59] accel/hvf: Simplify hvf_set_phys_mem Date: Tue, 28 Oct 2025 06:42:14 +0100 Message-ID: <20251028054238.14949-39-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251028054238.14949-1-philmd@linaro.org> References: <20251028054238.14949-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 client-ip=2a00:1450:4864:20::42c; envelope-from=philmd@linaro.org; helo=mail-wr1-x42c.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=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 @linaro.org) X-ZM-MESSAGEID: 1761631816245154100 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 --- 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 4b0a1af9fdc..97b367bd788 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -86,45 +86,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 gva =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) { @@ -138,69 +109,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(gva, 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(gva, size); + ret =3D hv_vm_unmap(gva, 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(gva, size, mem, flags, + flags & HV_MEMORY_READ ? 'R' : '-', + flags & HV_MEMORY_WRITE ? 'W' : '-', + flags & HV_MEMORY_EXEC ? 'X' : '-'); + ret =3D hv_vm_map(mem, gva, size, flags); + assert_hvf_ok(ret); } =20 static void hvf_log_start(MemoryListener *listener, @@ -259,7 +189,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; @@ -280,12 +209,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.51.0