From nobody Thu May 9 17:09:42 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) client-ip=209.85.128.44; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f44.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1615103317; cv=none; d=zohomail.com; s=zohoarc; b=Fzk52orcBA2M8svhxgWHQQ+5mNh5xG0cxvUglLrrRjUTBZ8gWU/dny4DcsnZfIKbe34avf4f8MXISjbnGdpgAJJFOzZXRDUcxMFPtO6BkwC1A0rNp+mIvhNcaexZoIuKi1VEc6gNEJuvmkNCNjNf6258qSFFQBUSQvHjuTyOIZw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1615103317; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=or3s5L1DEA3J17CPf5B/vfRTzz01RYN/ydodt8L3izA=; b=ESvAr9GzV24AkNroem7r8jPCJFa8FF1N+5TtTgVDeCMQpWhEyCDcHQea7aME2f6b1q4LOneTzRwJBxHV8IXCMAK13jDhr9C8tPgYW/yHYREuqtIfqFQxQri9qGYpo/SzFlTaAIiVY3rjzKJo7EnW5sWVdAtCxjHp+6hsXVCsa6o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.44 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.zohomail.com with SMTPS id 1615103317768915.5161042501169; Sat, 6 Mar 2021 23:48:37 -0800 (PST) Received: by mail-wm1-f44.google.com with SMTP id t5-20020a1c77050000b029010e62cea9deso1843453wmi.0 for ; Sat, 06 Mar 2021 23:48:37 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (68.red-83-57-175.dynamicip.rima-tde.net. [83.57.175.68]) by smtp.gmail.com with ESMTPSA id y18sm4897684wrw.39.2021.03.06.23.48.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 06 Mar 2021 23:48:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=or3s5L1DEA3J17CPf5B/vfRTzz01RYN/ydodt8L3izA=; b=WfQr53HnjqAeHolJSQF2SVkFTulpZHoDaIubHglpAqGxCRzIPp05XX1RLBCcI/qNXF wFeT78T8rHzSNIULs4ht0dZVK88I1zgxjFDjT73dXFRpe29fYdvDC7psESze+sNKCtHg wJCSXAX/TOVYJtrhWnnLY/zF3Y/xZmjqgkUyBe4CDG+EeRtgvAbw9zIOHhdb93MBHHmN XEscjebjml53R0MLq3+d4VUuqSNiEPYT40N3KbZhe29sXN/BIqf+6uo65cw+C8UX4zlC bep0Y9cKHVu4qI1M6Es0tmhL/MBtFpYaEjJgpZuL3y2ELrUBBZA0P6povOBmfDSR+n0/ 683w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=or3s5L1DEA3J17CPf5B/vfRTzz01RYN/ydodt8L3izA=; b=hrXfjbpQ7XC4gstBdjBvZX9DGA7rPfzJnDeXfa+oJ4EEX0pi1SlpaXX7ML9bpJKlQL 5yeTazGrtZqecckss+znN4YT/HulEyD6B4zaHoL0gD5kFGhNPvmMRoZ4L5QK7wtoAL25 f9uxILcDBRcj0Y4FNjFtNeCa5PvP3uxwNuLo3fHm0UTZfLIVt7rwQcyx1ZekZTUxU33z 6C87gm2Wc+wT7DPi8COFmUPZ7m1Qar8yMK78dJ8QAqM4AG6QSpD8gRhe+jAUPyWK670K CZKMOnFCiSjVGuGkC+AUfvtzWssnDTFODAuGB7zTEy0wgAKpxB5n1Dfv96FBMx+2H8FZ uutw== X-Gm-Message-State: AOAM532ILsN/elgqHBGz+rkd2CjspWvBy9v++Xxx/rOpuLr2lb3AE11u KtMRhW/YTWc0iYm1zNkr8zU= X-Google-Smtp-Source: ABdhPJwkka1sJ/nrA6olt3/5ib2JcQGi8WF2Reu1ttQ4tNmQatlVd4ctqiqGugJ4uJQhOkM53t5gvw== X-Received: by 2002:a1c:66c4:: with SMTP id a187mr16719194wmc.164.1615103315979; Sat, 06 Mar 2021 23:48:35 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] memory: Display MemoryRegion name in read/write ops trace events Date: Sun, 7 Mar 2021 08:48:33 +0100 Message-Id: <20210307074833.143106-1-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) MemoryRegion names is cached on first call to memory_region_name(), so displaying the name is trace events is cheap. Add it for read / write ops. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Laurent Vivier --- softmmu/memory.c | 12 ++++++++---- softmmu/trace-events | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/softmmu/memory.c b/softmmu/memory.c index 874a8fccdee..d4d9ab8828e 100644 --- a/softmmu/memory.c +++ b/softmmu/memory.c @@ -444,7 +444,8 @@ static MemTxResult memory_region_read_accessor(MemoryR= egion *mr, trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, s= ize); } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_READ= )) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); - trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); + trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize, + memory_region_name(mr)); } memory_region_shift_read_access(value, shift, mask, tmp); return MEMTX_OK; @@ -466,7 +467,8 @@ static MemTxResult memory_region_read_with_attrs_access= or(MemoryRegion *mr, trace_memory_region_subpage_read(get_cpu_index(), mr, addr, tmp, s= ize); } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_READ= )) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); - trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize); + trace_memory_region_ops_read(get_cpu_index(), mr, abs_addr, tmp, s= ize, + memory_region_name(mr)); } memory_region_shift_read_access(value, shift, mask, tmp); return r; @@ -486,7 +488,8 @@ static MemTxResult memory_region_write_accessor(MemoryR= egion *mr, trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_WRIT= E)) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); - trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, = size); + trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, = size, + memory_region_name(mr)); } mr->ops->write(mr->opaque, addr, tmp, size); return MEMTX_OK; @@ -506,7 +509,8 @@ static MemTxResult memory_region_write_with_attrs_acces= sor(MemoryRegion *mr, trace_memory_region_subpage_write(get_cpu_index(), mr, addr, tmp, = size); } else if (trace_event_get_state_backends(TRACE_MEMORY_REGION_OPS_WRIT= E)) { hwaddr abs_addr =3D memory_region_to_absolute_addr(mr, addr); - trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, = size); + trace_memory_region_ops_write(get_cpu_index(), mr, abs_addr, tmp, = size, + memory_region_name(mr)); } return mr->ops->write_with_attrs(mr->opaque, addr, tmp, size, attrs); } diff --git a/softmmu/trace-events b/softmmu/trace-events index b80ca042e1f..359fb37cc8d 100644 --- a/softmmu/trace-events +++ b/softmmu/trace-events @@ -9,8 +9,8 @@ cpu_in(unsigned int addr, char size, unsigned int val) "add= r 0x%x(%c) value %u" cpu_out(unsigned int addr, char size, unsigned int val) "addr 0x%x(%c) val= ue %u" =20 # memory.c -memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t va= lue, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size %= u" -memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t v= alue, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64" size = %u" +memory_region_ops_read(int cpu_index, void *mr, uint64_t addr, uint64_t va= lue, unsigned size, const char *name) "cpu %d mr %p addr 0x%"PRIx64" value = 0x%"PRIx64" size %u name '%s'" +memory_region_ops_write(int cpu_index, void *mr, uint64_t addr, uint64_t v= alue, unsigned size, const char *name) "cpu %d mr %p addr 0x%"PRIx64" value= 0x%"PRIx64" size %u name '%s'" memory_region_subpage_read(int cpu_index, void *mr, uint64_t offset, uint6= 4_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx64= " size %u" memory_region_subpage_write(int cpu_index, void *mr, uint64_t offset, uint= 64_t value, unsigned size) "cpu %d mr %p offset 0x%"PRIx64" value 0x%"PRIx6= 4" size %u" memory_region_ram_device_read(int cpu_index, void *mr, uint64_t addr, uint= 64_t value, unsigned size) "cpu %d mr %p addr 0x%"PRIx64" value 0x%"PRIx64"= size %u" --=20 2.26.2