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 CCBE2CCD1BE for ; Thu, 23 Oct 2025 11:54:29 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vBtt6-00067P-Hi; Thu, 23 Oct 2025 07:53:48 -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 1vBtt4-00065P-MC for qemu-devel@nongnu.org; Thu, 23 Oct 2025 07:53:46 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1vBtt2-0002eG-Q8 for qemu-devel@nongnu.org; Thu, 23 Oct 2025 07:53:46 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-47112edf9f7so4411005e9.0 for ; Thu, 23 Oct 2025 04:53:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1761220422; x=1761825222; 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=eAxR7mUpNjwjSajsZFGtwQMzgIfAC9EBDPwVN/5kdzk=; b=hP9VwXjL5QtSLAipke4qPnB8OIKei5FgSAYp7B8rlH/aCZe88RsRFqu7r1hCyBPJYa Bp83oLgjP7tYRBuBhRsbxqjNQ2RYg/CxWsyYQmUD18VJy/Zu+sL89PGlLgYi3oC434JC 1qyDMbFlIve9BpFa2VPPNl1ntqc5qF1l2THOeQFOrS3UHpnIEoFSExBoxgJ6emyjlcuz 7k8HSFy0U/xV1ZlYT1il9acpOlt67SxA0ggqdRl0c52bEUZGAE7fJRBvhucXdEK5vBPZ jyLdGULeZ1xLCno8KzPl7PGnVlt4hlnJ+0zDlX8tCeLjYFz0fxY09h0sXqAFppkQHMd2 Nwmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1761220422; x=1761825222; 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=eAxR7mUpNjwjSajsZFGtwQMzgIfAC9EBDPwVN/5kdzk=; b=byQjIselowCxrG4xZ27dfzWj5NBfZfMerrhSM+Hcm1/e8uC6V3GiBAegih6mCBLsav Xlt5bA9qJ10fW/xE2jxykoyKSyAtM10CnrMIasuLnfhnOarIV1WJvO5ci6Dyw45Asotk 3MjJII43PL1rg0EyABxTFyjJC08+Qh3yYtt4/DO7ujhkoCh82XsZR1/hLSyOOZBxZcoq kMN3qsuJoY1VF3qFE0/+GuKPCFkMZDFCvWLAcgcYCetBFYa4tija04itYvhfji8EthdP Bm7f/yoAI1DN3bAq8AAgxCxJ2S+6ehV/09NBNXWGloWSv0QAGvToaqKXva962k+6PiZc PFFQ== X-Gm-Message-State: AOJu0YzksIIfmJuDPPcopsvbMltb9Qrq883116uSIuPtASp2rWUKGwyS sqY6IdopjhjNkCCKRX+UEN8v3m5tjLdttD4HNCCoUCn/YIb+pRMYBLuliCvvDTC4QCeAnBLzloc adMFkN6Y= X-Gm-Gg: ASbGnctDLuqagukQkb9Zp1Q8h4kWbZtCMPsNJQ39T5J69v5y7eoqmNyKCUk+oxxJC59 f4HrRNdV+oEZHwIWRf6q9oiIpf43HY/lBb1RCsC5TELNgNZkzVUtJK+o/9UyS95mT8+fWhZfVkc mE3jXZncHQBPrGREHAjDVUqmW/iqDov+QGDVDcSHTnrC5/0m7frztMw0hgg9D8+LZ0CvyIKrMEn knJTjwKr5PPYeTPxJZZCjT4AXyeOKXcI2IMzwCtybkSg6HrMo/6Xkjze4XPTJdLlgqgVh4XtRY/ Y3o/7r4y/NFAbYPWI3hm+nvXwv04AokQyqFNSUJH6cd2VDa3dZebJN6fT9gEWJmJPTxvJz+yTjm VfxY4UNj3PHthgxhlaD+eg7K3V7BuwlP2/gycjsoeU2CHg9KbpX5ov/u2zaUy5A+C+7Dx2q+PwN aPVc5K6u/HvKDtksNnesBPDSJzm9AoEiOwbJGtKQlPsfVUMoA+KQ== X-Google-Smtp-Source: AGHT+IE2qeF/JXnAb8/QMIGST/cg5fHI5kD1OiBmI18xcMweO45BIvrynKS+h0d7N0RRheTfHzR33w== X-Received: by 2002:a05:600c:a4e:b0:46e:711c:efeb with SMTP id 5b1f17b1804b1-475cb02f5b9mr14221605e9.25.1761220422542; Thu, 23 Oct 2025 04:53:42 -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-475c428f709sm94694775e9.8.2025.10.23.04.53.41 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 23 Oct 2025 04:53:42 -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 36/58] target/i386/hvf: Use address_space_translate in ept_emulation_fault Date: Thu, 23 Oct 2025 13:52:47 +0200 Message-ID: <20251023115311.6944-7-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: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=philmd@linaro.org; helo=mail-wm1-x335.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+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 Signed-off-by: Philippe Mathieu-Daudé --- target/i386/hvf/hvf.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/target/i386/hvf/hvf.c b/target/i386/hvf/hvf.c index aae4877d568..4597d191f9d 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 & TARGET_PAGE_MASK; + hwaddr xlat; /* EPT fault on an instruction fetch doesn't make sense here */ if (ept_qual & EPT_VIOLATION_INST_FETCH) { @@ -129,18 +132,20 @@ 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 & ~(TARGET_PAGE_SIZE - 1u); - memory_region_set_dirty(slot->region, gpa - slot->start, 1); - hvf_unprotect_dirty_range(dirty_page_start, TARGET_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)) { + memory_region_set_dirty(mr, gpa_page + xlat, TARGET_PAGE_SIZE); + hvf_unprotect_dirty_range(gpa_page, TARGET_PAGE_SIZE); } /* @@ -153,9 +158,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; @@ -761,7 +763,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) && @@ -769,9 +770,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