[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH 02/27] Make tb_invalidate_phys_addr() take a Mem
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH 02/27] Make tb_invalidate_phys_addr() take a MemTxAttrs argument |
Date: |
Tue, 22 May 2018 10:21:39 +0100 |
User-agent: |
mu4e 1.1.0; emacs 26.1 |
Peter Maydell <address@hidden> writes:
> As part of plumbing MemTxAttrs down to the IOMMU translate method,
> add MemTxAttrs as an argument to tb_invalidate_phys_addr().
> Its callers either have an attrs value to hand, or don't care
> and can use MEMTXATTRS_UNSPECIFIED.
>
> Signed-off-by: Peter Maydell <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
> ---
> include/exec/exec-all.h | 5 +++--
> accel/tcg/translate-all.c | 2 +-
> exec.c | 2 +-
> target/xtensa/op_helper.c | 3 ++-
> 4 files changed, 7 insertions(+), 5 deletions(-)
>
> diff --git a/include/exec/exec-all.h b/include/exec/exec-all.h
> index bd68328ed9..4d09eaba72 100644
> --- a/include/exec/exec-all.h
> +++ b/include/exec/exec-all.h
> @@ -255,7 +255,7 @@ void tlb_set_page_with_attrs(CPUState *cpu, target_ulong
> vaddr,
> void tlb_set_page(CPUState *cpu, target_ulong vaddr,
> hwaddr paddr, int prot,
> int mmu_idx, target_ulong size);
> -void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr);
> +void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs
> attrs);
> void probe_write(CPUArchState *env, target_ulong addr, int size, int mmu_idx,
> uintptr_t retaddr);
> #else
> @@ -303,7 +303,8 @@ static inline void
> tlb_flush_by_mmuidx_all_cpus_synced(CPUState *cpu,
> uint16_t idxmap)
> {
> }
> -static inline void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr)
> +static inline void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr,
> + MemTxAttrs attrs)
> {
> }
> #endif
> diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c
> index f409d42d54..f04a922ef7 100644
> --- a/accel/tcg/translate-all.c
> +++ b/accel/tcg/translate-all.c
> @@ -1672,7 +1672,7 @@ static TranslationBlock *tb_find_pc(uintptr_t tc_ptr)
> }
>
> #if !defined(CONFIG_USER_ONLY)
> -void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr)
> +void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)
> {
> ram_addr_t ram_addr;
> MemoryRegion *mr;
> diff --git a/exec.c b/exec.c
> index ffa1099547..c3a197e67b 100644
> --- a/exec.c
> +++ b/exec.c
> @@ -898,7 +898,7 @@ static void breakpoint_invalidate(CPUState *cpu,
> target_ulong pc)
> if (phys != -1) {
> /* Locks grabbed by tb_invalidate_phys_addr */
> tb_invalidate_phys_addr(cpu->cpu_ases[asidx].as,
> - phys | (pc & ~TARGET_PAGE_MASK));
> + phys | (pc & ~TARGET_PAGE_MASK), attrs);
> }
> }
> #endif
> diff --git a/target/xtensa/op_helper.c b/target/xtensa/op_helper.c
> index e3bcbe10d6..8a8c763c63 100644
> --- a/target/xtensa/op_helper.c
> +++ b/target/xtensa/op_helper.c
> @@ -105,7 +105,8 @@ static void tb_invalidate_virtual_addr(CPUXtensaState
> *env, uint32_t vaddr)
> int ret = xtensa_get_physical_addr(env, false, vaddr, 2, 0,
> &paddr, &page_size, &access);
> if (ret == 0) {
> - tb_invalidate_phys_addr(&address_space_memory, paddr);
> + tb_invalidate_phys_addr(&address_space_memory, paddr,
> + MEMTXATTRS_UNSPECIFIED);
> }
> }
--
Alex Bennée
- Re: [Qemu-devel] [PATCH 04/27] Make address_space_map() take a MemTxAttrs argument, (continued)
- [Qemu-devel] [PATCH 06/27] Make flatview_extend_translation() take a MemTxAttrs argument, Peter Maydell, 2018/05/21
- [Qemu-devel] [PATCH 08/27] Make MemoryRegion valid.accepts callback take a MemTxAttrs argument, Peter Maydell, 2018/05/21
- [Qemu-devel] [PATCH 02/27] Make tb_invalidate_phys_addr() take a MemTxAttrs argument, Peter Maydell, 2018/05/21
- [Qemu-devel] [PATCH 11/27] Make address_space_get_iotlb_entry() take a MemTxAttrs argument, Peter Maydell, 2018/05/21
- [Qemu-devel] [PATCH 05/27] Make address_space_access_valid() take a MemTxAttrs argument, Peter Maydell, 2018/05/21
- [Qemu-devel] [PATCH 01/27] memory.h: Improve IOMMU related documentation, Peter Maydell, 2018/05/21