lib/rwmmio/arm64: Add support to trace register reads/writes
Subsystems (16)
v14 cover lib/rwmmio/arm64: Add support to trace register reads/writes
Generic MMIO read/write i.e., __raw_{read,write}{b,l,w,q} accessors are typically used to read/write from/to memory mapped registers and can cause hangs or some undefined behaviour in following cases,
* If the access to the register space is unclocked, for example: if there is an access to multimedia(MM) block registers without MM clocks.
* If the register space is protected and not set to be accessible from non-secure world, for example: only EL3 (EL: Exception level) access is allowed and any EL2/EL1 access is forbidden.
* If xPU(memory/register protection units) is controlling access to certain memory/register space for specific clients.
and more...
Such cases usually results in instant reboot/SErrors/NOC or interconnect hangs and tracing these register accesses can be very helpful to debug such issues during initial development stages and also in later stages.
So use ftrace trace events to log such MMIO register accesses which provides rich feature set such as early enablement of trace events, filtering capability, dumping ftrace logs on console and many more.
Sample output:
rwmmio_write: __qcom_geni_serial_console_write+0x160/0x1e0 width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_post_write: __qcom_geni_serial_console_write+0x160/0x1e0 width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_read: qcom_geni_serial_poll_bit+0x94/0x138 width=32 addr=0xfffffbfffdbff610rwmmio_post_read: qcom_geni_serial_poll_bit+0x94/0x138 width=32 val=0x0 addr=0xfffffbfffdbff610
This series is a follow-up for the series [1] and a recent series [2] making use of both.
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
Note in v4 version, Arnd suggested to benchmark and compare size with callback based implementation, please see [3] for more details on that with brief comparison below.
**Inline version with CONFIG_FTRACE=y and CONFIG_TRACE_MMIO_ACCESS=y**
$ size vmlinux text data bss dec hex filename 23884219 14284468 532568 38701255 24e88c7 vmlinux
**Callback version with CONFIG_FTRACE=y and CONFIG_TRACE_MMIO_ACCESS=y**
$ size vmlinux
text data bss dec hex filename
24108179 14279596 532568 38920343 251e097 vmlinux$ ./scripts/bloat-o-meter inline-vmlinux callback-vmlinux add/remove: 8/3 grow/shrink: 4889/89 up/down: 242244/-11564 (230680) Total: Before=25812612, After=26043292, chg +0.89%
[3] https://lore.kernel.org/lkml/[email protected]/
Changes in v14:
* Add more description to disabling MMIO traces in geni serial drivers (Steve).
Changes in v13:
* Remove the copyright update as one line change doesn't warrant it (Greg and Lawyers :))
* Update the comment about disabling MMIO traces in geni se and uart drivers.
* Add description for the build time flag to asm-generic/io.h.
Changes in v12:
* Split the generic flag addition patch (Greg).
* Move the flag from makefile to driver .c file (Greg).
Changes in v11:
* Use unsigned long for caller ip and current ip addr (Steven Rostedt).
* Include review tags from Arnd.
Changes in v10:
* Use GENMASK(31, 0) for -Woverflow warning in irqchip tegra driver (Marc).
* Convert ETM4x ARM64 driver to use asm-generic IO memory barriers (Catalin).
* Collect ack from Catalin for arm64 change.
Changes in v9:
* Use TRACE_EVENT_CLASS for rwmmio_write and post_write (Steven Rostedt).
Changes in v8:
* Fix build error reported by kernel test robot.
Changes in v7:
* Use lib/ instead of kernel/trace/ based on review comment by Steven Rostedt.
Changes in v6:
* Implemented suggestions by Arnd Bergmann:
- Use arch independent IO barriers in arm64/asm
- Add ARCH_HAVE_TRACE_MMIO_ACCESS
- Add post read and post write logging support
- Remove tracepoint_active check
* Fix build error reported by kernel test robot.
Changes in v5:
* Move arm64 to use asm-generic provided high level MMIO accessors (Arnd).
* Add inline logging for MMIO relaxed and non-relaxed accessors.
* Move nVHE KVM comment to makefile (Marc).
* Fix overflow warning due to switch to inline accessors instead of macro.
* Modify trace event field to include caller and parent details for more detailed logs.
Changes in v4:
* Drop dynamic debug based filter support since that will be developed later with the help from Steven (Ftrace maintainer).
* Drop value passed to writel as it is causing hangs when tracing is enabled.
* Code cleanup for trace event as suggested by Steven for earlier version.
* Fixed some build errors reported by 0-day bot.
Changes in v3:
* Create a generic mmio header for instrumented version (Earlier suggested in [1] by Will Deacon and recently [2] by Greg to have a generic version first).
* Add dynamic debug support to filter out traces which can be very useful for targeted debugging specific to subsystems or drivers.
* Few modifications to the rwmmio trace event fields to include the mmio width and print addresses in hex.
* Rewrote commit msg to explain some more about usecases.
Prasad Sodagudi (1):
lib: Add register read/write tracing support
Sai Prakash Ranjan (8):
arm64: io: Use asm-generic high level MMIO accessors
coresight: etm4x: Use asm-generic IO memory barriers irqchip/tegra: Fix overflow implicit truncation warnings drm/meson: Fix overflow implicit truncation warnings
KVM: arm64: Add a flag to disable MMIO trace for nVHE KVM asm-generic/io: Add logging support for MMIO accessors
serial: qcom_geni_serial: Disable MMIO tracing for geni serial
soc: qcom: geni: Disable MMIO tracing for GENI SE
arch/Kconfig | 3 + arch/arm64/Kconfig | 1 + arch/arm64/include/asm/io.h | 41 ++------ arch/arm64/kvm/hyp/nvhe/Makefile | 7 +- drivers/gpu/drm/meson/meson_viu.c | 22 ++--- .../coresight/coresight-etm4x-core.c | 8 +- drivers/hwtracing/coresight/coresight-etm4x.h | 8 +- drivers/irqchip/irq-tegra.c | 10 +- drivers/soc/qcom/qcom-geni-se.c | 3 + drivers/tty/serial/qcom_geni_serial.c | 3 + include/asm-generic/io.h | 91 ++++++++++++++++- include/trace/events/rwmmio.h | 97 +++++++++++++++++++ lib/Kconfig | 7 ++ lib/Makefile | 2 + lib/trace_readwrite.c | 47 +++++++++ 15 files changed, 288 insertions(+), 62 deletions(-) create mode 100644 include/trace/events/rwmmio.h create mode 100644 lib/trace_readwrite.c
Signature · 1 line
2.33.1
PATCH v14 1/9 arm64: io: Use asm-generic high level MMIO accessors
Remove custom arm64 MMIO accessors read{b,w,l,q} and their relaxed versions in support to use asm-generic defined accessors. Also define one set of IO barriers (ar/bw version) used by asm-generic code to override the arm64 specific variants.
--- arch/arm64/include/asm/io.h | 41 ++++++++----------------------------- 1 file changed, 8 insertions(+), 33 deletions(-)
arch/arm64/include/asm/io.h +8 -33
@@ -91,7 +91,7 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) }/* IO barriers */ -#define __iormb (v) \ +#define __io_ar (v) \ ({ \ unsigned long tmp; \ \
@@ -108,39 +108,14 @@ static inline u64 __raw_readq(const volatile void __iomem *addr) : "memory"); \ }) -#define __io_par (v) __iormb(v) -#define __iowmb () dma_wmb() -#define __iomb () dma_mb() - -/* -* Relaxed I/O memory access primitives. These follow the Device memory -* ordering rules but do not guarantee any ordering relative to Normal memory -* accesses. -*/ -#define readb_relaxed (c) ({ u8 __r = __raw_readb(c); __r; }) -#define readw_relaxed (c) ({ u16 __r = le16_to_cpu((__force __le16)__raw_readw(c)); __r; }) -#define readl_relaxed (c) ({ u32 __r = le32_to_cpu((__force __le32)__raw_readl(c)); __r; }) -#define readq_relaxed (c) ({ u64 __r = le64_to_cpu((__force __le64)__raw_readq(c)); __r; }) +#define __io_bw () dma_wmb() +#define __io_br (v) +#define __io_aw (v) -#define writeb_relaxed (v,c) ((void)__raw_writeb((v),(c))) -#define writew_relaxed (v,c) ((void)__raw_writew((__force u16)cpu_to_le16(v),(c))) -#define writel_relaxed (v,c) ((void)__raw_writel((__force u32)cpu_to_le32(v),(c))) -#define writeq_relaxed (v,c) ((void)__raw_writeq((__force u64)cpu_to_le64(v),(c))) - -/* -* I/O memory access primitives. Reads are ordered relative to any -* following Normal memory access. Writes are ordered relative to any prior -* Normal memory access. -*/ -#define readb (c) ({ u8 __v = readb_relaxed(c); __iormb(__v); __v; }) -#define readw (c) ({ u16 __v = readw_relaxed(c); __iormb(__v); __v; }) -#define readl (c) ({ u32 __v = readl_relaxed(c); __iormb(__v); __v; }) -#define readq (c) ({ u64 __v = readq_relaxed(c); __iormb(__v); __v; }) - -#define writeb (v,c) ({ __iowmb(); writeb_relaxed((v),(c)); }) -#define writew (v,c) ({ __iowmb(); writew_relaxed((v),(c)); }) -#define writel (v,c) ({ __iowmb(); writel_relaxed((v),(c)); }) -#define writeq (v,c) ({ __iowmb(); writeq_relaxed((v),(c)); }) +/* arm64-specific, don't use in portable drivers */ +#define __iormb (v) __io_ar(v) +#define __iowmb () __io_bw() +#define __iomb () dma_mb()/* * I/O port access primitives.
Signature · 1 line
2.33.1
PATCH v14 2/9 coresight: etm4x: Use asm-generic IO memory barriers
In reply to Sai Prakash RanjanPer discussion in [1], it was decided to move to using architecture independent/asm-generic IO memory barriers to have just one set of them and deprecate use of arm64 specific IO memory barriers in driver code. So replace current usage of __io_rmb()/__iowmb() in drivers to __io_ar()/__io_bw().
[1] https://lore.kernel.org/lkml/CAK8P3a0L2tLeF1Q0+0ijUxhGNaw+Z0fyPC1oW6_ELQfn0=i4iw@mail.gmail.com/
--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 ++++---- drivers/hwtracing/coresight/coresight-etm4x.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/hwtracing/coresight/coresight-etm4x-core.c +4 -4
@@ -98,7 +98,7 @@ u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit) }if (!_relaxed) -__iormb (res);/* Imitate the !relaxed I/O helpers */ +__io_ar (res);/* Imitate the !relaxed I/O helpers */ return res; }
@@ -106,7 +106,7 @@ u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit)void etm4x_sysreg_write (u64 val,u32 offset,bool _relaxed,bool _64bit) {if (!_relaxed) -__iowmb ();/* Imitate the !relaxed I/O helpers */ +__io_bw ();/* Imitate the !relaxed I/O helpers */ if (!_64bit) val &=GENMASK (31 ,0 );
@@ -130,7 +130,7 @@ static u64 ete_sysreg_read(u32 offset, bool _relaxed, bool _64bit) }if (!_relaxed) -__iormb (res);/* Imitate the !relaxed I/O helpers */ +__io_ar (res);/* Imitate the !relaxed I/O helpers */ return res; }
@@ -138,7 +138,7 @@ static u64 ete_sysreg_read(u32 offset, bool _relaxed, bool _64bit)static void ete_sysreg_write (u64 val,u32 offset,bool _relaxed,bool _64bit) {if (!_relaxed) -__iowmb ();/* Imitate the !relaxed I/O helpers */ +__io_bw ();/* Imitate the !relaxed I/O helpers */ if (!_64bit) val &=GENMASK (31 ,0 );
drivers/hwtracing/coresight/coresight-etm4x.h +4 -4
@@ -448,14 +448,14 @@#define etm4x_read32 (csa, offset) \ ({ \ u32 __val = etm4x_relaxed_read32((csa), (offset)); \ - __iormb(__val); \ + __io_ar(__val); \ __val; \ })#define etm4x_read64 (csa, offset) \ ({ \ u64 __val = etm4x_relaxed_read64((csa), (offset)); \ - __iormb(__val); \ + __io_ar(__val); \ __val; \ })
@@ -479,13 +479,13 @@#define etm4x_write32 (csa, val, offset) \ do { \ - __iowmb(); \ + __io_bw(); \ etm4x_relaxed_write32((csa), (val), (offset)); \ } while (0)#define etm4x_write64 (csa, val, offset) \ do { \ - __iowmb(); \ + __io_bw(); \ etm4x_relaxed_write64((csa), (val), (offset)); \ } while (0)
Signature · 1 line
2.33.1
Suzuki K Poulose
maintainerRe: [PATCHv14 2/9] coresight: etm4x: Use asm-generic IO memory barriers
Hi,
Quoted 8 lines · Sai Prakash Ranjan
Per discussion in [1], it was decided to move to using architecture independent/asm-generic IO memory barriers to have just one set of them and deprecate use of arm64 specific IO memory barriers in driver code. So replace current usage of __io_rmb()/__iowmb() in drivers to __io_ar()/__io_bw().
[1] https://lore.kernel.org/lkml/CAK8P3a0L2tLeF1Q0+0ijUxhGNaw+Z0fyPC1oW6_ELQfn0=i4iw@mail.gmail.com/
Looking at the dis-assembly it looks like in effect they are slightly different for arm64.
i.e., before this patch we had
"dmb osh{ld/st}"
and after the patch we have :
"dsb {ld/st}"
Is this really what we want ? I don't think this is desirable.
Suzuki
Quoted 86 lines
Cc Mathieu Poirier <[email protected]>Cc Suzuki K Poulose <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>Reviewed-by Arnd Bergmann <[email protected]>--- drivers/hwtracing/coresight/coresight-etm4x-core.c | 8 ++++---- drivers/hwtracing/coresight/coresight-etm4x.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)drivers/hwtracing/coresight/coresight-etm4x-core.c +4
-4@@ -98,7 +98,7 @@ u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit) }if (!_relaxed) -__iormb (res);/* Imitate the !relaxed I/O helpers */ +__io_ar (res);/* Imitate the !relaxed I/O helpers */ return res; }@@ -106,7 +106,7 @@ u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit)void etm4x_sysreg_write (u64 val,u32 offset,bool _relaxed,bool _64bit) {if (!_relaxed) -__iowmb ();/* Imitate the !relaxed I/O helpers */ +__io_bw ();/* Imitate the !relaxed I/O helpers */ if (!_64bit) val &=GENMASK (31 ,0 );@@ -130,7 +130,7 @@ static u64 ete_sysreg_read(u32 offset, bool _relaxed, bool _64bit) }if (!_relaxed) -__iormb (res);/* Imitate the !relaxed I/O helpers */ +__io_ar (res);/* Imitate the !relaxed I/O helpers */ return res; }@@ -138,7 +138,7 @@ static u64 ete_sysreg_read(u32 offset, bool _relaxed, bool _64bit)static void ete_sysreg_write (u64 val,u32 offset,bool _relaxed,bool _64bit) {if (!_relaxed) -__iowmb ();/* Imitate the !relaxed I/O helpers */ +__io_bw ();/* Imitate the !relaxed I/O helpers */ if (!_64bit) val &=GENMASK (31 ,0 );drivers/hwtracing/coresight/coresight-etm4x.h +4
-4@@ -448,14 +448,14 @@#define etm4x_read32 (csa, offset) \ ({ \ u32 __val = etm4x_relaxed_read32((csa), (offset)); \ - __iormb(__val); \ + __io_ar(__val); \ __val; \ })#define etm4x_read64 (csa, offset) \ ({ \ u64 __val = etm4x_relaxed_read64((csa), (offset)); \ - __iormb(__val); \ + __io_ar(__val); \ __val; \ })@@ -479,13 +479,13 @@#define etm4x_write32 (csa, val, offset) \ do { \ - __iowmb(); \ + __io_bw(); \ etm4x_relaxed_write32((csa), (val), (offset)); \ } while (0)#define etm4x_write64 (csa, val, offset) \ do { \ - __iowmb(); \ + __io_bw(); \ etm4x_relaxed_write64((csa), (val), (offset)); \ } while (0)
Re: [PATCHv14 2/9] coresight: etm4x: Use asm-generic IO memory barriers
Hi Suzuki,
Quoted 19 lines · Suzuki K Poulose
Hi,
Quoted 8 lines · Sai Prakash Ranjan
Per discussion in [1], it was decided to move to using architecture independent/asm-generic IO memory barriers to have just one set of them and deprecate use of arm64 specific IO memory barriers in driver code. So replace current usage of __io_rmb()/__iowmb() in drivers to __io_ar()/__io_bw().
[1] https://lore.kernel.org/lkml/CAK8P3a0L2tLeF1Q0+0ijUxhGNaw+Z0fyPC1oW6_ELQfn0=i4iw@mail.gmail.com/
Looking at the dis-assembly it looks like in effect they are slightly different for arm64.
i.e., before this patch we had
"dmb osh{ld/st}"
Quoted 8 lines
and after the patch we have :
"dsb {ld/st}"
Is this really what we want ? I don't think this is desirable.
Suzuki
No, this is not supposed to happen and I do not see how it could happen. __io_ar() is defined as __iormb() and __io_bw() is __iowmb().
I checked the disassembly in both case with MMIO trace off/on with __etm4_cpu_save() as below and saw the same number of "dmb"s.
aarch64-linux-gnu-gdb -batch -ex "disassemble/rs __etm4_cpu_save" vmlinux-without-mmio aarch64-linux-gnu-gdb -batch -ex "disassemble/rs __etm4_cpu_save" vmlinux-with-mmio
Can you tell me how are you validating if I am missing something?
Thanks,
Sai
Quoted 77 lines
Quoted 76 lines
Cc Mathieu Poirier <[email protected]>Cc Suzuki K Poulose <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>Reviewed-by Arnd Bergmann <[email protected]>---
drivers/hwtracing/coresight/coresight-etm4x-core.c| 8 ++++---- drivers/hwtracing/coresight/coresight-etm4x.h | 8 ++++----2 files changed, 8 insertions(+), 8 deletions(-)drivers/hwtracing/coresight/coresight-etm4x-core.c +2
-2@@ -98,7 +98,7 @@ u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit) } if (!_relaxed) - __iormb(res); /* Imitate the !relaxed I/O helpers */ + __io_ar(res); /* Imitate the !relaxed I/O helpers */ return res; }@@ -106,7 +106,7 @@ u64 etm4x_sysreg_read(u32 offset, bool _relaxed, bool _64bit) void etm4x_sysreg_write(u64 val, u32 offset, bool _relaxed, bool _64bit) { if (!_relaxed) - __iowmb(); /* Imitate the !relaxed I/O helpers */ + __io_bw(); /* Imitate the !relaxed I/O helpers */ if (!_64bit) val &= GENMASK(31, 0); @@ -130,7 +130,7 @@ static u64 ete_sysreg_read(u32 offset, bool _relaxed, bool _64bit)}
if (!_relaxed)
- __iormb(res); /* Imitate the !relaxed I/O helpers */ + __io_ar(res); /* Imitate the !relaxed I/O helpers */ return res;
}drivers/hwtracing/coresight/coresight-etm4x-core.c +1
-1@@ -138,7 +138,7 @@ static u64 ete_sysreg_read(u32 offset, bool _relaxed, bool _64bit) static void ete_sysreg_write(u64 val, u32 offset, bool _relaxed, bool _64bit) { if (!_relaxed) - __iowmb(); /* Imitate the !relaxed I/O helpers */ + __io_bw(); /* Imitate the !relaxed I/O helpers */ if (!_64bit) val &= GENMASK(31, 0);diff --git
a/drivers/hwtracing/coresight/coresight-etm4x.hb/drivers/hwtracing/coresight/coresight-etm4x.hindex3c4d69b096ca..f54698731582100644drivers/hwtracing/coresight/coresight-etm4x.h +2
-2@@ -448,14 +448,14 @@ #define etm4x_read32(csa, offset) \ ({ \ u32 __val = etm4x_relaxed_read32((csa), (offset)); \ - __iormb(__val); \ + __io_ar(__val); \ __val; \ }) #define etm4x_read64(csa, offset) \ ({ \ u64 __val = etm4x_relaxed_read64((csa), (offset)); \ - __iormb(__val); \ + __io_ar(__val); \ __val; \ })@@ -479,13 +479,13 @@
#defineetm4x_write32(csa, val, offset)\
do { \
- __iowmb(); \
+ __io_bw(); \
etm4x_relaxed_write32((csa), (val), (offset)); \
} while (0)
#defineetm4x_write64(csa, val, offset)\
do { \
- __iowmb(); \
+ __io_bw(); \
etm4x_relaxed_write64((csa), (val), (offset)); \
} while (0)
Re: [PATCHv14 2/9] coresight: etm4x: Use asm-generic IO memory barriers
Quoted 35 lines · Sai Prakash Ranjan
Hi Suzuki,
Quoted 20 lines · Suzuki K Poulose
Hi,
Quoted 9 lines · Sai Prakash Ranjan
Per discussion in [1], it was decided to move to using architecture independent/asm-generic IO memory barriers to have just one set of them and deprecate use of arm64 specific IO memory barriers in driver code. So replace current usage of __io_rmb()/__iowmb() in drivers to __io_ar()/__io_bw().
[1] https://lore.kernel.org/lkml/CAK8P3a0L2tLeF1Q0+0ijUxhGNaw+Z0fyPC1oW6_ELQfn0=i4iw@mail.gmail.com/
Looking at the dis-assembly it looks like in effect they are slightly different for arm64.
i.e., before this patch we had
"dmb osh{ld/st}"
Quoted 8 lines
and after the patch we have :
"dsb {ld/st}"
Is this really what we want ? I don't think this is desirable.
Suzuki
No, this is not supposed to happen and I do not see how it could happen.
__io_ar()is defined as__iormb()and__io_bw()is__iowmb().
Quoted 7 lines
I checked the disassembly in both case with MMIO trace off/on with
__etm4_cpu_save()as below and saw the same number of "dmb"s.aarch64-linux-gnu-gdb -batch -ex "disassemble/rs
__etm4_cpu_save" vmlinux-without-mmio aarch64-linux-gnu-gdb -batch -ex "disassemble/rs__etm4_cpu_save" vmlinux-with-mmioCan you tell me how are you validating if I am missing something?
Apologies, I was missing the patch in this series, which adds the arm64 definition for __io_ar/__io_bw. (hint: Please Cc the affected subsystem in the Cover letter for the series, so we know what the intention of the changes are).
With the patch1, yes this makes sense to me. Otherwise, __io_ar() is default to rmb() which implies dsb ld.
With that said,
Re: [PATCHv14 2/9] coresight: etm4x: Use asm-generic IO memory barriers
Quoted 41 lines · Suzuki K Poulose
Quoted 40 lines · Sai Prakash Ranjan
Hi Suzuki,
Quoted 19 lines · Suzuki K Poulose
Hi,
Quoted 8 lines · Sai Prakash Ranjan
Per discussion in [1], it was decided to move to using architecture independent/asm-generic IO memory barriers to have just one set of them and deprecate use of arm64 specific IO memory barriers in driver code. So replace current usage of __io_rmb()/__iowmb() in drivers to __io_ar()/__io_bw().
[1] https://lore.kernel.org/lkml/CAK8P3a0L2tLeF1Q0+0ijUxhGNaw+Z0fyPC1oW6_ELQfn0=i4iw@mail.gmail.com/
Looking at the dis-assembly it looks like in effect they are slightly different for arm64.
i.e., before this patch we had
"dmb osh{ld/st}"
Quoted 8 lines
and after the patch we have :
"dsb {ld/st}"
Is this really what we want ? I don't think this is desirable.
Suzuki
No, this is not supposed to happen and I do not see how it could happen.
__io_ar()is defined as__iormb()and__io_bw()is__iowmb().I checked the disassembly in both case with MMIO trace off/on with
__etm4_cpu_save()as below and saw the same number of "dmb"s.aarch64-linux-gnu-gdb -batch -ex "disassemble/rs
__etm4_cpu_save" vmlinux-without-mmio aarch64-linux-gnu-gdb -batch -ex "disassemble/rs__etm4_cpu_save" vmlinux-with-mmio
Quoted 7 lines
Quoted 1 line
Can you tell me how are you validating if I am missing something?
Apologies, I was missing the patch in this series, which adds the arm64 definition for __io_ar/__io_bw. (hint: Please Cc the affected subsystem in the Cover letter for the series, so we know what the intention of the changes are).
Sure, I will keep this in mind, apologies for the confusion.
Quoted 6 lines
With the patch1, yes this makes sense to me. Otherwise,
__io_ar()is default tormb()which implies dsb ld.With that said,
Reviewed-by Suzuki K Poulose <[email protected]>
Thanks,
Sai
PATCH v14 3/9 irqchip/tegra: Fix overflow implicit truncation warnings
In reply to Sai Prakash RanjanFix -Woverflow warnings for tegra irqchip driver which is a result of moving arm64 custom MMIO accessor macros to asm-generic function implementations giving a bonus type-checking now and uncovering these overflow warnings.
drivers/irqchip/irq-tegra.c: In function ‘tegra_ictlr_suspend’:drivers/irqchip/irq-tegra.c:151:18: warning: large integer implicitly truncated to unsigned type [-Woverflow]
writel_relaxed(~0ul, ictlr + ICTLR_COP_IER_CLR);
^--- drivers/irqchip/irq-tegra.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/irqchip/irq-tegra.c +5 -5
@@ -148,10 +148,10 @@ static int tegra_ictlr_suspend(void) lic->cop_iep[i] =readl_relaxed (ictlr +ICTLR_COP_IEP_CLASS );/* Disable COP interrupts */ -writel_relaxed (~0ul , ictlr +ICTLR_COP_IER_CLR ); +writel_relaxed (GENMASK (31 ,0 ), ictlr +ICTLR_COP_IER_CLR );/* Disable CPU interrupts */ -writel_relaxed (~0ul , ictlr +ICTLR_CPU_IER_CLR ); +writel_relaxed (GENMASK (31 ,0 ), ictlr +ICTLR_CPU_IER_CLR );/* Enable the wakeup sources of ictlr */ writel_relaxed (lic->ictlr_wake_mask[i], ictlr +ICTLR_CPU_IER_SET );
@@ -172,12 +172,12 @@ static void tegra_ictlr_resume(void)writel_relaxed (lic->cpu_iep[i], ictlr +ICTLR_CPU_IEP_CLASS ); -writel_relaxed (~0ul , ictlr +ICTLR_CPU_IER_CLR ); +writel_relaxed (GENMASK (31 ,0 ), ictlr +ICTLR_CPU_IER_CLR );writel_relaxed (lic->cpu_ier[i], ictlr +ICTLR_CPU_IER_SET );writel_relaxed (lic->cop_iep[i], ictlr +ICTLR_COP_IEP_CLASS ); -writel_relaxed (~0ul , ictlr +ICTLR_COP_IER_CLR ); +writel_relaxed (GENMASK (31 ,0 ), ictlr +ICTLR_COP_IER_CLR );writel_relaxed (lic->cop_ier[i], ictlr +ICTLR_COP_IER_SET ); }
@@ -312,7 +312,7 @@ static int __init tegra_ictlr_init(struct device_node *node, lic->base[i] = base;/* Disable all interrupts */ -writel_relaxed (~0UL , base +ICTLR_CPU_IER_CLR ); +writel_relaxed (GENMASK (31 ,0 ), base +ICTLR_CPU_IER_CLR );/* All interrupts target IRQ */ writel_relaxed (0 , base +ICTLR_CPU_IEP_CLASS );
Signature · 1 line
2.33.1
PATCH v14 4/9 drm/meson: Fix overflow implicit truncation warnings
In reply to Sai Prakash RanjanFix -Woverflow warnings for drm/meson driver which is a result of moving arm64 custom MMIO accessor macros to asm-generic function implementations giving a bonus type-checking now and uncovering these overflow warnings.
drivers/gpu/drm/meson/meson_viu.c: In function ‘meson_viu_init’:drivers/gpu/drm/meson/meson_registers.h:1826:48: error: large integer implicitly truncated to unsigned type [-Werror=overflow]
#define VIU_OSD_BLEND_REORDER(dest, src) ((src) << (dest * 4))
^
drivers/gpu/drm/meson/meson_viu.c:472:18: note: in expansion of macro ‘VIU_OSD_BLEND_REORDER’
writel_relaxed(VIU_OSD_BLEND_REORDER(0, 1) |
^~~~~~~~~~~~~~~~~~~~~--- drivers/gpu/drm/meson/meson_viu.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/meson/meson_viu.c +11 -11
@@ -469,17 +469,17 @@ void meson_viu_init(struct meson_drm *priv) priv->io_base + _REG(VD2_IF0_LUMA_FIFO_SIZE));if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { -writel_relaxed (VIU_OSD_BLEND_REORDER (0 ,1 ) | -VIU_OSD_BLEND_REORDER (1 ,0 ) | -VIU_OSD_BLEND_REORDER (2 ,0 ) | -VIU_OSD_BLEND_REORDER (3 ,0 ) | -VIU_OSD_BLEND_DIN_EN (1 ) | -VIU_OSD_BLEND1_DIN3_BYPASS_TO_DOUT1 | -VIU_OSD_BLEND1_DOUT_BYPASS_TO_BLEND2 | -VIU_OSD_BLEND_DIN0_BYPASS_TO_DOUT0 | -VIU_OSD_BLEND_BLEN2_PREMULT_EN (1 ) | -VIU_OSD_BLEND_HOLD_LINES (4 ), - priv->io_base +_REG (VIU_OSD_BLEND_CTRL )); +u32 val = (u32 )VIU_OSD_BLEND_REORDER (0 ,1 ) | + (u32 )VIU_OSD_BLEND_REORDER (1 ,0 ) | + (u32 )VIU_OSD_BLEND_REORDER (2 ,0 ) | + (u32 )VIU_OSD_BLEND_REORDER (3 ,0 ) | + (u32 )VIU_OSD_BLEND_DIN_EN (1 ) | + (u32 )VIU_OSD_BLEND1_DIN3_BYPASS_TO_DOUT1 | + (u32 )VIU_OSD_BLEND1_DOUT_BYPASS_TO_BLEND2 | + (u32 )VIU_OSD_BLEND_DIN0_BYPASS_TO_DOUT0 | + (u32 )VIU_OSD_BLEND_BLEN2_PREMULT_EN (1 ) | + (u32 )VIU_OSD_BLEND_HOLD_LINES (4 ); +writel_relaxed (val, priv->io_base +_REG (VIU_OSD_BLEND_CTRL ));writel_relaxed (OSD_BLEND_PATH_SEL_ENABLE , priv->io_base +_REG (OSD1_BLEND_SRC_CTRL ));
Signature · 1 line
2.33.1
PATCH v14 5/9 lib: Add register read/write tracing support
In reply to Sai Prakash RanjanFrom: Prasad Sodagudi <[email protected]>
Generic MMIO read/write i.e., __raw_{read,write}{b,l,w,q} accessors are typically used to read/write from/to memory mapped registers and can cause hangs or some undefined behaviour in following few cases,
* If the access to the register space is unclocked, for example: if there is an access to multimedia(MM) block registers without MM clocks.
* If the register space is protected and not set to be accessible from non-secure world, for example: only EL3 (EL: Exception level) access is allowed and any EL2/EL1 access is forbidden.
* If xPU(memory/register protection units) is controlling access to certain memory/register space for specific clients.
and more...
Such cases usually results in instant reboot/SErrors/NOC or interconnect hangs and tracing these register accesses can be very helpful to debug such issues during initial development stages and also in later stages.
So use ftrace trace events to log such MMIO register accesses which provides rich feature set such as early enablement of trace events, filtering capability, dumping ftrace logs on console and many more.
Sample output:
rwmmio_write: __qcom_geni_serial_console_write+0x160/0x1e0 width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_post_write: __qcom_geni_serial_console_write+0x160/0x1e0 width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_read: qcom_geni_serial_poll_bit+0x94/0x138 width=32 addr=0xfffffbfffdbff610rwmmio_post_read: qcom_geni_serial_poll_bit+0x94/0x138 width=32 val=0x0 addr=0xfffffbfffdbff610
--- arch/Kconfig | 3 ++ arch/arm64/Kconfig | 1 + include/trace/events/rwmmio.h | 97 +++++++++++++++++++++++++++++++++++ lib/Kconfig | 7 +++ lib/Makefile | 2 + lib/trace_readwrite.c | 47 +++++++++++++++++ 6 files changed, 157 insertions(+) create mode 100644 include/trace/events/rwmmio.h create mode 100644 lib/trace_readwrite.c
arch/Kconfig +3 -0
@@ -1369,6 +1369,9 @@ config ARCH_HAS_ELFCORE_COMPAT config ARCH_HAS_PARANOID_L1D_FLUSH bool +config ARCH_HAVE_TRACE_MMIO_ACCESS + bool + config DYNAMIC_SIGFRAME bool
arch/arm64/Kconfig +1 -0
@@ -48,6 +48,7 @@ config ARM64 select ARCH_HAS_ZONE_DMA_SET if EXPERT select ARCH_HAVE_ELF_PROT select ARCH_HAVE_NMI_SAFE_CMPXCHG + select ARCH_HAVE_TRACE_MMIO_ACCESS select ARCH_INLINE_READ_LOCK if !PREEMPTION select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPTION
include/trace/events/rwmmio.h new file +97 -0
97 lines not on this page · raw message
lib/Kconfig +7 -0
@@ -118,6 +118,13 @@ config INDIRECT_IOMEM_FALLBACK mmio accesses when the IO memory address is not a registered emulated region. +config TRACE_MMIO_ACCESS + bool "Register read/write tracing" + depends on TRACING && ARCH_HAVE_TRACE_MMIO_ACCESS + help + Create tracepoints for MMIO read/write operations. These trace events + can be used for logging all MMIO read/write operations. + source "lib/crypto/Kconfig" config CRC_CCITT
lib/Makefile +2 -0
@@ -151,6 +151,8 @@ lib-y += logic_pio.o lib-$(CONFIG_INDIRECT_IOMEM) += logic_iomem.o +obj-$(CONFIG_TRACE_MMIO_ACCESS) += trace_readwrite.o + obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_BTREE) += btree.o
lib/trace_readwrite.c new file +47 -0
47 lines not on this page · raw message
Signature · 1 line
2.33.1
Re: [PATCHv14 5/9] lib: Add register read/write tracing support
Quoted 252 lines · Sai Prakash Ranjan
From: Prasad Sodagudi <[email protected]>
Generic MMIO read/write i.e., __raw_{read,write}{b,l,w,q} accessors are typically used to read/write from/to memory mapped registers and can cause hangs or some undefined behaviour in following few cases,
* If the access to the register space is unclocked, for example: if there is an access to multimedia(MM) block registers without MM clocks.
* If the register space is protected and not set to be accessible from non-secure world, for example: only EL3 (EL: Exception level) access is allowed and any EL2/EL1 access is forbidden.
* If xPU(memory/register protection units) is controlling access to certain memory/register space for specific clients.
and more...
Such cases usually results in instant reboot/SErrors/NOC or interconnect hangs and tracing these register accesses can be very helpful to debug such issues during initial development stages and also in later stages.
So use ftrace trace events to log such MMIO register accesses which provides rich feature set such as early enablement of trace events, filtering capability, dumping ftrace logs on console and many more.
Sample output:
rwmmio_write:__qcom_geni_serial_console_write+0x160/0x1e0width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_post_write:__qcom_geni_serial_console_write+0x160/0x1e0width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_read:qcom_geni_serial_poll_bit+0x94/0x138width=32 addr=0xfffffbfffdbff610rwmmio_post_read:qcom_geni_serial_poll_bit+0x94/0x138width=32 val=0x0 addr=0xfffffbfffdbff610Signed-off-by Prasad Sodagudi <[email protected]>Co-developed-by Sai Prakash Ranjan <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>--- arch/Kconfig | 3 ++ arch/arm64/Kconfig | 1 + include/trace/events/rwmmio.h | 97 +++++++++++++++++++++++++++++++++++ lib/Kconfig | 7 +++ lib/Makefile | 2 + lib/trace_readwrite.c | 47 +++++++++++++++++ 6 files changed, 157 insertions(+)create mode 100644
include/trace/events/rwmmio.hcreate mode 100644lib/trace_readwrite.carch/Kconfig +3
-0@@ -1369,6 +1369,9 @@ config ARCH_HAS_ELFCORE_COMPAT config ARCH_HAS_PARANOID_L1D_FLUSH bool +config ARCH_HAVE_TRACE_MMIO_ACCESS + bool + config DYNAMIC_SIGFRAME boolarch/arm64/Kconfig +1
-0@@ -48,6 +48,7 @@ config ARM64 select ARCH_HAS_ZONE_DMA_SET if EXPERT select ARCH_HAVE_ELF_PROT select ARCH_HAVE_NMI_SAFE_CMPXCHG + select ARCH_HAVE_TRACE_MMIO_ACCESS select ARCH_INLINE_READ_LOCK if !PREEMPTION select ARCH_INLINE_READ_LOCK_BH if !PREEMPTION select ARCH_INLINE_READ_LOCK_IRQ if !PREEMPTIONinclude/trace/events/rwmmio.h new file +97
-0@@ -0,0 +1,97 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +*/ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM rwmmio + +#if !defined(_TRACE_RWMMIO_H) || defined(TRACE_HEADER_MULTI_READ ) +#define _TRACE_RWMMIO_H + +#include <linux/tracepoint.h> + +DECLARE_EVENT_CLASS (rwmmio_rw_template, + + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), + +TP_ARGS (caller, val, width, addr), + +TP_STRUCT__entry ( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) +__field (u8, width) + ), + +TP_fast_assign ( + __entry->caller = caller; + __entry->val = val; + __entry->addr = (unsigned long)(void *)addr; + __entry->width = width; + ), + +TP_printk ("%pS width=%d val=%#llx addr=%#lx" , + (void *)(unsigned long )__entry->caller, __entry->width, + __entry->val, __entry->addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), +TP_ARGS (caller, val, width, addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_post_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), +TP_ARGS (caller, val, width, addr) +); + +TRACE_EVENT (rwmmio_read, + + TP_PROTO(unsigned long caller, u8 width, const volatile void __iomem *addr), + +TP_ARGS (caller, width, addr), + +TP_STRUCT__entry ( + __field(unsigned long, caller) + __field(unsigned long, addr) +__field (u8, width) + ), + +TP_fast_assign ( + __entry->caller = caller; + __entry->addr = (unsigned long)(void *)addr; + __entry->width = width; + ), + +TP_printk ("%pS width=%d addr=%#lx" , + (void *)(unsigned long )__entry->caller, __entry->width, __entry->addr) +); + +TRACE_EVENT (rwmmio_post_read, + + TP_PROTO(unsigned long caller, u64 val, u8 width, const volatile void __iomem *addr), + +TP_ARGS (caller, val, width, addr), + +TP_STRUCT__entry ( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) +__field (u8, width) + ), + +TP_fast_assign ( + __entry->caller = caller; + __entry->val = val; + __entry->addr = (unsigned long)(void *)addr; + __entry->width = width; + ), + +TP_printk ("%pS width=%d val=%#llx addr=%#lx" , + (void *)(unsigned long )__entry->caller, __entry->width, + __entry->val, __entry->addr) +); + +#endif /* _TRACE_RWMMIO_H */ + +#include <trace/define_trace.h> lib/Kconfig +7
-0@@ -118,6 +118,13 @@ config INDIRECT_IOMEM_FALLBACK mmio accesses when the IO memory address is not a registered emulated region. +config TRACE_MMIO_ACCESS + bool "Register read/write tracing" + depends on TRACING && ARCH_HAVE_TRACE_MMIO_ACCESS + help + Create tracepoints for MMIO read/write operations. These trace events + can be used for logging all MMIO read/write operations. + source "lib/crypto/Kconfig" config CRC_CCITTlib/Makefile +2
-0@@ -151,6 +151,8 @@ lib-y += logic_pio.o lib-$(CONFIG_INDIRECT_IOMEM) += logic_iomem.o +obj-$(CONFIG_TRACE_MMIO_ACCESS) += trace_readwrite.o + obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_BTREE) += btree.olib/trace_readwrite.c new file +37
-0@@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Register read and write tracepoints +* +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +*/ + +#include <linux/ftrace.h> +#include <linux/module.h> +#include <asm-generic/io.h> + +#define CREATE_TRACE_POINTS +#include <trace/events/rwmmio.h> + +#ifdef CONFIG_TRACE_MMIO_ACCESS +void log_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_write (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_write); + +void log_post_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_post_write (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_write); + +void log_read_mmio (u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_read (caller_addr, width, addr); +} +EXPORT_SYMBOL_GPL (log_read_mmio);
lib/trace_readwrite.c line 47
Quoted 10 lines
lib/trace_readwrite.c new file +10
-0+EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_read); + +void log_post_read_mmio (u64 val,u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_post_read (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_read_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_read); +#endif /* CONFIG_TRACE_MMIO_ACCESS */
Hi Steve,
Could you please review this patch, it is the main one left for this series to get merged. All your previous review comments have been incorporated, you can find them in the cover letter changelog.
Thanks,
Sai
Re: [PATCHv14 5/9] lib: Add register read/write tracing support
Quoted 259 lines · Sai Prakash Ranjan
Quoted 245 lines · Sai Prakash Ranjan
From: Prasad Sodagudi <[email protected]>
Generic MMIO read/write i.e., __raw_{read,write}{b,l,w,q} accessors are typically used to read/write from/to memory mapped registers and can cause hangs or some undefined behaviour in following few cases,
* If the access to the register space is unclocked, for example: if there is an access to multimedia(MM) block registers without MM clocks.
* If the register space is protected and not set to be accessible from non-secure world, for example: only EL3 (EL: Exception level) access is allowed and any EL2/EL1 access is forbidden.
* If xPU(memory/register protection units) is controlling access to certain memory/register space for specific clients.
and more...
Such cases usually results in instant reboot/SErrors/NOC or interconnect hangs and tracing these register accesses can be very helpful to debug such issues during initial development stages and also in later stages.
So use ftrace trace events to log such MMIO register accesses which provides rich feature set such as early enablement of trace events, filtering capability, dumping ftrace logs on console and many more.
Sample output:
rwmmio_write:__qcom_geni_serial_console_write+0x160/0x1e0width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_post_write:__qcom_geni_serial_console_write+0x160/0x1e0width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_read:qcom_geni_serial_poll_bit+0x94/0x138width=32 addr=0xfffffbfffdbff610rwmmio_post_read:qcom_geni_serial_poll_bit+0x94/0x138width=32 val=0x0 addr=0xfffffbfffdbff610Signed-off-by Prasad Sodagudi <[email protected]>Co-developed-by Sai Prakash Ranjan <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>---
arch/Kconfig | 3 ++
arch/arm64/Kconfig | 1 +include/trace/events/rwmmio.h| 97 +++++++++++++++++++++++++++++++++++ lib/Kconfig | 7 +++
lib/Makefile | 2 +
lib/trace_readwrite.c | 47 +++++++++++++++++6 files changed, 157 insertions(+)create mode 100644
include/trace/events/rwmmio.hcreate mode 100644lib/trace_readwrite.carch/Kconfig +0
-0@@ -1369,6 +1369,9 @@ config ARCH_HAS_ELFCORE_COMPATconfig
ARCH_HAS_PARANOID_L1D_FLUSH
bool
+configARCH_HAVE_TRACE_MMIO_ACCESS
+ bool
+
configDYNAMIC_SIGFRAME
bool
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index20ea89d9ac2f..926e1a252b6f100644arch/arm64/Kconfig +0
-0@@ -48,6 +48,7 @@ config ARM64select
ARCH_HAS_ZONE_DMA_SETif EXPERT selectARCH_HAVE_ELF_PROT
selectARCH_HAVE_NMI_SAFE_CMPXCHG
+ selectARCH_HAVE_TRACE_MMIO_ACCESSselectARCH_INLINE_READ_LOCKif !PREEMPTION selectARCH_INLINE_READ_LOCK_BHif !PREEMPTION selectARCH_INLINE_READ_LOCK_IRQif !PREEMPTIONinclude/trace/events/rwmmio.h new file +97
-0@@ -0,0 +1,97 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +*/ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM rwmmio + +#if !defined(_TRACE_RWMMIO_H) || defined(TRACE_HEADER_MULTI_READ ) +#define _TRACE_RWMMIO_H + +#include <linux/tracepoint.h> + +DECLARE_EVENT_CLASS (rwmmio_rw_template, + + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), + + TP_ARGS(caller, val, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) + __field(u8, width) + ), + + TP_fast_assign( + __entry->caller = caller; + __entry->val = val; + __entry->addr = (unsigned long)(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d val=%#llx addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width, + __entry->val, __entry->addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), + TP_ARGS(caller, val, width, addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_post_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), + TP_ARGS(caller, val, width, addr) +); + +TRACE_EVENT (rwmmio_read, + + TP_PROTO(unsigned long caller, u8 width, const volatile void __iomem *addr), + + TP_ARGS(caller, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u8, width) + ), + + TP_fast_assign( + __entry->caller = caller; + __entry->addr = (unsigned long)(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width, __entry->addr) +); + +TRACE_EVENT (rwmmio_post_read, + + TP_PROTO(unsigned long caller, u64 val, u8 width, const volatile void __iomem *addr), + + TP_ARGS(caller, val, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) + __field(u8, width) + ), + + TP_fast_assign( + __entry->caller = caller; + __entry->val = val; + __entry->addr = (unsigned long)(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d val=%#llx addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width, + __entry->val, __entry->addr) +); + +#endif /* _TRACE_RWMMIO_H */ + +#include <trace/define_trace.h> lib/Kconfig +0
-0@@ -118,6 +118,13 @@ config INDIRECT_IOMEM_FALLBACKmmio accesses when the IO memory address is not a registered emulated region.
+configTRACE_MMIO_ACCESS
+ bool "Register read/write tracing"
+ depends on TRACING &&ARCH_HAVE_TRACE_MMIO_ACCESS
+ help
+ Create tracepoints for MMIO read/write operations. These trace events + can be used for logging all MMIO read/write operations.
+
source "lib/crypto/Kconfig"
configCRC_CCITTlib/Makefile +0
-0@@ -151,6 +151,8 @@ lib-y += logic_pio.olib-$(CONFIG_INDIRECT_IOMEM) += logic_iomem.o +obj-$(CONFIG_TRACE_MMIO_ACCESS) += trace_readwrite.o +
obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_BTREE) += btree.olib/trace_readwrite.c new file +37
-0@@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Register read and write tracepoints +* +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +*/ + +#include <linux/ftrace.h> +#include <linux/module.h> +#include <asm-generic/io.h> + +#define CREATE_TRACE_POINTS +#include <trace/events/rwmmio.h> + +#ifdef CONFIG_TRACE_MMIO_ACCESS +void log_write_mmio (u64 val,u8 width,volatile void __iomem *addr, + unsigned long caller_addr) +{ + trace_rwmmio_write(caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_write); + +void log_post_write_mmio (u64 val,u8 width,volatile void __iomem *addr, + unsigned long caller_addr) +{ + trace_rwmmio_post_write(caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_write); + +void log_read_mmio (u8 width,const volatile void __iomem *addr, + unsigned long caller_addr) +{ + trace_rwmmio_read(caller_addr, width, addr); +} +EXPORT_SYMBOL_GPL (log_read_mmio);lib/trace_readwrite.c line 47
Quoted 10 lines
lib/trace_readwrite.c new file +10
-0+EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_read); + +void log_post_read_mmio (u64 val,u8 width,const volatile void __iomem *addr, + unsigned long caller_addr) +{ + trace_rwmmio_post_read(caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_read_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_read); +#endif /* CONFIG_TRACE_MMIO_ACCESS */ Hi Steve,
Quoted 5 lines
Could you please review this patch, it is the main one left for this series to get merged. All your previous review comments have been incorporated, you can find them in the cover letter changelog.
Thanks,
Sai
Hi Steve,
Could we get your blessing for this patch?
Thanks,
Sai
Steven Rostedt
maintainerRe: [PATCHv14 5/9] lib: Add register read/write tracing support
In reply to Sai Prakash RanjanQuoted 14 lines · On Wed, 4 May 2022 16:58:24 +0530 Sai Prakash Ranjan…
include/trace/events/rwmmio.h new file +14
-0+#include <linux/tracepoint.h> + +DECLARE_EVENT_CLASS(rwmmio_rw_template, + + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), + + TP_ARGS(caller, val, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) + __field(u8, width) + ),
include/trace/events/rwmmio.h line 34
Quoted 10 lines
include/trace/events/rwmmio.h new file +10
-0+ +TP_fast_assign ( + __entry->caller = caller; + __entry->val = val; + __entry->addr = (unsigned long )(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d val=%#llx addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width,
__entry->caller is already defined as "unsigned long", why the extra typecast?
Quoted 23 lines
include/trace/events/rwmmio.h new file +23
-0+ __entry->val, __entry->addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), +TP_ARGS (caller, val, width, addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_post_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), +TP_ARGS (caller, val, width, addr) +); + +TRACE_EVENT(rwmmio_read, + + TP_PROTO(unsigned long caller, u8 width, const volatile void __iomem *addr), + + TP_ARGS(caller, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u8, width)
include/trace/events/rwmmio.h line 67
Quoted 10 lines
include/trace/events/rwmmio.h new file +10
-0+ ), + + TP_fast_assign( + __entry->caller = caller; + __entry->addr = (unsigned long )(void *)addr; + __entry->width = width; + ), + +TP_printk ("%pS width=%d addr=%#lx" , + (void *)(unsigned long )__entry->caller, __entry->width, __entry->addr)
Same here.
Quoted 14 lines
include/trace/events/rwmmio.h new file +14
-0+); + +TRACE_EVENT(rwmmio_post_read, + + TP_PROTO(unsigned long caller, u64 val, u8 width, const volatile void __iomem *addr), + + TP_ARGS(caller, val, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) + __field(u8, width) + ),
include/trace/events/rwmmio.h line 91
Quoted 10 lines
include/trace/events/rwmmio.h new file +10
-0+ +TP_fast_assign ( + __entry->caller = caller; + __entry->val = val; + __entry->addr = (unsigned long )(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d val=%#llx addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width,
And here.
Quoted 49 lines
include/trace/events/rwmmio.h new file +6
-0+ __entry->val, __entry->addr) +); + +#endif /* _TRACE_RWMMIO_H */ + +#include <trace/define_trace.h> lib/Kconfig +7
-0@@ -118,6 +118,13 @@ config INDIRECT_IOMEM_FALLBACK mmio accesses when the IO memory address is not a registered emulated region. +config TRACE_MMIO_ACCESS + bool "Register read/write tracing" + depends on TRACING && ARCH_HAVE_TRACE_MMIO_ACCESS + help + Create tracepoints for MMIO read/write operations. These trace events + can be used for logging all MMIO read/write operations. + source "lib/crypto/Kconfig" config CRC_CCITTlib/Makefile +2
-0@@ -151,6 +151,8 @@ lib-y += logic_pio.o lib-$(CONFIG_INDIRECT_IOMEM) += logic_iomem.o +obj-$(CONFIG_TRACE_MMIO_ACCESS) += trace_readwrite.o + obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_BTREE) += btree.olib/trace_readwrite.c new file +6
-0@@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Register read and write tracepoints +* +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +*/
lib/trace_readwrite.c line 16
Quoted 10 lines
lib/trace_readwrite.c new file +10
-0+ +#include <linux/ftrace.h> +#include <linux/module.h> +#include <asm-generic/io.h> + +#define CREATE_TRACE_POINTS +#include <trace/events/rwmmio.h> + +#ifdef CONFIG_TRACE_MMIO_ACCESS +void log_write_mmio(u64 val, u8 width, volatile void __iomem *addr,
Where's the header file that defines these functions? I would think it should be in this patch as well.
-- Steve
Quoted 31 lines
lib/trace_readwrite.c new file +31
-0+ unsigned long caller_addr) +{ +trace_rwmmio_write (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_write); + +void log_post_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_post_write (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_write); + +void log_read_mmio (u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_read (caller_addr, width, addr); +} +EXPORT_SYMBOL_GPL (log_read_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_read); + +void log_post_read_mmio (u64 val,u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_post_read (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_read_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_read); +#endif /* CONFIG_TRACE_MMIO_ACCESS */
Re: [PATCHv14 5/9] lib: Add register read/write tracing support
Hi Steve,
Quoted 21 lines · Steven Rostedt
Quoted 18 lines · On Wed, 4 May 2022 16:58:24 +0530 Sai Prakash Ranjan…
include/trace/events/rwmmio.h new file +18
-0+#include <linux/tracepoint.h> + +DECLARE_EVENT_CLASS(rwmmio_rw_template, + + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), + + TP_ARGS(caller, val, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) + __field(u8, width) + ), + + TP_fast_assign( + __entry->caller = caller; + __entry->val = val;
Quoted 8 lines
include/trace/events/rwmmio.h line 34
Quoted 6 lines
include/trace/events/rwmmio.h new file +6
-0+ __entry->addr = (unsigned long )(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d val=%#llx addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width,
__entry->calleris already defined as "unsigned long", why the extra typecast?
I remember seeing compilation errors without this change in early versions of the series. Let me check this again.
Quoted 27 lines
Quoted 27 lines
include/trace/events/rwmmio.h new file +27
-0+ __entry->val, __entry->addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), +TP_ARGS (caller, val, width, addr) +); + +DEFINE_EVENT (rwmmio_rw_template, rwmmio_post_write, + TP_PROTO(unsigned long caller, u64 val, u8 width, volatile void __iomem *addr), +TP_ARGS (caller, val, width, addr) +); + +TRACE_EVENT(rwmmio_read, + + TP_PROTO(unsigned long caller, u8 width, const volatile void __iomem *addr), + + TP_ARGS(caller, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u8, width) + ), + + TP_fast_assign( + __entry->caller = caller;
Quoted 8 lines
include/trace/events/rwmmio.h line 67
Quoted 6 lines
include/trace/events/rwmmio.h new file +6
-0+ __entry->addr = (unsigned long )(void *)addr; + __entry->width = width; + ), + +TP_printk ("%pS width=%d addr=%#lx" , + (void *)(unsigned long )__entry->caller, __entry->width, __entry->addr)Same here.
Same as above.
Quoted 17 lines
Quoted 17 lines
include/trace/events/rwmmio.h new file +17
-0+); + +TRACE_EVENT(rwmmio_post_read, + + TP_PROTO(unsigned long caller, u64 val, u8 width, const volatile void __iomem *addr), + + TP_ARGS(caller, val, width, addr), + + TP_STRUCT__entry( + __field(unsigned long, caller) + __field(unsigned long, addr) + __field(u64, val) + __field(u8, width) + ), + + TP_fast_assign( + __entry->caller = caller;
Quoted 8 lines
include/trace/events/rwmmio.h line 34
Quoted 7 lines
include/trace/events/rwmmio.h new file +7
-0+ __entry->val = val; + __entry->addr = (unsigned long )(void *)addr; + __entry->width = width; + ), + + TP_printk("%pS width=%d val=%#llx addr=%#lx", + (void *)(unsigned long)__entry->caller, __entry->width,And here.
Same as above.
Quoted 53 lines
Quoted 53 lines
include/trace/events/rwmmio.h new file +6
-0+ __entry->val, __entry->addr) +); + +#endif /* _TRACE_RWMMIO_H */ + +#include <trace/define_trace.h> lib/Kconfig +7
-0@@ -118,6 +118,13 @@ config INDIRECT_IOMEM_FALLBACK mmio accesses when the IO memory address is not a registered emulated region. +config TRACE_MMIO_ACCESS + bool "Register read/write tracing" + depends on TRACING && ARCH_HAVE_TRACE_MMIO_ACCESS + help + Create tracepoints for MMIO read/write operations. These trace events + can be used for logging all MMIO read/write operations. + source "lib/crypto/Kconfig" config CRC_CCITTlib/Makefile +2
-0@@ -151,6 +151,8 @@ lib-y += logic_pio.o lib-$(CONFIG_INDIRECT_IOMEM) += logic_iomem.o +obj-$(CONFIG_TRACE_MMIO_ACCESS) += trace_readwrite.o + obj-$(CONFIG_GENERIC_HWEIGHT) += hweight.o obj-$(CONFIG_BTREE) += btree.olib/trace_readwrite.c new file +10
-0@@ -0,0 +1,47 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Register read and write tracepoints +* +* Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. +*/ + +#include <linux/ftrace.h> +#include <linux/module.h> +#include <asm-generic/io.h>
Quoted 8 lines
lib/trace_readwrite.c line 16
Quoted 6 lines
lib/trace_readwrite.c new file +6
-0+ +#define CREATE_TRACE_POINTS +#include <trace/events/rwmmio.h> + +#ifdef CONFIG_TRACE_MMIO_ACCESS +void log_write_mmio(u64 val, u8 width, volatile void __iomem *addr,Where's the header file that defines these functions? I would think it should be in this patch as well.
It is present in "include/asm-generic/io.h" which is already included above.
Thanks,
Sai
Quoted 34 lines
-- Steve
Quoted 31 lines
lib/trace_readwrite.c new file +31
-0+ unsigned long caller_addr) +{ +trace_rwmmio_write (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_write); + +void log_post_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_post_write (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_write_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_write); + +void log_read_mmio (u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_read (caller_addr, width, addr); +} +EXPORT_SYMBOL_GPL (log_read_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_read); + +void log_post_read_mmio (u64 val,u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) +{ +trace_rwmmio_post_read (caller_addr, val, width, addr); +} +EXPORT_SYMBOL_GPL (log_post_read_mmio); +EXPORT_TRACEPOINT_SYMBOL_GPL (rwmmio_post_read); +#endif /* CONFIG_TRACE_MMIO_ACCESS */
Re: [PATCHv14 5/9] lib: Add register read/write tracing support
Quoted 11 lines · Sai Prakash Ranjan
Hi Steve,
Quoted 3 lines · Steven Rostedt
Quoted 1 line
+ (void *)(unsigned long)__entry->caller,
__entry->width,
__entry->calleris already defined as "unsigned long", why the extra typecast?I remember seeing compilation errors without this change in early versions of the series. Let me check this again.
No warnings or errors without this extra cast, yay. New version posted.
Thanks,
Sai
PATCH v14 6/9 KVM: arm64: Add a flag to disable MMIO trace for nVHE KVM
In reply to Sai Prakash RanjanAdd a generic flag (__DISABLE_TRACE_MMIO__) to disable MMIO tracing in nVHE KVM as the tracepoint and MMIO logging symbols should not be visible at nVHE KVM as there is no way to execute them. It can also be used to disable MMIO tracing for specific drivers.
--- arch/arm64/kvm/hyp/nvhe/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
arch/arm64/kvm/hyp/nvhe/Makefile +6 -1
@@ -4,7 +4,12 @@ # asflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS -ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS + +# Tracepoint and MMIO logging symbols should not be visible at nVHE KVM as +# there is no way to execute them and any such MMIO access from nVHE KVM +# will explode instantly (Words of Marc Zyngier). So introduce a generic flag +# __DISABLE_TRACE_MMIO__ to disable MMIO tracing for nVHE KVM. +ccflags-y := -D__KVM_NVHE_HYPERVISOR__ -D__DISABLE_EXPORTS -D__DISABLE_TRACE_MMIO__ hostprogs := gen-hyprel HOST_EXTRACFLAGS += -I$(objtree)/include
Signature · 1 line
2.33.1
PATCH v14 7/9 asm-generic/io: Add logging support for MMIO accessors
In reply to Sai Prakash RanjanAdd logging support for MMIO high level accessors such as read{b,w,l,q} and their relaxed versions to aid in debugging unexpected crashes/hangs caused by the corresponding MMIO operation.
--- include/asm-generic/io.h | 91 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 87 insertions(+), 4 deletions(-)
include/asm-generic/io.h +87 -4
@@ -10,6 +10,7 @@#include <asm/page.h> /* I/O is all done through memory accesses */ #include <linux/string.h> /* for memset() and memcpy() */ #include <linux/types.h> +#include <linux/instruction_pointer.h> #ifdef CONFIG_GENERIC_IOMAP #include <asm-generic/iomap.h>
@@ -61,6 +62,44 @@#define __io_par (v) __io_ar(v)#endif +/* +* "__DISABLE_TRACE_MMIO__" flag can be used to disable MMIO tracing for +* specific kernel drivers in case of excessive/unwanted logging. +* +* Usage: Add a #define flag at the beginning of the driver file. +* Ex: #define __DISABLE_TRACE_MMIO__ +* #include <...> +* ... +*/ +#if IS_ENABLED (CONFIG_TRACE_MMIO_ACCESS ) && !(defined(__DISABLE_TRACE_MMIO__)) +#include <linux/tracepoint-defs.h> + +DECLARE_TRACEPOINT (rwmmio_write); +DECLARE_TRACEPOINT (rwmmio_post_write); +DECLARE_TRACEPOINT (rwmmio_read); +DECLARE_TRACEPOINT (rwmmio_post_read); + +void log_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr); +void log_post_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr); +void log_read_mmio (u8 width,const volatile void __iomem *addr, +unsigned long caller_addr); +void log_post_read_mmio (u64 val,u8 width,const volatile void __iomem *addr, +unsigned long caller_addr); + +#else + +static inline void log_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr) {} +static inline void log_post_write_mmio (u64 val,u8 width,volatile void __iomem *addr, +unsigned long caller_addr) {} +static inline void log_read_mmio (u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) {} +static inline void log_post_read_mmio (u64 val,u8 width,const volatile void __iomem *addr, +unsigned long caller_addr) {} + +#endif /* CONFIG_TRACE_MMIO_ACCESS */ /* * __raw_{read,write}{b,w,l,q}() access memory in native endianness.
@@ -149,9 +188,11 @@ static inline u8 readb(const volatile void __iomem *addr) {u8 val; +log_read_mmio (8 , addr, _THIS_IP_);__io_br (); val =__raw_readb (addr);__io_ar (val); +log_post_read_mmio (val,8 , addr, _THIS_IP_);return val; }#endif
@@ -162,9 +203,11 @@ static inline u16 readw(const volatile void __iomem *addr) {u16 val; +log_read_mmio (16 , addr, _THIS_IP_);__io_br (); val =__le16_to_cpu ((__le16 __force )__raw_readw (addr));__io_ar (val); +log_post_read_mmio (val,16 , addr, _THIS_IP_);return val; }#endif
@@ -175,9 +218,11 @@ static inline u32 readl(const volatile void __iomem *addr) {u32 val; +log_read_mmio (32 , addr, _THIS_IP_);__io_br (); val =__le32_to_cpu ((__le32 __force )__raw_readl (addr));__io_ar (val); +log_post_read_mmio (val,32 , addr, _THIS_IP_);return val; }#endif
@@ -189,9 +234,11 @@ static inline u64 readq(const volatile void __iomem *addr) {u64 val; +log_read_mmio (64 , addr, _THIS_IP_);__io_br (); val =__le64_to_cpu (__raw_readq (addr));__io_ar (val); +log_post_read_mmio (val,64 , addr, _THIS_IP_);return val; }#endif
@@ -201,9 +248,11 @@ static inline u64 readq(const volatile void __iomem *addr)#define writeb writebstatic inline void writeb (u8 value,volatile void __iomem *addr) { +log_write_mmio (value,8 , addr, _THIS_IP_);__io_bw ();__raw_writeb (value, addr);__io_aw (); +log_post_write_mmio (value,8 , addr, _THIS_IP_); }#endif
@@ -211,9 +260,11 @@ static inline void writeb(u8 value, volatile void __iomem *addr)#define writew writewstatic inline void writew (u16 value,volatile void __iomem *addr) { +log_write_mmio (value,16 , addr, _THIS_IP_);__io_bw ();__raw_writew ((u16 __force )cpu_to_le16 (value), addr);__io_aw (); +log_post_write_mmio (value,16 , addr, _THIS_IP_); }#endif
@@ -221,9 +272,11 @@ static inline void writew(u16 value, volatile void __iomem *addr)#define writel writelstatic inline void writel (u32 value,volatile void __iomem *addr) { +log_write_mmio (value,32 , addr, _THIS_IP_);__io_bw ();__raw_writel ((u32 __force )__cpu_to_le32 (value), addr);__io_aw (); +log_post_write_mmio (value,32 , addr, _THIS_IP_); }#endif
@@ -232,9 +285,11 @@ static inline void writel(u32 value, volatile void __iomem *addr)#define writeq writeqstatic inline void writeq (u64 value,volatile void __iomem *addr) { +log_write_mmio (value,64 , addr, _THIS_IP_);__io_bw ();__raw_writeq (__cpu_to_le64 (value), addr);__io_aw (); +log_post_write_mmio (value,64 , addr, _THIS_IP_); }#endif #endif /* CONFIG_64BIT */
@@ -248,7 +303,12 @@ static inline void writeq(u64 value, volatile void __iomem *addr)#define readb_relaxed readb_relaxedstatic inline u8 readb_relaxed (const volatile void __iomem *addr) { -return __raw_readb (addr); +u8 val; + +log_read_mmio (8 , addr, _THIS_IP_); + val =__raw_readb (addr); +log_post_read_mmio (val,8 , addr, _THIS_IP_); +return val; }#endif
@@ -256,7 +316,12 @@ static inline u8 readb_relaxed(const volatile void __iomem *addr)#define readw_relaxed readw_relaxedstatic inline u16 readw_relaxed (const volatile void __iomem *addr) { -return __le16_to_cpu (__raw_readw (addr)); +u16 val; + +log_read_mmio (16 , addr, _THIS_IP_); + val =__le16_to_cpu (__raw_readw (addr)); +log_post_read_mmio (val,16 , addr, _THIS_IP_); +return val; }#endif
@@ -264,7 +329,12 @@ static inline u16 readw_relaxed(const volatile void __iomem *addr)#define readl_relaxed readl_relaxedstatic inline u32 readl_relaxed (const volatile void __iomem *addr) { -return __le32_to_cpu (__raw_readl (addr)); +u32 val; + +log_read_mmio (32 , addr, _THIS_IP_); + val =__le32_to_cpu (__raw_readl (addr)); +log_post_read_mmio (val,32 , addr, _THIS_IP_); +return val; }#endif
@@ -272,7 +342,12 @@ static inline u32 readl_relaxed(const volatile void __iomem *addr)#define readq_relaxed readq_relaxedstatic inline u64 readq_relaxed (const volatile void __iomem *addr) { -return __le64_to_cpu (__raw_readq (addr)); +u64 val; + +log_read_mmio (64 , addr, _THIS_IP_); + val =__le64_to_cpu (__raw_readq (addr)); +log_post_read_mmio (val,64 , addr, _THIS_IP_); +return val; }#endif
@@ -280,7 +355,9 @@ static inline u64 readq_relaxed(const volatile void __iomem *addr)#define writeb_relaxed writeb_relaxedstatic inline void writeb_relaxed (u8 value,volatile void __iomem *addr) { +log_write_mmio (value,8 , addr, _THIS_IP_);__raw_writeb (value, addr); +log_post_write_mmio (value,8 , addr, _THIS_IP_); }#endif
@@ -288,7 +365,9 @@ static inline void writeb_relaxed(u8 value, volatile void __iomem *addr)#define writew_relaxed writew_relaxedstatic inline void writew_relaxed (u16 value,volatile void __iomem *addr) { +log_write_mmio (value,16 , addr, _THIS_IP_);__raw_writew (cpu_to_le16 (value), addr); +log_post_write_mmio (value,16 , addr, _THIS_IP_); }#endif
@@ -296,7 +375,9 @@ static inline void writew_relaxed(u16 value, volatile void __iomem *addr)#define writel_relaxed writel_relaxedstatic inline void writel_relaxed (u32 value,volatile void __iomem *addr) { +log_write_mmio (value,32 , addr, _THIS_IP_);__raw_writel (__cpu_to_le32 (value), addr); +log_post_write_mmio (value,32 , addr, _THIS_IP_); }#endif
@@ -304,7 +385,9 @@ static inline void writel_relaxed(u32 value, volatile void __iomem *addr)#define writeq_relaxed writeq_relaxedstatic inline void writeq_relaxed (u64 value,volatile void __iomem *addr) { +log_write_mmio (value,64 , addr, _THIS_IP_);__raw_writeq (__cpu_to_le64 (value), addr); +log_post_write_mmio (value,64 , addr, _THIS_IP_); }#endif
Signature · 1 line
2.33.1
PATCH v14 8/9 serial: qcom_geni_serial: Disable MMIO tracing for geni serial
In reply to Sai Prakash RanjanDisable MMIO tracing for geni serial driver to prevent excessive logging. Any access over serial console would involve a lot of TX and RX register accesses (and few others), so these MMIO read/write trace events in these drivers cause a lot of unwanted noise because of the high frequency of such operations and it is not very useful tracing these events for such drivers. Given we want to enable these trace events on development devices (maybe not production devices) where performance also really matters so that we don't regress other components by wasting CPU cycles and memory collecting these traces, it makes more sense to disable these traces from such drivers.
Also another reason to disable these traces would be to prevent recursive tracing when we display the trace buffer containing these MMIO trace events since writing onto serial console would further record MMIO traces.
--- drivers/tty/serial/qcom_geni_serial.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/tty/serial/qcom_geni_serial.c +3 -0
@@ -1,6 +1,9 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2017-2018, The Linux foundation. All rights reserved. +/* Disable MMIO tracing to prevent excessive logging of unwanted MMIO traces */ +#define __DISABLE_TRACE_MMIO__ +#include <linux/clk.h> #include <linux/console.h> #include <linux/io.h>
Signature · 1 line
2.33.1
PATCH v14 9/9 soc: qcom: geni: Disable MMIO tracing for GENI SE
In reply to Sai Prakash RanjanDisable MMIO tracing for GENI SE driver to prevent excessive logging. Any access over serial console would involve a lot of TX and RX register accesses (and few others), so these MMIO read/write trace events in these drivers cause a lot of unwanted noise because of the high frequency of such operations and it is not very useful tracing these events for such drivers. Given we want to enable these trace events on development devices (maybe not production devices) where performance also really matters so that we don't regress other components by wasting CPU cycles and memory collecting these traces, it makes more sense to disable these traces from such drivers.
Also another reason to disable these traces would be to prevent recursive tracing when we display the trace buffer containing these MMIO trace events since writing onto serial console would further record MMIO traces.
--- drivers/soc/qcom/qcom-geni-se.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/soc/qcom/qcom-geni-se.c +3 -0
@@ -1,6 +1,9 @@// SPDX-License-Identifier: GPL-2.0 // Copyright (c) 2017-2018, The Linux Foundation. All rights reserved. +/* Disable MMIO tracing to prevent excessive logging of unwanted MMIO traces */ +#define __DISABLE_TRACE_MMIO__ +#include <linux/acpi.h> #include <linux/clk.h> #include <linux/slab.h>
Signature · 1 line
2.33.1
Hi Arnd,
Quoted 148 lines · Sai Prakash Ranjan
Generic MMIO read/write i.e., __raw_{read,write}{b,l,w,q} accessors are typically used to read/write from/to memory mapped registers and can cause hangs or some undefined behaviour in following cases,
* If the access to the register space is unclocked, for example: if there is an access to multimedia(MM) block registers without MM clocks.
* If the register space is protected and not set to be accessible from non-secure world, for example: only EL3 (EL: Exception level) access is allowed and any EL2/EL1 access is forbidden.
* If xPU(memory/register protection units) is controlling access to certain memory/register space for specific clients.
and more...
Such cases usually results in instant reboot/SErrors/NOC or interconnect hangs and tracing these register accesses can be very helpful to debug such issues during initial development stages and also in later stages.
So use ftrace trace events to log such MMIO register accesses which provides rich feature set such as early enablement of trace events, filtering capability, dumping ftrace logs on console and many more.
Sample output:
rwmmio_write:__qcom_geni_serial_console_write+0x160/0x1e0width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_post_write:__qcom_geni_serial_console_write+0x160/0x1e0width=32 val=0xa0d5d addr=0xfffffbfffdbff700rwmmio_read:qcom_geni_serial_poll_bit+0x94/0x138width=32 addr=0xfffffbfffdbff610rwmmio_post_read:qcom_geni_serial_poll_bit+0x94/0x138width=32 val=0x0 addr=0xfffffbfffdbff610This series is a follow-up for the series [1] and a recent series [2] making use of both.
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/Note in v4 version, Arnd suggested to benchmark and compare size with callback based implementation, please see [3] for more details on that with brief comparison below.
**Inline version with
CONFIG_FTRACE=yandCONFIG_TRACE_MMIO_ACCESS=y**$ size vmlinux text data bss dec hex filename 23884219 14284468 532568 38701255 24e88c7 vmlinux**Callback version with
CONFIG_FTRACE=yandCONFIG_TRACE_MMIO_ACCESS=y**$ size vmlinux text data bss dec hex filename 24108179 14279596 532568 38920343 251e097 vmlinux$ ./scripts/bloat-o-meter inline-vmlinux callback-vmlinux add/remove: 8/3 grow/shrink: 4889/89 up/down: 242244/-11564 (230680) Total: Before=25812612, After=26043292, chg +0.89%[3] https://lore.kernel.org/lkml/[email protected]/
Changes in v14:
* Add more description to disabling MMIO traces in geni serial drivers (Steve).Changes in v13:
* Remove the copyright update as one line change doesn't warrant it (Greg and Lawyers :))
* Update the comment about disabling MMIO traces in geni se and uart drivers.
* Add description for the build time flag toasm-generic/io.h.Changes in v12:
* Split the generic flag addition patch (Greg).
* Move the flag from makefile to driver .c file (Greg).Changes in v11:
* Use unsigned long for caller ip and current ip addr (Steven Rostedt).
* Include review tags from Arnd.Changes in v10:
* UseGENMASK(31, 0)for -Woverflow warning in irqchip tegra driver (Marc).
* Convert ETM4x ARM64 driver to use asm-generic IO memory barriers (Catalin).
* Collect ack from Catalin for arm64 change.Changes in v9:
* UseTRACE_EVENT_CLASSforrwmmio_writeandpost_write(Steven Rostedt).Changes in v8:
* Fix build error reported by kernel test robot.Changes in v7:
* Uselib/instead ofkernel/trace/based on review comment by Steven Rostedt.Changes in v6:
* Implemented suggestions by Arnd Bergmann:
- Use arch independent IO barriers in arm64/asm
- AddARCH_HAVE_TRACE_MMIO_ACCESS
- Add post read and post write logging support
- Removetracepoint_activecheck
* Fix build error reported by kernel test robot.Changes in v5:
* Move arm64 to use asm-generic provided high level MMIO accessors (Arnd).
* Add inline logging for MMIO relaxed and non-relaxed accessors.
* Move nVHE KVM comment to makefile (Marc).
* Fix overflow warning due to switch to inline accessors instead of macro.
* Modify trace event field to include caller and parent details for more detailed logs.Changes in v4:
* Drop dynamic debug based filter support since that will be developed later with the help from Steven (Ftrace maintainer).
* Drop value passed to writel as it is causing hangs when tracing is enabled.
* Code cleanup for trace event as suggested by Steven for earlier version.
* Fixed some build errors reported by 0-day bot.Changes in v3:
* Create a generic mmio header for instrumented version (Earlier suggested in [1] by Will Deacon and recently [2] by Greg to have a generic version first).
* Add dynamic debug support to filter out traces which can be very useful for targeted debugging specific to subsystems or drivers.
* Few modifications to the rwmmio trace event fields to include the mmio width and print addresses in hex.
* Rewrote commit msg to explain some more about usecases.Prasad Sodagudi (1):
lib: Add register read/write tracing supportSai Prakash Ranjan (8):
arm64: io: Use asm-generic high level MMIO accessors
coresight: etm4x: Use asm-generic IO memory barriers irqchip/tegra: Fix overflow implicit truncation warnings drm/meson: Fix overflow implicit truncation warnings
KVM: arm64: Add a flag to disable MMIO trace for nVHE KVM asm-generic/io: Add logging support for MMIO accessors
serial:qcom_geni_serial: Disable MMIO tracing for geni serial
soc: qcom: geni: Disable MMIO tracing for GENI SEarch/Kconfig | 3 + arch/arm64/Kconfig | 1 + arch/arm64/include/asm/io.h | 41 ++------ arch/arm64/kvm/hyp/nvhe/Makefile | 7 +- drivers/gpu/drm/meson/meson_viu.c | 22 ++--- .../coresight/coresight-etm4x-core.c | 8 +- drivers/hwtracing/coresight/coresight-etm4x.h | 8 +- drivers/irqchip/irq-tegra.c | 10 +- drivers/soc/qcom/qcom-geni-se.c | 3 + drivers/tty/serial/qcom_geni_serial.c | 3 + include/asm-generic/io.h | 91 ++++++++++++++++- include/trace/events/rwmmio.h | 97 +++++++++++++++++++ lib/Kconfig | 7 ++ lib/Makefile | 2 + lib/trace_readwrite.c | 47 +++++++++ 15 files changed, 288 insertions(+), 62 deletions(-)
Quoted 3 lines
create mode 100644
include/trace/events/rwmmio.hcreate mode 100644lib/trace_readwrite.c
Could you take first 4 patches which are independent and not related to MMIO tracing? And the rest can be taken once we get ack from Steve for the tracing part.
Thanks,
Sai