Commit 618a5a8b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stefanha/tags/tracing-pull-request' into staging 



# gpg: Signature made Mon 14 Mar 2016 11:27:01 GMT using RSA key ID 81AB73C8
# gpg: Good signature from "Stefan Hajnoczi <stefanha@redhat.com>"
# gpg:                 aka "Stefan Hajnoczi <stefanha@gmail.com>"

* remotes/stefanha/tags/tracing-pull-request:
  trace: separate MMIO tracepoints from TB-access tracepoints
  trace: include CPU index in trace_memory_region_*()

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 6dcea614 f2d08942

memory.c

+50 −12
Original line number Diff line number Diff line
@@ -386,6 +386,14 @@ static hwaddr memory_region_to_absolute_addr(MemoryRegion *mr, hwaddr offset) 
    return abs_addr;

}



static int get_cpu_index(void)

{

    if (current_cpu) {

        return current_cpu->cpu_index;

    }

    return -1;

}



static MemTxResult memory_region_oldmmio_read_accessor(MemoryRegion *mr,

                                                       hwaddr addr,

                                                       uint64_t *value,
@@ -398,10 +406,15 @@ static MemTxResult memory_region_oldmmio_read_accessor(MemoryRegion *mr, 


    tmp = mr->ops->old_mmio.read[ctz32(size)](mr->opaque, addr);

    if (mr->subpage) {

        trace_memory_region_subpage_read(mr, addr, tmp, size);

        trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);

    } else if (mr == &io_mem_notdirty) {

        /* Accesses to code which has previously been translated into a TB show

         * up in the MMIO path, as accesses to the io_mem_notdirty

         * MemoryRegion. */

        trace_memory_region_tb_read(get_cpu_index(), addr, tmp, size);

    } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) {

        hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);

        trace_memory_region_ops_read(mr, abs_addr, tmp, size);

        trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size);

    }

    *value |= (tmp & mask) << shift;

    return MEMTX_OK;
@@ -419,10 +432,15 @@ static MemTxResult memory_region_read_accessor(MemoryRegion *mr, 


    tmp = mr->ops->read(mr->opaque, addr, size);

    if (mr->subpage) {

        trace_memory_region_subpage_read(mr, addr, tmp, size);

        trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);

    } else if (mr == &io_mem_notdirty) {

        /* Accesses to code which has previously been translated into a TB show

         * up in the MMIO path, as accesses to the io_mem_notdirty

         * MemoryRegion. */

        trace_memory_region_tb_read(get_cpu_index(), addr, tmp, size);

    } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) {

        hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);

        trace_memory_region_ops_read(mr, abs_addr, tmp, size);

        trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size);

    }

    *value |= (tmp & mask) << shift;

    return MEMTX_OK;
@@ -441,10 +459,15 @@ static MemTxResult memory_region_read_with_attrs_accessor(MemoryRegion *mr, 


    r = mr->ops->read_with_attrs(mr->opaque, addr, &tmp, size, attrs);

    if (mr->subpage) {

        trace_memory_region_subpage_read(mr, addr, tmp, size);

        trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, size);

    } else if (mr == &io_mem_notdirty) {

        /* Accesses to code which has previously been translated into a TB show

         * up in the MMIO path, as accesses to the io_mem_notdirty

         * MemoryRegion. */

        trace_memory_region_tb_read(get_cpu_index(), addr, tmp, size);

    } else if (TRACE_MEMORY_REGION_OPS_READ_ENABLED) {

        hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);

        trace_memory_region_ops_read(mr, abs_addr, tmp, size);

        trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, size);

    }

    *value |= (tmp & mask) << shift;

    return r;
@@ -462,10 +485,15 @@ static MemTxResult memory_region_oldmmio_write_accessor(MemoryRegion *mr, 


    tmp = (*value >> shift) & mask;

    if (mr->subpage) {

        trace_memory_region_subpage_write(mr, addr, tmp, size);

        trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, size);

    } else if (mr == &io_mem_notdirty) {

        /* Accesses to code which has previously been translated into a TB show

         * up in the MMIO path, as accesses to the io_mem_notdirty

         * MemoryRegion. */

        trace_memory_region_tb_write(get_cpu_index(), addr, tmp, size);

    } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) {

        hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);

        trace_memory_region_ops_write(mr, abs_addr, tmp, size);

        trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, size);

    }

    mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, tmp);

    return MEMTX_OK;
@@ -483,10 +511,15 @@ static MemTxResult memory_region_write_accessor(MemoryRegion *mr, 


    tmp = (*value >> shift) & mask;

    if (mr->subpage) {

        trace_memory_region_subpage_write(mr, addr, tmp, size);

        trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, size);

    } else if (mr == &io_mem_notdirty) {

        /* Accesses to code which has previously been translated into a TB show

         * up in the MMIO path, as accesses to the io_mem_notdirty

         * MemoryRegion. */

        trace_memory_region_tb_write(get_cpu_index(), addr, tmp, size);

    } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) {

        hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);

        trace_memory_region_ops_write(mr, abs_addr, tmp, size);

        trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, size);

    }

    mr->ops->write(mr->opaque, addr, tmp, size);

    return MEMTX_OK;
@@ -504,10 +537,15 @@ static MemTxResult memory_region_write_with_attrs_accessor(MemoryRegion *mr, 


    tmp = (*value >> shift) & mask;

    if (mr->subpage) {

        trace_memory_region_subpage_write(mr, addr, tmp, size);

        trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, size);

    } else if (mr == &io_mem_notdirty) {

        /* Accesses to code which has previously been translated into a TB show

         * up in the MMIO path, as accesses to the io_mem_notdirty

         * MemoryRegion. */

        trace_memory_region_tb_write(get_cpu_index(), addr, tmp, size);

    } else if (TRACE_MEMORY_REGION_OPS_WRITE_ENABLED) {

        hwaddr abs_addr = memory_region_to_absolute_addr(mr, addr);

        trace_memory_region_ops_write(mr, abs_addr, tmp, size);

        trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, size);

    }

    return mr->ops->write_with_attrs(mr->opaque, addr, tmp, size, attrs);

}

trace-events

+6 −4
Original line number Diff line number Diff line
@@ -1620,10 +1620,12 @@ disable exec_tb_exit(void *next_tb, unsigned int flags) "tb:%p flags=%x" 
translate_block(void *tb, uintptr_t pc, uint8_t *tb_code) "tb:%p, pc:0x%"PRIxPTR", tb_code:%p"



# memory.c

memory_region_ops_read(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u"

memory_region_ops_write(void *mr, uint64_t addr, uint64_t value, unsigned size) "mr %p addr %#"PRIx64" value %#"PRIx64" size %u"

memory_region_subpage_read(void *mr, uint64_t offset, uint64_t value, unsigned size) "mr %p offset %#"PRIx64" value %#"PRIx64" size %u"

memory_region_subpage_write(void *mr, uint64_t offset, uint64_t value, unsigned size) "mr %p offset %#"PRIx64" value %#"PRIx64" size %u"

memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr %#"PRIx64" value %#"PRIx64" size %u"

memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t value, unsigned size) "cpu %d mr %p addr %#"PRIx64" value %#"PRIx64" size %u"

memory_region_subpage_read(int cpu_index, void *mr, uint64_t offset, uint64_t value, unsigned size) "cpu %d mr %p offset %#"PRIx64" value %#"PRIx64" size %u"

memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint64_t value, unsigned size) "cpu %d mr %p offset %#"PRIx64" value %#"PRIx64" size %u"

memory_region_tb_read(int cpu_index, uint64_t addr, uint64_t value, unsigned size) "cpu %d addr %#"PRIx64" value %#"PRIx64" size %u"

memory_region_tb_write(int cpu_index, uint64_t addr, uint64_t value, unsigned size) "cpu %d addr %#"PRIx64" value %#"PRIx64" size %u"



# qom/object.c

object_dynamic_cast_assert(const char *type, const char *target, const char *file, int line, const char *func) "%s->%s (%s:%d:%s)"