From nobody Fri Nov 14 19:43:56 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=1761220553; cv=none; d=zohomail.com; s=zohoarc; b=dx8pAlw+/tuYyDBM2iYMd2pKGTD69R/3lCGZmDVTfH74+7qSWIyck80xBnNsoU2djZI2Q4atxTwAD7na57tpqNf4e5zEzLjuQLWMSK7M7wwgxklQLhpFSVix4aJ/szy18sHWrBYfpXy2FlJSCMTssTpOt9DsQIyBRmOyFicW11I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1761220553; 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=dNYppjdbbTX0VMSysfUsuhVWdSTiLr/N0jxDYIR1lVM=; b=bcv4TgpVrr66R+XURLTTrGWkayaTZ0WFQjbPnixHquwi9K9ysfUtK6xURlMFoBPukdnlzlf6Y6YEOKckwF2vHFfKW+eUDhccDHn/TWVCjhszD7+zSbaHJ11Lu0IW4i0YF0Y8Oz3mxSrD3mQVP0jNCcxKk9Il5sTryye20DzXPKE= 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 1761220553952923.1626141806067; Thu, 23 Oct 2025 04:55:53 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBttP-0006gB-Ec; Thu, 23 Oct 2025 07:54:09 -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 1vBttJ-0006cQ-LJ for qemu-devel@nongnu.org; Thu, 23 Oct 2025 07:54:01 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBttH-0002fz-Dz for qemu-devel@nongnu.org; Thu, 23 Oct 2025 07:54:01 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-471191ac79dso7852925e9.3 for ; Thu, 23 Oct 2025 04:53:58 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-475caf4642fsm31950115e9.17.2025.10.23.04.53.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Oct 2025 04:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761220437; x=1761825237; 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=dNYppjdbbTX0VMSysfUsuhVWdSTiLr/N0jxDYIR1lVM=; b=lP/Rsy5sT4Ij6KMrktu9CppsUL039o0T0XUt79CqPpLsdqcci4S1kgFPCE9KxqstCH pPWqXjqjHPVT+sVA86lZqgJXAsomnMJouE8DufnnbHCS0raYCjhmt48zyS7x8jnGk3hd Q5tLxdTQk9FAhcHtUl3qgYznmpk36M1wTWeTiTXFmrQSffgNerfCfEsEs/glwekMvEIx dX4Rac956dAoygkFhfgNMkR9kcVcTlST7e10Grcfvlixc1U7QIPmOHdeCheeL6fuOD3q LynA3nXg/dfrYKcTJwSIx59SZD7tYw9TMZrQPM2jprCUAuzzXhlS+uABCBB3uqADoniM ulcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761220437; x=1761825237; 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=dNYppjdbbTX0VMSysfUsuhVWdSTiLr/N0jxDYIR1lVM=; b=ByZkHVeuoutYjZUYDaFU94OC0NQFD9ZB/H3YSQK4wLAU7I7PCpGCvRDxebkFd8q7b8 cZVgL7r+ZTzQ0zk8eBKOXChWy4l3fwtI2cb6Nlx1+4deZAPmrKFGVjrsuf5p9GG7OZlZ CC4RYdMkakpb+eDDnLrGIR6aIiZcesvFZR8TkXuUfM9UvM3lwgngRjpqQoKjm64mTnWw Pn8XQll24tzLfKCBaKWUPG15fY3Uqgd8HCHZkClQQOj4kPeudt9VtzvkFSi9xkY7s0V4 chxmCanXeM9Il/45vv+g+je2LRG3SdJMFCzRyVpTWHQiKL+7Nwgm+87pLv5taQRJY3OT Unhg== X-Gm-Message-State: AOJu0YzG1v+7545dEANRAE8dF649+gmHN2NMisCitV2vYfLmQu594V4R haA2eR2BRjOdIiesZ33eJq0ZK8NXf3gpbD8FFjRA2ZZWB0oQ9hKaPO/y/pxoVavDUNEr5utGUe5 4DqA/edc= X-Gm-Gg: ASbGnctTNqhg+MdbnWOHFZe3S/lCJXjxA0vj4T39Dnr/EeJS0DHO/i+ELR879OAXE2v VBpF5jREcnjE/f4FBrFWwGmBFfi1IMmEzf4okne+Fv2X9cPj+a5lxuKix5bPNv8icGtJbcFAVzL 4Mj0ROkmpNQmaDkI69iv/9LH493r1UvXvtEzkkBckS+Hk+8aRTS7DswgLGBoBtlJt3mQseGZFMB QXIqh1Lp9Ef5IBfS58l5dal4uCrgifRu6KH8Ypv7VyI2SoMzKz7uwLa7FQnKVU14yJQKtpPuyAW siQW1OJcKDOJlKgflYsSm91+bQu4CsYU8IRcKzV5FPgJeYtFwVeNOYVbnnZ9yGss34ExItf/k13 Tc/GOuoQFvl78VE7fL7FsuPqSZK/sNGDD2FeQVCGirXMfe1jncm1ksoRwb2WvOlb5+8yrSTE8qV HPEE6caGDMAZac+lQYbRHygOipY22zdGJEt6FdWSzU6lIVQmnN2A== X-Google-Smtp-Source: AGHT+IH/kpJO8nzyovomjrNYbFFdYdRsPywphvLn5SYgs8H7Arbk2/7NElts22pkl2Gq+X6Wop0eDA== X-Received: by 2002:a05:600c:8b2f:b0:471:56:6f79 with SMTP id 5b1f17b1804b1-4711793149emr168139665e9.41.1761220437437; Thu, 23 Oct 2025 04:53:57 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Mohamed Mediouni , Phil Dennis-Jordan , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cameron Esfahani , Richard Henderson , qemu-arm@nongnu.org, Peter Maydell , Peter Collingbourne , Mads Ynddal , Roman Bolshakov , Alexander Graf , Stefan Hajnoczi , Paolo Bonzini Subject: [PATCH v2 39/58] accel/hvf: Simplify hvf_set_phys_mem Date: Thu, 23 Oct 2025 13:52:50 +0200 Message-ID: <20251023115311.6944-10-philmd@linaro.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251023114638.5667-1-philmd@linaro.org> References: <20251023114638.5667-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::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.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: 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: 1761220555856158500 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 844cc179de2..21386acd143 100644 --- a/accel/hvf/hvf-all.c +++ b/accel/hvf/hvf-all.c @@ -83,45 +83,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) { @@ -135,69 +106,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, @@ -256,7 +186,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; @@ -277,12 +206,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