From patchwork Wed Aug 28 23:16:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 172508 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1419616ily; Wed, 28 Aug 2019 16:20:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+ri9dVu+NEQ59NJ78xotVeYdIkRoM4P0Xe7wPjsUPU38e4JXNtUwmeiqPYARNFGoGA/5J X-Received: by 2002:aa7:dd04:: with SMTP id i4mr6620167edv.235.1567034445601; Wed, 28 Aug 2019 16:20:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567034445; cv=none; d=google.com; s=arc-20160816; b=zTSU5h/FKsHU05UloJq33bd7vQJV1el2TfvlKqi1CkXk1J5vxu366J/2rK8FE+sKd3 hlifV8w+XMw3iTsEZ8iwSwf7cPitUbWw8yNy5twVi35ptzifY8CV9tqBbXSmghjlcyrO 959ftDvgAS4714Jzn9hEqG58rh8nfJVXCXsGRNE2RMzpX6TL5G1yxU5ptN0PZ3hvGLSE c0FCpCGDDDaFqxxMkbwLu3j8FFg99AI97OM5++8C7fMU+HRogCnCFXfK6UEAR84VFxlX dMzIAf0tvHotpbkEbpnFKXHZKRNib41w56K8NFG+RpY1ohSVCIJfxTqrYR3KRpcZGfsW NaIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=4hy82QgJUYjjhSQJRivLUVd+yZYge9fg7c759/kiQtk=; b=eQiS1ktG0GXSrlAZYa6CwyfTkgRVRRIgz06xRYmKsjrqNe02f59B2AXZwXJctKUzdi tEb/q2Ov58Kfl59YEyhAxeCDwuiKnjRjOhe8QP+/Q9XUwuazJ0AZaV3lQEjebfHdHsth K1XDt1BLv8zUlzzMggbILQbvBuZ7bYEIQ55DiuAevSigO2izQQtI/8se+S6w6xY8jtfc 6Y7tVRr2Zz5XEp7IAst3fP9tJJISicE0LEq9kLyz8xSg/0lNJaO9M15ODVqCUUILhcXL fmo2YeO5rnc0paBvQM2RzT7ANt9bUfdZsz3fn3BcXhXErDalqOvH+FQqYTtW6UfL2ZLo waYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dQ37Wgc8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p32si217127edc.259.2019.08.28.16.20.45 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 16:20:45 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=dQ37Wgc8; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43630 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i37F5-0007fo-Jv for patch@linaro.org; Wed, 28 Aug 2019 19:20:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52297) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i37BS-0004BT-O3 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 19:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i37BR-0008Fj-Gw for qemu-devel@nongnu.org; Wed, 28 Aug 2019 19:16:58 -0400 Received: from mail-pl1-x62b.google.com ([2607:f8b0:4864:20::62b]:47074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i37BR-0008Fb-B3 for qemu-devel@nongnu.org; Wed, 28 Aug 2019 19:16:57 -0400 Received: by mail-pl1-x62b.google.com with SMTP id o3so635635plb.13 for ; Wed, 28 Aug 2019 16:16:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4hy82QgJUYjjhSQJRivLUVd+yZYge9fg7c759/kiQtk=; b=dQ37Wgc8rakuIoinrc1m85v7oqC0osu9PpzDSxwCvCY5LVQtoorbpZj7A6PH5RiD5w 5GsQh13h2vUOJnqOilezQDN3OEsUcZ9RrV3vaJdp3sZgT+Ys4kwUMdVOwZNjUC4YnjAe 4xA2nj9QeSMn/vZa2BrY9RCzKj6RlQeIc9JGzcJRyhf+LBP18yIMjuSb8qyE+tLOwZPD HHLkZvGJwRz9mvz6+uyaaRzqC90mszevwPX833awajP2dreNNu2HkXFkN4b+kvJsjZYB AS4ZTDRFMYG8m6qiJNOFRSdJ22IzPFZDxhkxFmLETYFJtlCQa8wJXl3cT6n0enQZHoHI jAkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4hy82QgJUYjjhSQJRivLUVd+yZYge9fg7c759/kiQtk=; b=IzmU942fxQ742fbDtw0h7j0A9R0+nq/WQlt7ilpEIVK7ICZkNNAoB5xvWLysdKAnpo s1sKiuid56DMWNZlaH5DvwNg7kkZAT3YgX7dK1F45rxzX/Z1PBOk9DMTk5mElilAisf7 KJ5+DXIJ+KhWW02+q5Qb9TSllCZ1bxfMazHocynIn0csVIxW3Z906De16R1hlxdqYF7k RZIh9KtVxVYAfmmY77rP0V7DJIfMvZVR3pI6Som3JCqarhvR1YdGSrBVIQdVjPpce05O Lw3A68uhKohhfSPPtM9as8QTZ4y3QZvLbWNWO8xKafOdPFT6yWfbMYPOk83SICqLBxZ0 YwtQ== X-Gm-Message-State: APjAAAVPoF76itLyAShS76Y6Eq4n+3/JjsFK/vQmlIKIQGyQYfJ+Yf0L oL39aEnv6wD/ZZBHQr5OcV40Xfv/oZY= X-Received: by 2002:a17:902:da8:: with SMTP id 37mr6679884plv.69.1567034216021; Wed, 28 Aug 2019 16:16:56 -0700 (PDT) Received: from localhost.localdomain (97-113-7-119.tukw.qwest.net. [97.113.7.119]) by smtp.gmail.com with ESMTPSA id s5sm485197pfm.97.2019.08.28.16.16.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Aug 2019 16:16:55 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 28 Aug 2019 16:16:45 -0700 Message-Id: <20190828231651.17176-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190828231651.17176-1-richard.henderson@linaro.org> References: <20190828231651.17176-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::62b Subject: [Qemu-devel] [PATCH v2 2/8] exec: Factor out core logic of check_watchpoint() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: david@redhat.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: David Hildenbrand We want to perform the same checks in probe_write() to trigger a cpu exit before doing any modifications. We'll have to pass a PC. Signed-off-by: David Hildenbrand Reviewed-by: Richard Henderson Message-Id: <20190823100741.9621-9-david@redhat.com> [rth: Use vaddr for len, like other watchpoint functions; Move user-only stub to static inline.] Signed-off-by: Richard Henderson --- include/hw/core/cpu.h | 7 +++++++ exec.c | 26 ++++++++++++++++++-------- 2 files changed, 25 insertions(+), 8 deletions(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 6de688059d..7bd8bed5b2 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -1091,6 +1091,11 @@ static inline void cpu_watchpoint_remove_by_ref(CPUState *cpu, static inline void cpu_watchpoint_remove_all(CPUState *cpu, int mask) { } + +static inline void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, + MemTxAttrs atr, int fl, uintptr_t ra) +{ +} #else int cpu_watchpoint_insert(CPUState *cpu, vaddr addr, vaddr len, int flags, CPUWatchpoint **watchpoint); @@ -1098,6 +1103,8 @@ int cpu_watchpoint_remove(CPUState *cpu, vaddr addr, vaddr len, int flags); void cpu_watchpoint_remove_by_ref(CPUState *cpu, CPUWatchpoint *watchpoint); void cpu_watchpoint_remove_all(CPUState *cpu, int mask); +void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, + MemTxAttrs attrs, int flags, uintptr_t ra); #endif /** diff --git a/exec.c b/exec.c index 31fb75901f..cb6f5763dc 100644 --- a/exec.c +++ b/exec.c @@ -2789,11 +2789,10 @@ static const MemoryRegionOps notdirty_mem_ops = { }; /* Generate a debug exception if a watchpoint has been hit. */ -static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) +void cpu_check_watchpoint(CPUState *cpu, vaddr addr, vaddr len, + MemTxAttrs attrs, int flags, uintptr_t ra) { - CPUState *cpu = current_cpu; CPUClass *cc = CPU_GET_CLASS(cpu); - target_ulong vaddr; CPUWatchpoint *wp; assert(tcg_enabled()); @@ -2804,17 +2803,17 @@ static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) cpu_interrupt(cpu, CPU_INTERRUPT_DEBUG); return; } - vaddr = (cpu->mem_io_vaddr & TARGET_PAGE_MASK) + offset; - vaddr = cc->adjust_watchpoint_address(cpu, vaddr, len); + + addr = cc->adjust_watchpoint_address(cpu, addr, len); QTAILQ_FOREACH(wp, &cpu->watchpoints, entry) { - if (cpu_watchpoint_address_matches(wp, vaddr, len) + if (cpu_watchpoint_address_matches(wp, addr, len) && (wp->flags & flags)) { if (flags == BP_MEM_READ) { wp->flags |= BP_WATCHPOINT_HIT_READ; } else { wp->flags |= BP_WATCHPOINT_HIT_WRITE; } - wp->hitaddr = vaddr; + wp->hitaddr = MAX(addr, wp->vaddr); wp->hitattrs = attrs; if (!cpu->watchpoint_hit) { if (wp->flags & BP_CPU && @@ -2829,11 +2828,14 @@ static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) if (wp->flags & BP_STOP_BEFORE_ACCESS) { cpu->exception_index = EXCP_DEBUG; mmap_unlock(); - cpu_loop_exit(cpu); + cpu_loop_exit_restore(cpu, ra); } else { /* Force execution of one insn next time. */ cpu->cflags_next_tb = 1 | curr_cflags(); mmap_unlock(); + if (ra) { + cpu_restore_state(cpu, ra, true); + } cpu_loop_exit_noexc(cpu); } } @@ -2843,6 +2845,14 @@ static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) } } +static void check_watchpoint(int offset, int len, MemTxAttrs attrs, int flags) +{ + CPUState *cpu = current_cpu; + vaddr addr = (cpu->mem_io_vaddr & TARGET_PAGE_MASK) + offset; + + cpu_check_watchpoint(cpu, addr, len, attrs, flags, 0); +} + /* Watchpoint access routines. Watchpoints are inserted using TLB tricks, so these check for a hit then pass through to the normal out-of-line phys routines. */