From: David Hildenbrand <david@redhat.com> To: qemu-devel@nongnu.org Cc: Thomas Huth <thuth@redhat.com>, Riku Voipio <riku.voipio@iki.fi>, Eduardo Habkost <ehabkost@redhat.com>, David Hildenbrand <david@redhat.com>, Aleksandar Rikalo <arikalo@wavecomp.com>, Cornelia Huck <cohuck@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Aleksandar Markovic <amarkovic@wavecomp.com>, qemu-s390x@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>, Aurelien Jarno <aurelien@aurel32.net>, Richard Henderson <rth@twiddle.net> Subject: [Qemu-devel] [PATCH v1 9/9] tcg: Check for watchpoints in probe_write() Date: Fri, 23 Aug 2019 12:07:41 +0200 Message-ID: <20190823100741.9621-10-david@redhat.com> (raw) In-Reply-To: <20190823100741.9621-1-david@redhat.com> Let's check for write watchpoints. We'll want to do something similar for probe_read() in the future (once we introduce that). Suggested-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: David Hildenbrand <david@redhat.com> --- accel/tcg/cputlb.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 4b49ccb58a..8382ac2fc2 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -1063,6 +1063,7 @@ void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx, { uintptr_t index = tlb_index(env, mmu_idx, addr); CPUTLBEntry *entry = tlb_entry(env, mmu_idx, addr); + target_ulong tlb_addr; g_assert(-(addr | TARGET_PAGE_MASK) >= size); @@ -1071,8 +1072,23 @@ void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx, if (!VICTIM_TLB_HIT(addr_write, addr)) { tlb_fill(env_cpu(env), addr, size, MMU_DATA_STORE, mmu_idx, retaddr); + /* TLB resize via tlb_fill may have moved the entry. */ + entry = tlb_entry(env, mmu_idx, addr); } } + + if (!size) { + return; + } + tlb_addr = tlb_addr_write(entry); + + /* Watchpoints for this entry only apply if TLB_MMIO was set. */ + if (tlb_addr & TLB_MMIO) { + MemTxAttrs attrs = env_tlb(env)->d[mmu_idx].iotlb[index].attrs; + + cpu_check_watchpoint(env_cpu(env), addr, size, attrs, BP_MEM_WRITE, + retaddr); + } } void *tlb_vaddr_to_host(CPUArchState *env, abi_ptr addr, -- 2.21.0
next prev parent reply index Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-23 10:07 [Qemu-devel] [PATCH v1 0/9] tcg: probe_write() refactorings and watchpoints David Hildenbrand 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 1/9] s390x/tcg: Use guest_addr_valid() instead of h2g_valid() in probe_write_access() David Hildenbrand 2019-08-23 14:49 ` Richard Henderson 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 2/9] s390x/tcg: Fix length calculation " David Hildenbrand 2019-08-23 14:50 ` Richard Henderson 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 3/9] tcg: Factor out CONFIG_USER_ONLY probe_write() from s390x code David Hildenbrand 2019-08-23 15:17 ` Richard Henderson 2019-08-23 15:22 ` Richard Henderson 2019-08-23 15:49 ` David Hildenbrand 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 4/9] tcg: Enforce single page access in probe_write() for !CONFIG_USER_ONLY David Hildenbrand 2019-08-23 15:28 ` Richard Henderson 2019-08-23 15:29 ` Richard Henderson 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 5/9] mips/tcg: Call probe_write() for CONFIG_USER_ONLY as well David Hildenbrand 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 6/9] hppa/tcg: Call probe_write() also for CONFIG_USER_ONLY David Hildenbrand 2019-08-23 15:31 ` Richard Henderson 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 7/9] s390x/tcg: Pass a size to probe_write() in do_csst() David Hildenbrand 2019-08-23 15:32 ` Richard Henderson 2019-08-23 10:07 ` [Qemu-devel] [PATCH v1 8/9] exec.c: Factor out core logic of check_watchpoint() David Hildenbrand 2019-08-23 11:27 ` David Hildenbrand 2019-08-23 16:09 ` Richard Henderson 2019-08-23 18:25 ` David Hildenbrand 2019-08-24 15:27 ` Richard Henderson 2019-08-23 10:07 ` David Hildenbrand [this message] 2019-08-23 16:15 ` [Qemu-devel] [PATCH v1 9/9] tcg: Check for watchpoints in probe_write() Richard Henderson 2019-08-24 19:45 ` Richard Henderson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190823100741.9621-10-david@redhat.com \ --to=david@redhat.com \ --cc=amarkovic@wavecomp.com \ --cc=arikalo@wavecomp.com \ --cc=aurelien@aurel32.net \ --cc=cohuck@redhat.com \ --cc=ehabkost@redhat.com \ --cc=pbonzini@redhat.com \ --cc=qemu-devel@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=richard.henderson@linaro.org \ --cc=riku.voipio@iki.fi \ --cc=rth@twiddle.net \ --cc=thuth@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
QEMU-Devel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \ qemu-devel@nongnu.org public-inbox-index qemu-devel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git