hw: Remove dynamic field width from trace event
cover hw: Remove dynamic field width from trace event
Eric noted in [1] the dtrace via stap backend can not support the dynamic '*' width format.
I'd really like to use dynamic width in trace event because the read/write accesses are easier to read but it is not a priority. Since next release is close, time to fix LP#1844817 [2].
[1] https://lists.gnu.org/archive/html/qemu-devel/2019-09/msg04720.html
[2] https://bugs.launchpad.net/qemu/+bug/1844817
Philippe Mathieu-Daudé (3):
hw/block/pflash: Remove dynamic field width from trace event hw/mips/gt64xxx: Remove dynamic field width from trace event
trace: Forbid dynamic field width in event format
hw/block/pflash_cfi01.c | 8 ++++---- hw/block/pflash_cfi02.c | 8 ++++---- hw/mips/gt64xxx_pci.c | 34 +++++++++++++++++----------------- hw/block/trace-events | 8 ++++---- hw/mips/trace-events | 4 ++-- scripts/tracetool/__init__.py | 3 +++ 6 files changed, 34 insertions(+), 31 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/3 hw/block/pflash: Remove dynamic field width from trace event
Since not all trace backends support dynamic field width in format (dtrace via stap does not), replace by a static field width instead.
--- hw/block/pflash_cfi01.c | 8 ++++---- hw/block/pflash_cfi02.c | 8 ++++---- hw/block/trace-events | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-)
hw/block/pflash_cfi01.c +4 -4
@@ -276,7 +276,7 @@ static uint32_t pflash_data_read(PFlashCFI01 *pfl, hwaddr offset,DPRINTF ("BUG in %s\n" , __func__);abort (); } -trace_pflash_data_read (offset, width <<1 , ret); +trace_pflash_data_read (offset, width <<3 , ret);return ret; }
@@ -389,7 +389,7 @@ static uint32_t pflash_read(PFlashCFI01 *pfl, hwaddr offset,break ; } -trace_pflash_io_read (offset, width, width <<1 , ret, pfl->cmd, pfl->wcycle); +trace_pflash_io_read (offset, width <<3 , ret, pfl->cmd, pfl->wcycle);return ret; }
@@ -414,7 +414,7 @@ static inline void pflash_data_write(PFlashCFI01 *pfl, hwaddr offset, {uint8_t *p = pfl->storage; -trace_pflash_data_write (offset, width <<1 , value, pfl->counter); +trace_pflash_data_write (offset, width <<3 , value, pfl->counter);switch (width) {case 1 : p[offset] = value;
@@ -453,7 +453,7 @@ static void pflash_write(PFlashCFI01 *pfl, hwaddr offset, cmd = value; -trace_pflash_io_write (offset, width, width <<1 , value, pfl->wcycle); +trace_pflash_io_write (offset, width <<3 , value, pfl->wcycle);if (!pfl->wcycle) {/* Set the device in I/O access mode */ memory_region_rom_device_set_romd (&pfl->mem, false);
hw/block/pflash_cfi02.c +4 -4
@@ -260,7 +260,7 @@ static uint64_t pflash_data_read(PFlashCFI02 *pfl, hwaddr offset, {uint8_t *p = (uint8_t *)pfl->storage + offset;uint64_t ret = pfl->be ?ldn_be_p (p, width) :ldn_le_p (p, width); -trace_pflash_data_read (offset, width <<1 , ret); +trace_pflash_data_read (offset, width <<3 , ret);return ret; }
@@ -385,7 +385,7 @@ static uint64_t pflash_read(void *opaque, hwaddr offset, unsigned int width) }break ; } -trace_pflash_io_read (offset, width, width <<1 , ret, pfl->cmd, pfl->wcycle); +trace_pflash_io_read (offset, width <<3 , ret, pfl->cmd, pfl->wcycle);return ret; }
@@ -432,7 +432,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value,uint8_t *p;uint8_t cmd; -trace_pflash_io_write (offset, width, width <<1 , value, pfl->wcycle); +trace_pflash_io_write (offset, width <<3 , value, pfl->wcycle); cmd = value;if (pfl->cmd !=0xA0 ) {/* Reset does nothing during chip erase and sector erase. */
@@ -542,7 +542,7 @@ static void pflash_write(void *opaque, hwaddr offset, uint64_t value, } goto reset_flash; } -trace_pflash_data_write (offset, width <<1 , value,0 ); +trace_pflash_data_write (offset, width <<3 , value,0 );if (!pfl->ro) { p = (uint8_t *)pfl->storage + offset;if (pfl->be) {
hw/block/trace-events +4 -4
@@ -8,10 +8,10 @@ fdc_ioport_write(uint8_t reg, uint8_t value) "write reg 0x%02x val 0x%02x" # pflash_cfi01.c pflash_reset(void) "reset" pflash_timer_expired(uint8_t cmd) "command 0x%02x done" -pflash_io_read(uint64_t offset, int width, int fmt_width, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%0*x cmd:0x%02x wcycle:%u" -pflash_io_write(uint64_t offset, int width, int fmt_width, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%0*x wcycle:%u" -pflash_data_read(uint64_t offset, int width, uint32_t value) "data offset:0x%04"PRIx64" value:0x%0*x" -pflash_data_write(uint64_t offset, int width, uint32_t value, uint64_t counter) "data offset:0x%04"PRIx64" value:0x%0*x counter:0x%016"PRIx64 +pflash_io_read(uint64_t offset, int width, uint32_t value, uint8_t cmd, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%04x cmd:0x%02x wcycle:%u" +pflash_io_write(uint64_t offset, int width, uint32_t value, uint8_t wcycle) "offset:0x%04"PRIx64" width:%d value:0x%04x wcycle:%u" +pflash_data_read(uint64_t offset, int width, uint32_t value) "data offset:0x%04"PRIx64" width:%d value:0x%04x" +pflash_data_write(uint64_t offset, int width, uint32_t value, uint64_t counter) "data offset:0x%04"PRIx64" width:%d value:0x%04x counter:0x%016"PRIx64 pflash_manufacturer_id(uint16_t id) "Read Manufacturer ID: 0x%04x" pflash_device_id(uint16_t id) "Read Device ID: 0x%04x" pflash_device_info(uint64_t offset) "Read Device Information offset:0x%04"PRIx64
Signature · 1 line
2.21.0
PATCH 2/3 hw/mips/gt64xxx: Remove dynamic field width from trace event
In reply to Philippe Mathieu-DaudéSince not all trace backends support dynamic field width in format (dtrace via stap does not), replace by a static field width instead.
--- hw/mips/gt64xxx_pci.c | 34 +++++++++++++++++----------------- hw/mips/trace-events | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-)
hw/mips/gt64xxx_pci.c +17 -17
@@ -464,7 +464,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Read-only register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* CPU Sync Barrier */
@@ -474,7 +474,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Read-only register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* SDRAM and Device Address Decode */
@@ -516,7 +516,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented device register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* ECC */
@@ -529,7 +529,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Read-only register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* DMA Record */
@@ -566,7 +566,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented DMA register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* Timer/Counter */
@@ -579,7 +579,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented timer register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* PCI Internal */
@@ -623,7 +623,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented timer register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;case GT_PCI0_CFGADDR : phb->config_reg = val &0x80fffffc ;
@@ -642,19 +642,19 @@ static void gt64120_writel(void *opaque, hwaddr addr,/* not really implemented */ s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val &0xfffffffe )); s->regs[saddr] |= !!(s->regs[saddr] &0xfffffffe ); -trace_gt64120_write ("INTRCAUSE" , size <<1 , val); +trace_gt64120_write ("INTRCAUSE" , size <<3 , val);break ;case GT_INTRMASK : s->regs[saddr] = val &0x3c3ffffe ; -trace_gt64120_write ("INTRMASK" , size <<1 , val); +trace_gt64120_write ("INTRMASK" , size <<3 , val);break ;case GT_PCI0_ICMASK : s->regs[saddr] = val &0x03fffffe ; -trace_gt64120_write ("ICMASK" , size <<1 , val); +trace_gt64120_write ("ICMASK" , size <<3 , val);break ;case GT_PCI0_SERR0MASK : s->regs[saddr] = val &0x0000003f ; -trace_gt64120_write ("SERR0MASK" , size <<1 , val); +trace_gt64120_write ("SERR0MASK" , size <<3 , val);break ;/* Reserved when only PCI_0 is configured. */
@@ -683,7 +683,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Illegal register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ; } }
@@ -930,19 +930,19 @@ static uint64_t gt64120_readl(void *opaque,/* Interrupts */ case GT_INTRCAUSE : val = s->regs[saddr]; -trace_gt64120_read ("INTRCAUSE" , size <<1 , val); +trace_gt64120_read ("INTRCAUSE" , size <<3 , val);break ;case GT_INTRMASK : val = s->regs[saddr]; -trace_gt64120_read ("INTRMASK" , size <<1 , val); +trace_gt64120_read ("INTRMASK" , size <<3 , val);break ;case GT_PCI0_ICMASK : val = s->regs[saddr]; -trace_gt64120_read ("ICMASK" , size <<1 , val); +trace_gt64120_read ("ICMASK" , size <<3 , val);break ;case GT_PCI0_SERR0MASK : val = s->regs[saddr]; -trace_gt64120_read ("SERR0MASK" , size <<1 , val); +trace_gt64120_read ("SERR0MASK" , size <<3 , val);break ;/* Reserved when only PCI_0 is configured. */
@@ -960,7 +960,7 @@ static uint64_t gt64120_readl(void *opaque,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Illegal register read " "reg:0x03%x size:%u value:0x%0*x\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ; }
hw/mips/trace-events +2 -2
@@ -1,4 +1,4 @@ # gt64xxx.c -gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s value:0x%0*" PRIx64 -gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s value:0x%0*" PRIx64 +gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s width:%d value:0x%08" PRIx64 +gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s width:%d value:0x%08" PRIx64 gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_length, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRIx64 "@0x%08" PRIx64
Signature · 1 line
2.21.0
Re: [PATCH 2/3] hw/mips/gt64xxx: Remove dynamic field width from trace event
Quoted 17 lines · Philippe Mathieu-Daudé
Since not all trace backends support dynamic field width in format (dtrace via stap does not), replace by a static field width instead.
Reported-by Eric Blake <[email protected]>Signed-off-by Philippe Mathieu-Daudé <[email protected]>--- hw/mips/gt64xxx_pci.c | 34 +++++++++++++++++----------------- hw/mips/trace-events | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-)hw/mips/gt64xxx_pci.c +0
-0
hw/mips/gt64xxx_pci.c static void gt64120_writel(void *opaque, hwaddr addr, · line 467
Quoted 5 lines
hw/mips/gt64xxx_pci.c +1
-1@@ -464,7 +464,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Read-only register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);
Wrong replacement :( I'll respin.
Quoted 135 lines
hw/mips/gt64xxx_pci.c +16
-16break ;/* CPU Sync Barrier */ @@ -474,7 +474,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Read-only register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* SDRAM and Device Address Decode */ @@ -516,7 +516,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented device register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* ECC */ @@ -529,7 +529,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Read-only register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* DMA Record */ @@ -566,7 +566,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented DMA register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* Timer/Counter */ @@ -579,7 +579,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented timer register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;/* PCI Internal */ @@ -623,7 +623,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_UNIMP ,"gt64120: Unimplemented timer register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ;case GT_PCI0_CFGADDR : phb->config_reg = val &0x80fffffc ;@@ -642,19 +642,19 @@ static void gt64120_writel(void *opaque, hwaddr addr,/* not really implemented */ s->regs[saddr] = ~(~(s->regs[saddr]) | ~(val &0xfffffffe )); s->regs[saddr] |= !!(s->regs[saddr] &0xfffffffe ); -trace_gt64120_write ("INTRCAUSE" , size <<1 , val); +trace_gt64120_write ("INTRCAUSE" , size <<3 , val);break ;case GT_INTRMASK : s->regs[saddr] = val &0x3c3ffffe ; -trace_gt64120_write ("INTRMASK" , size <<1 , val); +trace_gt64120_write ("INTRMASK" , size <<3 , val);break ;case GT_PCI0_ICMASK : s->regs[saddr] = val &0x03fffffe ; -trace_gt64120_write ("ICMASK" , size <<1 , val); +trace_gt64120_write ("ICMASK" , size <<3 , val);break ;case GT_PCI0_SERR0MASK : s->regs[saddr] = val &0x0000003f ; -trace_gt64120_write ("SERR0MASK" , size <<1 , val); +trace_gt64120_write ("SERR0MASK" , size <<3 , val);break ;/* Reserved when only PCI_0 is configured. */ @@ -683,7 +683,7 @@ static void gt64120_writel(void *opaque, hwaddr addr,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Illegal register write " "reg:0x03%x size:%u value:0x%0*" PRIx64"\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ; } }@@ -930,19 +930,19 @@ static uint64_t gt64120_readl(void *opaque,/* Interrupts */ case GT_INTRCAUSE : val = s->regs[saddr]; -trace_gt64120_read ("INTRCAUSE" , size <<1 , val); +trace_gt64120_read ("INTRCAUSE" , size <<3 , val);break ;case GT_INTRMASK : val = s->regs[saddr]; -trace_gt64120_read ("INTRMASK" , size <<1 , val); +trace_gt64120_read ("INTRMASK" , size <<3 , val);break ;case GT_PCI0_ICMASK : val = s->regs[saddr]; -trace_gt64120_read ("ICMASK" , size <<1 , val); +trace_gt64120_read ("ICMASK" , size <<3 , val);break ;case GT_PCI0_SERR0MASK : val = s->regs[saddr]; -trace_gt64120_read ("SERR0MASK" , size <<1 , val); +trace_gt64120_read ("SERR0MASK" , size <<3 , val);break ;/* Reserved when only PCI_0 is configured. */ @@ -960,7 +960,7 @@ static uint64_t gt64120_readl(void *opaque,qemu_log_mask (LOG_GUEST_ERROR ,"gt64120: Illegal register read " "reg:0x03%x size:%u value:0x%0*x\n" , - saddr <<2 , size, size <<1 , val); + saddr <<2 , size, size <<3 , val);break ; }hw/mips/trace-events +2
-2@@ -1,4 +1,4 @@ # gt64xxx.c -gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s value:0x%0*" PRIx64 -gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s value:0x%0*" PRIx64 +gt64120_read(const char *regname, int width, uint64_t value) "gt64120 read %s width:%d value:0x%08" PRIx64 +gt64120_write(const char *regname, int width, uint64_t value) "gt64120 write %s width:%d value:0x%08" PRIx64 gt64120_isd_remap(uint64_t from_length, uint64_t from_addr, uint64_t to_length, uint64_t to_addr) "ISD: 0x%08" PRIx64 "@0x%08" PRIx64 " -> 0x%08" PRIx64 "@0x%08" PRIx64
PATCH 3/3 trace: Forbid dynamic field width in event format
In reply to Philippe Mathieu-DaudéSince not all trace backends support dynamic field width in format (dtrace via stap does not), forbid them.
Add a check to refuse field width in new formats:
$ make
[...]
GEN hw/block/trace.h
Traceback (most recent call last):
File "scripts/tracetool.py", line 152, in <module>
main(sys.argv)
File "scripts/tracetool.py", line 143, in main
events.extend(tracetool.read_events(fh, arg))
File "scripts/tracetool/__init__.py", line 371, in read_events
event = Event.build(line)
File "scripts/tracetool/__init__.py", line 285, in build
raise ValueError("Event format must not contain field width '%*'")
ValueError: Error at hw/block/trace-events:11: Event format must not contain field width '%*'--- scripts/tracetool/__init__.py | 3 +++ 1 file changed, 3 insertions(+)
scripts/tracetool/__init__.py +3 -0
@@ -206,6 +206,7 @@ class Event(object): "\s*" "(?:(?:(?P<fmt_trans>\".+),)?\s*(?P<fmt>\".+))?" "\s*") + _DFWRE = re.compile(".*(%0?\*).*") _VALID_PROPS = set(["disable", "tcg", "tcg-trans", "tcg-exec", "vcpu"])
@@ -280,6 +281,8 @@ class Event(object): if fmt.endswith(r'\n"'): raise ValueError("Event format must not end with a newline " "character") + if Event._DFWRE.match(fmt): + raise ValueError("Event format must not contain field width '%*'") if len(fmt_trans) > 0: fmt = [fmt_trans, fmt]
Signature · 1 line
2.21.0