Skip to content

tracing: wprobe: x86: Add wprobe for watchpoint

Masami Hiramatsu (Google) linux-doc linux-perf-users linux-trace-kernel lkml 19 versions – New

Get series with b4
b4 am 179101393469.22872.5895666191299551553.stgit@devnote2

Versions newest first · linked by author and title

  1. v19 Latest11 patches 0 repliesNew
  2. v1810 of 11 patches 0 repliesSuperseded
  3. v1713 patches 18 repliesApplied
Earlier versions · 16
VersionPostedPatchesRepliesStatus
v1613 patches4 repliesSuperseded
v1512 patches8 repliesSuperseded
v1414 patches7 repliesSuperseded
v1312 patches7 repliesSuperseded
v1211 patches11 repliesSuperseded
v1111 patches16 repliesSuperseded
v1011 patches1 replySuperseded
v910 patches3 repliesSuperseded
v89 patches0 repliesSuperseded
v710 patches4 repliesSuperseded
v611 patches0 repliesSuperseded
v58 patches12 repliesSuperseded
v48 patches6 repliesSuperseded
v37 patches0 repliesSuperseded
v26 patches2 repliesSuperseded
v1 RFC6 patches7 repliesSuperseded

Changes in v18 from the cover letter · 24 lines

- Drop patch "x86/mce: Fix hardware debug register corruption on task migration"
- Drop patch "perf/x86, KVM: Prevent host debug register leak into guest OS on NMI".
- Drop patch "x86/hw_breakpoints: Make DR7 updates NMI safe".
- Update "Assisted-by:" tags across all commits to "Assisted-by: LLM".
[01/11]
- Drop perf_guest_in_guest() check and cpu_dr7_seq sequence loop
since wprobe does not support updating DR7 in NMI context.
[03/11]
- Add register_wide_hw_breakpoint_cpuslocked() API.
[08/11]
- Use register_wide_hw_breakpoint_cpuslocked() under cpus_read_lock() in __register_trace_wprobe() to avoid CPU hotplug race and lockdep recursive locking warnings.
- Return early on in_nmi() in wprobe_trigger() before taking tw->lock to prevent NMI deadlock.
- Always evaluate __wprobe_count_func() under tw->lock in wprobe_trigger() to fix TOCTOU race for counted triggers.
- Drop redundant in_nmi() check from __wprobe_count_func().
- Defer data->count decrement to wprobe_trigger() under tw->lock after successful hardware update to avoid consuming count on missed triggers and prevent counter underflow.
[09/11]
- Add "set_wprobe:<wprobe-event>":README to requires line in wprobe trigger tests so they are skipped if CONFIG_WPROBE_TRIGGERS is disabled.
- Clear trace buffer after taking CPU offline in trigger-wprobe-hotplug.tc to avoid matching watchpoint events logged prior to offlining.
[10/11]
- Add "set_wprobe:<wprobe-event>":README to requires line in trigger-wprobe-btf-typecast.tc so the test is skipped if CONFIG_WPROBE_TRIGGERS is disabled.
[11/11]
- In get_offset_of_field(), rename mtype to container and document that it represents the containing structure/union type (handling anonymous structures/unions) rather than member's own type.
- In get_offset_of_field(), verify bit offset is byte-aligned before returning byte offset.
- Add "set_wprobe:<wprobe-event>":README to requires line in trigger-wprobe-btf-offset.tc so the test is skipped if CONFIG_WPROBE_TRIGGERS is disabled.

Patches in v19 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/11x86/hw_breakpoints: Add arch_modify_local_hw_breakpoint_addr() APIarch/x86/include/asm/hw_breakpoint.h arch/x86/kernel/hw_breakpoint.c+53 -00 replies
2/11HWBP: Add modify_local_hw_breakpoint_addr() APIarch/Kconfig arch/x86/Kconfig include/linux/hw_breakpoint.h +1 more+63 -00 replies
3/11perf/hw_breakpoint: Add register_wide_hw_breakpoint_cpuslocked() APIinclude/linux/hw_breakpoint.h kernel/events/hw_breakpoint.c+41 -60 replies
4/11tracing/wprobe: Add wprobe (watchpoint probe) trace event supportDocumentation/trace/index.rst Documentation/trace/wprobetrace.rst include/linux/trace_events.h +7 more+907 -40 replies
5/11x86: hw_breakpoint: Add a kconfig to clarify when a breakpoint firesarch/Kconfig arch/x86/Kconfig kernel/trace/Kconfig+12 -00 replies
6/11selftests: tracing: Add a basic testcase for wprobetools/testing/selftests/ftrace/config tools/testing/selftests/ftrace/test.d/dynevent/add_remove_wprobe.tc+67 -00 replies
7/11selftests: tracing: Add syntax testcase for wprobetools/testing/selftests/ftrace/test.d/dynevent/wprobes_syntax_errors.tc+23 -00 replies
8/11tracing/wprobe: Add set_wprobe and clear_wprobe event triggersDocumentation/trace/wprobetrace.rst include/linux/trace_events.h kernel/trace/Kconfig +6 more+919 -50 replies
9/11selftests: tracing: Add wprobe trigger testcasestools/testing/selftests/ftrace/config tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-hotplug.tc tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-syntax-errors.tc +1 more+298 -00 replies
10/11tracing/wprobe: Support BTF typecast in fetchargsDocumentation/trace/wprobetrace.rst kernel/trace/trace_probe.c kernel/trace/trace_probe.h +2 more+111 -10 replies
11/11tracing/wprobe: Support BTF struct offset resolution in set_wprobe triggerDocumentation/trace/wprobetrace.rst kernel/trace/trace_wprobe.c tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-btf-offset.tc+318 -780 replies

Reviews trailers per patch

1 of 11 patches has a Reviewed-by or Acked-by.

PatchJinchao Wang
1/11
2/11
3/11
4/11
5/11R-b
6/11
7/11
8/11
9/11
10/11
11/11

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v19 thread

Cover letter [PATCH v19 00/11] tracing: wprobe: x86: Add wprobe for watchpoint

Hi,

Here is the 19th version of the series for adding new wprobe (watch probe) which provides memory access tracing event. Moreover, this can be used via event trigger. Thus it can trace memory access on dynamically allocated objects too.
The previous version (v17) is here (It seems v18 failed to send the patch.):

https://lore.kernel.org/all/179005108298.388919.4535333252892590932.stgit@devnote2/

v19 is just rebased on the latest probes/for-next branch.
In the version 18:
- Dropped MCE related fix because it is merged in -tip tree.
- Dropped the patches related to making DR7 updates NMI-safe (and the associated KVM guest debug register isolation patch) because wprobe itself does not support updating DR7 in NMI context (wprobe explicitly rejects execution in NMI context via in_nmi()). Those patches are still valid for KGDB, but not related to wprobe.
- Addressed review comments from Sashiko bot on wprobe triggers, selftests, and BTF struct offset resolution:
- Add register_wide_hw_breakpoint_cpuslocked() API to hw_breakpoint and use it under cpus_read_lock() in __register_trace_wprobe() to avoid both the CPU hotplug race and lockdep recursive locking warnings.
- Added early check for in_nmi() in wprobe_trigger() before acquiring

    tw->lock to avoid deadlock if interrupted by an NMI.

- Always evaluate __wprobe_count_func() under tw->lock in wprobe_trigger() to eliminate the TOCTOU race for counted triggers.
- Added "set_wprobe:<wprobe-event>":README requirement to wprobe trigger selftests so they are gracefully skipped if CONFIG_WPROBE_TRIGGERS=n.
- Added clear_trace in trigger-wprobe-hotplug.tc after taking CPU offline to avoid falsely matching events logged prior to offlining.
- In get_offset_of_field(), clarified that the containing structure/union type is checked for kflag (renamed mtype to container with comments) and verified that the resolved bit offset is byte-aligned.
- Updated all "Assisted-by:" tags across all commits to "Assisted-by: LLM".

Detailed changes are here.

Changes in v18:
- Drop patch "x86/mce: Fix hardware debug register corruption on task migration"
- Drop patch "perf/x86, KVM: Prevent host debug register leak into guest OS on NMI".
- Drop patch "x86/hw_breakpoints: Make DR7 updates NMI safe".
- Update "Assisted-by:" tags across all commits to "Assisted-by: LLM".
[01/11]
- Drop perf_guest_in_guest() check and cpu_dr7_seq sequence loop
since wprobe does not support updating DR7 in NMI context.
[03/11]
- Add register_wide_hw_breakpoint_cpuslocked() API.
[08/11]
- Use register_wide_hw_breakpoint_cpuslocked() under cpus_read_lock() in __register_trace_wprobe() to avoid CPU hotplug race and lockdep recursive locking warnings.
- Return early on in_nmi() in wprobe_trigger() before taking tw->lock to prevent NMI deadlock.
- Always evaluate __wprobe_count_func() under tw->lock in wprobe_trigger() to fix TOCTOU race for counted triggers.
- Drop redundant in_nmi() check from __wprobe_count_func().
- Defer data->count decrement to wprobe_trigger() under tw->lock after successful hardware update to avoid consuming count on missed triggers and prevent counter underflow.
[09/11]
- Add "set_wprobe:<wprobe-event>":README to requires line in wprobe trigger tests so they are skipped if CONFIG_WPROBE_TRIGGERS is disabled.
- Clear trace buffer after taking CPU offline in trigger-wprobe-hotplug.tc to avoid matching watchpoint events logged prior to offlining.
[10/11]
- Add "set_wprobe:<wprobe-event>":README to requires line in trigger-wprobe-btf-typecast.tc so the test is skipped if CONFIG_WPROBE_TRIGGERS is disabled.
[11/11]
- In get_offset_of_field(), rename mtype to container and document that it represents the containing structure/union type (handling anonymous structures/unions) rather than member's own type.
- In get_offset_of_field(), verify bit offset is byte-aligned before returning byte offset.
- Add "set_wprobe:<wprobe-event>":README to requires line in trigger-wprobe-btf-offset.tc so the test is skipped if CONFIG_WPROBE_TRIGGERS is disabled.

Public branch
-------------
I will push this branch as topic/wprobe-v2 to my tree so that it can be easily tested.

https://git.kernel.org/pub/scm/linux/kernel/git/mhiramat/linux.git/log/?h=topic/wprobe-v2

This is based on linux-trace tree's linux-trace/probes/fixes.

Usage
-----

The basic usage of this wprobe is similar to other probes;

w:[GRP/][EVENT] [r|w|rw]@<ADDRESS|SYMBOL[+|-OFFS]>[:LEN] [FETCHARGS]

This defines a new wprobe event. For example, to trace jiffies update, you can do;

echo 'w:my_jiffies w@jiffies:8 value=+0($addr)' >> dynamic_events echo 1 > events/wprobes/my_jiffies/enable

Moreover, this can be combined with event trigger to trace the memory access on slab objects. The trigger syntax is;

set_wprobe:WPROBE_EVENT:FIELD[+|-OFFSET][:COUNT] [if FILTER] clear_wprobe:WPROBE_EVENT[:FIELD[+|-OFFSET][:COUNT]] [if FILTER]

set_wprobe sets WPROBE_EVENT's watch address on FIELD[+|-OFFSET]. clear_wprobe clears WPROBE_EVENT's watch address if it is set to FIELD[+|-OFFSET]. If FIELD is omitted, forcibly clear the watch address when trigger event is hit.

For example, trace the first 8 byte of the dentry data structure passed to do_truncate() until it is deleted by dentry_kill().
(Note: all tracefs setup uses '>>' so that it does not kick do_truncate())

  # echo 'w:watch rw@-1:8 address=$addr value=+0($addr)' > dynamic_events
  # echo 'f:truncate do_truncate dentry=$arg2' >> dynamic_events
  # echo 'set_wprobe:watch:dentry' >> events/fprobes/truncate/trigger
  # echo 'f:dentry_kill dentry_kill dentry=$arg1' >> dynamic_events
  # echo 'clear_wprobe:watch:dentry' >> events/fprobes/dentry_kill/trigger
  # echo 1 >> events/fprobes/truncate/enable
  # echo 1 >> events/fprobes/dentry_kill/enable
  # echo aaa > /tmp/hoge
  # echo bbb > /tmp/hoge
  # echo ccc > /tmp/hoge
  # rm /tmp/hoge

Then, the trace data will show;

# tracer: nop
#
# entries-in-buffer/entries-written: 32/32 #P:8
#
# _-----=> irqs-off/BH-disabled
# / _----=> need-resched

 #                              | / _---=> hardirq/softirq
 #                              || / _--=> preempt-depth
 #                              ||| / _-=> migrate-disable
 #                              |||| /     delay
 #           TASK-PID     CPU#  |||||  TIMESTAMP  FUNCTION
 #              | |         |   |||||     |         |
               sh-107     [004] ...1.     9.990418: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004ad6618
               sh-107     [004] ...1.     9.990914: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004b3de78
               sh-107     [004] ...1.     9.993175: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880049ddd40
               sh-107     [004] .....     9.995198: truncate: (do_truncate+0x4/0x120) dentry=0xffff8880048083a8
               sh-107     [004] ...1.     9.995389: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880049db998
               sh-107     [004] ..Zff     9.997503: watch: (lookup_fast+0xaa/0x150) address=0xffff8880048083a8 value=0x8200080
               sh-107     [004] ..Zff     9.997509: watch: (path_openat+0x211/0xda0) address=0xffff8880048083a8 value=0x8200080
               sh-107     [004] ..Zff     9.997514: watch: (path_openat+0xa56/0xda0) address=0xffff8880048083a8 value=0x8200080
               sh-107     [004] ..Zff     9.997518: watch: (path_openat+0xae2/0xda0) address=0xffff8880048083a8 value=0x8200080
               sh-107     [004] .....     9.997521: truncate: (do_truncate+0x4/0x120) dentry=0xffff8880048083a8
               sh-107     [004] ...1.     9.997582: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004808270
               sh-107     [004] ...1.     9.999365: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880049db728
               sh-107     [004] ...1.     9.999388: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004b1c000
               rm-113     [005] ..Zff    10.000965: watch: (lookup_fast+0xaa/0x150) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.000971: watch: (path_lookupat+0x97/0x1e0) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.000984: watch: (lookup_fast+0xaa/0x150) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.000988: watch: (path_lookupat+0x97/0x1e0) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.001010: watch: (lookup_one_qstr_excl+0x28/0x140) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.001014: watch: (lookup_one_qstr_excl+0xd1/0x140) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.001018: watch: (may_delete_dentry+0x1c/0x200) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.001021: watch: (may_delete_dentry+0x195/0x200) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] ..Zff    10.001031: watch: (vfs_unlink+0x5e/0x260) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] d.Z..    10.001067: watch: (d_make_discardable+0x1b/0x40) address=0xffff8880048083a8 value=0x8200080
               rm-113     [005] d.Z..    10.001071: watch: (d_make_discardable+0x29/0x40) address=0xffff8880048083a8 value=0x200080
               rm-113     [005] ...1.    10.001072: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880048083a8
               rm-113     [005] ...1.    10.001218: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880048083a8
               sh-107     [004] ...1.    10.001416: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880049db110
               sh-107     [004] ...1.    10.001444: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff8880049db248
               sh-107     [004] ...1.    10.001500: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004ad6618
               sh-107     [004] ...1.    10.002067: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004b41e78
               sh-107     [004] ...1.    10.904920: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004b41e78
               sh-107     [004] ...1.    10.905129: dentry_kill: (dentry_kill+0x0/0x2c0) dentry=0xffff888004ad6618

Thank you,

---
base-commit: 06e0d3b89da12f24ed5ed434acc8e2cb504f5e4f

Jinchao Wang (1):
x86/hw_breakpoints: Add arch_modify_local_hw_breakpoint_addr() API

Masami Hiramatsu (Google) (10):
HWBP: Add modify_local_hw_breakpoint_addr() API perf/hw_breakpoint: Add register_wide_hw_breakpoint_cpuslocked() API tracing/wprobe: Add wprobe (watchpoint probe) trace event support
x86: hw_breakpoint: Add a kconfig to clarify when a breakpoint fires
selftests: tracing: Add a basic testcase for wprobe
selftests: tracing: Add syntax testcase for wprobe tracing/wprobe: Add set_wprobe and clear_wprobe event triggers
selftests: tracing: Add wprobe trigger testcases tracing/wprobe: Support BTF typecast in fetchargs tracing/wprobe: Support BTF struct offset resolution in set_wprobe trigger

 Documentation/trace/index.rst                      |    1 
 Documentation/trace/wprobetrace.rst                |  200 ++
 arch/Kconfig                                       |   18 
 arch/x86/Kconfig                                   |    2 
 arch/x86/include/asm/hw_breakpoint.h               |    2 
 arch/x86/kernel/hw_breakpoint.c                    |   51 +
 include/linux/hw_breakpoint.h                      |   15 
 include/linux/trace_events.h                       |    3 
 kernel/events/hw_breakpoint.c                      |   86 +
 kernel/trace/Kconfig                               |   24 
 kernel/trace/Makefile                              |    1 
 kernel/trace/trace.c                               |    9 
 kernel/trace/trace.h                               |    6 
 kernel/trace/trace_events_trigger.c                |    2 
 kernel/trace/trace_probe.c                         |   36 
 kernel/trace/trace_probe.h                         |   22 
 kernel/trace/trace_wprobe.c                        | 1707 ++++++++++++++++++++
 tools/testing/selftests/ftrace/config              |    3 
 .../ftrace/test.d/dynevent/add_remove_wprobe.tc    |   66 +
 .../test.d/dynevent/wprobes_syntax_errors.tc       |   23 
 .../test.d/trigger/trigger-wprobe-btf-offset.tc    |   85 +
 .../test.d/trigger/trigger-wprobe-btf-typecast.tc  |   85 +
 .../test.d/trigger/trigger-wprobe-hotplug.tc       |  153 ++
 .../test.d/trigger/trigger-wprobe-syntax-errors.tc |   37 
 .../ftrace/test.d/trigger/trigger-wprobe.tc        |  107 +
 25 files changed, 2731 insertions(+), 13 deletions(-)
 create mode 100644 Documentation/trace/wprobetrace.rst
 create mode 100644 kernel/trace/trace_wprobe.c
 create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_wprobe.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/wprobes_syntax_errors.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-btf-offset.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-btf-typecast.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-hotplug.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe-syntax-errors.tc
 create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-wprobe.tc

--
Masami Hiramatsu (Google) <[email protected]>