Commit 23d92d68 authored by Hollis Blanchard's avatar Hollis Blanchard Committed by Stefan Hajnoczi
Browse files

trace: split subpage MMIOs into their own trace events. 



Previously, a single MMIO could trigger the memory_region_ops tracepoint twice:
once on its way into subpage ops, then later on its way into the model's ops.

Also, the fields previously called "addr" are actually offsets into the memory
region. Rename them to "offset" while we're editing the tracepoint definitions.

Signed-off-by: default avatarHollis Blanchard <hollis_blanchard@mentor.com>
Message-id: 1454976185-30095-2-git-send-email-hollis_blanchard@mentor.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 2c140f5f

memory.c

+30 −6
Original line number Diff line number Diff line
@@ -383,7 +383,11 @@ static MemTxResult memory_region_oldmmio_read_accessor(MemoryRegion *mr, 
    uint64_t tmp;



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

    if (mr->subpage) {

        trace_memory_region_subpage_read(mr, addr, tmp, size);

    } else {

        trace_memory_region_ops_read(mr, addr, tmp, size);

    }

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

    return MEMTX_OK;

}
@@ -399,7 +403,11 @@ static MemTxResult memory_region_read_accessor(MemoryRegion *mr, 
    uint64_t tmp;



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

    if (mr->subpage) {

        trace_memory_region_subpage_read(mr, addr, tmp, size);

    } else {

        trace_memory_region_ops_read(mr, addr, tmp, size);

    }

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

    return MEMTX_OK;

}
@@ -416,7 +424,11 @@ static MemTxResult memory_region_read_with_attrs_accessor(MemoryRegion *mr, 
    MemTxResult r;



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

    if (mr->subpage) {

        trace_memory_region_subpage_read(mr, addr, tmp, size);

    } else {

        trace_memory_region_ops_read(mr, addr, tmp, size);

    }

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

    return r;

}
@@ -432,7 +444,11 @@ static MemTxResult memory_region_oldmmio_write_accessor(MemoryRegion *mr, 
    uint64_t tmp;



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

    if (mr->subpage) {

        trace_memory_region_subpage_write(mr, addr, tmp, size);

    } else {

        trace_memory_region_ops_write(mr, addr, tmp, size);

    }

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

    return MEMTX_OK;

}
@@ -448,7 +464,11 @@ static MemTxResult memory_region_write_accessor(MemoryRegion *mr, 
    uint64_t tmp;



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

    if (mr->subpage) {

        trace_memory_region_subpage_write(mr, addr, tmp, size);

    } else {

        trace_memory_region_ops_write(mr, addr, tmp, size);

    }

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

    return MEMTX_OK;

}
@@ -464,7 +484,11 @@ static MemTxResult memory_region_write_with_attrs_accessor(MemoryRegion *mr, 
    uint64_t tmp;



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

    if (mr->subpage) {

        trace_memory_region_subpage_write(mr, addr, tmp, size);

    } else {

        trace_memory_region_ops_write(mr, addr, tmp, size);

    }

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

}

trace-events

+4 −2
Original line number Diff line number Diff line
@@ -1620,8 +1620,10 @@ 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_ops_read(void *mr, uint64_t offset, uint64_t value, unsigned size) "mr %p offset %#"PRIx64" value %#"PRIx64" size %u"

memory_region_ops_write(void *mr, uint64_t offset, uint64_t value, unsigned size) "mr %p offset %#"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"



# 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)"