Commit 8bca9a03 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

move public invalidate APIs out of translate-all.{c,h}, clean up 



Place them in exec.c, exec-all.h and ram_addr.h.  This removes
knowledge of translate-all.h (which is an internal header) from
several files outside accel/tcg and removes knowledge of
AddressSpace from translate-all.c (as it only operates on ram_addr_t).

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent a99761d3

accel/tcg/translate-all.c

+6 −22
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#endif

#endif

#else

#include "exec/address-spaces.h"

#include "exec/ram_addr.h"

#endif



#include "exec/cputlb.h"
@@ -1934,7 +1934,11 @@ void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end, 
 *

 * Called with mmap_lock held for user-mode emulation.

 */

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end)

#ifdef CONFIG_SOFTMMU

void tb_invalidate_phys_range(ram_addr_t start, ram_addr_t end)

#else

void tb_invalidate_phys_range(target_ulong start, target_ulong end)

#endif

{

    struct page_collection *pages;

    tb_page_addr_t next;
@@ -2073,26 +2077,6 @@ static bool tb_invalidate_phys_page(tb_page_addr_t addr, uintptr_t pc) 
}

#endif



#if !defined(CONFIG_USER_ONLY)

void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)

{

    ram_addr_t ram_addr;

    MemoryRegion *mr;

    hwaddr l = 1;



    rcu_read_lock();

    mr = address_space_translate(as, addr, &addr, &l, false, attrs);

    if (!(memory_region_is_ram(mr)

          || memory_region_is_romd(mr))) {

        rcu_read_unlock();

        return;

    }

    ram_addr = memory_region_get_ram_addr(mr) + addr;

    tb_invalidate_phys_page_range(ram_addr, ram_addr + 1, 0);

    rcu_read_unlock();

}

#endif /* !defined(CONFIG_USER_ONLY) */



/* user-mode: call with mmap_lock held */

void tb_check_watchpoint(CPUState *cpu)

{

accel/tcg/translate-all.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ void tb_invalidate_phys_page_fast(struct page_collection *pages, 
                                  tb_page_addr_t start, int len);

void tb_invalidate_phys_page_range(tb_page_addr_t start, tb_page_addr_t end,

                                   int is_cpu_write_access);

void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end);

void tb_check_watchpoint(CPUState *cpu);



#ifdef CONFIG_USER_ONLY

exec.c

+25 −4
Original line number Diff line number Diff line
@@ -1028,13 +1028,36 @@ const char *parse_cpu_model(const char *cpu_model) 
}



#if defined(CONFIG_USER_ONLY)

static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

void tb_invalidate_phys_addr(target_ulong addr)

{

    mmap_lock();

    tb_invalidate_phys_page_range(pc, pc + 1, 0);

    tb_invalidate_phys_page_range(addr, addr + 1, 0);

    mmap_unlock();

}



static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

{

    tb_invalidate_phys_addr(pc);

}

#else

void tb_invalidate_phys_addr(AddressSpace *as, hwaddr addr, MemTxAttrs attrs)

{

    ram_addr_t ram_addr;

    MemoryRegion *mr;

    hwaddr l = 1;



    rcu_read_lock();

    mr = address_space_translate(as, addr, &addr, &l, false, attrs);

    if (!(memory_region_is_ram(mr)

          || memory_region_is_romd(mr))) {

        rcu_read_unlock();

        return;

    }

    ram_addr = memory_region_get_ram_addr(mr) + addr;

    tb_invalidate_phys_page_range(ram_addr, ram_addr + 1, 0);

    rcu_read_unlock();

}



static void breakpoint_invalidate(CPUState *cpu, target_ulong pc)

{

    MemTxAttrs attrs;
@@ -3146,9 +3169,7 @@ static void invalidate_and_set_dirty(MemoryRegion *mr, hwaddr addr, 
    }

    if (dirty_log_mask & (1 << DIRTY_MEMORY_CODE)) {

        assert(tcg_enabled());

        mmap_lock();

        tb_invalidate_phys_range(addr, addr + length);

        mmap_unlock();

        dirty_log_mask &= ~(1 << DIRTY_MEMORY_CODE);

    }

    cpu_physical_memory_set_dirty_range(addr, length, dirty_log_mask);

include/exec/exec-all.h

+4 −4
Original line number Diff line number Diff line
@@ -299,14 +299,14 @@ static inline void tlb_flush_page_by_mmuidx_all_cpus_synced(CPUState *cpu, 
static inline void tlb_flush_by_mmuidx_all_cpus(CPUState *cpu, uint16_t idxmap)

{

}



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,

                                           MemTxAttrs attrs)

{

}



void tb_invalidate_phys_addr(target_ulong addr);

void tb_invalidate_phys_range(target_ulong start, target_ulong end);

#endif



#define CODE_GEN_ALIGN           16 /* must be >= of the size of a icache line */

include/exec/ram_addr.h

+2 −0
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ int qemu_ram_resize(RAMBlock *block, ram_addr_t newsize, Error **errp); 
#define DIRTY_CLIENTS_ALL     ((1 << DIRTY_MEMORY_NUM) - 1)

#define DIRTY_CLIENTS_NOCODE  (DIRTY_CLIENTS_ALL & ~(1 << DIRTY_MEMORY_CODE))



void tb_invalidate_phys_range(ram_addr_t start, ram_addr_t end);



static inline bool cpu_physical_memory_get_dirty(ram_addr_t start,

                                                 ram_addr_t length,

                                                 unsigned client)