From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DCAFFCCF9EA for ; Tue, 28 Oct 2025 06:08:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vDcs4-0006nU-Qc; Tue, 28 Oct 2025 02:07:52 -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 1vDcs0-0006ix-BL for qemu-devel@nongnu.org; Tue, 28 Oct 2025 02:07:48 -0400 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vDcrv-00067u-0O for qemu-devel@nongnu.org; Tue, 28 Oct 2025 02:07:47 -0400 Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-475dbc3c9efso21696335e9.0 for ; Mon, 27 Oct 2025 23:07:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761631661; x=1762236461; 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=hsgMJlyY8TVXlqW6r595TkCwLDrrP0zYcTa4NqDCmPE=; b=R6hc3Lys9H7VY5Vc+EIwCAmL7yN3oHu30iJ54wCA/yCDFoCxIEqDvgfYtLFiBPyekE sfnMMdVq7wPGHNHX0Cs9b/V2+I4/4PMW/mSV36V+qSPYKjrsLSLXpK7ay5Qb/NOqErVS CtLQ+zppedXGmzniWftropsYCy3dOFV/vPL5p8j4bak3027G8pc8PTkxMqVfx7zndkCA GtDzLAy8DGsXVQDe2p6wBCLU/Gyuv//7S/gFQ+iVcyGRBR4C3ePQ7m55E7zh3Y0eSoZU GzWjrrQvwDC1s4J/G+tPhCiRBViY3AzrYHBz6XrE4oz03TvVofNH2aZxOx2bHj4nJDS2 DwtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761631661; x=1762236461; 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=hsgMJlyY8TVXlqW6r595TkCwLDrrP0zYcTa4NqDCmPE=; b=VVc9oPwTyCygI3VpL882D6UKxbtVzXXxs6nzMY2J+xTZxOKR+j9MHtWL0fLTkc0BhX AIT6wWH1aW5qX8kMmfv0lAZg+fQV9BR+n/xBDTACZA0PFVtcNfJcYOVHXbFVWcUEvQDw vdUkv6hBNoV0DluDWOBetrLaDFNTd/i98Ukj6GP38gkSqplSQM4tdSqN+XRgxitlf6qC EeKGCOsaNYpCH9iy+/l6HWrVj5VyqEItcJyELHOxWX7bSxMs2q1nZIQIHr1j3QCPlP7F FTdHPHkmM/Bb/rWumpD9OAitIUG2kPFjkNs1qXzyY+zRc2jas/BQpYzGJqRrb5PRy2+J 2/pg== X-Gm-Message-State: AOJu0YyY0n841WSb+73H1HOKIBZTwBytYn9SEz7v6boie6NWFgYNUDPQ EtpvBJ48ABHfyWXf1I821xWg48DGTf4xro2wFvzBkcRZhEgyYVazc2ahuIX4rtezr21+jTeDiSZ 90ShuQ2A= X-Gm-Gg: ASbGncsvDTR9gYsjGUQQY+AHtTn2N3vP5oPngIyD2B1kGFKAs5UoW4QO0ErCyjf1xmy weu3zntvtAaLGOljYG1s+ho9hwIfJUUD38nkef5ZoVo5LvhI+ka0WBgHNLNIdNcD2/80SvjbWOj eqwLhCQgSuhjqBtyj8r4FV357gmqYa8jiyrJUmuG93rK9qVAnvoX0lK7twkZjq3e34VL94Ua9b2 jGoA9QGsLGIstsk5wkUQEb/JtDZ2k1OVqdmKyw++ZjSroZA7+9g8EMWBc0lL2yqCeRGSSGoX8Rj 8gyibrlCnnnjhJLLj9X1YfB3/U/YPku5GX0palyZ7ae4IYBk8Wr0HKBb1Rayh+XrXWeclyjiUnG TmWtYNPpwdo8u6oWTFQrzp89X6OKP2AISxzV2dSyusFBTTq2+cyE1epf0mV07j8bpRNU8Fsj8Z2 eGRWf0OP/ZutSSYx0g3EqgJyobLjnZUdw2WQ0B8e2U6KAY9/zixdCyx94= X-Google-Smtp-Source: AGHT+IGhl9TK/X6SnHE2Fq/7y/NKLCGxWqQwm7XWauEgZs0GNMncNbQDU2SW/v3QjzZKy30/+RE5YQ== X-Received: by 2002:a05:6000:2410:b0:426:ec63:18fc with SMTP id ffacd0b85a97d-429a7e59d99mr1792143f8f.20.1761631660980; Mon, 27 Oct 2025 23:07:40 -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-429952da12dsm18532200f8f.29.2025.10.27.23.07.38 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 27 Oct 2025 23:07:39 -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 35/59] target/i386/hvf: Use address_space_translate in ept_emulation_fault Date: Tue, 28 Oct 2025 06:42:11 +0100 Message-ID: <20251028054238.14949-36-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: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philmd@linaro.org; helo=mail-wm1-x32c.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org From: Richard Henderson The hvf_slot structure is a poor replacement for properly looking up a memory region in the address space. Use memory_region_get_dirty_log_mask instead of HVF_SLOT_LOG. Signed-off-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé --- target/i386/hvf/hvf.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index 1e92e9b707b..b0c3fb97864 100644 --- a/target/i386/hvf/hvf.c +++ b/target/i386/hvf/hvf.c @@ -119,9 +119,12 @@ void hvf_handle_io(CPUState *env, uint16_t port, void *buffer, } } -static bool ept_emulation_fault(hvf_slot *slot, uint64_t gpa, uint64_t ept_qual) +static bool ept_emulation_fault(CPUState *cs, uint64_t gpa, uint64_t ept_qual) { - int read, write; + bool read, write; + MemoryRegion *mr; + hwaddr gpa_page = gpa & qemu_real_host_page_mask(); + hwaddr xlat; /* EPT fault on an instruction fetch doesn't make sense here */ if (ept_qual & EPT_VIOLATION_INST_FETCH) { @@ -129,19 +132,22 @@ static bool ept_emulation_fault(hvf_slot *slot, uint64_t gpa, uint64_t ept_qual) } /* EPT fault must be a read fault or a write fault */ - read = ept_qual & EPT_VIOLATION_DATA_READ ? 1 : 0; - write = ept_qual & EPT_VIOLATION_DATA_WRITE ? 1 : 0; - if ((read | write) == 0) { + read = ept_qual & EPT_VIOLATION_DATA_READ; + write = ept_qual & EPT_VIOLATION_DATA_WRITE; + if (!read && !write) { return false; } - if (write && slot) { - if (slot->flags & HVF_SLOT_LOG) { - uint64_t dirty_page_start = gpa & qemu_real_host_page_mask(); - memory_region_set_dirty(slot->region, gpa - slot->start, 1); - hvf_unprotect_dirty_range(dirty_page_start, - qemu_real_host_page_size()); - } + mr = address_space_translate(cpu_get_address_space(cs, X86ASIdx_MEM), + gpa_page, &xlat, NULL, write, + MEMTXATTRS_UNSPECIFIED); + + /* Handle dirty page logging for ram. */ + if (write && memory_region_get_dirty_log_mask(mr)) { + size_t page_size = qemu_real_host_page_size(); + + memory_region_set_dirty(mr, gpa_page + xlat, page_size); + hvf_unprotect_dirty_range(gpa_page, page_size); } /* @@ -154,9 +160,6 @@ static bool ept_emulation_fault(hvf_slot *slot, uint64_t gpa, uint64_t ept_qual) return false; } - if (!slot) { - return true; - } if (!memory_region_is_ram(slot->region) && !(read && memory_region_is_romd(slot->region))) { return true; @@ -762,7 +765,6 @@ static int hvf_handle_vmexit(CPUState *cpu) /* Need to check if MMIO or unmapped fault */ case EXIT_REASON_EPT_FAULT: { - hvf_slot *slot; uint64_t gpa = rvmcs(cpu->accel->fd, VMCS_GUEST_PHYSICAL_ADDRESS); if (((idtvec_info & VMCS_IDT_VEC_VALID) == 0) && @@ -770,9 +772,8 @@ static int hvf_handle_vmexit(CPUState *cpu) vmx_set_nmi_blocking(cpu); } - slot = hvf_find_overlap_slot(gpa, 1); /* mmio */ - if (ept_emulation_fault(slot, gpa, exit_qual)) { + if (ept_emulation_fault(cpu, gpa, exit_qual)) { struct x86_decode decode; hvf_load_regs(cpu); -- 2.51.0