Tracefs support for pKVM
Subsystems (6)
Vincent Donnefort
maintainerv12 cover Tracefs support for pKVM
The growing set of features supported by the hypervisor in protected mode necessitates debugging and profiling tools. Tracefs is the ideal candidate for this task:
* It is simple to use and to script.
* It is supported by various tools, from the trace-cmd CLI to the Android web-based perfetto.
* The ring-buffer, where are stored trace events consists of linked pages, making it an ideal structure for sharing between kernel and hypervisor.
This series first introduces a new generic way of creating remote events and remote buffers. Then it adds support to the pKVM hypervisor.
1. ring-buffer
--------------
To setup the per-cpu ring-buffers, a new interface is created:
ring_buffer_remote: Describes what the kernel needs to know about the
remote writer, that is, the set of pages forming the ring-buffer and a callback for the reader/head swapping (enables consuming read)
ring_buffer_remote(): Creates a read-only ring-buffer from a
ring_buffer_remote.
To keep the internals of struct ring_buffer in sync with the remote, the meta-page is used. It was originally introduced to enable user-space mapping of the ring-buffer [1]. In this case, the kernel is not the producer anymore but the reader. The function to read that meta-page is:
ring_buffer_poll_remote():
Update struct ring_buffer based on the remote meta-page. Wake-up readers if necessary.
The kernel has to poll the meta-page to be notified of newly written events.
2. Tracefs
----------
This series introduce a new trace_remote that does the link between tracefs and the remote ring-buffer.
The interface is found in the remotes/ directory at the root of the tracefs mount point. Each remote is like an instance and you'll find there a subset of the regular Tracefs user-space interface:
remotes/test
|-- buffer_size_kb |-- events | |-- enable | |-- header_event | |-- header_page | `-- test | `-- selftest | |-- enable | |-- format | `-- id |-- per_cpu | `-- cpu0 | |-- trace | `-- trace_pipe |-- trace |-- trace_pipe |-- tracing_on
Behind the scenes, kernel/trace/trace_remote.c creates this tracefs hierarchy without relying on kernel/trace/trace.c. This is due to fundamental differences:
* Remote tracing doesn't support trace_array's system-specific features (snapshots, tracers, etc.).
* Logged event formats differ (e.g., no PID for remote events).
* Buffer operations require specific remote interactions.
3. Simple Ring-Buffer
---------------------
As the current ring-buffer.c implementation has too many dependencies to be used directly by the pKVM hypervisor. A new simple implementation is created and can be found in kernel/trace/simple-ring-buffer.c.
This implementation is write-only and is used by both the pKVM hypervisor and a trace_remote test module.
4. Events
---------
A new REMOTE_EVENT() macro is added to simplify the creation of events on the kernel side. As remote tracing buffer are read only, only the event structure and a way of printing must be declared. The prototype of the macro is very similar to the well-known TRACE_EVENT()
REMOTE_EVENT(my_event, id,
RE_STRUCT(
re_field(u64, foobar)
),
RE_PRINTK("foobar=%lld", __entry->foobar)
))
5. pKVM
-------
The pKVM support simply creates a "hypervisor" trace_remote on the kernel side and inherits from simple-ring-buffer.c on the hypervisor side.
A new event macro is created HYP_EVENT() that is under the hood re-using REMOTE_EVENT() (defined in the previous paragaph) as well as generate hypervisor specific struct and trace_<event>() functions.
5. Limitations:
---------------
Non-consuming reading of the buffer isn't supported (i.e. cat trace -> -EPERM) due to current the lack of support in the ring-buffer meta-page.
[1] https://tracingsummit.org/ts/2022/hypervisortracing/
[2] https://lore.kernel.org/all/[email protected]/
changes since v11 (https://lore.kernel.org/all/[email protected]/)
- Fix kerneldoc (Steven)
- Remove useless ring_buffer_event_data type cast (Steven)
- Fix __free_ring_buffer_iter() (Steven)
- Move trace seq locking into start/stop (Steven)
changes since v10 (https://lore.kernel.org/all/[email protected]/)
- Move kerneldoc to .c files (Steven)
- Return EBUSY on buffer_size_kb write if buffer is loaded (Steven)
- Remove rb_iter/rb_iters union in trace_remote_iterator (Steven)
- Rename a refactor trace file seq_operations (Steven)
- Make trace_get_cpu() accessible to trace_remote.c (Steven)
- Remove unnecessary cpus_read_unlock() (Steven)
- !preempt on remote_test driver buffer writing (Steven)
- Do not fail selftest if cpu/online is unavailable (Steven)
- Add rational for trace_remote into documentation (Steven)
changes since v9 (https://lore.kernel.org/all/[email protected]/)
- Add vCPU PID to hyp_enter/hyp_exit (Marc)
- Remove useless X1 setting for tracing HVCs (Marc)
- Fix REMOTE_PRINTK_COUNT_ARGS()
- Rebase on 6.19-rc7
Changes since v8 (https://lore.kernel.org/all/[email protected]/)
- Do not enable tracing if unstable cnvct (Marc)
- Add support for nVHE (Marc)
- Add PKVM_DISABLE_STAGE2_ON_PANIC (Marc)
- NVHE_EL2_TRACING depends on NVHE_EL2_DEBUG (Marc)
- Add a reason for hyp_enter/hyp_exit events (Marc)
- Remove PKVM_SELFTESTS in favour of NVHE_EL2_DEBUG
- Add wrapper for arm_smccc_1_2, now used in nvhe/ffa.c
Changes since v7 (https://lore.kernel.org/all/[email protected]/)
- Add missing EXPORT_SYMBOL_GPL for remote_test.ko
- Rebase on 6.18-rc4
Changes since v6 (https://lore.kernel.org/all/[email protected]/)
- Add requires field to the selftest (Masami)
- Use guard() for ring_buffer_poll_remote (Steven)
- Rename ring_buffer_remote() to ring_buffer_alloc_remote() (Steven)
- kerneldoc for trace_buffer_remote and simple_ring_buffer (Steven)
- Validate trace_buffer_desc size in trace_remote_alloc_buffer (Steven)
- Add non-consuming ring-buffer read (Steven)
- Add spinning failsafe in simple_ring_buffer (Steven)
- Range check for hyp_trace_desc::bpages_backing_* in hyp_trace_desc_validate()
- unsigned int cpu in hyp_trace_desc_validate()
- Fix event/format file
- Add tests with an offline CPU
- Add tests for non-consuming read
- Add documentation
- Rebase on 6.17
Changes since v5 (https://lore.kernel.org/all/[email protected]/)
- Add tishift lib to the hyp (Aneesh)
- Rebase on 6.17-rc2
Changes since v4 (https://lore.kernel.org/all/[email protected]/)
- Extend meta-page with pages_touched and pages_lost
- Create ring_buffer_types.h
- Fix simple_ring_buffer build for 32-bits arch and x86
- Try unload buffer on reset (+ test)
- Minor renaming and comments
Changes since v3 (https://lore.kernel.org/all/[email protected]/)
- Move tracefs support from kvm/hyp_trace.c into a generic trace_remote.c.
- Move ring-buffer implementation from nvhe/trace.c into a generic simple-ring-buffer.c
- Rebase on 6.15-rc4.
Changes since v2 (https://lore.kernel.org/all/[email protected]/)
- Fix ring-buffer remote reset
- Fix fast-forward in rb_page_desc()
- Refactor nvhe/trace.c
- struct hyp_buffer_page more compact
- Add a struct_len to trace_page_desc
- Extend reset testing
- Rebase on 6.14-rc3
Changes since v1 (https://lore.kernel.org/all/[email protected]/)
- Add 128-bits mult fallback in the unlikely event of an overflow. (John)
- Fix ELF section sort.
- __always_inline trace_* event macros.
- Fix events/<event>/enable permissions.
- Rename ring-buffer "writer" to "remote".
- Rename CONFIG_PROTECTED_NVHE_TESTING to PKVM_SELFTEST to align with Quentin's upcoming selftest
- Rebase on 6.13-rc3.
Changes since RFC (https://lore.kernel.org/all/[email protected]/)
- hypervisor trace clock:
- mult/shift computed in hyp_trace.c. (John)
- Update clock when it deviates from kernel boot clock. (John)
- Add trace_clock file.
- Separate patch for better readability.
- Add a proper reset interface which does not need to teardown the tracing buffers. (Steven)
- Return -EPERM on trace access. (Steven)
- Add per-cpu trace file.
- Automatically teardown and free the tracing buffer when it is empty, without readers and not currently tracing.
- Show in buffer_size_kb if the buffer is loaded in the hypervisor or not.
- Extend tests to cover reset and unload.
- CC timekeeping folks on relevant patches (Marc)
Vincent Donnefort (30):
ring-buffer: Add page statistics to the meta-page
ring-buffer: Store bpage pointers into subbuf_ids
ring-buffer: Introduce ring-buffer remotes
ring-buffer: Add non-consuming read for ring-buffer remotes
tracing: Introduce trace remotes
tracing: Add reset to trace remotes
tracing: Add non-consuming read to trace remotes
tracing: Add init callback to trace remotes
tracing: Add events to trace remotes
tracing: Add events/ root files to trace remotes
tracing: Add helpers to create trace remote events
ring-buffer: Export buffer_data_page and macros
tracing: Introduce simple_ring_buffer
tracing: Add a trace remote module for testing
tracing: selftests: Add trace remote tests
Documentation: tracing: Add tracing remotes
tracing: load/unload page callbacks for simple_ring_buffer
tracing: Check for undefined symbols in simple_ring_buffer
KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC
KVM: arm64: Add clock support to nVHE/pKVM hyp
KVM: arm64: Initialise hyp_nr_cpus for nVHE hyp
KVM: arm64: Support unaligned fixmap in the pKVM hyp
KVM: arm64: Add tracing capability for the nVHE/pKVM hyp
KVM: arm64: Add trace remote for the nVHE/pKVM hyp
KVM: arm64: Sync boot clock with the nVHE/pKVM hyp
KVM: arm64: Add trace reset to the nVHE/pKVM hyp
KVM: arm64: Add event support to the nVHE/pKVM hyp and trace remote
KVM: arm64: Add hyp_enter/hyp_exit events to nVHE/pKVM hyp
KVM: arm64: Add selftest event support to nVHE/pKVM hyp
tracing: selftests: Add hypervisor trace remote tests
Documentation/trace/index.rst | 11 + Documentation/trace/remotes.rst | 66 + arch/arm64/include/asm/kvm_asm.h | 8 + arch/arm64/include/asm/kvm_define_hypevents.h | 16 + arch/arm64/include/asm/kvm_host.h | 3 + arch/arm64/include/asm/kvm_hyp.h | 4 +- arch/arm64/include/asm/kvm_hypevents.h | 60 + arch/arm64/include/asm/kvm_hyptrace.h | 26 + arch/arm64/kernel/image-vars.h | 4 + arch/arm64/kernel/vmlinux.lds.S | 18 + arch/arm64/kvm/Kconfig | 64 +- arch/arm64/kvm/Makefile | 2 + arch/arm64/kvm/arm.c | 12 +- arch/arm64/kvm/handle_exit.c | 2 +- arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h | 23 + arch/arm64/kvm/hyp/include/nvhe/clock.h | 16 + .../kvm/hyp/include/nvhe/define_events.h | 14 + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 2 - arch/arm64/kvm/hyp/include/nvhe/trace.h | 70 + arch/arm64/kvm/hyp/nvhe/Makefile | 6 +- arch/arm64/kvm/hyp/nvhe/clock.c | 65 + arch/arm64/kvm/hyp/nvhe/events.c | 25 + arch/arm64/kvm/hyp/nvhe/ffa.c | 28 +- arch/arm64/kvm/hyp/nvhe/host.S | 2 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 87 +- arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 6 + arch/arm64/kvm/hyp/nvhe/mm.c | 4 +- arch/arm64/kvm/hyp/nvhe/psci-relay.c | 7 +- arch/arm64/kvm/hyp/nvhe/setup.c | 4 +- arch/arm64/kvm/hyp/nvhe/stacktrace.c | 6 +- arch/arm64/kvm/hyp/nvhe/switch.c | 5 +- arch/arm64/kvm/hyp/nvhe/trace.c | 306 ++++ arch/arm64/kvm/hyp_trace.c | 443 ++++++ arch/arm64/kvm/hyp_trace.h | 11 + arch/arm64/kvm/stacktrace.c | 8 +- fs/tracefs/inode.c | 1 + include/linux/ring_buffer.h | 58 + include/linux/ring_buffer_types.h | 41 + include/linux/simple_ring_buffer.h | 65 + include/linux/trace_remote.h | 48 + include/linux/trace_remote_event.h | 33 + include/trace/define_remote_events.h | 73 + include/uapi/linux/trace_mmap.h | 8 +- kernel/trace/Kconfig | 14 + kernel/trace/Makefile | 20 + kernel/trace/remote_test.c | 261 ++++ kernel/trace/remote_test_events.h | 10 + kernel/trace/ring_buffer.c | 356 ++++- kernel/trace/simple_ring_buffer.c | 517 +++++++ kernel/trace/trace.c | 4 +- kernel/trace/trace.h | 7 + kernel/trace/trace_remote.c | 1368 +++++++++++++++++ .../ftrace/test.d/remotes/buffer_size.tc | 25 + .../selftests/ftrace/test.d/remotes/functions | 88 ++ .../test.d/remotes/hypervisor/buffer_size.tc | 11 + .../ftrace/test.d/remotes/hypervisor/reset.tc | 11 + .../ftrace/test.d/remotes/hypervisor/trace.tc | 11 + .../test.d/remotes/hypervisor/trace_pipe.tc | 11 + .../test.d/remotes/hypervisor/unloading.tc | 11 + .../selftests/ftrace/test.d/remotes/reset.tc | 90 ++ .../selftests/ftrace/test.d/remotes/trace.tc | 127 ++ .../ftrace/test.d/remotes/trace_pipe.tc | 127 ++ .../ftrace/test.d/remotes/unloading.tc | 41 + 63 files changed, 4751 insertions(+), 120 deletions(-) create mode 100644 Documentation/trace/remotes.rst create mode 100644 arch/arm64/include/asm/kvm_define_hypevents.h create mode 100644 arch/arm64/include/asm/kvm_hypevents.h create mode 100644 arch/arm64/include/asm/kvm_hyptrace.h create mode 100644 arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h create mode 100644 arch/arm64/kvm/hyp/include/nvhe/clock.h create mode 100644 arch/arm64/kvm/hyp/include/nvhe/define_events.h create mode 100644 arch/arm64/kvm/hyp/include/nvhe/trace.h create mode 100644 arch/arm64/kvm/hyp/nvhe/clock.c create mode 100644 arch/arm64/kvm/hyp/nvhe/events.c create mode 100644 arch/arm64/kvm/hyp/nvhe/trace.c create mode 100644 arch/arm64/kvm/hyp_trace.c create mode 100644 arch/arm64/kvm/hyp_trace.h create mode 100644 include/linux/ring_buffer_types.h create mode 100644 include/linux/simple_ring_buffer.h create mode 100644 include/linux/trace_remote.h create mode 100644 include/linux/trace_remote_event.h create mode 100644 include/trace/define_remote_events.h create mode 100644 kernel/trace/remote_test.c create mode 100644 kernel/trace/remote_test_events.h create mode 100644 kernel/trace/simple_ring_buffer.c create mode 100644 kernel/trace/trace_remote.c create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/buffer_size.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/functions create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/buffer_size.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/reset.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace_pipe.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/hypervisor/unloading.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/reset.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/trace.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc create mode 100644 tools/testing/selftests/ftrace/test.d/remotes/unloading.tc
base-commit: 2b7a25df823dc7d8f56f8ce7c2d2dac391cea9c2
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 1/30 ring-buffer: Add page statistics to the meta-page
Add two fields pages_touched and pages_lost to the ring-buffer meta-page. Those fields are useful to get the number of used pages in the ring-buffer.
include/uapi/linux/trace_mmap.h +4 -4
@@ -17,8 +17,8 @@* @entries: Number of entries in the ring-buffer. * @overrun: Number of entries lost in the ring-buffer. * @read: Number of entries that have been read. -* @Reserved1: Internal use only. -* @Reserved2: Internal use only. +* @pages_lost: Number of pages overwritten by the writer. +* @pages_touched: Number of pages written by the writer. */ struct trace_buffer_meta {__u32 meta_page_size;
@@ -39,8 +39,8 @@ struct trace_buffer_meta {__u64 overrun;__u64 read; -__u64 Reserved1; -__u64 Reserved2; +__u64 pages_lost; +__u64 pages_touched; };#define TRACE_MMAP_IOCTL_GET_READER _IO('R', 0x20)
kernel/trace/ring_buffer.c +2 -0
@@ -6149,6 +6149,8 @@ static void rb_update_meta_page(struct ring_buffer_per_cpu *cpu_buffer) meta->entries =local_read (&cpu_buffer->entries); meta->overrun =local_read (&cpu_buffer->overrun); meta->read = cpu_buffer->read; + meta->pages_lost =local_read (&cpu_buffer->pages_lost); + meta->pages_touched =local_read (&cpu_buffer->pages_touched);/* Some archs do not have data cache coherency between kernel and user-space */ flush_kernel_vmap_range (cpu_buffer->meta_page,PAGE_SIZE );
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 2/30 ring-buffer: Store bpage pointers into subbuf_ids
In reply to Vincent DonnefortThe subbuf_ids field allows to point to a specific page from the ring-buffer based on its ID. As a preparation or the upcoming ring-buffer remote support, point this array to the buffer_page instead of the buffer_data_page.
kernel/trace/ring_buffer.c +11 -8
@@ -555,7 +555,7 @@ struct ring_buffer_per_cpu {unsigned int mapped;unsigned int user_mapped;/* user space mapping */ struct mutex mapping_lock; -unsigned long *subbuf_ids;/* ID to subbuf VA */ +struct buffer_page **subbuf_ids;/* ID to subbuf VA */ struct trace_buffer_meta *meta_page;struct ring_buffer_cpu_meta *ring_meta;
@@ -7031,7 +7031,7 @@ static void rb_free_meta_page(struct ring_buffer_per_cpu *cpu_buffer) }static void rb_setup_ids_meta_page (struct ring_buffer_per_cpu *cpu_buffer, -unsigned long *subbuf_ids) +struct buffer_page **subbuf_ids) {struct trace_buffer_meta *meta = cpu_buffer->meta_page;unsigned int nr_subbufs = cpu_buffer->nr_pages +1 ;
@@ -7040,7 +7040,7 @@ static void rb_setup_ids_meta_page(struct ring_buffer_per_cpu *cpu_buffer,int id =0 ; id =rb_page_id (cpu_buffer, cpu_buffer->reader_page, id); - subbuf_ids[id++] = (unsigned long )cpu_buffer->reader_page->page; + subbuf_ids[id++] = cpu_buffer->reader_page; cnt++; first_subbuf = subbuf =rb_set_head_page (cpu_buffer);
@@ -7050,7 +7050,7 @@ static void rb_setup_ids_meta_page(struct ring_buffer_per_cpu *cpu_buffer,if (WARN_ON (id >= nr_subbufs))break ; - subbuf_ids[id] = (unsigned long )subbuf->page; + subbuf_ids[id] = subbuf;rb_inc_page (&subbuf); id++;
@@ -7059,7 +7059,7 @@ static void rb_setup_ids_meta_page(struct ring_buffer_per_cpu *cpu_buffer,WARN_ON (cnt != nr_subbufs); -/* install subbuf ID to kern VA translation */ +/* install subbuf ID to bpage translation */ cpu_buffer->subbuf_ids = subbuf_ids; meta->meta_struct_len =sizeof (*meta);
@@ -7215,13 +7215,15 @@ static int __rb_map_vma(struct ring_buffer_per_cpu *cpu_buffer, }while (p < nr_pages) { +struct buffer_page *subbuf;struct page *page;int off =0 ;if (WARN_ON_ONCE (s >= nr_subbufs))return -EINVAL ; - page =virt_to_page ((void *)cpu_buffer->subbuf_ids[s]); + subbuf = cpu_buffer->subbuf_ids[s]; + page =virt_to_page ((void *)subbuf->page);for (; off < (1 << (subbuf_order)); off++, page++) {if (p >= nr_pages)
@@ -7248,7 +7250,8 @@ int ring_buffer_map(struct trace_buffer *buffer, int cpu, struct vm_area_struct *vma) {struct ring_buffer_per_cpu *cpu_buffer; -unsigned long flags, *subbuf_ids; +struct buffer_page **subbuf_ids; +unsigned long flags;int err;if (!cpumask_test_cpu (cpu, buffer->cpumask))
@@ -7272,7 +7275,7 @@ int ring_buffer_map(struct trace_buffer *buffer, int cpu,if (err)return err; -/* subbuf_ids include the reader while nr_pages does not */ +/* subbuf_ids includes the reader while nr_pages does not */ subbuf_ids =kcalloc (cpu_buffer->nr_pages +1 ,sizeof (*subbuf_ids),GFP_KERNEL );if (!subbuf_ids) {rb_free_meta_page (cpu_buffer);
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 3/30 ring-buffer: Introduce ring-buffer remotes
In reply to Vincent DonnefortA ring-buffer remote is an entity outside of the kernel (most likely a firmware or a hypervisor) capable of writing events in a ring-buffer following the same format as the tracefs ring-buffer.
To setup the ring-buffer on the kernel side, a description of the pages forming the ring-buffer (struct trace_buffer_desc) must be given. Callbacks (swap_reader_page and reset) must also be provided.
It is expected from the remote to keep the meta-page updated.
include/linux/ring_buffer.h +58 -0
@@ -250,4 +250,62 @@ int ring_buffer_map(struct trace_buffer *buffer, int cpu, struct vm_area_struct *vma);int ring_buffer_unmap (struct trace_buffer *buffer,int cpu);int ring_buffer_map_get_reader (struct trace_buffer *buffer,int cpu); + +struct ring_buffer_desc { +int cpu; +unsigned int nr_page_va;/* excludes the meta page */ +unsigned long meta_va; + unsigned long page_va[] __counted_by(nr_page_va); +}; + +struct trace_buffer_desc { +int nr_cpus; +size_t struct_len; +char __data[];/* list of ring_buffer_desc */ +}; + +static inline struct ring_buffer_desc *__next_ring_buffer_desc (struct ring_buffer_desc *desc) +{ +size_t len =struct_size (desc, page_va, desc->nr_page_va); + +return (struct ring_buffer_desc *)((void *)desc + len); +} + +static inline struct ring_buffer_desc *__first_ring_buffer_desc (struct trace_buffer_desc *desc) +{ +return (struct ring_buffer_desc *)(&desc->__data[0 ]); +} + +static inline size_t trace_buffer_desc_size (size_t buffer_size,unsigned int nr_cpus) +{ +unsigned int nr_pages =max (DIV_ROUND_UP (buffer_size,PAGE_SIZE ),2UL ) +1 ; +struct ring_buffer_desc *rbdesc; + +return size_add (offsetof(struct trace_buffer_desc , __data), +size_mul (nr_cpus,struct_size (rbdesc, page_va, nr_pages))); +} + +#define for_each_ring_buffer_desc (__pdesc, __cpu, __trace_pdesc) \ + for (__pdesc = __first_ring_buffer_desc(__trace_pdesc), __cpu = 0; \ + (__cpu) < (__trace_pdesc)->nr_cpus; \ + (__cpu)++, __pdesc = __next_ring_buffer_desc(__pdesc)) + +struct ring_buffer_remote { +struct trace_buffer_desc *desc; +int (*swap_reader_page)(unsigned int cpu,void *priv); +int (*reset)(unsigned int cpu,void *priv); +void *priv; +}; + +int ring_buffer_poll_remote (struct trace_buffer *buffer,int cpu); + +struct trace_buffer * +__ring_buffer_alloc_remote (struct ring_buffer_remote *remote, +struct lock_class_key *key); + +#define ring_buffer_alloc_remote (remote) \ +({ \ + static struct lock_class_key __key; \ + __ring_buffer_alloc_remote(remote, &__key); \ +})#endif /* _LINUX_RING_BUFFER_H */
kernel/trace/ring_buffer.c +227 -8
379 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 4/30 ring-buffer: Add non-consuming read for ring-buffer remotes
In reply to Vincent DonnefortHopefully, the remote will only swap pages on the kernel instruction (via the swap_reader_page() callback). This means we know at what point the ring-buffer geometry has changed. It is therefore possible to rearrange the kernel view of that ring-buffer to allow non-consuming read.
kernel/trace/ring_buffer.c +69 -6
@@ -5383,10 +5383,51 @@ static bool rb_read_remote_meta_page(struct ring_buffer_per_cpu *cpu_buffer)return rb_num_of_entries (cpu_buffer); } +static void rb_update_remote_head (struct ring_buffer_per_cpu *cpu_buffer) +{ +struct buffer_page *next, *orig; +int retry =3 ; + + orig = next = cpu_buffer->head_page; +rb_inc_page (&next); + +/* Run after the writer */ +while (cpu_buffer->head_page->page->time_stamp > next->page->time_stamp) { +rb_inc_page (&next); + +rb_list_head_clear (cpu_buffer->head_page->list.prev); +rb_inc_page (&cpu_buffer->head_page); +rb_set_list_to_head (cpu_buffer->head_page->list.prev); + +if (cpu_buffer->head_page == orig) { +if (WARN_ON_ONCE (!(--retry))) +return ; + } + } + + orig = cpu_buffer->commit_page = cpu_buffer->head_page; + retry =3 ; + +while (cpu_buffer->commit_page->page->time_stamp < next->page->time_stamp) { +rb_inc_page (&next); +rb_inc_page (&cpu_buffer->commit_page); + +if (cpu_buffer->commit_page == orig) { +if (WARN_ON_ONCE (!(--retry))) +return ; + } + } +} +static void rb_iter_reset (struct ring_buffer_iter *iter) {struct ring_buffer_per_cpu *cpu_buffer = iter->cpu_buffer; +if (cpu_buffer->remote) { +rb_read_remote_meta_page (cpu_buffer); +rb_update_remote_head (cpu_buffer); + } +/* Iterator usage is expected to have record disabled */ iter->head_page = cpu_buffer->reader_page; iter->head = cpu_buffer->reader_page->read;
@@ -5539,7 +5580,7 @@ rb_update_iter_read_stamp(struct ring_buffer_iter *iter,static struct buffer_page *__rb_get_reader_page_from_remote (struct ring_buffer_per_cpu *cpu_buffer) { -struct buffer_page *new_reader, *prev_reader; +struct buffer_page *new_reader, *prev_reader, *prev_head, *new_head, *last;if (!rb_read_remote_meta_page (cpu_buffer))return NULL ;
@@ -5563,10 +5604,32 @@ __rb_get_reader_page_from_remote(struct ring_buffer_per_cpu *cpu_buffer)WARN_ON_ONCE (prev_reader == new_reader); - cpu_buffer->reader_page->page = new_reader->page; - cpu_buffer->reader_page->id = new_reader->id; - cpu_buffer->reader_page->read =0 ; - cpu_buffer->read_stamp = cpu_buffer->reader_page->page->time_stamp; + prev_head = new_reader;/* New reader was also the previous head */ + new_head = prev_head; +rb_inc_page (&new_head); + last = prev_head; +rb_dec_page (&last); + +/* Clear the old HEAD flag */ +rb_list_head_clear (cpu_buffer->head_page->list.prev); + + prev_reader->list.next = prev_head->list.next; + prev_reader->list.prev = prev_head->list.prev; + +/* Swap prev_reader with new_reader */ + last->list.next = &prev_reader->list; + new_head->list.prev = &prev_reader->list; + + new_reader->list.prev = &new_reader->list; + new_reader->list.next = &new_head->list; + +/* Reactivate the HEAD flag */ +rb_set_list_to_head (&last->list); + + cpu_buffer->head_page = new_head; + cpu_buffer->reader_page = new_reader; + cpu_buffer->pages = &new_head->list; + cpu_buffer->read_stamp = new_reader->page->time_stamp; cpu_buffer->lost_events = cpu_buffer->meta_page->reader.lost_events;return rb_page_size (cpu_buffer->reader_page) ? cpu_buffer->reader_page :NULL ;
@@ -6150,7 +6213,7 @@ ring_buffer_read_start(struct trace_buffer *buffer, int cpu, gfp_t flags)struct ring_buffer_per_cpu *cpu_buffer;struct ring_buffer_iter *iter; -if (!cpumask_test_cpu (cpu, buffer->cpumask) || buffer->remote) +if (!cpumask_test_cpu (cpu, buffer->cpumask))return NULL ; iter =kzalloc (sizeof (*iter), flags);
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 5/30 tracing: Introduce trace remotes
In reply to Vincent DonnefortA trace remote relies on ring-buffer remotes to read and control compatible tracing buffers, written by entity such as firmware or hypervisor.
Add a Tracefs directory remotes/ that contains all instances of trace remotes. Each instance follows the same hierarchy as any other to ease the support by existing user-space tools.
This currently does not provide any event support, which will come later.
include/linux/trace_remote.h new file +36 -0
@@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_TRACE_REMOTE_H +#define _LINUX_TRACE_REMOTE_H + +#include <linux/ring_buffer.h> + +/** +* struct trace_remote_callbacks - Callbacks used by Tracefs to control the remote +* @load_trace_buffer: Called before Tracefs accesses the trace buffer for the first +* time. Must return a &trace_buffer_desc +* (most likely filled with trace_remote_alloc_buffer()) +* @unload_trace_buffer: +* Called once Tracefs has no use for the trace buffer +* (most likely call trace_remote_free_buffer()) +* @enable_tracing: Called on Tracefs tracing_on. It is expected from the +* remote to allow writing. +* @swap_reader_page: Called when Tracefs consumes a new page from a +* ring-buffer. It is expected from the remote to isolate a +* new reader-page from the @cpu ring-buffer. +*/ +struct trace_remote_callbacks { +struct trace_buffer_desc *(*load_trace_buffer)(unsigned long size,void *priv); +void (*unload_trace_buffer)(struct trace_buffer_desc *desc,void *priv); +int (*enable_tracing)(bool enable,void *priv); +int (*swap_reader_page)(unsigned int cpu,void *priv); +}; + +int trace_remote_register (const char *name,struct trace_remote_callbacks *cbs,void *priv); + +int trace_remote_alloc_buffer (struct trace_buffer_desc *desc,size_t desc_size,size_t buffer_size, +const struct cpumask *cpumask); + +void trace_remote_free_buffer (struct trace_buffer_desc *desc); + +#endif
kernel/trace/Kconfig +3 -0
@@ -1281,4 +1281,7 @@ config HIST_TRIGGERS_DEBUG source "kernel/trace/rv/Kconfig" +config TRACE_REMOTE + bool + endif # FTRACE
kernel/trace/Makefile +1 -0
@@ -128,4 +128,5 @@ obj-$(CONFIG_FPROBE_EVENTS) += trace_fprobe.o obj-$(CONFIG_TRACEPOINT_BENCHMARK) += trace_benchmark.o obj-$(CONFIG_RV) += rv/ +obj-$(CONFIG_TRACE_REMOTE) += trace_remote.o libftrace-y := ftrace.o
kernel/trace/trace.c +1 -1
@@ -8577,7 +8577,7 @@ static struct dentry *tracing_dentry_percpu(struct trace_array *tr, int cpu)return tr->percpu_dir; } -static struct dentry * +struct dentry *trace_create_cpu_file (const char *name,umode_t mode,struct dentry *parent,void *data,long cpu,const struct file_operations *fops) {
kernel/trace/trace.h +6 -0
@@ -689,6 +689,12 @@ struct dentry *trace_create_file(const char *name,struct dentry *parent, void *data, const struct file_operations *fops); +struct dentry *trace_create_cpu_file (const char *name, +umode_t mode, +struct dentry *parent, +void *data, +long cpu, +const struct file_operations *fops);/**
kernel/trace/trace_remote.c new file +619 -0
619 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Re: [PATCH v12 05/30] tracing: Introduce trace remotes
Quoted 4 lines · On Thu, 19 Feb 2026 15:02:42 +0000 Vincent Donnefort <[email protected]>…
A trace remote relies on ring-buffer remotes to read and control compatible tracing buffers, written by entity such as firmware or hypervisor.
Quoted 8 lines
Add a Tracefs directory remotes/ that contains all instances of trace remotes. Each instance follows the same hierarchy as any other to ease the support by existing user-space tools.
This currently does not provide any event support, which will come later.
Signed-off-by Vincent Donnefort <[email protected]>
-- Steve
Vincent Donnefort
maintainerPATCH v12 6/30 tracing: Add reset to trace remotes
In reply to Vincent DonnefortAllow to reset the trace remote buffer by writing to the Tracefs "trace" file. This is similar to the regular Tracefs interface.
include/linux/trace_remote.h +3 -0
@@ -17,6 +17,8 @@* remote to allow writing. * @swap_reader_page: Called when Tracefs consumes a new page from a * ring-buffer. It is expected from the remote to isolate a +* @reset: Called on `echo 0 > trace`. It is expected from the +* remote to reset all ring-buffer pages. * new reader-page from the @cpu ring-buffer. */ struct trace_remote_callbacks {
@@ -24,6 +26,7 @@ struct trace_remote_callbacks {void (*unload_trace_buffer)(struct trace_buffer_desc *desc,void *priv);int (*enable_tracing)(bool enable,void *priv);int (*swap_reader_page)(unsigned int cpu,void *priv); +int (*reset)(unsigned int cpu,void *priv); };int trace_remote_register (const char *name,struct trace_remote_callbacks *cbs,void *priv);
kernel/trace/trace_remote.c +45 -0
75 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 7/30 tracing: Add non-consuming read to trace remotes
In reply to Vincent DonnefortAllow reading the trace file for trace remotes. This performs a non-consuming read of the trace buffer.
kernel/trace/trace.c +1 -1
@@ -3856,7 +3856,7 @@ static int s_show(struct seq_file *m, void *v)* Should be used after trace_array_get(), trace_types_lock * ensures that i_cdev was already initialized. */ -static inline int tracing_get_cpu (struct inode *inode) +int tracing_get_cpu (struct inode *inode) {if (inode->i_cdev)/* See trace_create_cpu_file() */ return (long )inode->i_cdev -1 ;
kernel/trace/trace.h +1 -0
@@ -695,6 +695,7 @@ struct dentry *trace_create_cpu_file(const char *name,void *data, long cpu, const struct file_operations *fops); +int tracing_get_cpu (struct inode *inode);/**
kernel/trace/trace_remote.c +324 -15
463 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Re: [PATCH v12 07/30] tracing: Add non-consuming read to trace remotes
Quoted 4 lines · On Thu, 19 Feb 2026 15:02:44 +0000 Vincent Donnefort <[email protected]>…
Allow reading the trace file for trace remotes. This performs a non-consuming read of the trace buffer.
Signed-off-by Vincent Donnefort <[email protected]>
-- Steve
Vincent Donnefort
maintainerPATCH v12 8/30 tracing: Add init callback to trace remotes
In reply to Vincent DonnefortAdd a .init call back so the trace remote callers can add entries to the tracefs directory.
include/linux/trace_remote.h +4 -0
@@ -3,10 +3,13 @@#ifndef _LINUX_TRACE_REMOTE_H#define _LINUX_TRACE_REMOTE_H +#include <linux/dcache.h> #include <linux/ring_buffer.h> /** * struct trace_remote_callbacks - Callbacks used by Tracefs to control the remote +* @init: Called once the remote has been registered. Allows the +* caller to extend the Tracefs remote directory * @load_trace_buffer: Called before Tracefs accesses the trace buffer for the first * time. Must return a &trace_buffer_desc * (most likely filled with trace_remote_alloc_buffer())
@@ -22,6 +25,7 @@* new reader-page from the @cpu ring-buffer. */ struct trace_remote_callbacks { +int (*init)(struct dentry *d,void *priv);struct trace_buffer_desc *(*load_trace_buffer)(unsigned long size,void *priv);void (*unload_trace_buffer)(struct trace_buffer_desc *desc,void *priv);int (*enable_tracing)(bool enable,void *priv);
kernel/trace/trace_remote.c +6 -1
@@ -863,6 +863,7 @@ static int trace_remote_init_tracefs(const char *name, struct trace_remote *remoint trace_remote_register (const char *name,struct trace_remote_callbacks *cbs,void *priv) {struct trace_remote *remote; +int ret; remote =kzalloc (sizeof (*remote),GFP_KERNEL );if (!remote)
@@ -880,7 +881,11 @@ int trace_remote_register(const char *name, struct trace_remote_callbacks *cbs,return -ENOMEM ; } -return 0 ; + ret = cbs->init ? cbs->init (remote->dentry, priv) :0 ; +if (ret) +pr_err ("Init failed for trace remote '%s' (%d)\n" , name, ret); + +return ret; }EXPORT_SYMBOL_GPL (trace_remote_register);
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 9/30 tracing: Add events to trace remotes
In reply to Vincent DonnefortAn event is predefined point in the writer code that allows to log data. Following the same scheme as kernel events, add remote events, described to user-space within the events/ tracefs directory found in the corresponding trace remote.
Remote events are expected to be described during the trace remote registration.
Add also a .enable_event callback for trace_remote to toggle the event logging, if supported.
include/linux/trace_remote.h +6 -1
@@ -5,6 +5,7 @@#include <linux/dcache.h> #include <linux/ring_buffer.h> +#include <linux/trace_remote_event.h> /** * struct trace_remote_callbacks - Callbacks used by Tracefs to control the remote
@@ -23,6 +24,8 @@* @reset: Called on `echo 0 > trace`. It is expected from the * remote to reset all ring-buffer pages. * new reader-page from the @cpu ring-buffer. +* @enable_event: Called on events/event_name/enable. It is expected from +* the remote to allow the writing event @id. */ struct trace_remote_callbacks {int (*init)(struct dentry *d,void *priv);
@@ -31,9 +34,11 @@ struct trace_remote_callbacks {int (*enable_tracing)(bool enable,void *priv);int (*swap_reader_page)(unsigned int cpu,void *priv);int (*reset)(unsigned int cpu,void *priv); +int (*enable_event)(unsigned short id,bool enable,void *priv); }; -int trace_remote_register (const char *name,struct trace_remote_callbacks *cbs,void *priv); +int trace_remote_register (const char *name,struct trace_remote_callbacks *cbs,void *priv, +struct remote_event *events,size_t nr_events);int trace_remote_alloc_buffer (struct trace_buffer_desc *desc,size_t desc_size,size_t buffer_size,const struct cpumask *cpumask);
include/linux/trace_remote_event.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_TRACE_REMOTE_EVENTS_H +#define _LINUX_TRACE_REMOTE_EVENTS_H + +struct trace_remote ; +struct trace_event_fields ; + +struct remote_event_hdr { +unsigned short id; +}; + +#define REMOTE_EVENT_NAME_MAX 30 +struct remote_event { +char name[REMOTE_EVENT_NAME_MAX ]; +unsigned short id; +bool enabled; +struct trace_remote *remote; +struct trace_event_fields *fields; +char *print_fmt; +void (*print)(void *evt,struct trace_seq *seq); +}; +#endif
kernel/trace/trace_remote.c +259 -5
356 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 10/30 tracing: Add events/ root files to trace remotes
In reply to Vincent DonnefortJust like for the kernel events directory, add 'enable', 'header_page' and 'header_event' at the root of the trace remote events/ directory.
kernel/trace/ring_buffer.c +2 -1
@@ -640,7 +640,8 @@ int ring_buffer_print_page_header(struct trace_buffer *buffer, struct trace_seqtrace_seq_printf (s,"\tfield: char data;\t" "offset:%u;\tsize:%u;\tsigned:%u;\n" , (unsigned int )offsetof(typeof (field ), data), - (unsigned int )buffer->subbuf_size, + (unsigned int )(buffer ? buffer->subbuf_size : +PAGE_SIZE -BUF_PAGE_HDR_SIZE ), (unsigned int )is_signed_type (char));return !trace_seq_has_overflowed (s);
kernel/trace/trace_remote.c +137 -1
154 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 11/30 tracing: Add helpers to create trace remote events
In reply to Vincent DonnefortDeclaring remote events can be cumbersome let's add a set of macros to simplify developers life. The declaration of a remote event is very similar to kernel's events:
REMOTE_EVENT(name, id,
RE_STRUCT(
re_field(u64 foo)
),
RE_PRINTK("foo=%llu", __entry->foo))
include/linux/trace_remote_event.h +10 -0
@@ -5,6 +5,7 @@struct trace_remote ;struct trace_event_fields ; +struct trace_seq ;struct remote_event_hdr {unsigned short id;
@@ -20,4 +21,13 @@ struct remote_event {char *print_fmt;void (*print)(void *evt,struct trace_seq *seq); }; + +#define RE_STRUCT(__args...) __args +#define re_field (__type, __field) __type __field; + +#define REMOTE_EVENT_FORMAT (__name, __struct) \ + struct remote_event_format_##__name { \ + struct remote_event_hdr hdr; \ + __struct \ + }#endif
include/trace/define_remote_events.h new file +73 -0
73 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 12/30 ring-buffer: Export buffer_data_page and macros
In reply to Vincent DonnefortIn preparation for allowing the writing of ring-buffer compliant pages outside of ring_buffer.c, move buffer_data_page and timestamps encoding macros into the publicly available ring_buffer_types.h.
include/linux/ring_buffer_types.h new file +41 -0
@@ -0,0 +1,41 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_RING_BUFFER_TYPES_H +#define _LINUX_RING_BUFFER_TYPES_H + +#include <asm/local.h> + +#define TS_SHIFT 27 +#define TS_MASK ((1ULL << TS_SHIFT) - 1) +#define TS_DELTA_TEST (~TS_MASK) + +/* +* We need to fit the time_stamp delta into 27 bits. +*/ +static inline bool test_time_stamp (u64 delta) +{ +return !!(delta &TS_DELTA_TEST ); +} + +#define BUF_PAGE_HDR_SIZE offsetof(struct buffer_data_page, data) + +#define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) +#define RB_ALIGNMENT 4U +#define RB_MAX_SMALL_DATA (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX) +#define RB_EVNT_MIN_SIZE 8U/* two 32bit words */ + +#ifndef CONFIG_HAVE_64BIT_ALIGNED_ACCESS +# define RB_FORCE_8BYTE_ALIGNMENT 0 +# define RB_ARCH_ALIGNMENT RB_ALIGNMENT +#else +# define RB_FORCE_8BYTE_ALIGNMENT 1 +# define RB_ARCH_ALIGNMENT 8U +#endif + +#define RB_ALIGN_DATA __aligned(RB_ARCH_ALIGNMENT) + +struct buffer_data_page { +u64 time_stamp;/* page time stamp */ +local_t commit;/* write committed index */ + unsigned char data[] RB_ALIGN_DATA; /* data of buffer page */ +}; +#endif
kernel/trace/ring_buffer.c +1 -35
@@ -4,6 +4,7 @@* * Copyright (C) 2008 Steven Rostedt <[email protected]> */ +#include <linux/ring_buffer_types.h> #include <linux/sched/isolation.h> #include <linux/trace_recursion.h> #include <linux/trace_events.h>
@@ -157,23 +158,6 @@ int ring_buffer_print_entry_header(struct trace_seq *s)/* Used for individual buffers (after the counter) */ #define RB_BUFFER_OFF (1 << 20) -#define BUF_PAGE_HDR_SIZE offsetof(struct buffer_data_page, data) - -#define RB_EVNT_HDR_SIZE (offsetof(struct ring_buffer_event, array)) -#define RB_ALIGNMENT 4U -#define RB_MAX_SMALL_DATA (RB_ALIGNMENT * RINGBUF_TYPE_DATA_TYPE_LEN_MAX) -#define RB_EVNT_MIN_SIZE 8U/* two 32bit words */ - -#ifndef CONFIG_HAVE_64BIT_ALIGNED_ACCESS -# define RB_FORCE_8BYTE_ALIGNMENT 0 -# define RB_ARCH_ALIGNMENT RB_ALIGNMENT -#else -# define RB_FORCE_8BYTE_ALIGNMENT 1 -# define RB_ARCH_ALIGNMENT 8U -#endif - -#define RB_ALIGN_DATA __aligned(RB_ARCH_ALIGNMENT) -/* define RINGBUF_TYPE_DATA for 'case RINGBUF_TYPE_DATA:' */ #define RINGBUF_TYPE_DATA 0 ... RINGBUF_TYPE_DATA_TYPE_LEN_MAX
@@ -316,10 +300,6 @@ EXPORT_SYMBOL_GPL(ring_buffer_event_data);#define for_each_online_buffer_cpu (buffer, cpu) \ for_each_cpu_and(cpu, buffer->cpumask, cpu_online_mask) -#define TS_SHIFT 27 -#define TS_MASK ((1ULL << TS_SHIFT) - 1) -#define TS_DELTA_TEST (~TS_MASK) -static u64 rb_event_time_stamp (struct ring_buffer_event *event) {u64 ts;
@@ -338,12 +318,6 @@ static u64 rb_event_time_stamp(struct ring_buffer_event *event)#define RB_MISSED_MASK (3 << 30) -struct buffer_data_page { -u64 time_stamp;/* page time stamp */ -local_t commit;/* write committed index */ - unsigned char data[] RB_ALIGN_DATA; /* data of buffer page */ -}; -struct buffer_data_read_page {unsigned order;/* order of the page */ struct buffer_data_page *data;/* actual data, stored in this page */
@@ -437,14 +411,6 @@ static struct buffer_data_page *alloc_cpu_data(int cpu, int order)return dpage; } -/* -* We need to fit the time_stamp delta into 27 bits. -*/ -static inline bool test_time_stamp (u64 delta) -{ -return !!(delta &TS_DELTA_TEST ); -} -struct rb_irq_work {struct irq_work work;wait_queue_head_t waiters;
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 13/30 tracing: Introduce simple_ring_buffer
In reply to Vincent DonnefortAdd a simple implementation of the kernel ring-buffer. This intends to be used later by ring-buffer remotes such as the pKVM hypervisor, hence the need for a cut down version (write only) without any dependency.
include/linux/simple_ring_buffer.h new file +57 -0
@@ -0,0 +1,57 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _LINUX_SIMPLE_RING_BUFFER_H +#define _LINUX_SIMPLE_RING_BUFFER_H + +#include <linux/list.h> +#include <linux/ring_buffer.h> +#include <linux/ring_buffer_types.h> +#include <linux/types.h> + +/* +* Ideally those struct would stay private but the caller needs to know +* the allocation size for simple_ring_buffer_init(). +*/ +struct simple_buffer_page { +struct list_head link; +struct buffer_data_page *page; +u64 entries; +u32 write; +u32 id; +}; + +struct simple_rb_per_cpu { +struct simple_buffer_page *tail_page; +struct simple_buffer_page *reader_page; +struct simple_buffer_page *head_page; +struct simple_buffer_page *bpages; +struct trace_buffer_meta *meta; +u32 nr_pages; + +#define SIMPLE_RB_UNAVAILABLE 0 +#define SIMPLE_RB_READY 1 +#define SIMPLE_RB_WRITING 2 +u32 status; + +u64 last_overrun; +u64 write_stamp; + +struct simple_rb_cbs *cbs; +}; + +int simple_ring_buffer_init (struct simple_rb_per_cpu *cpu_buffer,struct simple_buffer_page *bpages, +const struct ring_buffer_desc *desc); + +void simple_ring_buffer_unload (struct simple_rb_per_cpu *cpu_buffer); + +void *simple_ring_buffer_reserve (struct simple_rb_per_cpu *cpu_buffer,unsigned long length, +u64 timestamp); + +void simple_ring_buffer_commit (struct simple_rb_per_cpu *cpu_buffer); + +int simple_ring_buffer_enable_tracing (struct simple_rb_per_cpu *cpu_buffer,bool enable); + +int simple_ring_buffer_reset (struct simple_rb_per_cpu *cpu_buffer); + +int simple_ring_buffer_swap_reader_page (struct simple_rb_per_cpu *cpu_buffer); + +#endif
kernel/trace/Kconfig +3 -0
@@ -1284,4 +1284,7 @@ source "kernel/trace/rv/Kconfig" config TRACE_REMOTE bool +config SIMPLE_RING_BUFFER + bool + endif # FTRACE
kernel/trace/Makefile +1 -0
@@ -129,4 +129,5 @@ obj-$(CONFIG_TRACEPOINT_BENCHMARK) += trace_benchmark.o obj-$(CONFIG_RV) += rv/ obj-$(CONFIG_TRACE_REMOTE) += trace_remote.o +obj-$(CONFIG_SIMPLE_RING_BUFFER) += simple_ring_buffer.o libftrace-y := ftrace.o
kernel/trace/simple_ring_buffer.c new file +464 -0
464 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 14/30 tracing: Add a trace remote module for testing
In reply to Vincent DonnefortAdd a module to help testing the tracefs support for trace remotes. This module:
* Use simple_ring_buffer to write into a ring-buffer.
* Declare a single "selftest" event that can be triggered from user-space.
* Register a "test" trace remote.
This is intended to be used by trace remote selftests.
fs/tracefs/inode.c +1 -0
@@ -664,6 +664,7 @@ struct dentry *tracefs_create_file(const char *name, umode_t mode,fsnotify_create (d_inode (dentry->d_parent), dentry);return tracefs_end_creating (dentry); } +EXPORT_SYMBOL_GPL (tracefs_create_file);static struct dentry *__create_dir (const char *name,struct dentry *parent,const struct inode_operations *ops)
kernel/trace/Kconfig +8 -0
@@ -1287,4 +1287,12 @@ config TRACE_REMOTE config SIMPLE_RING_BUFFER bool +config TRACE_REMOTE_TEST + tristate "Test module for remote tracing" + select TRACE_REMOTE + select SIMPLE_RING_BUFFER + help + This trace remote includes a ring-buffer writer implementation using + "simple_ring_buffer". This is solely intending for testing. + endif # FTRACE
kernel/trace/Makefile +2 -0
@@ -130,4 +130,6 @@ obj-$(CONFIG_RV) += rv/ obj-$(CONFIG_TRACE_REMOTE) += trace_remote.o obj-$(CONFIG_SIMPLE_RING_BUFFER) += simple_ring_buffer.o +obj-$(CONFIG_TRACE_REMOTE_TEST) += remote_test.o + libftrace-y := ftrace.o
kernel/trace/remote_test.c new file +261 -0
261 lines not on this page · raw message
kernel/trace/remote_test_events.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#define REMOTE_TEST_EVENT_ID 1 + +REMOTE_EVENT (selftest,REMOTE_TEST_EVENT_ID , +RE_STRUCT ( +re_field (u64, id) + ), +RE_PRINTK ("id=%llu" , __entry->id) +);
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 15/30 tracing: selftests: Add trace remote tests
In reply to Vincent DonnefortExercise the tracefs interface for trace remote with a set of tests to check:
* loading/unloading (unloading.tc)
* reset (reset.tc)
* size changes (buffer_size.tc)
* consuming read (trace_pipe.tc)
* non-consuming read (trace.tc)
tools/testing/selftests/ftrace/test.d/remotes/buffer_size.tc new file +25 -0
@@ -0,0 +1,25 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test trace remote buffer size +# requires: remotes/test + +. $TEST_DIR/remotes/functions + +test_buffer_size() +{ + echo 0 > tracing_on + assert_unloaded + + echo 4096 > buffer_size_kb + echo 1 > tracing_on + assert_loaded + + echo 0 > tracing_on + echo 7 > buffer_size_kb +} + +if [ -z "$SOURCE_REMOTE_TEST" ]; then + set -e + setup_remote_test + test_buffer_size +fi
tools/testing/selftests/ftrace/test.d/remotes/functions new file +88 -0
88 lines not on this page · raw message
tools/testing/selftests/ftrace/test.d/remotes/reset.tc new file +90 -0
90 lines not on this page · raw message
tools/testing/selftests/ftrace/test.d/remotes/trace.tc new file +127 -0
127 lines not on this page · raw message
tools/testing/selftests/ftrace/test.d/remotes/trace_pipe.tc new file +127 -0
127 lines not on this page · raw message
tools/testing/selftests/ftrace/test.d/remotes/unloading.tc new file +41 -0
41 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Re: [PATCH v12 15/30] tracing: selftests: Add trace remote tests
Quoted 9 lines · On Thu, 19 Feb 2026 15:02:52 +0000 Vincent Donnefort <[email protected]>…
Exercise the tracefs interface for trace remote with a set of tests to check:
* loading/unloading (unloading.tc)
* reset (reset.tc)
* size changes (buffer_size.tc)
* consuming read (trace_pipe.tc)
* non-consuming read (trace.tc)
Quoted 3 lines
Cc Shuah Khan <[email protected]>Signed-off-by Vincent Donnefort <[email protected]>
-- Steve
Vincent Donnefort
maintainerPATCH v12 16/30 Documentation: tracing: Add tracing remotes
In reply to Vincent DonnefortAdd documentation about the newly introduced tracing remotes framework.
Documentation/trace/index.rst +11 -0
@@ -91,6 +91,17 @@ interactions. user_events uprobetracer +Remote Tracing +-------------- + +This section covers the framework to read compatible ring-buffers, written by +entities outside of the kernel (most likely firmware or hypervisor) + +.. toctree:: + :maxdepth: 1 + + remotes + Additional Resources --------------------
Documentation/trace/remotes.rst new file +66 -0
66 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 17/30 tracing: load/unload page callbacks for simple_ring_buffer
In reply to Vincent DonnefortAdd load/unload callback used for each admitted page in the ring-buffer. This will be later useful for the pKVM hypervisor which uses a different VA space and need to dynamically map/unmap the ring-buffer pages.
include/linux/simple_ring_buffer.h +8 -0
@@ -54,4 +54,12 @@ int simple_ring_buffer_reset(struct simple_rb_per_cpu *cpu_buffer);int simple_ring_buffer_swap_reader_page (struct simple_rb_per_cpu *cpu_buffer); +int simple_ring_buffer_init_mm (struct simple_rb_per_cpu *cpu_buffer, +struct simple_buffer_page *bpages, +const struct ring_buffer_desc *desc, +void *(*load_page)(unsigned long va), +void (*unload_page)(void *va)); + +void simple_ring_buffer_unload_mm (struct simple_rb_per_cpu *cpu_buffer, +void (*unload_page)(void *));#endif
kernel/trace/simple_ring_buffer.c +72 -19
148 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 18/30 tracing: Check for undefined symbols in simple_ring_buffer
In reply to Vincent DonnefortThe simple_ring_buffer implementation must remain simple enough to be used by the pKVM hypervisor. Prevent the object build if unresolved symbols are found.
kernel/trace/Makefile +16 -0
@@ -132,4 +132,20 @@ obj-$(CONFIG_TRACE_REMOTE) += trace_remote.o obj-$(CONFIG_SIMPLE_RING_BUFFER) += simple_ring_buffer.o obj-$(CONFIG_TRACE_REMOTE_TEST) += remote_test.o +# +# simple_ring_buffer is used by the pKVM hypervisor which does not have access +# to all kernel symbols. Fail the build if forbidden symbols are found. +# +UNDEFINED_ALLOWLIST := memset alt_cb_patch_nops __x86 __ubsan __asan __kasan __gcov __aeabi_unwind +UNDEFINED_ALLOWLIST += __stack_chk_fail stackleak_track_stack __ref_stack __sanitizer +UNDEFINED_ALLOWLIST := $(addprefix -e , $(UNDEFINED_ALLOWLIST)) + +quiet_cmd_check_undefined = NM $< + cmd_check_undefined = test -z "`$(NM) -u $< | grep -v $(UNDEFINED_ALLOWLIST)`" + +$(obj)/%.o.checked: $(obj)/%.o FORCE + $(call if_changed,check_undefined) + +always-$(CONFIG_SIMPLE_RING_BUFFER) += simple_ring_buffer.o.checked + libftrace-y := ftrace.o
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 19/30 KVM: arm64: Add PKVM_DISABLE_STAGE2_ON_PANIC
In reply to Vincent DonnefortOn NVHE_EL2_DEBUG, when using pKVM, the host stage-2 is relaxed to grant the kernel access to the stacktrace, hypervisor bug table and text to symbolize addresses. This is unsafe for production. In preparation for adding more debug options to NVHE_EL2_DEBUG, decouple the stage-2 relaxation into a separate option.
While at it, rename PROTECTED_NVHE_STACKTRACE into PKVM_STACKTRACE, following the same naming scheme as PKVM_DISABLE_STAGE2_ON_PANIC.
arch/arm64/kvm/Kconfig +37 -21
@@ -43,9 +43,27 @@ menuconfig KVM If unsure, say N. +if KVM + +config PTDUMP_STAGE2_DEBUGFS + bool "Present the stage-2 pagetables to debugfs" + depends on DEBUG_KERNEL + depends on DEBUG_FS + depends on ARCH_HAS_PTDUMP + select PTDUMP + default n + help + Say Y here if you want to show the stage-2 kernel pagetables + layout in a debugfs file. This information is only useful for kernel developers + who are working in architecture specific areas of the kernel. + It is probably not a good idea to enable this feature in a production + kernel. + + If in doubt, say N. + config NVHE_EL2_DEBUG bool "Debug mode for non-VHE EL2 object" - depends on KVM + default n help Say Y here to enable the debug mode for the non-VHE KVM EL2 object. Failure reports will BUG() in the hypervisor. This is intended for
@@ -53,10 +71,23 @@ config NVHE_EL2_DEBUG If unsure, say N. -config PROTECTED_NVHE_STACKTRACE - bool "Protected KVM hypervisor stacktraces" - depends on NVHE_EL2_DEBUG +if NVHE_EL2_DEBUG + +config PKVM_DISABLE_STAGE2_ON_PANIC + bool "Disable the host stage-2 on panic" default n + help + Relax the host stage-2 on hypervisor panic to allow the kernel to + unwind and symbolize the hypervisor stacktrace. This however tampers + the system security. This is intended for local EL2 hypervisor + development. + + If unsure, say N. + +config PKVM_STACKTRACE + bool "Protected KVM hypervisor stacktraces" + depends on PKVM_DISABLE_STAGE2_ON_PANIC + default y help Say Y here to enable pKVM hypervisor stacktraces on hyp_panic()
@@ -66,21 +97,6 @@ config PROTECTED_NVHE_STACKTRACE If unsure, or not using protected nVHE (pKVM), say N. -config PTDUMP_STAGE2_DEBUGFS - bool "Present the stage-2 pagetables to debugfs" - depends on KVM - depends on DEBUG_KERNEL - depends on DEBUG_FS - depends on ARCH_HAS_PTDUMP - select PTDUMP - default n - help - Say Y here if you want to show the stage-2 kernel pagetables - layout in a debugfs file. This information is only useful for kernel developers - who are working in architecture specific areas of the kernel. - It is probably not a good idea to enable this feature in a production - kernel. - - If in doubt, say N. - +endif # NVHE_EL2_DEBUG +endif # KVM endif # VIRTUALIZATION
arch/arm64/kvm/handle_exit.c +1 -1
@@ -539,7 +539,7 @@ void __noreturn __cold nvhe_hyp_panic_handler(u64 esr, u64 spsr,/* All hyp bugs, including warnings, are treated as fatal. */ if (!is_protected_kvm_enabled () || -IS_ENABLED (CONFIG_NVHE_EL2_DEBUG )) { +IS_ENABLED (CONFIG_PKVM_DISABLE_STAGE2_ON_PANIC )) {struct bug_entry *bug =find_bug (elr_in_kimg);if (bug)
arch/arm64/kvm/hyp/nvhe/host.S +1 -1
@@ -120,7 +120,7 @@ SYM_FUNC_START(__hyp_do_panic) mov x29, x0 -#ifdef CONFIG_NVHE_EL2_DEBUG +#ifdef PKVM_DISABLE_STAGE2_ON_PANIC /* Ensure host stage-2 is disabled */ mrs x0, hcr_el2 bic x0, x0, #HCR_VM
arch/arm64/kvm/hyp/nvhe/stacktrace.c +3 -3
@@ -34,7 +34,7 @@ static void hyp_prepare_backtrace(unsigned long fp, unsigned long pc) stacktrace_info->pc = pc; } -#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +#ifdef CONFIG_PKVM_STACKTRACE #include <asm/stacktrace/nvhe.h> DEFINE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace);
@@ -134,11 +134,11 @@ static void pkvm_save_backtrace(unsigned long fp, unsigned long pc) unwind(&state, pkvm_save_backtrace_entry, &idx); } -#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +#else /* !CONFIG_PKVM_STACKTRACE */ static void pkvm_save_backtrace (unsigned long fp,unsigned long pc) { } -#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +#endif /* CONFIG_PKVM_STACKTRACE */ /* * kvm_nvhe_prepare_backtrace - prepare to dump the nVHE backtrace
arch/arm64/kvm/stacktrace.c +4 -4
@@ -197,7 +197,7 @@ static void hyp_dump_backtrace(unsigned long hyp_offset)kvm_nvhe_dump_backtrace_end (); } -#ifdef CONFIG_PROTECTED_NVHE_STACKTRACE +#ifdef CONFIG_PKVM_STACKTRACE DECLARE_KVM_NVHE_PER_CPU(unsigned long [NVHE_STACKTRACE_SIZE/sizeof(long)], pkvm_stacktrace);
@@ -225,12 +225,12 @@ static void pkvm_dump_backtrace(unsigned long hyp_offset)kvm_nvhe_dump_backtrace_entry ((void *)hyp_offset, stacktrace[i]); kvm_nvhe_dump_backtrace_end(); } -#else /* !CONFIG_PROTECTED_NVHE_STACKTRACE */ +#else /* !CONFIG_PKVM_STACKTRACE */ static void pkvm_dump_backtrace (unsigned long hyp_offset) { -kvm_err ("Cannot dump pKVM nVHE stacktrace: !CONFIG_PROTECTED_NVHE_STACKTRACE\n" ); +kvm_err ("Cannot dump pKVM nVHE stacktrace: !CONFIG_PKVM_STACKTRACE\n" ); } -#endif /* CONFIG_PROTECTED_NVHE_STACKTRACE */ +#endif /* CONFIG_PKVM_STACKTRACE */ /* * kvm_nvhe_dump_backtrace - Dump KVM nVHE hypervisor backtrace.
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 20/30 KVM: arm64: Add clock support to nVHE/pKVM hyp
In reply to Vincent DonnefortIn preparation for supporting tracing from the nVHE hyp, add support to generate timestamps with a clock fed by the CNTCVT counter. The clock can be kept in sync with the kernel's by updating the slope values. This will be done later.
As current we do only create a trace clock, make the whole support dependent on the upcoming CONFIG_NVHE_EL2_TRACING.
arch/arm64/kvm/hyp/include/nvhe/clock.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ARM64_KVM_HYP_NVHE_CLOCK_H +#define __ARM64_KVM_HYP_NVHE_CLOCK_H +#include <linux/types.h> + +#include <asm/kvm_hyp.h> + +#ifdef CONFIG_NVHE_EL2_TRACING +void trace_clock_update (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc); +u64 trace_clock (void ); +#else +static inline void +trace_clock_update (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc) { } +static inline u64 trace_clock (void ) {return 0 ; } +#endif +#endif
arch/arm64/kvm/hyp/nvhe/Makefile +2 -1
@@ -17,7 +17,7 @@ ccflags-y += -fno-stack-protector \ hostprogs := gen-hyprel HOST_EXTRACFLAGS += -I$(objtree)/include -lib-objs := clear_page.o copy_page.o memcpy.o memset.o +lib-objs := clear_page.o copy_page.o memcpy.o memset.o tishift.o lib-objs := $(addprefix ../../../lib/, $(lib-objs)) CFLAGS_switch.nvhe.o += -Wno-override-init
@@ -29,6 +29,7 @@ hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y += ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) += list_debug.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o hyp-obj-y += $(lib-objs) ##
arch/arm64/kvm/hyp/nvhe/clock.c new file +65 -0
65 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 21/30 KVM: arm64: Initialise hyp_nr_cpus for nVHE hyp
In reply to Vincent DonnefortKnowing the number of CPUs is necessary for determining the boundaries of per-cpu variables, which will be used for upcoming hypervisor tracing. hyp_nr_cpus which stores this value, is only initialised for the pKVM hypervisor. Make it accessible for the nVHE hypervisor as well.
With the kernel now responsible for initialising hyp_nr_cpus, the nr_cpus parameter is no longer needed in __pkvm_init.
arch/arm64/include/asm/kvm_hyp.h +2 -2
@@ -129,8 +129,7 @@ void __noreturn __hyp_do_panic(struct kvm_cpu_context *host_ctxt, u64 spsr,#ifdef __KVM_NVHE_HYPERVISOR__void __pkvm_init_switch_pgd (phys_addr_t pgd,unsigned long sp,void (*fn)(void )); -int __pkvm_init (phys_addr_t phys,unsigned long size,unsigned long nr_cpus, -unsigned long *per_cpu_base,u32 hyp_va_bits); +int __pkvm_init (phys_addr_t phys,unsigned long size,unsigned long *per_cpu_base,u32 hyp_va_bits);void __noreturn __host_enter (struct kvm_cpu_context *host_ctxt);#endif
@@ -147,5 +146,6 @@ extern u64 kvm_nvhe_sym(id_aa64smfr0_el1_sys_val);extern unsigned long kvm_nvhe_sym (__icache_flags );extern unsigned int kvm_nvhe_sym (kvm_arm_vmid_bits );extern unsigned int kvm_nvhe_sym (kvm_host_sve_max_vl ); +extern unsigned long kvm_nvhe_sym (hyp_nr_cpus );#endif /* __ARM64_KVM_HYP_H__ */
arch/arm64/kvm/arm.c +4 -1
@@ -35,6 +35,7 @@#include <asm/kvm_arm.h> #include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> +#include <asm/kvm_hyp.h> #include <asm/kvm_mmu.h> #include <asm/kvm_nested.h> #include <asm/kvm_pkvm.h>
@@ -2466,7 +2467,7 @@ static int __init do_pkvm_init(u32 hyp_va_bits)preempt_disable ();cpu_hyp_init_context (); ret =kvm_call_hyp_nvhe (__pkvm_init, hyp_mem_base, hyp_mem_size, -num_possible_cpus (),kern_hyp_va (per_cpu_base), +kern_hyp_va (per_cpu_base), hyp_va_bits);cpu_hyp_init_features ();
@@ -2675,6 +2676,8 @@ static int __init init_hyp_mode(void)kvm_nvhe_sym (kvm_arm_hyp_percpu_base)[cpu] = (unsigned long )page_addr; } +kvm_nvhe_sym (hyp_nr_cpus) =num_possible_cpus (); +/* * Map the Hyp-code called directly from the host */
arch/arm64/kvm/hyp/include/nvhe/mem_protect.h +0 -2
@@ -30,8 +30,6 @@ enum pkvm_component_id { PKVM_ID_FFA, }; -extern unsigned long hyp_nr_cpus; -int __pkvm_prot_finalize (void );int __pkvm_host_share_hyp (u64 pfn);int __pkvm_host_unshare_hyp (u64 pfn);
arch/arm64/kvm/hyp/nvhe/hyp-main.c +3 -5
@@ -486,17 +486,15 @@ static void handle___pkvm_init(struct kvm_cpu_context *host_ctxt) {DECLARE_REG (phys_addr_t, phys, host_ctxt,1 ); DECLARE_REG(unsigned long, size, host_ctxt, 2); - DECLARE_REG(unsigned long, nr_cpus, host_ctxt, 3); - DECLARE_REG(unsigned long *, per_cpu_base, host_ctxt, 4); -DECLARE_REG (u32, hyp_va_bits, host_ctxt,5 ); + DECLARE_REG(unsigned long *, per_cpu_base, host_ctxt, 3); +DECLARE_REG (u32, hyp_va_bits, host_ctxt,4 );/* * __pkvm_init() will return only if an error occurred, otherwise it * will tail-call in __pkvm_init_finalise() which will have to deal * with the host context directly. */ -cpu_reg (host_ctxt,1 ) =__pkvm_init (phys, size, nr_cpus, per_cpu_base, - hyp_va_bits); +cpu_reg (host_ctxt,1 ) =__pkvm_init (phys, size, per_cpu_base, hyp_va_bits); }static void handle___pkvm_cpu_set_vector (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp/nvhe/setup.c +1 -3
@@ -341,8 +341,7 @@ void __noreturn __pkvm_init_finalise(void)__host_enter (host_ctxt); } -int __pkvm_init (phys_addr_t phys,unsigned long size,unsigned long nr_cpus, -unsigned long *per_cpu_base,u32 hyp_va_bits) +int __pkvm_init (phys_addr_t phys,unsigned long size,unsigned long *per_cpu_base,u32 hyp_va_bits) {struct kvm_nvhe_init_params *params;void *virt =hyp_phys_to_virt (phys);
@@ -355,7 +354,6 @@ int __pkvm_init(phys_addr_t phys, unsigned long size, unsigned long nr_cpus,return -EINVAL ;hyp_spin_lock_init (&pkvm_pgd_lock); - hyp_nr_cpus = nr_cpus; ret =divide_memory_pool (virt, size);if (ret)
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 22/30 KVM: arm64: Support unaligned fixmap in the pKVM hyp
In reply to Vincent DonnefortReturn the fixmap VA with the page offset, instead of the page base address. This allows to use hyp_fixmap_map() seamlessly regardless of the address alignment. While at it, do the same for hyp_fixblock_map().
arch/arm64/kvm/hyp/nvhe/mm.c +2 -2
@@ -244,7 +244,7 @@ static void *fixmap_map_slot(struct hyp_fixmap_slot *slot, phys_addr_t phys)void *hyp_fixmap_map (phys_addr_t phys) { -return fixmap_map_slot (this_cpu_ptr (&fixmap_slots), phys); +return fixmap_map_slot (this_cpu_ptr (&fixmap_slots), phys) +offset_in_page (phys); }static void fixmap_clear_slot (struct hyp_fixmap_slot *slot)
@@ -366,7 +366,7 @@ void *hyp_fixblock_map(phys_addr_t phys, size_t *size)#ifdef HAS_FIXBLOCK *size =PMD_SIZE ;hyp_spin_lock (&hyp_fixblock_lock); -return fixmap_map_slot (&hyp_fixblock_slot, phys); +return fixmap_map_slot (&hyp_fixblock_slot, phys) +offset_in_page (phys);#else *size =PAGE_SIZE ;return hyp_fixmap_map (phys);
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 23/30 KVM: arm64: Add tracing capability for the nVHE/pKVM hyp
In reply to Vincent DonnefortThere is currently no way to inspect or log what's happening at EL2 when the nVHE or pKVM hypervisor is used. With the growing set of features for pKVM, the need for tooling is more pressing. And tracefs, by its reliability, versatility and support for user-space is fit for purpose.
Add support to write into a tracefs compatible ring-buffer. There's no way the hypervisor could log events directly into the host tracefs ring-buffers. So instead let's use our own, where the hypervisor is the writer and the host the reader.
arch/arm64/include/asm/kvm_asm.h +4 -0
@@ -89,6 +89,10 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___pkvm_vcpu_load, __KVM_HOST_SMCCC_FUNC___pkvm_vcpu_put, __KVM_HOST_SMCCC_FUNC___pkvm_tlb_flush_vmid, + __KVM_HOST_SMCCC_FUNC___tracing_load, + __KVM_HOST_SMCCC_FUNC___tracing_unload, + __KVM_HOST_SMCCC_FUNC___tracing_enable, + __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, };#define DECLARE_KVM_VHE_SYM (sym) extern char sym[]
arch/arm64/include/asm/kvm_hyptrace.h new file +13 -0
@@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ARM64_KVM_HYPTRACE_H_ +#define __ARM64_KVM_HYPTRACE_H_ + +#include <linux/ring_buffer.h> + +struct hyp_trace_desc { +unsigned long bpages_backing_start; +size_t bpages_backing_size; +struct trace_buffer_desc trace_buffer_desc; + +}; +#endif
arch/arm64/kvm/Kconfig +5 -0
@@ -73,6 +73,11 @@ config NVHE_EL2_DEBUG if NVHE_EL2_DEBUG +config NVHE_EL2_TRACING + bool + depends on TRACING + default y + config PKVM_DISABLE_STAGE2_ON_PANIC bool "Disable the host stage-2 on panic" default n
arch/arm64/kvm/hyp/include/nvhe/trace.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ARM64_KVM_HYP_NVHE_TRACE_H +#define __ARM64_KVM_HYP_NVHE_TRACE_H +#include <asm/kvm_hyptrace.h> + +#ifdef CONFIG_NVHE_EL2_TRACING +void *tracing_reserve_entry (unsigned long length); +void tracing_commit_entry (void ); + +int __tracing_load (unsigned long desc_va,size_t desc_size); +void __tracing_unload (void ); +int __tracing_enable (bool enable); +int __tracing_swap_reader (unsigned int cpu); +#else +static inline void *tracing_reserve_entry (unsigned long length) {return NULL ; } +static inline void tracing_commit_entry (void ) { } + +static inline int __tracing_load (unsigned long desc_va,size_t desc_size) {return -ENODEV ; } +static inline void __tracing_unload (void ) { } +static inline int __tracing_enable (bool enable) {return -ENODEV ; } +static inline int __tracing_swap_reader (unsigned int cpu) {return -ENODEV ; } +#endif +#endif
arch/arm64/kvm/hyp/nvhe/Makefile +4 -1
@@ -29,9 +29,12 @@ hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y += ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) += list_debug.o -hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o trace.o hyp-obj-y += $(lib-objs) +# Path to simple_ring_buffer.c +CFLAGS_trace.nvhe.o += -I$(objtree)/kernel/trace/ + ## ## Build rules for compiling nVHE hyp code ## Output of this folder is `kvm_nvhe.o`, a partially linked object
arch/arm64/kvm/hyp/nvhe/hyp-main.c +32 -0
@@ -18,6 +18,7 @@#include <nvhe/mem_protect.h> #include <nvhe/mm.h> #include <nvhe/pkvm.h> +#include <nvhe/trace.h> #include <nvhe/trap_handler.h> DEFINE_PER_CPU(struct kvm_nvhe_init_params, kvm_init_params);
@@ -587,6 +588,33 @@ static void handle___pkvm_teardown_vm(struct kvm_cpu_context *host_ctxt)cpu_reg (host_ctxt,1 ) =__pkvm_teardown_vm (handle); } +static void handle___tracing_load (struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned long, desc_hva, host_ctxt, 1); +DECLARE_REG (size_t, desc_size, host_ctxt,2 ); + +cpu_reg (host_ctxt,1 ) =__tracing_load (desc_hva, desc_size); +} + +static void handle___tracing_unload (struct kvm_cpu_context *host_ctxt) +{ +__tracing_unload (); +} + +static void handle___tracing_enable (struct kvm_cpu_context *host_ctxt) +{ +DECLARE_REG (bool, enable, host_ctxt,1 ); + +cpu_reg (host_ctxt,1 ) =__tracing_enable (enable); +} + +static void handle___tracing_swap_reader (struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned int, cpu, host_ctxt, 1); + +cpu_reg (host_ctxt,1 ) =__tracing_swap_reader (cpu); +} +typedef void (*hcall_t )(struct kvm_cpu_context *);#define HANDLE_FUNC (x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x
@@ -628,6 +656,10 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__pkvm_vcpu_load),HANDLE_FUNC (__pkvm_vcpu_put),HANDLE_FUNC (__pkvm_tlb_flush_vmid), +HANDLE_FUNC (__tracing_load), +HANDLE_FUNC (__tracing_unload), +HANDLE_FUNC (__tracing_enable), + HANDLE_FUNC(__tracing_swap_reader), };static void handle_host_hcall (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp/nvhe/trace.c new file +273 -0
273 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 24/30 KVM: arm64: Add trace remote for the nVHE/pKVM hyp
In reply to Vincent DonnefortIn both protected and nVHE mode, the hypervisor is capable of writing events into tracefs compatible ring-buffers. Create a trace remote so the kernel can read those buffers.
This currently doesn't provide any event support which will come later.
arch/arm64/kvm/Kconfig +1 -0
@@ -76,6 +76,7 @@ if NVHE_EL2_DEBUG config NVHE_EL2_TRACING bool depends on TRACING + select TRACE_REMOTE default y config PKVM_DISABLE_STAGE2_ON_PANIC
arch/arm64/kvm/Makefile +2 -0
@@ -30,6 +30,8 @@ kvm-$(CONFIG_HW_PERF_EVENTS) += pmu-emul.o pmu.o kvm-$(CONFIG_ARM64_PTR_AUTH) += pauth.o kvm-$(CONFIG_PTDUMP_STAGE2_DEBUGFS) += ptdump.o +kvm-$(CONFIG_NVHE_EL2_TRACING) += hyp_trace.o + always-y := hyp_constants.h hyp-constants.s define rule_gen_hyp_constants
arch/arm64/kvm/arm.c +5 -0
@@ -24,6 +24,7 @@#define CREATE_TRACE_POINTS #include "trace_arm.h" +#include "hyp_trace.h" #include <linux/uaccess.h> #include <asm/ptrace.h>
@@ -2416,6 +2417,10 @@ static int __init init_subsystems(void)kvm_register_perf_callbacks (); + err =kvm_hyp_trace_init (); +if (err) +kvm_err ("Failed to initialize Hyp tracing\n" ); + out:if (err)hyp_cpu_pm_exit ();
arch/arm64/kvm/hyp_trace.c new file +219 -0
219 lines not on this page · raw message
arch/arm64/kvm/hyp_trace.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __ARM64_KVM_HYP_TRACE_H__ +#define __ARM64_KVM_HYP_TRACE_H__ + +#ifdef CONFIG_NVHE_EL2_TRACING +int kvm_hyp_trace_init (void ); +#else +static inline int kvm_hyp_trace_init (void ) {return 0 ; } +#endif +#endif
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 25/30 KVM: arm64: Sync boot clock with the nVHE/pKVM hyp
In reply to Vincent DonnefortConfigure the hypervisor tracing clock with the kernel boot clock. For tracing purposes, the boot clock is interesting: it doesn't stop on suspend. However, it is corrected on a regular basis, which implies the need to re-evaluate it every once in a while.
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -93,6 +93,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_unload, __KVM_HOST_SMCCC_FUNC___tracing_enable, __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, + __KVM_HOST_SMCCC_FUNC___tracing_update_clock, };#define DECLARE_KVM_VHE_SYM (sym) extern char sym[]
arch/arm64/kvm/hyp/include/nvhe/trace.h +2 -0
@@ -11,6 +11,7 @@ int __tracing_load(unsigned long desc_va, size_t desc_size);void __tracing_unload (void );int __tracing_enable (bool enable);int __tracing_swap_reader (unsigned int cpu); +void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc);#else static inline void *tracing_reserve_entry (unsigned long length) {return NULL ; }static inline void tracing_commit_entry (void ) { }
@@ -19,5 +20,6 @@ static inline int __tracing_load(unsigned long desc_va, size_t desc_size) { retustatic inline void __tracing_unload (void ) { }static inline int __tracing_enable (bool enable) {return -ENODEV ; }static inline int __tracing_swap_reader (unsigned int cpu) {return -ENODEV ; } +static inline void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc) { }#endif #endif
arch/arm64/kvm/hyp/nvhe/hyp-main.c +11 -0
@@ -615,6 +615,16 @@ static void handle___tracing_swap_reader(struct kvm_cpu_context *host_ctxt)cpu_reg (host_ctxt,1 ) =__tracing_swap_reader (cpu); } +static void handle___tracing_update_clock (struct kvm_cpu_context *host_ctxt) +{ +DECLARE_REG (u32, mult, host_ctxt,1 ); +DECLARE_REG (u32, shift, host_ctxt,2 ); +DECLARE_REG (u64, epoch_ns, host_ctxt,3 ); +DECLARE_REG (u64, epoch_cyc, host_ctxt,4 ); + +__tracing_update_clock (mult, shift, epoch_ns, epoch_cyc); +} +typedef void (*hcall_t )(struct kvm_cpu_context *);#define HANDLE_FUNC (x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x
@@ -660,6 +670,7 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__tracing_unload),HANDLE_FUNC (__tracing_enable),HANDLE_FUNC (__tracing_swap_reader), + HANDLE_FUNC(__tracing_update_clock), };static void handle_host_hcall (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp/nvhe/trace.c +16 -0
@@ -271,3 +271,19 @@ int __tracing_swap_reader(unsigned int cpu)return ret; } + +void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc) +{ +int cpu; + +/* After this loop, all CPUs are observing the new bank... */ +for (cpu =0 ; cpu < hyp_nr_cpus; cpu++) { +struct simple_rb_per_cpu *simple_rb =per_cpu_ptr (trace_buffer.simple_rbs, cpu); + +while (READ_ONCE (simple_rb->status) ==SIMPLE_RB_WRITING ) + ; + } + +/* ...we can now override the old one and swap. */ +trace_clock_update (mult, shift, epoch_ns, epoch_cyc); +}
arch/arm64/kvm/hyp_trace.c +149 -0
185 lines not on this page · raw message
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 26/30 KVM: arm64: Add trace reset to the nVHE/pKVM hyp
In reply to Vincent DonnefortMake the hypervisor reset either the whole tracing buffer or a specific ring-buffer, on remotes/hypervisor/trace or per_cpu/<cpu>/trace write access.
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -94,6 +94,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_enable, __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, __KVM_HOST_SMCCC_FUNC___tracing_update_clock, + __KVM_HOST_SMCCC_FUNC___tracing_reset, };#define DECLARE_KVM_VHE_SYM (sym) extern char sym[]
arch/arm64/kvm/hyp/include/nvhe/trace.h +2 -0
@@ -12,6 +12,7 @@ void __tracing_unload(void);int __tracing_enable (bool enable);int __tracing_swap_reader (unsigned int cpu);void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc); +int __tracing_reset (unsigned int cpu);#else static inline void *tracing_reserve_entry (unsigned long length) {return NULL ; }static inline void tracing_commit_entry (void ) { }
@@ -21,5 +22,6 @@ static inline void __tracing_unload(void) { }static inline int __tracing_enable (bool enable) {return -ENODEV ; }static inline int __tracing_swap_reader (unsigned int cpu) {return -ENODEV ; }static inline void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc) { } +static inline int __tracing_reset (unsigned int cpu) {return -ENODEV ; }#endif #endif
arch/arm64/kvm/hyp/nvhe/hyp-main.c +8 -0
@@ -625,6 +625,13 @@ static void handle___tracing_update_clock(struct kvm_cpu_context *host_ctxt)__tracing_update_clock (mult, shift, epoch_ns, epoch_cyc); } +static void handle___tracing_reset (struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned int, cpu, host_ctxt, 1); + +cpu_reg (host_ctxt,1 ) =__tracing_reset (cpu); +} +typedef void (*hcall_t )(struct kvm_cpu_context *);#define HANDLE_FUNC (x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x
@@ -671,6 +678,7 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__tracing_enable),HANDLE_FUNC (__tracing_swap_reader),HANDLE_FUNC (__tracing_update_clock), + HANDLE_FUNC(__tracing_reset), };static void handle_host_hcall (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp/nvhe/trace.c +17 -0
@@ -287,3 +287,20 @@ void __tracing_update_clock(u32 mult, u32 shift, u64 epoch_ns, u64 epoch_cyc)/* ...we can now override the old one and swap. */ trace_clock_update (mult, shift, epoch_ns, epoch_cyc); } + +int __tracing_reset (unsigned int cpu) +{ +int ret = -ENODEV ; + +if (cpu >= hyp_nr_cpus) +return -EINVAL ; + +hyp_spin_lock (&trace_buffer.lock); + +if (hyp_trace_buffer_loaded (&trace_buffer)) + ret =simple_ring_buffer_reset (per_cpu_ptr (trace_buffer.simple_rbs, cpu)); + +hyp_spin_unlock (&trace_buffer.lock); + +return ret; +}
arch/arm64/kvm/hyp_trace.c +1 -1
@@ -313,7 +313,7 @@ static int hyp_trace_swap_reader_page(unsigned int cpu, void *priv)static int hyp_trace_reset (unsigned int cpu,void *priv) { -return 0 ; +return kvm_call_hyp_nvhe (__tracing_reset, cpu); }static int hyp_trace_enable_event (unsigned short id,bool enable,void *priv)
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 27/30 KVM: arm64: Add event support to the nVHE/pKVM hyp and trace remote
In reply to Vincent DonnefortAllow the creation of hypervisor and trace remote events with a single macro HYP_EVENT(). That macro expands in the kernel side to add all the required declarations (based on REMOTE_EVENT()) as well as in the hypervisor side to create the trace_<event>() function.
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -95,6 +95,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_swap_reader, __KVM_HOST_SMCCC_FUNC___tracing_update_clock, __KVM_HOST_SMCCC_FUNC___tracing_reset, + __KVM_HOST_SMCCC_FUNC___tracing_enable_event, };#define DECLARE_KVM_VHE_SYM (sym) extern char sym[]
arch/arm64/include/asm/kvm_define_hypevents.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#define REMOTE_EVENT_INCLUDE_FILE arch/arm64/include/asm/kvm_hypevents.h + +#define REMOTE_EVENT_SECTION "_hyp_events" + +#define HE_STRUCT (__args) __args +#define HE_PRINTK(__args...) __args +#define he_field re_field + +#define HYP_EVENT (__name, __proto, __struct, __assign, __printk) \ + REMOTE_EVENT(__name, 0, RE_STRUCT(__struct), RE_PRINTK(__printk)) + +#define HYP_EVENT_MULTI_READ +#include <trace/define_remote_events.h> +#undef HYP_EVENT_MULTI_READ
arch/arm64/include/asm/kvm_hypevents.h new file +10 -0
@@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#if !defined(__ARM64_KVM_HYPEVENTS_H_) || defined(HYP_EVENT_MULTI_READ ) +#define __ARM64_KVM_HYPEVENTS_H_ + +#ifdef __KVM_NVHE_HYPERVISOR__ +#include <nvhe/trace.h> +#endif + +#endif
arch/arm64/include/asm/kvm_hyptrace.h +13 -0
@@ -10,4 +10,17 @@ struct hyp_trace_desc { struct trace_buffer_desc trace_buffer_desc; }; + +struct hyp_event_id { +unsigned short id; +atomic_t enabled; +}; + +extern struct remote_event __hyp_events_start[]; +extern struct remote_event __hyp_events_end[]; + +/* hyp_event section used by the hypervisor */ +extern struct hyp_event_id __hyp_event_ids_start[]; +extern struct hyp_event_id __hyp_event_ids_end[]; +#endif
arch/arm64/kernel/image-vars.h +4 -0
@@ -138,6 +138,10 @@ KVM_NVHE_ALIAS(__hyp_data_start);KVM_NVHE_ALIAS (__hyp_data_end);KVM_NVHE_ALIAS (__hyp_rodata_start);KVM_NVHE_ALIAS (__hyp_rodata_end); +#ifdef CONFIG_NVHE_EL2_TRACING +KVM_NVHE_ALIAS (__hyp_event_ids_start); +KVM_NVHE_ALIAS (__hyp_event_ids_end); +#endif /* pKVM static key */ KVM_NVHE_ALIAS (kvm_protected_mode_initialized);
arch/arm64/kernel/vmlinux.lds.S +18 -0
@@ -13,12 +13,23 @@ *(__kvm_ex_table) \ __stop___kvm_ex_table = .; +#ifdef CONFIG_NVHE_EL2_TRACING +#define HYPERVISOR_EVENT_IDS \ + . = ALIGN(PAGE_SIZE); \ + __hyp_event_ids_start = .; \ + *(HYP_SECTION_NAME(.event_ids)) \ + __hyp_event_ids_end = .; +#else +#define HYPERVISOR_EVENT_IDS +#endif + #define HYPERVISOR_RODATA_SECTIONS \ HYP_SECTION_NAME(.rodata) : { \ . = ALIGN(PAGE_SIZE); \ __hyp_rodata_start = .; \ *(HYP_SECTION_NAME(.data..ro_after_init)) \ *(HYP_SECTION_NAME(.rodata)) \ + HYPERVISOR_EVENT_IDS \ . = ALIGN(PAGE_SIZE); \ __hyp_rodata_end = .; \ }
@@ -307,6 +318,13 @@ SECTIONS HYPERVISOR_DATA_SECTION +#ifdef CONFIG_NVHE_EL2_TRACING + .data.hyp_events : { + __hyp_events_start = .; + *(SORT(_hyp_events.*)) + __hyp_events_end = .; + } +#endif /* * Data written with the MMU off but read with the MMU on requires * cache lines to be invalidated, discarding up to a Cache Writeback
arch/arm64/kvm/hyp/include/nvhe/define_events.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#undef HYP_EVENT +#define HYP_EVENT (__name, __proto, __struct, __assign, __printk) \ + struct hyp_event_id hyp_event_id_##__name \ + __section(".hyp.event_ids."#__name) = { \ + .enabled = ATOMIC_INIT(0), \ + } + +#define HYP_EVENT_MULTI_READ +#include <asm/kvm_hypevents.h> +#undef HYP_EVENT_MULTI_READ + +#undef HYP_EVENT
arch/arm64/kvm/hyp/include/nvhe/trace.h +31 -0
@@ -1,9 +1,36 @@/* SPDX-License-Identifier: GPL-2.0-only */ #ifndef __ARM64_KVM_HYP_NVHE_TRACE_H#define __ARM64_KVM_HYP_NVHE_TRACE_H + +#include <linux/trace_remote_event.h> +#include <asm/kvm_hyptrace.h> +#define HE_PROTO(__args...) __args +#define HE_ASSIGN(__args...) __args +#define HE_STRUCT RE_STRUCT +#define he_field re_field +#ifdef CONFIG_NVHE_EL2_TRACING + +#define HYP_EVENT (__name, __proto, __struct, __assign, __printk) \ + REMOTE_EVENT_FORMAT(__name, __struct); \ + extern struct hyp_event_id hyp_event_id_##__name; \ + static __always_inline void trace_##__name(__proto) \ + { \ + struct remote_event_format_##__name *__entry; \ + size_t length = sizeof(*__entry); \ + \ + if (!atomic_read(&hyp_event_id_##__name.enabled)) \ + return; \ + __entry = tracing_reserve_entry(length); \ + if (!__entry) \ + return; \ + __entry->hdr.id = hyp_event_id_##__name.id; \ + __assign \ + tracing_commit_entry(); \ + } +void *tracing_reserve_entry (unsigned long length);void tracing_commit_entry (void );
@@ -13,9 +40,12 @@ int __tracing_enable(bool enable);int __tracing_swap_reader (unsigned int cpu);void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc);int __tracing_reset (unsigned int cpu); +int __tracing_enable_event (unsigned short id,bool enable);#else static inline void *tracing_reserve_entry (unsigned long length) {return NULL ; }static inline void tracing_commit_entry (void ) { } +#define HYP_EVENT (__name, __proto, __struct, __assign, __printk) \ + static inline void trace_##__name(__proto) {}static inline int __tracing_load (unsigned long desc_va,size_t desc_size) {return -ENODEV ; }static inline void __tracing_unload (void ) { }
@@ -23,5 +53,6 @@ static inline int __tracing_enable(bool enable) { return -ENODEV; }static inline int __tracing_swap_reader (unsigned int cpu) {return -ENODEV ; }static inline void __tracing_update_clock (u32 mult,u32 shift,u64 epoch_ns,u64 epoch_cyc) { }static inline int __tracing_reset (unsigned int cpu) {return -ENODEV ; } +static inline int __tracing_enable_event (unsigned short id,bool enable) {return -ENODEV ; }#endif #endif
arch/arm64/kvm/hyp/nvhe/Makefile +1 -1
@@ -29,7 +29,7 @@ hyp-obj-y += ../vgic-v3-sr.o ../aarch32.o ../vgic-v2-cpuif-proxy.o ../entry.o \ ../fpsimd.o ../hyp-entry.o ../exception.o ../pgtable.o hyp-obj-y += ../../../kernel/smccc-call.o hyp-obj-$(CONFIG_LIST_HARDENED) += list_debug.o -hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o trace.o +hyp-obj-$(CONFIG_NVHE_EL2_TRACING) += clock.o trace.o events.o hyp-obj-y += $(lib-objs) # Path to simple_ring_buffer.c
arch/arm64/kvm/hyp/nvhe/events.c new file +25 -0
@@ -0,0 +1,25 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2025 Google LLC +* Author: Vincent Donnefort <[email protected]> +*/ + +#include <nvhe/mm.h> +#include <nvhe/trace.h> + +#include <nvhe/define_events.h> + +int __tracing_enable_event (unsigned short id,bool enable) +{ +struct hyp_event_id *event_id = &__hyp_event_ids_start[id]; +atomic_t *enabled; + +if (event_id >= __hyp_event_ids_end) +return -EINVAL ; + + enabled =hyp_fixmap_map (__hyp_pa (&event_id->enabled)); +atomic_set (enabled, enable); +hyp_fixmap_unmap (); + +return 0 ; +}
arch/arm64/kvm/hyp/nvhe/hyp-main.c +9 -0
@@ -632,6 +632,14 @@ static void handle___tracing_reset(struct kvm_cpu_context *host_ctxt)cpu_reg (host_ctxt,1 ) =__tracing_reset (cpu); } +static void handle___tracing_enable_event (struct kvm_cpu_context *host_ctxt) +{ + DECLARE_REG(unsigned short, id, host_ctxt, 1); +DECLARE_REG (bool, enable, host_ctxt,2 ); + +cpu_reg (host_ctxt,1 ) =__tracing_enable_event (id, enable); +} +typedef void (*hcall_t )(struct kvm_cpu_context *);#define HANDLE_FUNC (x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x
@@ -679,6 +687,7 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__tracing_swap_reader),HANDLE_FUNC (__tracing_update_clock),HANDLE_FUNC (__tracing_reset), + HANDLE_FUNC(__tracing_enable_event), };static void handle_host_hcall (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp/nvhe/hyp.lds.S +6 -0
@@ -16,6 +16,12 @@ SECTIONS { HYP_SECTION(.text) HYP_SECTION(.data..ro_after_init) HYP_SECTION(.rodata) +#ifdef CONFIG_NVHE_EL2_TRACING + . = ALIGN(PAGE_SIZE); + BEGIN_HYP_SECTION(.event_ids) + *(SORT(.hyp.event_ids.*)) + END_HYP_SECTION +#endif /* * .hyp..data..percpu needs to be page aligned to maintain the same
arch/arm64/kvm/hyp_trace.c +36 -1
@@ -318,6 +318,25 @@ static int hyp_trace_reset(unsigned int cpu, void *priv)static int hyp_trace_enable_event (unsigned short id,bool enable,void *priv) { +struct hyp_event_id *event_id =lm_alias (&__hyp_event_ids_start[id]); +struct page *page; +atomic_t *enabled; +void *map; + +if (is_protected_kvm_enabled ()) +return kvm_call_hyp_nvhe (__tracing_enable_event, id, enable); + + enabled = &event_id->enabled; + page =virt_to_page (enabled); + map =vmap (&page,1 ,VM_MAP ,PAGE_KERNEL ); +if (!map) +return -ENOMEM ; + + enabled = map +offset_in_page (enabled); +atomic_set (enabled, enable); + +vunmap (map); +return 0 ; }
@@ -345,6 +364,19 @@ static struct trace_remote_callbacks trace_remote_callbacks = { .enable_event = hyp_trace_enable_event, }; +#include <asm/kvm_define_hypevents.h> + +static void __init hyp_trace_init_events (void ) +{ +struct hyp_event_id *hyp_event_id = __hyp_event_ids_start; +struct remote_event *event = __hyp_events_start; +int id =0 ; + +/* Events on both sides hypervisor are sorted */ +for (; event < __hyp_events_end; event++, hyp_event_id++, id++) + event->id = hyp_event_id->id = id; +} +int __init kvm_hyp_trace_init (void ) {int cpu;
@@ -364,5 +396,8 @@ int __init kvm_hyp_trace_init(void) }#endif -return trace_remote_register ("hypervisor" , &trace_remote_callbacks, &trace_buffer,NULL ,0 ); +hyp_trace_init_events (); + +return trace_remote_register ("hypervisor" , &trace_remote_callbacks, &trace_buffer, + __hyp_events_start, __hyp_events_end - __hyp_events_start); }
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 28/30 KVM: arm64: Add hyp_enter/hyp_exit events to nVHE/pKVM hyp
In reply to Vincent DonnefortThe hyp_enter and hyp_exit events are logged by the hypervisor any time it is entered and exited.
arch/arm64/include/asm/kvm_host.h +3 -0
@@ -920,6 +920,9 @@ struct kvm_vcpu_arch {/* Per-vcpu TLB for VNCR_EL2 -- NULL when !NV */ struct vncr_tlb *vncr_tlb; + +/* Hyp-readable copy of kvm_vcpu::pid */ +pid_t pid; };/*
arch/arm64/include/asm/kvm_hypevents.h +39 -0
@@ -7,4 +7,43 @@#include <nvhe/trace.h> #endif +#ifndef __HYP_ENTER_EXIT_REASON +#define __HYP_ENTER_EXIT_REASON +enum hyp_enter_exit_reason { +HYP_REASON_SMC , +HYP_REASON_HVC , +HYP_REASON_PSCI , +HYP_REASON_HOST_ABORT , +HYP_REASON_GUEST_EXIT , +HYP_REASON_ERET_HOST , +HYP_REASON_ERET_GUEST , +HYP_REASON_UNKNOWN /* Must be last */ +}; +#endif + +HYP_EVENT (hyp_enter, + HE_PROTO(struct kvm_cpu_context *host_ctxt, u8 reason), +HE_STRUCT ( + he_field(u8, reason) +he_field (pid_t, vcpu) + ), +HE_ASSIGN ( + __entry->reason = reason; + __entry->vcpu = __tracing_get_vcpu_pid(host_ctxt); + ), +HE_PRINTK ("reason=%s vcpu=%d" ,__hyp_enter_exit_reason_str (__entry->reason), __entry->vcpu) +); + +HYP_EVENT (hyp_exit, + HE_PROTO(struct kvm_cpu_context *host_ctxt, u8 reason), +HE_STRUCT ( + he_field(u8, reason) +he_field (pid_t, vcpu) + ), +HE_ASSIGN ( + __entry->reason = reason; + __entry->vcpu = __tracing_get_vcpu_pid(host_ctxt); + ), +HE_PRINTK ("reason=%s vcpu=%d" ,__hyp_enter_exit_reason_str (__entry->reason), __entry->vcpu) +);#endif
arch/arm64/kvm/arm.c +2 -0
@@ -708,6 +708,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)if (!cpumask_test_cpu (cpu, vcpu->kvm->arch.supported_cpus))vcpu_set_on_unsupported_cpu (vcpu); + + vcpu->arch.pid =pid_nr (vcpu->pid); }void kvm_arch_vcpu_put (struct kvm_vcpu *vcpu)
arch/arm64/kvm/hyp/include/nvhe/arm-smccc.h new file +23 -0
@@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +#ifndef __ARM64_KVM_HYP_NVHE_ARM_SMCCC_H__ +#define __ARM64_KVM_HYP_NVHE_ARM_SMCCC_H__ + +#include <asm/kvm_hypevents.h> + +#include <linux/arm-smccc.h> + +#define hyp_smccc_1_1_smc (...) \ + do { \ + trace_hyp_exit(NULL, HYP_REASON_SMC); \ + arm_smccc_1_1_smc(__VA_ARGS__); \ + trace_hyp_enter(NULL, HYP_REASON_SMC); \ + } while (0) + +#define hyp_smccc_1_2_smc (...) \ + do { \ + trace_hyp_exit(NULL, HYP_REASON_SMC); \ + arm_smccc_1_2_smc(__VA_ARGS__); \ + trace_hyp_enter(NULL, HYP_REASON_SMC); \ + } while (0) + +#endif /* __ARM64_KVM_HYP_NVHE_ARM_SMCCC_H__ */
arch/arm64/kvm/hyp/include/nvhe/trace.h +12 -0
@@ -6,6 +6,18 @@#include <asm/kvm_hyptrace.h> +static inline pid_t __tracing_get_vcpu_pid (struct kvm_cpu_context *host_ctxt) +{ +struct kvm_vcpu *vcpu; + +if (!host_ctxt) + host_ctxt =host_data_ptr (host_ctxt); + + vcpu = host_ctxt->__hyp_running_vcpu; + +return vcpu ? vcpu->arch.pid :0 ; +} + #define HE_PROTO(__args...) __args #define HE_ASSIGN(__args...) __args#define HE_STRUCT RE_STRUCT
arch/arm64/kvm/hyp/nvhe/ffa.c +14 -14
@@ -26,10 +26,10 @@* the duration and are therefore serialised. */ -#include <linux/arm-smccc.h> #include <linux/arm_ffa.h> #include <asm/kvm_pkvm.h> +#include <nvhe/arm-smccc.h> #include <nvhe/ffa.h> #include <nvhe/mem_protect.h> #include <nvhe/memory.h>
@@ -147,7 +147,7 @@ static int ffa_map_hyp_buffers(u64 ffa_page_count) {struct arm_smccc_1_2_regs res; - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = FFA_FN64_RXTX_MAP, .a1 = hyp_virt_to_phys(hyp_buffers.tx), .a2 = hyp_virt_to_phys(hyp_buffers.rx),
@@ -161,7 +161,7 @@ static int ffa_unmap_hyp_buffers(void) {struct arm_smccc_1_2_regs res; -arm_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { +hyp_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { .a0 =FFA_RXTX_UNMAP , .a1 =HOST_FFA_ID , }, &res);
@@ -172,7 +172,7 @@ static int ffa_unmap_hyp_buffers(void)static void ffa_mem_frag_tx (struct arm_smccc_1_2_regs *res,u32 handle_lo,u32 handle_hi,u32 fraglen,u32 endpoint_id) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = FFA_MEM_FRAG_TX, .a1 = handle_lo, .a2 = handle_hi,
@@ -184,7 +184,7 @@ static void ffa_mem_frag_tx(struct arm_smccc_1_2_regs *res, u32 handle_lo,static void ffa_mem_frag_rx (struct arm_smccc_1_2_regs *res,u32 handle_lo,u32 handle_hi,u32 fragoff) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = FFA_MEM_FRAG_RX, .a1 = handle_lo, .a2 = handle_hi,
@@ -196,7 +196,7 @@ static void ffa_mem_frag_rx(struct arm_smccc_1_2_regs *res, u32 handle_lo,static void ffa_mem_xfer (struct arm_smccc_1_2_regs *res,u64 func_id,u32 len,u32 fraglen) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = func_id, .a1 = len, .a2 = fraglen,
@@ -206,7 +206,7 @@ static void ffa_mem_xfer(struct arm_smccc_1_2_regs *res, u64 func_id, u32 len,static void ffa_mem_reclaim (struct arm_smccc_1_2_regs *res,u32 handle_lo,u32 handle_hi,u32 flags) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = FFA_MEM_RECLAIM, .a1 = handle_lo, .a2 = handle_hi,
@@ -216,7 +216,7 @@ static void ffa_mem_reclaim(struct arm_smccc_1_2_regs *res, u32 handle_lo,static void ffa_retrieve_req (struct arm_smccc_1_2_regs *res,u32 len) { - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = FFA_FN64_MEM_RETRIEVE_REQ, .a1 = len, .a2 = len,
@@ -225,7 +225,7 @@ static void ffa_retrieve_req(struct arm_smccc_1_2_regs *res, u32 len)static void ffa_rx_release (struct arm_smccc_1_2_regs *res) { -arm_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { +hyp_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { .a0 =FFA_RX_RELEASE , }, res); }
@@ -728,7 +728,7 @@ static int hyp_ffa_post_init(void)size_t min_rxtx_sz;struct arm_smccc_1_2_regs res; -arm_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ){ +hyp_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ){ .a0 =FFA_ID_GET , }, &res);if (res.a0 !=FFA_SUCCESS )
@@ -737,7 +737,7 @@ static int hyp_ffa_post_init(void)if (res.a2 !=HOST_FFA_ID )return -EINVAL ; -arm_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ){ +hyp_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ){ .a0 =FFA_FEATURES , .a1 =FFA_FN64_RXTX_MAP , }, &res);
@@ -788,7 +788,7 @@ static void do_ffa_version(struct arm_smccc_1_2_regs *res,* first if TEE supports it. */ if (FFA_MINOR_VERSION (ffa_req_version) <FFA_MINOR_VERSION (hyp_ffa_version)) { -arm_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { +hyp_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { .a0 =FFA_VERSION , .a1 = ffa_req_version, }, res);
@@ -824,7 +824,7 @@ static void do_ffa_part_get(struct arm_smccc_1_2_regs *res, goto out_unlock; } - arm_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { + hyp_smccc_1_2_smc(&(struct arm_smccc_1_2_regs) { .a0 = FFA_PARTITION_INFO_GET, .a1 = uuid0, .a2 = uuid1,
@@ -939,7 +939,7 @@ int hyp_ffa_init(void *pages)if (kvm_host_psci_config.smccc_version <ARM_SMCCC_VERSION_1_2 )return 0 ; -arm_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { +hyp_smccc_1_2_smc (&(struct arm_smccc_1_2_regs ) { .a0 =FFA_VERSION , .a1 =FFA_VERSION_1_2 , }, &res);
arch/arm64/kvm/hyp/nvhe/hyp-main.c +11 -0
@@ -12,6 +12,7 @@#include <asm/kvm_emulate.h> #include <asm/kvm_host.h> #include <asm/kvm_hyp.h> +#include <asm/kvm_hypevents.h> #include <asm/kvm_mmu.h> #include <nvhe/ffa.h>
@@ -137,6 +138,8 @@ static void flush_hyp_vcpu(struct pkvm_hyp_vcpu *hyp_vcpu) hyp_vcpu->vcpu.arch.vsesr_el2 = host_vcpu->arch.vsesr_el2; hyp_vcpu->vcpu.arch.vgic_cpu.vgic_v3 = host_vcpu->arch.vgic_cpu.vgic_v3; + + hyp_vcpu->vcpu.arch.pid = host_vcpu->arch.pid; }static void sync_hyp_vcpu (struct pkvm_hyp_vcpu *hyp_vcpu)
@@ -728,7 +731,9 @@ static void handle_host_hcall(struct kvm_cpu_context *host_ctxt)static void default_host_smc_handler (struct kvm_cpu_context *host_ctxt) { +trace_hyp_exit (host_ctxt,HYP_REASON_SMC );__kvm_hyp_host_forward_smc (host_ctxt); +trace_hyp_enter (host_ctxt,HYP_REASON_SMC ); }static void handle_host_smc (struct kvm_cpu_context *host_ctxt)
@@ -815,15 +820,19 @@ void handle_trap(struct kvm_cpu_context *host_ctxt) {u64 esr =read_sysreg_el2 (SYS_ESR ); +switch (ESR_ELx_EC (esr)) {case ESR_ELx_EC_HVC64: +trace_hyp_enter (host_ctxt,HYP_REASON_HVC );handle_host_hcall (host_ctxt);break ;case ESR_ELx_EC_SMC64: +trace_hyp_enter (host_ctxt,HYP_REASON_SMC );handle_host_smc (host_ctxt);break ;case ESR_ELx_EC_IABT_LOW:case ESR_ELx_EC_DABT_LOW: +trace_hyp_enter (host_ctxt,HYP_REASON_HOST_ABORT );handle_host_mem_abort (host_ctxt);break ;case ESR_ELx_EC_SYS64:
@@ -833,4 +842,6 @@ void handle_trap(struct kvm_cpu_context *host_ctxt)default :BUG (); } + +trace_hyp_exit (host_ctxt,HYP_REASON_ERET_HOST ); }
arch/arm64/kvm/hyp/nvhe/psci-relay.c +5 -2
@@ -6,11 +6,12 @@#include <asm/kvm_asm.h> #include <asm/kvm_hyp.h> +#include <asm/kvm_hypevents.h> #include <asm/kvm_mmu.h> -#include <linux/arm-smccc.h> #include <linux/kvm_host.h> #include <uapi/linux/psci.h> +#include <nvhe/arm-smccc.h> #include <nvhe/memory.h> #include <nvhe/trap_handler.h>
@@ -65,7 +66,7 @@ static unsigned long psci_call(unsigned long fn, unsigned long arg0, {struct arm_smccc_res res; -arm_smccc_1_1_smc (fn, arg0, arg1, arg2, &res); +hyp_smccc_1_1_smc (fn, arg0, arg1, arg2, &res);return res.a0; }
@@ -206,6 +207,7 @@ asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on)struct kvm_cpu_context *host_ctxt; host_ctxt =host_data_ptr (host_ctxt); +trace_hyp_enter (host_ctxt,HYP_REASON_PSCI );if (is_cpu_on) boot_args =this_cpu_ptr (&cpu_on_args);
@@ -221,6 +223,7 @@ asmlinkage void __noreturn __kvm_host_psci_cpu_entry(bool is_cpu_on)write_sysreg_el1 (INIT_SCTLR_EL1_MMU_OFF ,SYS_SCTLR );write_sysreg (INIT_PSTATE_EL1 ,SPSR_EL2 ); +trace_hyp_exit (host_ctxt,HYP_REASON_PSCI );__host_enter (host_ctxt); }
arch/arm64/kvm/hyp/nvhe/switch.c +4 -1
@@ -7,7 +7,6 @@#include <hyp/switch.h> #include <hyp/sysreg-sr.h> -#include <linux/arm-smccc.h> #include <linux/kvm_host.h> #include <linux/types.h> #include <linux/jump_label.h>
@@ -21,6 +20,7 @@#include <asm/kvm_asm.h> #include <asm/kvm_emulate.h> #include <asm/kvm_hyp.h> +#include <asm/kvm_hypevents.h> #include <asm/kvm_mmu.h> #include <asm/fpsimd.h> #include <asm/debug-monitors.h>
@@ -308,10 +308,13 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu)__debug_switch_to_guest (vcpu);do { +trace_hyp_exit (host_ctxt,HYP_REASON_ERET_GUEST ); +/* Jump in the fire! */ exit_code =__guest_enter (vcpu);/* And we're baaack! */ +trace_hyp_enter (host_ctxt,HYP_REASON_GUEST_EXIT ); }while (fixup_guest_exit (vcpu, &exit_code));__sysreg_save_state_nvhe (guest_ctxt);
arch/arm64/kvm/hyp_trace.c +18 -0
@@ -364,8 +364,26 @@ static struct trace_remote_callbacks trace_remote_callbacks = { .enable_event = hyp_trace_enable_event, }; +static const char *__hyp_enter_exit_reason_str (u8 reason); +#include <asm/kvm_define_hypevents.h> +static const char *__hyp_enter_exit_reason_str (u8 reason) +{ +static const char strs[][12 ] = { +"smc" , +"hvc" , +"psci" , +"host_abort" , +"guest_exit" , +"eret_host" , +"eret_guest" , +"unknown" , + }; + +return strs[min (reason,HYP_REASON_UNKNOWN )]; +} +static void __init hyp_trace_init_events (void ) {struct hyp_event_id *hyp_event_id = __hyp_event_ids_start;
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 29/30 KVM: arm64: Add selftest event support to nVHE/pKVM hyp
In reply to Vincent DonnefortAdd a selftest event that can be triggered from a write_event tracefs file. This intends to be used by trace remote selftests.
arch/arm64/include/asm/kvm_asm.h +1 -0
@@ -96,6 +96,7 @@ enum __kvm_host_smccc_func { __KVM_HOST_SMCCC_FUNC___tracing_update_clock, __KVM_HOST_SMCCC_FUNC___tracing_reset, __KVM_HOST_SMCCC_FUNC___tracing_enable_event, + __KVM_HOST_SMCCC_FUNC___tracing_write_event, };#define DECLARE_KVM_VHE_SYM (sym) extern char sym[]
arch/arm64/include/asm/kvm_hypevents.h +11 -0
@@ -46,4 +46,15 @@ HYP_EVENT(hyp_exit, ),HE_PRINTK ("reason=%s vcpu=%d" ,__hyp_enter_exit_reason_str (__entry->reason), __entry->vcpu) ); + +HYP_EVENT (selftest, + HE_PROTO(u64 id), +HE_STRUCT ( +he_field (u64, id) + ), +HE_ASSIGN ( + __entry->id = id; + ), +RE_PRINTK ("id=%llu" , __entry->id) +);#endif
arch/arm64/kvm/hyp/nvhe/hyp-main.c +8 -0
@@ -643,6 +643,13 @@ static void handle___tracing_enable_event(struct kvm_cpu_context *host_ctxt)cpu_reg (host_ctxt,1 ) =__tracing_enable_event (id, enable); } +static void handle___tracing_write_event (struct kvm_cpu_context *host_ctxt) +{ +DECLARE_REG (u64, id, host_ctxt,1 ); + +trace_selftest (id); +} +typedef void (*hcall_t )(struct kvm_cpu_context *);#define HANDLE_FUNC (x) [__KVM_HOST_SMCCC_FUNC_##x] = (hcall_t)handle_##x
@@ -691,6 +698,7 @@ static const hcall_t host_hcall[] = {HANDLE_FUNC (__tracing_update_clock),HANDLE_FUNC (__tracing_reset),HANDLE_FUNC (__tracing_enable_event), + HANDLE_FUNC(__tracing_write_event), };static void handle_host_hcall (struct kvm_cpu_context *host_ctxt)
arch/arm64/kvm/hyp_trace.c +22 -0
@@ -348,8 +348,30 @@ static int hyp_trace_clock_show(struct seq_file *m, void *v) }DEFINE_SHOW_ATTRIBUTE (hyp_trace_clock); +static ssize_t hyp_trace_write_event_write (struct file *f,const char __user *ubuf, +size_t cnt,loff_t *pos) +{ +unsigned long val; +int ret; + + ret =kstrtoul_from_user (ubuf, cnt,10 , &val); +if (ret) +return ret; + +kvm_call_hyp_nvhe (__tracing_write_event, val); + +return cnt; +} + +static const struct file_operations hyp_trace_write_event_fops = { + .write = hyp_trace_write_event_write, +}; +static int hyp_trace_init_tracefs (struct dentry *d,void *priv) { +if (!tracefs_create_file ("write_event" ,0200 , d,NULL , &hyp_trace_write_event_fops)) +return -ENOMEM ; +return tracefs_create_file ("trace_clock" ,0440 , d,NULL , &hyp_trace_clock_fops) ?0 : -ENOMEM ; }
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Vincent Donnefort
maintainerPATCH v12 30/30 tracing: selftests: Add hypervisor trace remote tests
In reply to Vincent DonnefortRun the trace remote selftests with the trace remote 'hypervisor', This trace remote is most likely created when the arm64 KVM nVHE/pKVM hypervisor is in use.
tools/testing/selftests/ftrace/test.d/remotes/hypervisor/buffer_size.tc new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace buffer size +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=1 +. $TEST_DIR/remotes/buffer_size.tc + +set -e +setup_remote "hypervisor" +test_buffer_size
tools/testing/selftests/ftrace/test.d/remotes/hypervisor/reset.tc new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace buffer reset +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=1 +. $TEST_DIR/remotes/reset.tc + +set -e +setup_remote "hypervisor" +test_reset
tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace.tc new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor non-consuming trace read +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=1 +. $TEST_DIR/remotes/trace.tc + +set -e +setup_remote "hypervisor" +test_trace
tools/testing/selftests/ftrace/test.d/remotes/hypervisor/trace_pipe.tc new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor consuming trace read +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=1 +. $TEST_DIR/remotes/trace_pipe.tc + +set -e +setup_remote "hypervisor" +test_trace_pipe
tools/testing/selftests/ftrace/test.d/remotes/hypervisor/unloading.tc new file +11 -0
@@ -0,0 +1,11 @@ +#!/bin/sh +# SPDX-License-Identifier: GPL-2.0 +# description: Test hypervisor trace buffer unloading +# requires: remotes/hypervisor/write_event + +SOURCE_REMOTE_TEST=1 +. $TEST_DIR/remotes/unloading.tc + +set -e +setup_remote "hypervisor" +test_unloading
Signature · 1 line
2.53.0.335.g19a08e0c02-goog
Steven Rostedt
maintainerQuoted 9 lines · On Thu, 19 Feb 2026 15:02:37 +0000 Vincent Donnefort <[email protected]>…
The growing set of features supported by the hypervisor in protected mode necessitates debugging and profiling tools. Tracefs is the ideal candidate for this task:
* It is simple to use and to script.
* It is supported by various tools, from the trace-cmd CLI to the Android web-based perfetto.
Quoted 7 lines
* The ring-buffer, where are stored trace events consists of linked pages, making it an ideal structure for sharing between kernel and hypervisor.
This series first introduces a new generic way of creating remote events and remote buffers. Then it adds support to the pKVM hypervisor.
So I finished my review of all the tracing patches, but I just realized that there's likely going to be some major conflicts with changes in the tracing tree that's going to happen against this series.
To solve that, after -rc2 comes out, I'll apply the tracing portion of this series to a branch in my tree directly on top of -rc2 and I will then use that to base my changes for the next merge window.
Then the arm/kvm folks could start with that branch and add the arm/KVM portion of this series on top of it. This will prevent major merge conflicts in linux-next.
Does that sound OK?
-- Steve
Marc Zyngier
maintainerQuoted 29 lines · Steven Rostedt
Quoted 9 lines · On Thu, 19 Feb 2026 15:02:37 +0000 Vincent Donnefort <[email protected]>…
The growing set of features supported by the hypervisor in protected mode necessitates debugging and profiling tools. Tracefs is the ideal candidate for this task:
* It is simple to use and to script.
* It is supported by various tools, from the trace-cmd CLI to the Android web-based perfetto.
Quoted 7 lines
* The ring-buffer, where are stored trace events consists of linked pages, making it an ideal structure for sharing between kernel and hypervisor.
This series first introduces a new generic way of creating remote events and remote buffers. Then it adds support to the pKVM hypervisor.
So I finished my review of all the tracing patches, but I just realized that there's likely going to be some major conflicts with changes in the tracing tree that's going to happen against this series.
To solve that, after -rc2 comes out, I'll apply the tracing portion of this series to a branch in my tree directly on top of -rc2 and I will then use that to base my changes for the next merge window.
Quoted 5 lines
Then the arm/kvm folks could start with that branch and add the arm/KVM portion of this series on top of it. This will prevent major merge conflicts in linux-next.
Does that sound OK?
That works. Just send us a link to the branch after -rc2 and we'll get that sorted.
Thanks,
M.
Signature · 1 line
Jazz isn't dead. It just smells funny.
Steven Rostedt
maintainerQuoted 9 lines · On Thu, 19 Feb 2026 19:11:21 +0000 Marc Zyngier <[email protected]> wrote:
Quoted 6 lines
Then the arm/kvm folks could start with that branch and add the arm/KVM portion of this series on top of it. This will prevent major merge conflicts in linux-next.
Does that sound OK?
That works. Just send us a link to the branch after -rc2 and we'll get that sorted.
Vincent,
There's a few minor conflicts with this series and v7.0-rc2, can you rebase and send again?
Thanks,
-- Steve
Vincent Donnefort
maintainerQuoted 10 lines · Steven Rostedt
Quoted 7 lines · On Thu, 19 Feb 2026 19:11:21 +0000 Marc Zyngier <[email protected]> wrote:
Quoted 6 lines
Then the arm/kvm folks could start with that branch and add the arm/KVM portion of this series on top of it. This will prevent major merge conflicts in linux-next.
Does that sound OK?
Quoted 7 lines
Quoted 2 lines
That works. Just send us a link to the branch after -rc2 and we'll get that sorted.
Vincent,
There's a few minor conflicts with this series and v7.0-rc2, can you rebase and send again?
I'll send a rebased new version tomorrow.
Quoted 4 lines
Thanks,
-- Steve