From patchwork Wed Feb 17 21:29:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hollis Blanchard X-Patchwork-Id: 584358 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CFDFF1401CD for ; Thu, 18 Feb 2016 08:30:22 +1100 (AEDT) Received: from localhost ([::1]:33688 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW9fw-0006X1-TX for incoming@patchwork.ozlabs.org; Wed, 17 Feb 2016 16:30:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47349) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW9fZ-0005rV-E8 for qemu-devel@nongnu.org; Wed, 17 Feb 2016 16:29:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aW9fW-0002Th-AE for qemu-devel@nongnu.org; Wed, 17 Feb 2016 16:29:57 -0500 Received: from relay1.mentorg.com ([192.94.38.131]:59107) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aW9fW-0002SW-1h for qemu-devel@nongnu.org; Wed, 17 Feb 2016 16:29:54 -0500 Received: from svr-orw-fem-02x.mgc.mentorg.com ([147.34.96.206] helo=SVR-ORW-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1aW9fQ-0002xe-Ud from Hollis_Blanchard@mentor.com ; Wed, 17 Feb 2016 13:29:48 -0800 Received: from matte.unsanctioned (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.3.224.2; Wed, 17 Feb 2016 13:29:48 -0800 From: Hollis Blanchard To: Date: Wed, 17 Feb 2016 13:29:14 -0800 Message-ID: <1455744555-22101-1-git-send-email-hollis_blanchard@mentor.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Cc: pbonzini@redhat.com, Hollis Blanchard , qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 1/2] trace: include CPU index in trace_memory_region_ops_*() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Knowing which CPU performed an action is essential for understanding SMP guest behavior. However, cpu_physical_memory_rw() may be executed by a machine init function, before any VCPUs are running, when there is no CPU running ('current_cpu' is NULL). In this case, store -1 in the trace record as the CPU index. Trace analysis tools may need to be aware of this special case. Signed-off-by: Hollis Blanchard --- memory.c | 48 ++++++++++++++++++++++++++++++++++++------------ trace-events | 8 ++++---- 2 files changed, 40 insertions(+), 16 deletions(-) diff --git a/memory.c b/memory.c index 2d87c21..6ae7bae 100644 --- a/memory.c +++ b/memory.c @@ -395,13 +395,17 @@ static MemTxResult memory_region_oldmmio_read_accessor(MemoryRegion *mr, MemTxAttrs attrs) { uint64_t tmp; + int cpu_index = -1; + + if (current_cpu) + cpu_index = current_cpu->cpu_index; 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(cpu_index, mr, 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(cpu_index, mr, abs_addr, tmp, size); } *value |= (tmp & mask) << shift; return MEMTX_OK; @@ -416,13 +420,17 @@ static MemTxResult memory_region_read_accessor(MemoryRegion *mr, MemTxAttrs attrs) { uint64_t tmp; + int cpu_index = -1; + + if (current_cpu) + cpu_index = current_cpu->cpu_index; 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(cpu_index, mr, 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(cpu_index, mr, abs_addr, tmp, size); } *value |= (tmp & mask) << shift; return MEMTX_OK; @@ -438,13 +446,17 @@ static MemTxResult memory_region_read_with_attrs_accessor(MemoryRegion *mr, { uint64_t tmp = 0; MemTxResult r; + int cpu_index = -1; + + if (current_cpu) + cpu_index = current_cpu->cpu_index; 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(cpu_index, mr, 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(cpu_index, mr, abs_addr, tmp, size); } *value |= (tmp & mask) << shift; return r; @@ -459,13 +471,17 @@ static MemTxResult memory_region_oldmmio_write_accessor(MemoryRegion *mr, MemTxAttrs attrs) { uint64_t tmp; + int cpu_index = -1; + + if (current_cpu) + cpu_index = current_cpu->cpu_index; tmp = (*value >> shift) & mask; if (mr->subpage) { - trace_memory_region_subpage_write(mr, addr, tmp, size); + trace_memory_region_subpage_write(cpu_index, mr, 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(cpu_index, mr, abs_addr, tmp, size); } mr->ops->old_mmio.write[ctz32(size)](mr->opaque, addr, tmp); return MEMTX_OK; @@ -480,13 +496,17 @@ static MemTxResult memory_region_write_accessor(MemoryRegion *mr, MemTxAttrs attrs) { uint64_t tmp; + int cpu_index = -1; + + if (current_cpu) + cpu_index = current_cpu->cpu_index; tmp = (*value >> shift) & mask; if (mr->subpage) { - trace_memory_region_subpage_write(mr, addr, tmp, size); + trace_memory_region_subpage_write(cpu_index, mr, 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(cpu_index, mr, abs_addr, tmp, size); } mr->ops->write(mr->opaque, addr, tmp, size); return MEMTX_OK; @@ -501,13 +521,17 @@ static MemTxResult memory_region_write_with_attrs_accessor(MemoryRegion *mr, MemTxAttrs attrs) { uint64_t tmp; + int cpu_index = -1; + + if (current_cpu) + cpu_index = current_cpu->cpu_index; tmp = (*value >> shift) & mask; if (mr->subpage) { - trace_memory_region_subpage_write(mr, addr, tmp, size); + trace_memory_region_subpage_write(cpu_index, mr, 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(cpu_index, mr, abs_addr, tmp, size); } return mr->ops->write_with_attrs(mr->opaque, addr, tmp, size, attrs); } diff --git a/trace-events b/trace-events index a80dc1c..756ce86 100644 --- a/trace-events +++ b/trace-events @@ -1626,10 +1626,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_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" # 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)"