Re: [Qemu-devel] [PATCH v1 9/9] tcg: Check for watchpoints in probe_write()

From: Richard Henderson <richard.henderson@linaro.org>
To: David Hildenbrand <david@redhat.com>, qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, Riku Voipio <riku.voipio@iki.fi>,
	Eduardo Habkost <ehabkost@redhat.com>,
	Aleksandar Rikalo <arikalo@wavecomp.com>,
	Cornelia Huck <cohuck@redhat.com>,
	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: Re: [Qemu-devel] [PATCH v1 9/9] tcg: Check for watchpoints in probe_write()
Date: Sat, 24 Aug 2019 12:45:47 -0700	[thread overview]
Message-ID: <1ef25fb4-08d7-98db-41f9-65b00e288c43@linaro.org> (raw)
In-Reply-To: <20190823100741.9621-10-david@redhat.com>

On 8/23/19 3:07 AM, David Hildenbrand wrote:
> @@ -1071,8 +1072,23 @@ void probe_write(CPUArchState *env, target_ulong addr, 
>          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;

We need to recompute index above as well, since we use it here.
Fixed up and applied to tcg-next.

r~