Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP5:Update
lttng-modules
Update-for-kernel-5.7-use-vmalloc_sync_mappings...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File Update-for-kernel-5.7-use-vmalloc_sync_mappings.patch of Package lttng-modules
From 263b6c88138c3354d63dba3c70a965de94becd22 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> Date: Tue, 5 May 2020 13:38:31 -0400 Subject: [PATCH] Update for kernel 5.7: use vmalloc_sync_mappings on kernels >= 5.7 Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com> --- lib/ringbuffer/ring_buffer_backend.c | 4 +- lttng-abi.c | 4 +- lttng-context-cpu-id.c | 2 - lttng-context-hostname.c | 2 - lttng-context-interruptible.c | 2 - lttng-context-migratable.c | 2 - lttng-context-need-reschedule.c | 2 - lttng-context-nice.c | 2 - lttng-context-perf-counters.c | 2 - lttng-context-pid.c | 2 - lttng-context-ppid.c | 2 - lttng-context-preemptible.c | 2 - lttng-context-prio.c | 2 - lttng-context-procname.c | 2 - lttng-context-tid.c | 2 - lttng-context-vpid.c | 2 - lttng-context-vppid.c | 2 - lttng-context-vtid.c | 2 - lttng-context.c | 2 - lttng-events.c | 10 +++---- lttng-ring-buffer-client.h | 4 +- lttng-ring-buffer-metadata-client.h | 4 +- lttng-syscalls.c | 2 - probes/lttng-ftrace.c | 6 ++-- probes/lttng-kprobes.c | 2 - probes/lttng-kretprobes.c | 2 - probes/lttng-tracepoint-event-impl.h | 4 +- probes/lttng.c | 2 - tests/probes/lttng-test.c | 2 - wrapper/vmalloc.h | 49 ++++++++++++++++++++++++++++++++--- 30 files changed, 86 insertions(+), 43 deletions(-) --- a/lib/ringbuffer/ring_buffer_backend.c +++ b/lib/ringbuffer/ring_buffer_backend.c @@ -30,7 +30,7 @@ #include <linux/vmalloc.h> #include <wrapper/mm.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <wrapper/ringbuffer/config.h> #include <wrapper/ringbuffer/backend.h> #include <wrapper/ringbuffer/frontend.h> @@ -169,7 +169,7 @@ int lib_ring_buffer_backend_allocate(con * If kmalloc ever uses vmalloc underneath, make sure the buffer pages * will not fault. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); wrapper_clear_current_oom_origin(); vfree(pages); return 0; --- a/lttng-abi.c +++ b/lttng-abi.c @@ -44,7 +44,7 @@ #include <linux/uaccess.h> #include <linux/slab.h> #include <linux/err.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <wrapper/ringbuffer/vfs.h> #include <wrapper/ringbuffer/backend.h> #include <wrapper/ringbuffer/frontend.h> @@ -1726,7 +1726,7 @@ int __init lttng_abi_init(void) { int ret = 0; - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); lttng_clock_ref(); ret = lttng_tp_mempool_init(); --- a/lttng-context-cpu-id.c +++ b/lttng-context-cpu-id.c @@ -81,7 +81,7 @@ int lttng_add_cpu_id_to_ctx(struct lttng field->record = cpu_id_record; field->get_value = cpu_id_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_cpu_id_to_ctx); --- a/lttng-context-hostname.c +++ b/lttng-context-hostname.c @@ -114,7 +114,7 @@ int lttng_add_hostname_to_ctx(struct ltt field->record = hostname_record; field->get_value = hostname_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_hostname_to_ctx); --- a/lttng-context-interruptible.c +++ b/lttng-context-interruptible.c @@ -88,7 +88,7 @@ int lttng_add_interruptible_to_ctx(struc field->record = interruptible_record; field->get_value = interruptible_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_interruptible_to_ctx); --- a/lttng-context-migratable.c +++ b/lttng-context-migratable.c @@ -81,7 +81,7 @@ int lttng_add_migratable_to_ctx(struct l field->record = migratable_record; field->get_value = migratable_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_migratable_to_ctx); --- a/lttng-context-need-reschedule.c +++ b/lttng-context-need-reschedule.c @@ -81,7 +81,7 @@ int lttng_add_need_reschedule_to_ctx(str field->record = need_reschedule_record; field->get_value = need_reschedule_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_need_reschedule_to_ctx); --- a/lttng-context-nice.c +++ b/lttng-context-nice.c @@ -81,7 +81,7 @@ int lttng_add_nice_to_ctx(struct lttng_c field->record = nice_record; field->get_value = nice_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_nice_to_ctx); --- a/lttng-context-perf-counters.c +++ b/lttng-context-perf-counters.c @@ -334,7 +334,7 @@ int lttng_add_perf_counter_to_ctx(uint32 field->u.perf_counter = perf_field; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0)) --- a/lttng-context-pid.c +++ b/lttng-context-pid.c @@ -81,7 +81,7 @@ int lttng_add_pid_to_ctx(struct lttng_ct field->record = pid_record; field->get_value = pid_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_pid_to_ctx); --- a/lttng-context-ppid.c +++ b/lttng-context-ppid.c @@ -103,7 +103,7 @@ int lttng_add_ppid_to_ctx(struct lttng_c field->record = ppid_record; field->get_value = ppid_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_ppid_to_ctx); --- a/lttng-context-preemptible.c +++ b/lttng-context-preemptible.c @@ -99,7 +99,7 @@ int lttng_add_preemptible_to_ctx(struct field->record = preemptible_record; field->get_value = preemptible_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_preemptible_to_ctx); --- a/lttng-context-prio.c +++ b/lttng-context-prio.c @@ -102,7 +102,7 @@ int lttng_add_prio_to_ctx(struct lttng_c field->record = prio_record; field->get_value = prio_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_prio_to_ctx); --- a/lttng-context-procname.c +++ b/lttng-context-procname.c @@ -85,7 +85,7 @@ int lttng_add_procname_to_ctx(struct ltt field->record = procname_record; field->get_value = procname_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_procname_to_ctx); --- a/lttng-context-tid.c +++ b/lttng-context-tid.c @@ -84,7 +84,7 @@ int lttng_add_tid_to_ctx(struct lttng_ct field->record = tid_record; field->get_value = tid_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_tid_to_ctx); --- a/lttng-context-vpid.c +++ b/lttng-context-vpid.c @@ -96,7 +96,7 @@ int lttng_add_vpid_to_ctx(struct lttng_c field->record = vpid_record; field->get_value = vpid_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_vpid_to_ctx); --- a/lttng-context-vppid.c +++ b/lttng-context-vppid.c @@ -125,7 +125,7 @@ int lttng_add_vppid_to_ctx(struct lttng_ field->record = vppid_record; field->get_value = vppid_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_vppid_to_ctx); --- a/lttng-context-vtid.c +++ b/lttng-context-vtid.c @@ -96,7 +96,7 @@ int lttng_add_vtid_to_ctx(struct lttng_c field->record = vtid_record; field->get_value = vtid_get_value; lttng_context_update(*ctx); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } EXPORT_SYMBOL_GPL(lttng_add_vtid_to_ctx); --- a/lttng-context.c +++ b/lttng-context.c @@ -24,7 +24,7 @@ #include <linux/list.h> #include <linux/mutex.h> #include <linux/slab.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <lttng-events.h> #include <lttng-tracer.h> --- a/lttng-events.c +++ b/lttng-events.c @@ -42,7 +42,7 @@ #include <linux/vmalloc.h> #include <wrapper/uuid.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <wrapper/random.h> #include <wrapper/tracepoint.h> #include <wrapper/list.h> @@ -2614,9 +2614,9 @@ end: * Registers a transport which can be used as output to extract the data out of * LTTng. The module calling this registration function must ensure that no * trap-inducing code will be executed by the transport functions. E.g. - * vmalloc_sync_all() must be called between a vmalloc and the moment the memory + * vmalloc_sync_mappings() must be called between a vmalloc and the moment the memory * is made visible to the transport function. This registration acts as a - * vmalloc_sync_all. Therefore, only if the module allocates virtual memory + * vmalloc_sync_mappings. Therefore, only if the module allocates virtual memory * after its registration must it synchronize the TLBs. */ void lttng_transport_register(struct lttng_transport *transport) @@ -2624,9 +2624,9 @@ void lttng_transport_register(struct ltt /* * Make sure no page fault can be triggered by the module about to be * registered. We deal with this here so we don't have to call - * vmalloc_sync_all() in each module's init. + * vmalloc_sync_mappings() in each module's init. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); mutex_lock(&sessions_mutex); list_add_tail(&transport->node, <tng_transport_list); --- a/lttng-ring-buffer-client.h +++ b/lttng-ring-buffer-client.h @@ -23,7 +23,7 @@ #include <linux/module.h> #include <linux/types.h> #include <lib/bitfield.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <wrapper/trace-clock.h> #include <lttng-events.h> #include <lttng-tracer.h> @@ -744,7 +744,7 @@ static int __init lttng_ring_buffer_clie * This vmalloc sync all also takes care of the lib ring buffer * vmalloc'd module pages when it is built as a module into LTTng. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); lttng_transport_register(<tng_relay_transport); return 0; } --- a/lttng-ring-buffer-metadata-client.h +++ b/lttng-ring-buffer-metadata-client.h @@ -22,7 +22,7 @@ #include <linux/module.h> #include <linux/types.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <lttng-events.h> #include <lttng-tracer.h> @@ -439,7 +439,7 @@ static int __init lttng_ring_buffer_clie * This vmalloc sync all also takes care of the lib ring buffer * vmalloc'd module pages when it is built as a module into LTTng. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); lttng_transport_register(<tng_relay_transport); return 0; } --- a/lttng-syscalls.c +++ b/lttng-syscalls.c @@ -760,7 +760,7 @@ int lttng_syscalls_register(struct lttng struct lttng_kernel_event ev; int ret; - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); if (!chan->sc_table) { /* create syscall table mapping syscall to events */ --- a/probes/lttng-kprobes.c +++ b/probes/lttng-kprobes.c @@ -145,7 +145,7 @@ int lttng_kprobes_register(const char *n * Well.. kprobes itself puts the page fault handler on the blacklist, * but we can never be too careful. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); ret = register_kprobe(&event->u.kprobe.kp); if (ret) --- a/probes/lttng-kretprobes.c +++ b/probes/lttng-kretprobes.c @@ -234,7 +234,7 @@ int lttng_kretprobes_register(const char * Well.. kprobes itself puts the page fault handler on the blacklist, * but we can never be too careful. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); ret = register_kretprobe(<tng_krp->krp); if (ret) --- a/probes/lttng-tracepoint-event-impl.h +++ b/probes/lttng-tracepoint-event-impl.h @@ -28,7 +28,7 @@ #include <probes/lttng.h> #include <probes/lttng-types.h> #include <probes/lttng-probe-user.h> -#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <wrapper/ringbuffer/frontend_types.h> #include <wrapper/ringbuffer/backend.h> #include <wrapper/rcu.h> @@ -1365,7 +1365,7 @@ static __used struct lttng_probe_desc TP #ifndef TP_MODULE_NOINIT static int TP_ID(__lttng_events_init__, TRACE_SYSTEM)(void) { - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return lttng_probe_register(&TP_ID(__probe_desc___, TRACE_SYSTEM)); } --- a/probes/lttng.c +++ b/probes/lttng.c @@ -109,7 +109,7 @@ int __init lttng_logger_init(void) { int ret = 0; - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); lttng_logger_dentry = proc_create_data(LTTNG_LOGGER_FILE, S_IRUGO | S_IWUGO, NULL, <tng_logger_operations, NULL); --- a/tests/probes/lttng-test.c +++ b/tests/probes/lttng-test.c @@ -100,7 +100,7 @@ int __init lttng_test_init(void) int ret = 0; (void) wrapper_lttng_fixup_sig(THIS_MODULE); - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); lttng_test_filter_event_dentry = proc_create_data(LTTNG_TEST_FILTER_EVENT_FILE, S_IRUGO | S_IWUGO, NULL, --- a/wrapper/vmalloc.h +++ b/wrapper/vmalloc.h @@ -34,8 +34,35 @@ #include <linux/kallsyms.h> #include <wrapper/kallsyms.h> +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) + static inline -void wrapper_vmalloc_sync_all(void) +void wrapper_vmalloc_sync_mappings(void) +{ + void (*vmalloc_sync_mappings_sym)(void); + + vmalloc_sync_mappings_sym = (void *) kallsyms_lookup_funcptr("vmalloc_sync_mappings"); + if (vmalloc_sync_mappings_sym) { + vmalloc_sync_mappings_sym(); + } else { +#ifdef CONFIG_X86 + /* + * Only x86 needs vmalloc_sync_mappings to make sure LTTng does not + * trigger recursive page faults. + */ + printk_once(KERN_WARNING "LTTng: vmalloc_sync_mappings symbol lookup failed.\n"); + printk_once(KERN_WARNING "Page fault handler and NMI tracing might trigger faults.\n"); +#endif + } +} + +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */ + +/* + * Map vmalloc_sync_mappings to vmalloc_sync_all() on kernels before 5.7. + */ +static inline +void wrapper_vmalloc_sync_mappings(void) { void (*vmalloc_sync_all_sym)(void); @@ -53,13 +80,29 @@ void wrapper_vmalloc_sync_all(void) #endif } } + +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */ + #else +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) + +static inline +void wrapper_vmalloc_sync_mappings(void) +{ + return vmalloc_sync_mappings(); +} + +#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */ + static inline -void wrapper_vmalloc_sync_all(void) +void wrapper_vmalloc_sync_mappings(void) { return vmalloc_sync_all(); } + +#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) */ + #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) @@ -74,7 +117,7 @@ void *lttng_kvmalloc_node(unsigned long * Make sure we don't trigger recursive page faults in the * tracing fast path. */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); } return ret; } --- a/probes/lttng-ftrace.c +++ b/probes/lttng-ftrace.c @@ -36,7 +36,7 @@ #include <lttng-events.h> #include <wrapper/ringbuffer/frontend_types.h> #include <wrapper/ftrace.h> -#include <wrapper/vmalloc.h> +#include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_mappings() */ #include <lttng-tracer.h> #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)) @@ -190,7 +190,7 @@ int lttng_ftrace_register(const char *na goto name_error; /* Ensure the memory we just allocated don't trigger page faults */ - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); ret = wrapper_register_ftrace_function_probe(event->u.ftrace.symbol_name, <tng_ftrace_ops, event); @@ -226,7 +226,7 @@ EXPORT_SYMBOL_GPL(lttng_ftrace_destroy_p int lttng_ftrace_init(void) { - wrapper_vmalloc_sync_all(); + wrapper_vmalloc_sync_mappings(); return 0; } module_init(lttng_ftrace_init)
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
