Drop compat patches for kernels < 2.6.36
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
RFC PATCH v2 2/30 Drop compat patches for kernels < 2.6.36
--- .../backport-kallsym-sym-2.6.32.patch | 37 -- .../backport-splice-sym-2.6.32-34.patch | 71 --- .../backport-tp-2.6.34-tracepoint-data.patch | 559 ------------------ .../backport-tracepoint-data-2.6.32-33.patch | 555 ----------------- 4 files changed, 1222 deletions(-) delete mode 100644 linux-patches/backport-kallsym-sym-2.6.32.patch delete mode 100644 linux-patches/backport-splice-sym-2.6.32-34.patch delete mode 100644 linux-patches/backport-tp-2.6.34-tracepoint-data.patch delete mode 100644 linux-patches/backport-tracepoint-data-2.6.32-33.patch
linux-patches/backport-kallsym-sym-2.6.32.patch deleted +0 -37
@@ -1,37 +0,0 @@ -commit e6b48d720e39d17f06a4462be4164e1a358817de -Author: Mathieu Desnoyers <[email protected]> -Date: Sat Sep 1 17:51:33 2012 -0700 - - kallsyms: Re-enable export of kallsyms_lookup (backport) - - Backport of part of commit: - - commit f60d24d2ad04977b0bd9e3eb35dba2d2fa569af9 - Author: Frederic Weisbecker <[email protected]> - Date: Tue Nov 10 10:17:07 2009 +0100 - - hw-breakpoints: Fix broken hw-breakpoint sample module - - The hw-breakpoint sample module has been broken during the - hw-breakpoint internals refactoring. Propagate the changes - to it. - - Reported-by: "K. Prasad" <[email protected]> - Signed-off-by: Frederic Weisbecker <[email protected]> - - for kernel 2.6.32.x. (just the symbol export) - - Signed-off-by: Mathieu Desnoyers <[email protected]> - -diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c -index 8b6b8b6..8e5288a 100644 ---- a/kernel/kallsyms.c -+++ b/kernel/kallsyms.c -@@ -181,6 +181,7 @@ unsigned long kallsyms_lookup_name(const char *name) - } - return module_kallsyms_lookup_name(name); - } -+EXPORT_SYMBOL_GPL(kallsyms_lookup_name); - - int kallsyms_on_each_symbol(int (*fn)(void *, const char *, struct module *, - unsigned long),
linux-patches/backport-splice-sym-2.6.32-34.patch deleted +0 -71
71 lines not on this page · raw message
linux-patches/backport-tp-2.6.34-tracepoint-data.patch deleted +0 -559
559 lines not on this page · raw message
linux-patches/backport-tracepoint-data-2.6.32-33.patch deleted +0 -555
555 lines not on this page · raw message
Signature · 1 line
2.17.1
RFC PATCH v2 3/30 Drop support for kernels < 3.0 from atomic.h wrapper
In reply to a message not in the archive--- wrapper/atomic.h | 4 ---- 1 file changed, 4 deletions(-)
wrapper/atomic.h +0 -4
@@ -11,11 +11,7 @@#define _LTTNG_WRAPPER_ATOMIC_H#include <linux/version.h> -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 ))#include <linux/atomic.h> -#else -#include <asm/atomic.h> -#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,16 ,0 ))static inline void lttng_smp_mb__before_atomic (void )
Signature · 1 line
2.17.1
RFC PATCH v2 4/30 Drop support for kernels < 3.0 from perf.h wrapper
In reply to a message not in the archive--- wrapper/perf.h | 25 ------------------------- 1 file changed, 25 deletions(-)
wrapper/perf.h +0 -25
@@ -22,8 +22,6 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr,return perf_event_create_kernel_counter (attr, cpu, task, callback,NULL ); }#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */ - -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 ))static inline struct perf_event * wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu,
@@ -32,29 +30,6 @@ wrapper_perf_event_create_kernel_counter(struct perf_event_attr *attr, {return perf_event_create_kernel_counter (attr, cpu, task, callback); } -#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ -static inline struct perf_event * -wrapper_perf_event_create_kernel_counter (struct perf_event_attr *attr, -int cpu, -struct task_struct *task, -perf_overflow_handler_t callback) -{ -pid_t pid; - -if (!task) - pid =-1 ; -else - pid = task->pid; - -return perf_event_create_kernel_counter (attr, cpu, pid, callback); -} - -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ - -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,36 )) -#define local64_read (l) atomic64_read(l) -#endif -#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) */ #endif /* CONFIG_PERF_EVENTS */
Signature · 1 line
2.17.1
RFC PATCH v2 5/30 Drop support for kernels < 3.0 from tracepoint.h wrapper
In reply to a message not in the archive--- wrapper/tracepoint.h | 6 ------ 1 file changed, 6 deletions(-)
wrapper/tracepoint.h +0 -6
@@ -14,12 +14,6 @@#include <linux/tracepoint.h> #include <linux/module.h> -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,35 )) - -#define DECLARE_EVENT_CLASS (name, proto, args, tstruct, assign, print) - -#endif -#ifndef HAVE_KABI_2635_TRACEPOINT #define kabi_2635_tracepoint_probe_register tracepoint_probe_register
Signature · 1 line
2.17.1
RFC PATCH v2 6/30 Drop vzalloc.h wrapper
In reply to a message not in the archive--- lttng-events.c | 5 ++--- wrapper/vzalloc.h | 34 ---------------------------------- 2 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 wrapper/vzalloc.h
lttng-events.c +2 -3
@@ -40,7 +40,6 @@#include <lttng-abi-old.h> #include <lttng-endian.h> #include <lttng-string-utils.h> -#include <wrapper/vzalloc.h> #include <wrapper/ringbuffer/backend.h> #include <wrapper/ringbuffer/frontend.h>
@@ -130,7 +129,7 @@ struct lttng_session *lttng_session_create(void) GFP_KERNEL);if (!metadata_cache) goto err_free_session; - metadata_cache->data =lttng_vzalloc (METADATA_CACHE_DEFAULT_SIZE ); + metadata_cache->data =vzalloc (METADATA_CACHE_DEFAULT_SIZE );if (!metadata_cache->data) goto err_free_cache; metadata_cache->cache_alloc =METADATA_CACHE_DEFAULT_SIZE ;
@@ -1692,7 +1691,7 @@ int lttng_metadata_printf(struct lttng_session *session, tmp_cache_alloc_size = max_t(unsigned int, session->metadata_cache->cache_alloc + len, session->metadata_cache->cache_alloc <<1 ); - tmp_cache_realloc =lttng_vzalloc (tmp_cache_alloc_size); + tmp_cache_realloc =vzalloc (tmp_cache_alloc_size);if (!tmp_cache_realloc) goto err;if (session->metadata_cache->data) {
wrapper/vzalloc.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) -* -* wrapper/vzalloc.h -* -* Copyright (C) 2015 Michael Jeanson <[email protected]> -*/ - -#ifndef _LTTNG_WRAPPER_VZALLOC_H -#define _LTTNG_WRAPPER_VZALLOC_H - -#include <linux/version.h> -#include <linux/vmalloc.h> - -#if LTTNG_KERNEL_RANGE (2 ,6 ,36 ,2 ,6 ,37 ) -static inline -void *lttng_vzalloc (unsigned long size) -{ -void *ret; - ret =vmalloc (size); -if (!ret) -return NULL ; -memset (ret,0 , size); -return ret; -} -#else -static inline -void *lttng_vzalloc (unsigned long size) -{ -return vzalloc (size); -} -#endif - - -#endif /* _LTTNG_WRAPPER_VZALLOC_H */
Signature · 1 line
2.17.1
RFC PATCH v2 7/30 Drop uuid.h wrapper
In reply to a message not in the archive--- lttng-events.c | 2 +- lttng-events.h | 2 +- wrapper/uuid.h | 30 ------------------------------ 3 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 wrapper/uuid.h
lttng-events.c +1 -1
@@ -27,8 +27,8 @@#include <linux/jhash.h> #include <linux/uaccess.h> #include <linux/vmalloc.h> +#include <linux/uuid.h> -#include <wrapper/uuid.h> #include <wrapper/vmalloc.h> /* for wrapper_vmalloc_sync_all() */ #include <wrapper/random.h> #include <wrapper/tracepoint.h>
lttng-events.h +1 -1
@@ -15,7 +15,7 @@#include <linux/kprobes.h> #include <linux/kref.h> #include <lttng-cpuhotplug.h> -#include <wrapper/uuid.h> +#include <linux/uuid.h> #include <wrapper/uprobes.h> #include <lttng-tracer.h> #include <lttng-abi.h>
wrapper/uuid.h deleted +0 -30
@@ -1,30 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) -* -* wrapper/uuid.h -* -* Copyright (C) 2011-2012 Mathieu Desnoyers <[email protected]> -*/ - -#ifndef _LTTNG_WRAPPER_UUID_H -#define _LTTNG_WRAPPER_UUID_H - -#include <linux/version.h> - -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,35 )) -#include <linux/uuid.h> -#else - -#include <linux/random.h> - -typedef struct { -__u8 b[16 ]; -}uuid_le ; - -static inline -void uuid_le_gen (uuid_le *u) -{ -generate_random_uuid (u->b); -} - -#endif -#endif /* _LTTNG_WRAPPER_UUID_H */
Signature · 1 line
2.17.1
RFC PATCH v2 8/30 Drop kstrtox.h wrapper
In reply to a message not in the archive--- tests/probes/lttng-test.c | 3 +-- wrapper/kstrtox.h | 47 --------------------------------------- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 wrapper/kstrtox.h
tests/probes/lttng-test.c +1 -2
@@ -16,7 +16,6 @@#include <lttng-events.h> #include <lttng-tracer.h> #include <wrapper/tracepoint.h> -#include <wrapper/kstrtox.h> #define TP_MODULE_NOAUTOLOAD #define LTTNG_PACKAGE_BUILD
@@ -69,7 +68,7 @@ ssize_t lttng_test_filter_event_write(struct file *file, const char __user *userint ret;/* Get the number of iterations */ - ret =lttng_kstrtouint_from_user (user_buf, count,10 , &nr_iter); + ret =kstrtouint_from_user (user_buf, count,10 , &nr_iter);if (ret) { written = ret; goto end;
wrapper/kstrtox.h deleted +0 -47
47 lines not on this page · raw message
Signature · 1 line
2.17.1
RFC PATCH v2 9/30 Drop spinlock.h wrapper
In reply to a message not in the archive--- lib/ringbuffer/frontend_types.h | 1 - lttng-statedump-impl.c | 5 ++--- wrapper/spinlock.h | 34 --------------------------------- 3 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 wrapper/spinlock.h
lib/ringbuffer/frontend_types.h +0 -1
@@ -15,7 +15,6 @@#include <linux/kref.h> #include <wrapper/ringbuffer/config.h> #include <wrapper/ringbuffer/backend_types.h> -#include <wrapper/spinlock.h> #include <lib/prio_heap/lttng_prio_heap.h> /* For per-CPU read-side iterator */ #include <lttng-cpuhotplug.h>
lttng-statedump-impl.c +2 -3
@@ -37,7 +37,6 @@#include <lttng-events.h> #include <lttng-tracer.h> #include <wrapper/irqdesc.h> -#include <wrapper/spinlock.h> #include <wrapper/fdtable.h> #include <wrapper/irq.h> #include <wrapper/tracepoint.h>
@@ -373,12 +372,12 @@ int lttng_list_interrupts(struct lttng_session *session)irq_desc_get_chip (desc)->name ? :"unnamed_irq_chip" ;local_irq_save (flags); -wrapper_desc_spin_lock (&desc->lock); +raw_spin_lock (&desc->lock);for (action = desc->action; action; action = action->next) {trace_lttng_statedump_interrupt (session, irq, irq_chip_name, action); } -wrapper_desc_spin_unlock (&desc->lock); +raw_spin_unlock (&desc->lock);local_irq_restore (flags); }return 0 ;
wrapper/spinlock.h deleted +0 -34
@@ -1,34 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0 or LGPL-2.1) -* -* wrapper/spinlock.h -* -* Copyright (C) 2011-2012 Mathieu Desnoyers <[email protected]> -*/ - -#ifndef _LTTNG_WRAPPER_SPINLOCK_H -#define _LTTNG_WRAPPER_SPINLOCK_H - -#include <linux/version.h> - -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,33 )) - -#include <linux/string.h> - -#define raw_spin_lock_init (lock) \ - do { \ - raw_spinlock_t __lock = __RAW_SPIN_LOCK_UNLOCKED; \ - memcpy(lock, &__lock, sizeof(lock)); \ - } while (0) - -#define raw_spin_is_locked (lock) __raw_spin_is_locked(lock) - -#define wrapper_desc_spin_lock (lock) spin_lock(lock) -#define wrapper_desc_spin_unlock (lock) spin_unlock(lock) - -#else - -#define wrapper_desc_spin_lock (lock) raw_spin_lock(lock) -#define wrapper_desc_spin_unlock (lock) raw_spin_unlock(lock) - -#endif -#endif /* _LTTNG_WRAPPER_SPINLOCK_H */
Signature · 1 line
2.17.1
RFC PATCH v2 10/30 Drop support for kernels < 3.0 from lib
In reply to a message not in the archive--- lib/bug.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
lib/bug.h +1 -9
@@ -8,14 +8,6 @@#ifndef _LTTNG_BUG_H#define _LTTNG_BUG_H -#include <linux/version.h> - -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,38 )) -#define LTTNG_BUILD_BUG_ON (cond) BUILD_BUG_ON(cond) -#else -#define LTTNG_BUILD_BUG_ON (cond) MAYBE_BUILD_BUG_ON(cond) -#endif -/** * BUILD_RUNTIME_BUG_ON - check condition at build (if constant) or runtime * @condition: the condition which should be false.
@@ -28,7 +20,7 @@#define BUILD_RUNTIME_BUG_ON (condition) \ do { \ if (__builtin_constant_p(condition)) \ - LTTNG_BUILD_BUG_ON(condition); \ + BUILD_BUG_ON(condition); \ else \ BUG_ON(condition); \ } while (0)
Signature · 1 line
2.17.1
RFC PATCH v2 11/30 Drop support for kernels < 3.0 from lttng-events.h
In reply to a message not in the archive--- lttng-events.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
lttng-events.h +1 -3
@@ -716,7 +716,7 @@ int lttng_add_migratable_to_ctx(struct lttng_ctx **ctx)int lttng_add_callstack_to_ctx (struct lttng_ctx **ctx,int type); -#if defined(CONFIG_PERF_EVENTS ) && (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,33 )) +#if defined(CONFIG_PERF_EVENTS ) int lttng_add_perf_counter_to_ctx(uint32_t type, uint64_t config, const char *name,
@@ -891,8 +891,6 @@ int lttng_calibrate(struct lttng_kernel_calibrate *calibrate);extern const struct file_operations lttng_tracepoint_list_fops;extern const struct file_operations lttng_syscall_list_fops; -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,35 ))#define TRACEPOINT_HAS_DATA_ARG -#endif #endif /* _LTTNG_EVENTS_H */
Signature · 1 line
2.17.1
RFC PATCH v2 12/30 Drop support for kernels < 3.0 from lttng-kernel-version.h
In reply to a message not in the archive--- lttng-kernel-version.h | 5 ----- 1 file changed, 5 deletions(-)
lttng-kernel-version.h +0 -5
@@ -11,12 +11,7 @@#define _LTTNG_KERNEL_VERSION_H#include <linux/version.h> - -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,33 ))#include <generated/utsrelease.h> -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) */ -#include <linux/utsrelease.h> -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) */ /* * This macro checks if the kernel version is between the two specified
Signature · 1 line
2.17.1
RFC PATCH v2 13/30 Drop support for kernels < 3.0 from lttng-statedump-impl.c
In reply to a message not in the archive--- lttng-statedump-impl.c | 4 ---- 1 file changed, 4 deletions(-)
lttng-statedump-impl.c +0 -4
@@ -353,10 +353,6 @@ int lttng_enumerate_vm_maps(struct lttng_session *session)#ifdef CONFIG_LTTNG_HAS_LIST_IRQ -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,39 )) -#define irq_desc_get_chip (desc) get_irq_desc_chip(desc) -#endif -static int lttng_list_interrupts (struct lttng_session *session) {
Signature · 1 line
2.17.1
RFC PATCH v2 14/30 Drop support for kernels < 3.0 from block instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/block.h | 89 +-------------------- 1 file changed, 1 insertion(+), 88 deletions(-)
instrumentation/events/lttng-module/block.h +1 -88
@@ -81,24 +81,7 @@ enum { | ((rw) & REQ_FLUSH ? RWBS_FLAG_FLUSH : 0) \ | ((rw) & REQ_FUA ? RWBS_FLAG_FUA : 0)) -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) - -#define lttng_req_op (rq) -#define lttng_req_rw (rq) ((rq)->cmd_flags) -#define lttng_bio_op (bio) -#define lttng_bio_rw (bio) ((bio)->bi_rw) - -#define blk_rwbs_ctf_integer (type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ - ( (rw) & REQ_DISCARD ? RWBS_FLAG_DISCARD : \ - ( (bytes) ? RWBS_FLAG_READ : \ - ( 0 )))) \ - | ((rw) & REQ_RAHEAD ? RWBS_FLAG_RAHEAD : 0) \ - | ((rw) & REQ_SYNC ? RWBS_FLAG_SYNC : 0) \ - | ((rw) & REQ_META ? RWBS_FLAG_META : 0) \ - | ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0)) - -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,36 )) +#else #define lttng_req_op (rq)#define lttng_req_rw (rq) ((rq)->cmd_flags)
@@ -111,28 +94,10 @@ enum { ( (bytes) ?RWBS_FLAG_READ : \ ( 0 )))) \ | ((rw) &REQ_RAHEAD ?RWBS_FLAG_RAHEAD :0 ) \ - | ((rw) & REQ_HARDBARRIER ? RWBS_FLAG_BARRIER : 0) \ | ((rw) &REQ_SYNC ?RWBS_FLAG_SYNC :0 ) \ | ((rw) &REQ_META ?RWBS_FLAG_META :0 ) \ | ((rw) & REQ_SECURE ? RWBS_FLAG_SECURE : 0)) -#else - -#define lttng_req_op (rq) -#define lttng_req_rw (rq) ((rq)->cmd_flags) -#define lttng_bio_op (bio) -#define lttng_bio_rw (bio) ((bio)->bi_rw) - -#define blk_rwbs_ctf_integer (type, rwbs, op, rw, bytes) \ - ctf_integer(type, rwbs, ((rw) & WRITE ? RWBS_FLAG_WRITE : \ - ( (rw) & (1 << BIO_RW_DISCARD) ? RWBS_FLAG_DISCARD : \ - ( (bytes) ? RWBS_FLAG_READ : \ - ( 0 )))) \ - | ((rw) & (1 << BIO_RW_AHEAD) ? RWBS_FLAG_RAHEAD : 0) \ - | ((rw) & (1 << BIO_RW_SYNCIO) ? RWBS_FLAG_SYNC : 0) \ - | ((rw) & (1 << BIO_RW_META) ? RWBS_FLAG_META : 0) \ - | ((rw) & (1 << BIO_RW_BARRIER) ? RWBS_FLAG_BARRIER : 0)) - #endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,9,0))
@@ -653,15 +618,9 @@ LTTNG_TRACEPOINT_EVENT(block_bio_bounce,*/ LTTNG_TRACEPOINT_EVENT(block_bio_complete, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) TP_PROTO(struct request_queue *q, struct bio *bio, int error), TP_ARGS(q, bio, error), -#else - TP_PROTO(struct request_queue *q, struct bio *bio), - - TP_ARGS(q, bio), -#endif TP_FIELDS( #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,14,0))
@@ -679,11 +638,7 @@ LTTNG_TRACEPOINT_EVENT(block_bio_complete,#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */ ctf_integer(sector_t, sector, bio->bi_sector) ctf_integer(unsigned int, nr_sector, bio->bi_size >> 9) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,38 )) ctf_integer(int, error, error) -#else - ctf_integer(int, error, 0) -#endif blk_rwbs_ctf_integer(unsigned int, rwbs, lttng_bio_op(bio), lttng_bio_rw(bio), bio->bi_size)#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,14,0)) */
@@ -938,43 +893,17 @@ LTTNG_TRACEPOINT_EVENT(block_plug,LTTNG_TRACEPOINT_EVENT_CLASS (block_unplug, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit),TP_ARGS (q, depth, explicit), -#else - TP_PROTO(struct request_queue *q), - -TP_ARGS (q), -#endifTP_FIELDS ( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) ctf_integer(int, nr_rq, depth) -#else - ctf_integer(int, nr_rq, q->rq.count[READ] + q->rq.count[WRITE]) -#endif ctf_integer(pid_t, tid, current->pid)ctf_array_text (char, comm, current->comm,TASK_COMM_LEN ) ) ) -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,39 )) -/** -* block_unplug_timer - timed release of operations requests in queue to device driver -* @q: request queue to unplug -* -* Unplug the request queue @q because a timer expired and allow block -* operation requests to be sent to the device driver. -*/ -LTTNG_TRACEPOINT_EVENT_INSTANCE (block_unplug, block_unplug_timer, - - TP_PROTO(struct request_queue *q), - -TP_ARGS (q) -) -#endif -/** * block_unplug - release of operations requests in request queue * @q: request queue to unplug
@@ -984,21 +913,11 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(block_unplug, block_unplug_timer,* Unplug request queue @q because device driver is scheduled to work * on elements in the request queue. */ -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 ))LTTNG_TRACEPOINT_EVENT_INSTANCE (block_unplug, block_unplug, -#else -LTTNG_TRACEPOINT_EVENT_INSTANCE (block_unplug, block_unplug_io, -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) TP_PROTO(struct request_queue *q, unsigned int depth, bool explicit),TP_ARGS (q, depth, explicit) -#else - TP_PROTO(struct request_queue *q), - -TP_ARGS (q) -#endif )/**
@@ -1051,11 +970,7 @@ LTTNG_TRACEPOINT_EVENT(block_split,* An operation for a logical device has been mapped to the * raw block device. */ -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,38 )) LTTNG_TRACEPOINT_EVENT(block_bio_remap, -#else -LTTNG_TRACEPOINT_EVENT(block_remap, -#endif TP_PROTO(struct request_queue *q, struct bio *bio, dev_t dev, sector_t from),
@@ -1085,7 +1000,6 @@ LTTNG_TRACEPOINT_EVENT(block_remap, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,32 ))/** * block_rq_remap - map request for a block operation request * @q: queue holding the operation
@@ -1114,7 +1028,6 @@ LTTNG_TRACEPOINT_EVENT(block_rq_remap, lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) ) ) -#endif #undef __print_rwbs_flags#undef blk_fill_rwbs
Signature · 1 line
2.17.1
RFC PATCH v2 15/30 Drop support for kernels < 3.0 from ext4 instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/ext4.h | 179 ++------------------- 1 file changed, 15 insertions(+), 164 deletions(-)
instrumentation/events/lttng-module/ext4.h +15 -164
@@ -74,7 +74,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_allocate_inode, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) LTTNG_TRACEPOINT_EVENT(ext4_evict_inode, TP_PROTO(struct inode *inode),
@@ -122,7 +121,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate, ctf_integer(loff_t, new_size, new_size) ) ) -#endif LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin,
@@ -203,20 +201,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_end, ext4_da_write_end, TP_ARGS(inode, pos, len, copied) ) -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,40 )) -LTTNG_TRACEPOINT_EVENT (ext4_writepage, - TP_PROTO(struct inode *inode, struct page *page), - -TP_ARGS (inode, page), - -TP_FIELDS ( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) -ctf_integer (pgoff_t, index, page->index) - ) -) -#endif - LTTNG_TRACEPOINT_EVENT(ext4_da_writepages, TP_PROTO(struct inode *inode, struct writeback_control *wbc),
@@ -230,16 +214,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_writepages, ctf_integer(loff_t, range_start, wbc->range_start) ctf_integer(loff_t, range_end, wbc->range_end) ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) ctf_integer(int, sync_mode, wbc->sync_mode) -#endif -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,37 )) - ctf_integer(char, nonblocking, wbc->nonblocking) -#endif ctf_integer(char, for_kupdate, wbc->for_kupdate) -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,39 )) - ctf_integer(char, for_reclaim, wbc->for_reclaim) -#endif ctf_integer (char, range_cyclic, wbc->range_cyclic) ) )
@@ -277,9 +253,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages, ctf_integer(unsigned long, first_page, mpd->first_page) ctf_integer(int, io_done, mpd->io_done) ctf_integer(int, pages_written, mpd->pages_written) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 ))ctf_integer (int, sync_mode, mpd->wbc->sync_mode) -#endif ) )
@@ -316,22 +290,10 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_writepages_result, ctf_integer(int, pages_written, pages_written) ctf_integer(long, pages_skipped, wbc->pages_skipped) ctf_integer(pgoff_t, writeback_index, inode->i_mapping->writeback_index) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) ctf_integer(int, sync_mode, wbc->sync_mode) -#endif -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,33 )) - ctf_integer(char, encountered_congestion, wbc->encountered_congestion) -#endif -#if (LINUX_VERSION_CODE <KERNEL_VERSION (3 ,1 ,0 )) - ctf_integer(char, more_io, wbc->more_io) -#endif -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,35 )) - ctf_integer(char, no_nrwrite_index_update, wbc->no_nrwrite_index_update) -#endif ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) LTTNG_TRACEPOINT_EVENT_CLASS(ext4__page_op, TP_PROTO(struct page *page),
@@ -344,14 +306,12 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4__page_op, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,40 )) LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_writepage, TP_PROTO(struct page *page), TP_ARGS(page) ) -#endif LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_readpage,
@@ -413,8 +373,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_invalidatepage,#endif -#endif - LTTNG_TRACEPOINT_EVENT(ext4_discard_blocks, TP_PROTO(struct super_block *sb, unsigned long long blk, unsigned long long count),
@@ -461,91 +419,46 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mb_new_pa, ext4_mb_new_group_pa,LTTNG_TRACEPOINT_EVENT (ext4_mb_release_inode_pa,TP_PROTO ( -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,40)) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - struct super_block *sb, - struct inode *inode, -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - struct super_block *sb, - struct ext4_allocation_context *ac, -#else - struct ext4_allocation_context *ac, -#endif -#endif struct ext4_prealloc_space *pa, unsigned long long block, unsigned int count), -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40))TP_ARGS (pa, block, count), -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) -TP_ARGS (sb, inode, pa, block, count), -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) -TP_ARGS (sb, ac, pa, block, count), -#else -TP_ARGS (ac, pa, block, count), -#endifTP_FIELDS ( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev) ctf_integer(ino_t, ino, pa->pa_inode->i_ino) -#else -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - ctf_integer(dev_t, dev, sb->s_dev) -#else - ctf_integer(dev_t, dev, ac->ac_sb->s_dev) -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) - ctf_integer(ino_t, ino, inode->i_ino) -#else - ctf_integer(ino_t, ino, - (ac && ac->ac_inode) ? ac->ac_inode->i_ino : 0) -#endif -#endif ctf_integer(__u64, block, block)ctf_integer (__u32, count, count) ) ) +#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,3 ,0 ))LTTNG_TRACEPOINT_EVENT (ext4_mb_release_group_pa, -#if (LTTNG_KERNEL_RANGE(2,6,40, 3,3,0)) - TP_PROTO(struct ext4_prealloc_space *pa), - -TP_ARGS (pa), -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) TP_PROTO(struct super_block *sb, struct ext4_prealloc_space *pa),TP_ARGS (sb, pa), -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - TP_PROTO(struct super_block *sb, - struct ext4_allocation_context *ac, - struct ext4_prealloc_space *pa), -TP_ARGS (sb, ac, pa), +TP_FIELDS ( + ctf_integer(dev_t, dev, sb->s_dev) + ctf_integer(__u64, pa_pstart, pa->pa_pstart) +ctf_integer (__u32, pa_len, pa->pa_len) + ) +)#else - TP_PROTO(struct ext4_allocation_context *ac, - struct ext4_prealloc_space *pa), +LTTNG_TRACEPOINT_EVENT (ext4_mb_release_group_pa, -TP_ARGS (ac, pa), -#endif + TP_PROTO(struct ext4_prealloc_space *pa), + +TP_ARGS (pa),TP_FIELDS ( -#if (LTTNG_KERNEL_RANGE(2,6,40, 3,3,0)) ctf_integer(dev_t, dev, pa->pa_inode->i_sb->s_dev) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) - ctf_integer(dev_t, dev, sb->s_dev) -#else - ctf_integer(dev_t, dev, ac->ac_sb->s_dev) -#endif -#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,37)) - ctf_integer(ino_t, ino, - (ac && ac->ac_inode) ? ac->ac_inode->i_ino : 0) -#endif ctf_integer(__u64, pa_pstart, pa->pa_pstart)ctf_integer (__u32, pa_len, pa->pa_len) ) ) +#endif LTTNG_TRACEPOINT_EVENT(ext4_discard_preallocations, TP_PROTO(struct inode *inode),
@@ -609,62 +522,34 @@ LTTNG_TRACEPOINT_EVENT(ext4_allocate_blocks, )LTTNG_TRACEPOINT_EVENT (ext4_free_blocks, -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,33 )) TP_PROTO(struct inode *inode, __u64 block, unsigned long count, int flags),TP_ARGS (inode, block, count, flags), -#else - TP_PROTO(struct inode *inode, __u64 block, unsigned long count, - int metadata), - - TP_ARGS(inode, block, count, metadata), -#endifTP_FIELDS ( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) ctf_integer(__u64, block, block) ctf_integer(unsigned long, count, count) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) ctf_integer(int, flags, flags)ctf_integer (TP_MODE_T , mode, inode->i_mode) -#else - ctf_integer(int, metadata, metadata) -#endif ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39))LTTNG_TRACEPOINT_EVENT (ext4_sync_file_enter, -#else -LTTNG_TRACEPOINT_EVENT(ext4_sync_file, -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) TP_PROTO(struct file *file, int datasync),TP_ARGS (file, datasync), -#else - TP_PROTO(struct file *file, struct dentry *dentry, int datasync), - - TP_ARGS(file, dentry, datasync), -#endifTP_FIELDS ( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) ctf_integer(dev_t, dev, file->f_path.dentry->d_inode->i_sb->s_dev) ctf_integer(ino_t, ino, file->f_path.dentry->d_inode->i_ino) ctf_integer(ino_t, parent, file->f_path.dentry->d_parent->d_inode->i_ino) -#else - ctf_integer(dev_t, dev, dentry->d_inode->i_sb->s_dev) - ctf_integer(ino_t, ino, dentry->d_inode->i_ino) - ctf_integer(ino_t, parent, dentry->d_parent->d_inode->i_ino) -#endifctf_integer (int, datasync, datasync) ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,39)) LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit, TP_PROTO(struct inode *inode, int ret),
@@ -676,7 +561,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_sync_file_exit, ctf_integer(int, ret, ret) ) ) -#endif LTTNG_TRACEPOINT_EVENT(ext4_sync_fs, TP_PROTO(struct super_block *sb, int wait),
@@ -766,7 +650,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_mballoc_prealloc, ) LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc, -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) TP_PROTO(struct super_block *sb, struct inode *inode, ext4_group_t group,
@@ -774,33 +657,18 @@ LTTNG_TRACEPOINT_EVENT_CLASS(ext4__mballoc, ext4_grpblk_t len), TP_ARGS(sb, inode, group, start, len), -#else - TP_PROTO(struct ext4_allocation_context *ac), - - TP_ARGS(ac), -#endif TP_FIELDS( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) ctf_integer(dev_t, dev, sb->s_dev) ctf_integer(ino_t, ino, inode ? inode->i_ino : 0) ctf_integer(int, result_start, start) ctf_integer(__u32, result_group, group) ctf_integer(int, result_len, len) -#else - ctf_integer(dev_t, dev, ac->ac_sb->s_dev) - ctf_integer(ino_t, ino, ac->ac_inode ? ac->ac_inode->i_ino : 0) - ctf_integer(__u32, result_logical, ac->ac_b_ex.fe_logical) - ctf_integer(int, result_start, ac->ac_b_ex.fe_start) - ctf_integer(__u32, result_group, ac->ac_b_ex.fe_group) - ctf_integer(int, result_len, ac->ac_b_ex.fe_len) -#endif ) ) LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) TP_PROTO(struct super_block *sb, struct inode *inode, ext4_group_t group,
@@ -808,16 +676,10 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_discard, ext4_grpblk_t len), TP_ARGS(sb, inode, group, start, len) -#else - TP_PROTO(struct ext4_allocation_context *ac), - - TP_ARGS(ac) -#endif ) LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) TP_PROTO(struct super_block *sb, struct inode *inode, ext4_group_t group,
@@ -825,14 +687,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__mballoc, ext4_mballoc_free, ext4_grpblk_t len), TP_ARGS(sb, inode, group, start, len) -#else - TP_PROTO(struct ext4_allocation_context *ac), - - TP_ARGS(ac) -#endif ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)) LTTNG_TRACEPOINT_EVENT(ext4_forget, TP_PROTO(struct inode *inode, int is_metadata, __u64 block),
@@ -846,7 +702,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_forget, ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,13 ,0 )) LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space,
@@ -886,7 +741,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 )) +#else LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, TP_PROTO(struct inode *inode, int used_blocks),
@@ -940,7 +795,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 )) +#else LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, TP_PROTO(struct inode *inode, int md_needed),
@@ -976,7 +831,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 )) +#else LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, TP_PROTO(struct inode *inode, int freed_blocks),
@@ -998,7 +853,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, )#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,35 )) LTTNG_TRACEPOINT_EVENT_CLASS(ext4__bitmap_load, TP_PROTO(struct super_block *sb, unsigned long group),
@@ -1023,9 +877,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_mb_buddy_bitmap_load, TP_ARGS(sb, group) ) -#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__bitmap_load, ext4_read_block_bitmap_load, TP_PROTO(struct super_block *sb, unsigned long group),
@@ -1402,7 +1254,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_load_inode,ctf_integer (ino_t, ino, inode->i_ino) ) ) -#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0))
Signature · 1 line
2.17.1
RFC PATCH v2 16/30 Drop support for kernels < 3.0 from irq instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/irq.h | 64 ----------------------- 1 file changed, 64 deletions(-)
instrumentation/events/lttng-module/irq.h +0 -64
@@ -61,7 +61,6 @@ LTTNG_TRACEPOINT_EVENT(irq_handler_exit, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) LTTNG_TRACEPOINT_EVENT_CLASS(irq_softirq, TP_PROTO(unsigned int vec_nr),
@@ -120,69 +119,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(irq_softirq, softirq_raise, TP_ARGS(vec_nr) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ -LTTNG_TRACEPOINT_EVENT_CLASS (irq_softirq, - - TP_PROTO(struct softirq_action *h, struct softirq_action *vec), - -TP_ARGS (h, vec), - -TP_FIELDS ( - ctf_integer(unsigned int, vec, (int)(h - vec)) - ) -) - -/** -* softirq_entry - called immediately before the softirq handler -* @h: pointer to struct softirq_action -* @vec: pointer to first struct softirq_action in softirq_vec array -* -* When used in combination with the softirq_exit tracepoint -* we can determine the softirq handler runtine. - */ -LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP (irq_softirq, softirq_entry, - - irq_softirq_entry, - - TP_PROTO(struct softirq_action *h, struct softirq_action *vec), - -TP_ARGS (h, vec) -) - -/** -* softirq_exit - called immediately after the softirq handler returns -* @h: pointer to struct softirq_action -* @vec: pointer to first struct softirq_action in softirq_vec array -* -* When used in combination with the softirq_entry tracepoint -* we can determine the softirq handler runtine. - */ -LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP (irq_softirq, softirq_exit, - - irq_softirq_exit, - - TP_PROTO(struct softirq_action *h, struct softirq_action *vec), - -TP_ARGS (h, vec) -) - -/** -* softirq_raise - called immediately when a softirq is raised -* @h: pointer to struct softirq_action -* @vec: pointer to first struct softirq_action in softirq_vec array -* -* When used in combination with the softirq_entry tracepoint -* we can determine the softirq raise to run latency. - */ -LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP (irq_softirq, softirq_raise, - - irq_softirq_raise, - - TP_PROTO(struct softirq_action *h, struct softirq_action *vec), - -TP_ARGS (h, vec) -) -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ #endif /* LTTNG_TRACE_IRQ_H */
Signature · 1 line
2.17.1
RFC PATCH v2 17/30 Drop support for kernels < 3.0 from jbd2 instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/jbd2.h | 6 ------ 1 file changed, 6 deletions(-)
instrumentation/events/lttng-module/jbd2.h +0 -6
@@ -9,13 +9,11 @@#include <linux/jbd2.h> #include <linux/version.h> -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,32 ))#ifndef _TRACE_JBD2_DEF#define _TRACE_JBD2_DEFstruct transaction_chp_stats_s ;struct transaction_run_stats_s ;#endif -#endif LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint,
@@ -103,7 +101,6 @@ LTTNG_TRACEPOINT_EVENT(jbd2_submit_inode_data, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,32 )) LTTNG_TRACEPOINT_EVENT(jbd2_run_stats, TP_PROTO(dev_t dev, unsigned long tid, struct transaction_run_stats_s *stats),
@@ -139,9 +136,7 @@ LTTNG_TRACEPOINT_EVENT(jbd2_checkpoint_stats, ctf_integer(__u32, dropped, stats->cs_dropped) ) ) -#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 ))#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,4 ,0 )) LTTNG_TRACEPOINT_EVENT(jbd2_update_log_tail,#else
@@ -161,7 +156,6 @@ LTTNG_TRACEPOINT_EVENT(jbd2_cleanup_journal_tail, ctf_integer(unsigned long, freed, freed) ) ) -#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,4 ,0 )) LTTNG_TRACEPOINT_EVENT(jbd2_write_superblock,
Signature · 1 line
2.17.1
RFC PATCH v2 18/30 Drop support for kernels < 3.0 from kmem instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/kmem.h | 7 ------- 1 file changed, 7 deletions(-)
instrumentation/events/lttng-module/kmem.h +0 -7
@@ -115,7 +115,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(kmem_free, kmem_cache_free, TP_ARGS(call_site, ptr) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,32 ))#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,3 ,0 )) LTTNG_TRACEPOINT_EVENT_MAP(mm_page_free, kmem_mm_page_free,#else
@@ -218,11 +217,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain, kmem_mm_page_pcpu_drain, -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,33 )) TP_PROTO(struct page *page, unsigned int order, int migratetype), -#else -TP_PROTO (struct page *page,int order,int migratetype), -#endifTP_ARGS (page, order, migratetype) )
@@ -337,8 +332,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc_extfrag,#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) */ -#endif -#endif /* LTTNG_TRACE_KMEM_H */ /* This part must be outside protection */
Signature · 1 line
2.17.1
RFC PATCH v2 19/30 Drop support for kernels < 3.0 from kvm instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/kvm.h | 10 ---------- 1 file changed, 10 deletions(-)
instrumentation/events/lttng-module/kvm.h +0 -10
@@ -8,8 +8,6 @@#undef TRACE_SYSTEM#define TRACE_SYSTEM kvm -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,38 )) - LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit, TP_PROTO(__u32 reason, int errno), TP_ARGS(reason, errno),
@@ -19,7 +17,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_userspace_exit, ctf_integer(int, errno, errno) ) ) -#endif #if (LINUX_VERSION_CODE <KERNEL_VERSION (3 ,6 ,0 ))#if defined(__KVM_HAVE_IOAPIC)
@@ -142,8 +139,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_mmio,#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 )) -#define kvm_fpu_load_symbol \ {0, "unload"}, \ {1, "load"}
@@ -187,9 +182,6 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page, ) )#endif -#endif - -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,38 ))#ifdef CONFIG_KVM_ASYNC_PF LTTNG_TRACEPOINT_EVENT_CLASS(kvm_async_get_page_class,
@@ -276,8 +268,6 @@ LTTNG_TRACEPOINT_EVENT(#endif -#endif -#endif /* LTTNG_TRACE_KVM_MAIN_H */ /* This part must be outside protection */
Signature · 1 line
2.17.1
RFC PATCH v2 20/30 Drop support for kernels < 3.0 from lock instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/lock.h | 71 +--------------------- probes/lttng-probe-lock.c | 5 -- 2 files changed, 2 insertions(+), 74 deletions(-)
instrumentation/events/lttng-module/lock.h +2 -69
@@ -1,16 +1,7 @@/* SPDX-License-Identifier: GPL-2.0 */ -#include <linux/version.h> #undef TRACE_SYSTEM -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,33 ))#define TRACE_SYSTEM lock -#else -#define TRACE_SYSTEM lockdep -#define TRACE_INCLUDE_FILE lock -#if defined(_TRACE_LOCKDEP_H) -#define LTTNG_TRACE_LOCK_H -#endif -#endif #if !defined(LTTNG_TRACE_LOCK_H ) || defined(TRACE_HEADER_MULTI_READ )#define LTTNG_TRACE_LOCK_H
@@ -31,14 +22,10 @@ LTTNG_TRACEPOINT_EVENT(lock_acquire, TP_FIELDS( ctf_integer(unsigned int, flags, (trylock ? 1 : 0) | (read ? 2 : 0)) ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,34 )) ctf_integer_hex(void *, lockdep_addr, lock) -#endif ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,35 )) - LTTNG_TRACEPOINT_EVENT_CLASS(lock, TP_PROTO(struct lockdep_map *lock, unsigned long ip),
@@ -74,63 +61,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(lock, lock_acquired, TP_ARGS(lock, ip) ) -#endif - -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ - -LTTNG_TRACEPOINT_EVENT (lock_release, - - TP_PROTO(struct lockdep_map *lock, int nested, unsigned long ip), - -TP_ARGS (lock, nested, ip), - -TP_FIELDS ( - ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer_hex(void *, lockdep_addr, lock) -#endif - ) -) - -#ifdef CONFIG_LOCK_STAT - -LTTNG_TRACEPOINT_EVENT (lock_contended, - - TP_PROTO(struct lockdep_map *lock, unsigned long ip), - -TP_ARGS (lock, ip), - -TP_FIELDS ( - ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer_hex(void *, lockdep_addr, lock) -#endif - ) -) - -LTTNG_TRACEPOINT_EVENT (lock_acquired, - - TP_PROTO(struct lockdep_map *lock, unsigned long ip, s64 waittime), - -TP_ARGS (lock, ip, waittime), - -TP_FIELDS ( - ctf_string(name, lock->name) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) - ctf_integer(s64, wait_nsec, wait_nsec) - ctf_integer_hex(void *, lockdep_addr, lock) -#else - ctf_integer(unsigned long, wait_usec, (unsigned long) waittime) - ctf_integer(unsigned long, wait_nsec_rem, do_div(waittime, NSEC_PER_USEC)) -#endif - ) -) - -#endif - -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ +#endif /* CONFIG_LOCK_STAT */ -#endif +#endif /* CONFIG_LOCKDEP */ #endif /* LTTNG_TRACE_LOCK_H */
probes/lttng-probe-lock.c +0 -5
@@ -16,12 +16,7 @@* Create the tracepoint static inlines from the kernel to validate that our * trace event macros match the kernel we run on. */ -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,33 ))#include <trace/events/lock.h> -#else -#include <trace/events/lockdep.h> -#endif -#include <wrapper/tracepoint.h> /*
Signature · 1 line
2.17.1
RFC PATCH v2 21/30 Drop support for kernels < 3.0 from mm_vmscan instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/mm_vmscan.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
instrumentation/events/lttng-module/mm_vmscan.h +1 -1
@@ -640,7 +640,7 @@ LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, ctf_integer(int, reclaim_flags, trace_shrink_flags(file)) ) ) -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) +#else LTTNG_TRACEPOINT_EVENT(mm_vmscan_lru_shrink_inactive, TP_PROTO(int nid, int zid,
Signature · 1 line
2.17.1
RFC PATCH v2 22/30 Drop support for kernels < 3.0 from module instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/module.h | 22 +------------------- 1 file changed, 1 insertion(+), 21 deletions(-)
instrumentation/events/lttng-module/module.h +1 -21
@@ -54,24 +54,16 @@ LTTNG_TRACEPOINT_EVENT(module_free,LTTNG_TRACEPOINT_EVENT_CLASS (module_refcnt, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) TP_PROTO(struct module *mod, unsigned long ip),TP_ARGS (mod, ip), -#else - TP_PROTO(struct module *mod, unsigned long ip, int refcnt), - -TP_ARGS (mod, ip, refcnt), -#endifTP_FIELDS ( ctf_integer(unsigned long, ip, ip) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)) ctf_integer(int, refcnt, atomic_read(&mod->refcnt)) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) - ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs)) #else - ctf_integer(int, refcnt, refcnt) + ctf_integer(int, refcnt, __this_cpu_read(mod->refptr->incs) + __this_cpu_read(mod->refptr->decs)) #endifctf_string (name, mod->name) )
@@ -79,28 +71,16 @@ LTTNG_TRACEPOINT_EVENT_CLASS(module_refcnt,LTTNG_TRACEPOINT_EVENT_INSTANCE (module_refcnt, module_get, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) TP_PROTO(struct module *mod, unsigned long ip),TP_ARGS (mod, ip) -#else - TP_PROTO(struct module *mod, unsigned long ip, int refcnt), - -TP_ARGS (mod, ip, refcnt) -#endif )LTTNG_TRACEPOINT_EVENT_INSTANCE (module_refcnt, module_put, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) TP_PROTO(struct module *mod, unsigned long ip),TP_ARGS (mod, ip) -#else - TP_PROTO(struct module *mod, unsigned long ip, int refcnt), - -TP_ARGS (mod, ip, refcnt) -#endif )#endif /* CONFIG_MODULE_UNLOAD */
Signature · 1 line
2.17.1
RFC PATCH v2 23/30 Drop support for kernels < 3.0 from net instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/net.h | 12 ------------ 1 file changed, 12 deletions(-)
instrumentation/events/lttng-module/net.h +0 -12
@@ -439,30 +439,18 @@ LTTNG_TRACEPOINT_ENUM(net_network_header,LTTNG_TRACEPOINT_EVENT (net_dev_xmit, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) TP_PROTO(struct sk_buff *skb, int rc, struct net_device *dev, unsigned int skb_len),TP_ARGS (skb, rc, dev, skb_len), -#else - TP_PROTO(struct sk_buff *skb, - int rc), - -TP_ARGS (skb, rc), -#endifTP_FIELDS ( ctf_integer_hex(void *, skbaddr, skb) ctf_integer(int, rc, rc) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,40)) ctf_integer(unsigned int, len, skb_len)ctf_string (name, dev->name) -#else - ctf_integer(unsigned int, len, skb->len) -ctf_string (name, skb->dev->name) -#endif ) )
Signature · 1 line
2.17.1
RFC PATCH v2 24/30 Drop support for kernels < 3.0 from power instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/power.h | 40 --------------------- 1 file changed, 40 deletions(-)
instrumentation/events/lttng-module/power.h +0 -40
@@ -9,7 +9,6 @@#include <linux/ktime.h> #include <linux/version.h> -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,38 )) LTTNG_TRACEPOINT_EVENT_CLASS(power_cpu, TP_PROTO(unsigned int state, unsigned int cpu_id),
@@ -59,7 +58,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(machine_suspend, ctf_integer(u32, state, state) ) ) -#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,5 ,0 )) LTTNG_TRACEPOINT_EVENT_CLASS(power_wakeup_source,
@@ -93,12 +91,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivat )#endif -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,38 )) -#undef CONFIG_EVENT_POWER_TRACING_DEPRECATED -#define CONFIG_EVENT_POWER_TRACING_DEPRECATED -#define _PWR_EVENT_AVOID_DOUBLE_DEFINING_DEPRECATED -#endif -#ifdef CONFIG_EVENT_POWER_TRACING_DEPRECATED /*
@@ -107,69 +99,39 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(power_wakeup_source, wakeup_source_deactivat*/ LTTNG_TRACEPOINT_EVENT_CLASS (power, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),TP_ARGS (type, state, cpu_id), -#else - TP_PROTO(unsigned int type, unsigned int state), - -TP_ARGS (type, state), -#endifTP_FIELDS ( ctf_integer(u64, type, type) ctf_integer(u64, state, state) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))ctf_integer (u64, cpu_id, cpu_id) -#endif ) )LTTNG_TRACEPOINT_EVENT_INSTANCE (power, power_start, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),TP_ARGS (type, state, cpu_id) -#else - TP_PROTO(unsigned int type, unsigned int state), - -TP_ARGS (type, state) -#endif )LTTNG_TRACEPOINT_EVENT_INSTANCE (power, power_frequency, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int type, unsigned int state, unsigned int cpu_id),TP_ARGS (type, state, cpu_id) -#else - TP_PROTO(unsigned int type, unsigned int state), - -TP_ARGS (type, state) -#endif )LTTNG_TRACEPOINT_EVENT (power_end, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36)) TP_PROTO(unsigned int cpu_id),TP_ARGS (cpu_id), -#else - TP_PROTO(int dummy), - -TP_ARGS (dummy), -#endifTP_FIELDS ( -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,36))ctf_integer (u64, cpu_id, cpu_id) -#else -ctf_integer (u64, dummy,0xffff ) -#endif ) )
@@ -207,7 +169,6 @@ static inline void trace_power_frequency(u64 type, u64 state, u64 cpuid) {};#endif /* CONFIG_EVENT_POWER_TRACING_DEPRECATED */ -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 ))/* * The clock events are used for clock enable/disable and for * clock rate change
@@ -274,7 +235,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(power_domain, power_domain_target, TP_ARGS(name, state, cpu_id) ) -#endif #endif /* LTTNG_TRACE_POWER_H */
Signature · 1 line
2.17.1
RFC PATCH v2 25/30 Drop support for kernels < 3.0 from sched instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/sched.h | 68 +++------------------ 1 file changed, 7 insertions(+), 61 deletions(-)
instrumentation/events/lttng-module/sched.h +7 -61
@@ -93,7 +93,7 @@ static inline long __trace_sched_switch_state(struct task_struct *p) return state; } -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) +#else static inline long __trace_sched_switch_state (struct task_struct *p) {
@@ -170,24 +170,16 @@ LTTNG_TRACEPOINT_EVENT_CLASS(sched_wakeup_template,#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */ LTTNG_TRACEPOINT_EVENT_CLASS (sched_wakeup_template, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) TP_PROTO(struct task_struct *p, int success),TP_ARGS (p, success), -#else - TP_PROTO(struct rq *rq, struct task_struct *p, int success), - -TP_ARGS (rq, p, success), -#endifTP_FIELDS ( ctf_array_text(char, comm, p->comm, TASK_COMM_LEN) ctf_integer(pid_t, tid, p->pid) ctf_integer(int, prio, p->prio - MAX_RT_PRIO) ctf_integer(int, success, success) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32))ctf_integer (int, target_cpu,task_cpu (p)) -#endif ) )#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */
@@ -224,7 +216,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, TP_PROTO(struct task_struct *p), TP_ARGS(p)) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) +#else LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup, TP_PROTO(struct task_struct *p, int success),
@@ -237,20 +229,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, TP_PROTO(struct task_struct *p, int success), TP_ARGS(p, success)) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ - -LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup, - TP_PROTO(struct rq *rq, struct task_struct *p, int success), - TP_ARGS(rq, p, success)) - -/* - * Tracepoint for waking up a new task: - */ -LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_wakeup_template, sched_wakeup_new, - TP_PROTO(struct rq *rq, struct task_struct *p, int success), - TP_ARGS(rq, p, success)) - -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ +#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) *//* * Tracepoint for task switches, performed by the scheduler:
@@ -263,17 +242,12 @@ LTTNG_TRACEPOINT_EVENT(sched_switch, struct task_struct *next),TP_ARGS (preempt ,prev ,next ), -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) +#elseTP_PROTO (struct task_struct *prev,struct task_struct *next),TP_ARGS (prev ,next ), -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ -TP_PROTO (struct rq *rq,struct task_struct *prev, -struct task_struct *next), - -TP_ARGS (rq ,prev ,next ), -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ +#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0)) */TP_FIELDS ( ctf_array_text(char, prev_comm, prev->comm, TASK_COMM_LEN)
@@ -281,10 +255,8 @@ LTTNG_TRACEPOINT_EVENT(sched_switch, ctf_integer(int, prev_prio, prev->prio - MAX_RT_PRIO)#if (LINUX_VERSION_CODE >=KERNEL_VERSION (4 ,4 ,0 )) ctf_integer(long, prev_state, __trace_sched_switch_state(preempt, prev)) -#elif (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,35 )) - ctf_integer(long, prev_state, __trace_sched_switch_state(prev))#else - ctf_integer(long, prev_state, prev->state) + ctf_integer(long, prev_state, __trace_sched_switch_state(prev))#endif ctf_array_text(char, next_comm, next->comm, TASK_COMM_LEN)ctf_integer (pid_t, next_tid, next->pid)
@@ -341,15 +313,9 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(sched_process_template, sched_process_exit,/* * Tracepoint for waiting on task to unschedule: */ -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,35 ))LTTNG_TRACEPOINT_EVENT_INSTANCE (sched_process_template, sched_wait_task, TP_PROTO(struct task_struct *p),TP_ARGS (p)) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ -LTTNG_TRACEPOINT_EVENT_INSTANCE (sched_process_template, sched_wait_task, - TP_PROTO(struct rq *rq, struct task_struct *p), - TP_ARGS(rq, p)) -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) */ /* * Tracepoint for a waiting task:
@@ -445,24 +411,6 @@ LTTNG_TRACEPOINT_EVENT_CODE(sched_process_fork, TP_code_post() ) -#if (LINUX_VERSION_CODE <KERNEL_VERSION (2 ,6 ,33 )) -/* -* Tracepoint for sending a signal: -*/ -LTTNG_TRACEPOINT_EVENT (sched_signal_send, - - TP_PROTO(int sig, struct task_struct *p), - -TP_ARGS (sig, p), - -TP_FIELDS ( - ctf_integer(int, sig, sig) - ctf_array_text(char, comm, p->comm, TASK_COMM_LEN) -ctf_integer (pid_t, tid, p->pid) - ) -) -#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,4 ,0 ))/* * Tracepoint for exec:
@@ -482,7 +430,6 @@ LTTNG_TRACEPOINT_EVENT(sched_process_exec, )#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,32 ))/* * XXX the below sched_stat tracepoints only apply to SCHED_OTHER/BATCH/IDLE * adding sched_stat support to SCHED_FIFO/RR would be welcome.
@@ -551,7 +498,6 @@ LTTNG_TRACEPOINT_EVENT(sched_stat_runtime,ctf_integer (u64, vruntime, vruntime) ) ) -#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) || \ LTTNG_RT_KERNEL_RANGE(4,9,27,18, 4,10,0,0) || \
@@ -573,7 +519,7 @@ LTTNG_TRACEPOINT_EVENT(sched_pi_setprio, ctf_integer(int, newprio, pi_task ? pi_task->prio - MAX_RT_PRIO : tsk->prio - MAX_RT_PRIO) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) +#else /* * Tracepoint for showing priority inheritance modifying a tasks * priority.
Signature · 1 line
2.17.1
RFC PATCH v2 26/30 Drop support for kernels < 3.0 from scsi instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/scsi.h | 8 -------- 1 file changed, 8 deletions(-)
instrumentation/events/lttng-module/scsi.h +0 -8
@@ -388,7 +388,6 @@ scsi_statusbyte_name(SAM_STAT_ACA_ACTIVE), \ scsi_statusbyte_name(SAM_STAT_TASK_ABORTED)) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 ))#define scsi_prot_op_name (result) { result, #result }#define show_prot_op_name (val) \ __print_symbolic(val, \
@@ -399,7 +398,6 @@ scsi_prot_op_name(SCSI_PROT_WRITE_INSERT), \ scsi_prot_op_name(SCSI_PROT_READ_PASS), \ scsi_prot_op_name(SCSI_PROT_WRITE_PASS)) -#endif const char *scsi_trace_parse_cdb (struct trace_seq *,unsigned char *,int );#define __parse_cdb (cdb, len) scsi_trace_parse_cdb(p, cdb, len)
@@ -420,9 +418,7 @@ LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_start, ctf_integer(unsigned int, cmd_len, cmd->cmd_len) ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd)) ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd)) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd)) -#endif ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len) ) )
@@ -443,9 +439,7 @@ LTTNG_TRACEPOINT_EVENT(scsi_dispatch_cmd_error, ctf_integer(unsigned int, cmd_len, cmd->cmd_len) ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd)) ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd)) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd)) -#endif ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len) ) )
@@ -466,9 +460,7 @@ LTTNG_TRACEPOINT_EVENT_CLASS(scsi_cmd_done_timeout_template, ctf_integer(unsigned int, cmd_len, cmd->cmd_len) ctf_integer(unsigned int, data_sglen, scsi_sg_count(cmd)) ctf_integer(unsigned int, prot_sglen, scsi_prot_sg_count(cmd)) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,39 )) ctf_integer(unsigned char, prot_op, scsi_get_prot_op(cmd)) -#endif ctf_sequence_hex(unsigned char, cmnd, cmd->cmnd, u32, cmd->cmd_len) ) )
Signature · 1 line
2.17.1
RFC PATCH v2 27/30 Drop support for kernels < 3.0 from skb instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/skb.h | 4 ---- 1 file changed, 4 deletions(-)
instrumentation/events/lttng-module/skb.h +0 -4
@@ -28,7 +28,6 @@ LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) LTTNG_TRACEPOINT_EVENT_MAP(consume_skb, skb_consume,
@@ -41,9 +40,7 @@ LTTNG_TRACEPOINT_EVENT_MAP(consume_skb, ctf_integer_hex(void *, skbaddr, skb) ) ) -#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,32 )) LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec, TP_PROTO(const struct sk_buff *skb, int len),
@@ -55,7 +52,6 @@ LTTNG_TRACEPOINT_EVENT(skb_copy_datagram_iovec, ctf_integer(int, len, len) ) ) -#endif #endif /* LTTNG_TRACE_SKB_H */
Signature · 1 line
2.17.1
RFC PATCH v2 28/30 Drop support for kernels < 3.0 from workqueue instrumentation
In reply to a message not in the archive--- .../events/lttng-module/workqueue.h | 61 ------------------- 1 file changed, 61 deletions(-)
instrumentation/events/lttng-module/workqueue.h +0 -61
@@ -9,8 +9,6 @@#include <linux/workqueue.h> #include <linux/version.h> -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,36 )) -#ifndef _TRACE_WORKQUEUE_DEF_#define _TRACE_WORKQUEUE_DEF_
@@ -30,7 +28,6 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, ) ) -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 ))/** * workqueue_queue_work - called when a work gets queued * @req_cpu: the requested cpu
@@ -76,7 +73,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_activate_work,TP_ARGS (work) ) -#endif /** * workqueue_execute_start - called immediately before the workqueue callback
@@ -109,63 +105,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(workqueue_work, workqueue_execute_end, TP_ARGS(work) ) -#else - -LTTNG_TRACEPOINT_EVENT_CLASS (workqueue, - - TP_PROTO(struct task_struct *wq_thread, struct work_struct *work), - -TP_ARGS (wq_thread, work), - -TP_FIELDS ( - ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) - ctf_integer(pid_t, thread_pid, wq_thread->pid) -ctf_integer_hex (work_func_t, func, work->func) - ) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE (workqueue, workqueue_insertion, - - TP_PROTO(struct task_struct *wq_thread, struct work_struct *work), - -TP_ARGS (wq_thread, work) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE (workqueue, workqueue_execution, - - TP_PROTO(struct task_struct *wq_thread, struct work_struct *work), - -TP_ARGS (wq_thread, work) -) - -/* Trace the creation of one workqueue thread on a cpu */ -LTTNG_TRACEPOINT_EVENT (workqueue_creation, - - TP_PROTO(struct task_struct *wq_thread, int cpu), - -TP_ARGS (wq_thread, cpu), - -TP_FIELDS ( - ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) - ctf_integer(pid_t, thread_pid, wq_thread->pid) -ctf_integer (int, cpu, cpu) - ) -) - -LTTNG_TRACEPOINT_EVENT (workqueue_destruction, - - TP_PROTO(struct task_struct *wq_thread), - -TP_ARGS (wq_thread), - -TP_FIELDS ( - ctf_array(char, thread_comm, wq_thread->comm, TASK_COMM_LEN) -ctf_integer (pid_t, thread_pid, wq_thread->pid) - ) -) - -#endif -#endif /* LTTNG_TRACE_WORKQUEUE_H */ /* This part must be outside protection */
Signature · 1 line
2.17.1
RFC PATCH v2 29/30 Drop support for kernels < 3.0 from writeback instrumentation
In reply to a message not in the archive--- instrumentation/events/lttng-module/writeback.h | 4 ---- 1 file changed, 4 deletions(-)
instrumentation/events/lttng-module/writeback.h +0 -4
@@ -308,9 +308,7 @@ DEFINE_WRITEBACK_EVENT(writeback_bdi_register)#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0)) */ DEFINE_WRITEBACK_EVENT(writeback_nowork) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) DEFINE_WRITEBACK_EVENT(writeback_wake_background) -#endif DEFINE_WRITEBACK_EVENT(writeback_wake_thread) DEFINE_WRITEBACK_EVENT(writeback_wake_forker_thread) DEFINE_WRITEBACK_EVENT(writeback_bdi_unregister)
@@ -661,7 +659,6 @@ LTTNG_TRACEPOINT_EVENT(writeback_sb_inodes_requeue, )#endif -#if (LINUX_VERSION_CODE >=KERNEL_VERSION (2 ,6 ,37 )) LTTNG_TRACEPOINT_EVENT_CLASS(writeback_congest_waited_template, TP_PROTO(unsigned int usec_timeout, unsigned int usec_delayed),
@@ -687,7 +684,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(writeback_congest_waited_template, writeback_wai TP_ARGS(usec_timeout, usec_delayed) ) -#endif #if (LINUX_VERSION_CODE >=KERNEL_VERSION (3 ,1 ,0 )) LTTNG_TRACEPOINT_EVENT_CLASS(writeback_single_inode_template,
Signature · 1 line
2.17.1
RFC PATCH v2 30/30 Drop support for kernels < 3.0 from Makefiles
In reply to a message not in the archive--- Makefile | 5 +--- probes/Kbuild | 73 +++++++++++++-------------------------------------- 2 files changed, 19 insertions(+), 59 deletions(-)
Makefile +1 -4
@@ -66,10 +66,7 @@ ifneq ($(KERNELRELEASE),) endif # CONFIG_HAVE_SYSCALL_TRACEPOINTS ifneq ($(CONFIG_PERF_EVENTS),) - lttng-tracer-objs += $(shell \ - if [ $(VERSION) -ge 3 \ - -o \( $(VERSION) -eq 2 -a $(PATCHLEVEL) -eq 6 -a $(SUBLEVEL) -ge 33 \) ] ; then \ - echo "lttng-context-perf-counters.o" ; fi;) + lttng-tracer-objs += lttng-context-perf-counters.o endif # CONFIG_PERF_EVENTS ifneq ($(CONFIG_PREEMPT_RT_FULL),)
probes/Kbuild +18 -55
127 lines not on this page · raw message
Signature · 1 line
2.17.1
Re: [RFC PATCH lttng-modules v2 01/30] Bump minimum kernel version to 3.0
In reply to a message not in the archiveQuoted 11 lines · Michael Jeanson
Upstream Linux 3.0 was released 7 years ago, the oldest longterm release still supported is 3.16. On the distro kernels side, we still cover :
RHEL / CentOS 7 and up
SLES11 SP2 and up
SLES12 and up
Ubuntu 12.04 (Precise) and up
Debian 7 (Wheezy) and up
Fedora 16 and upSigned-off-by Michael Jeanson <[email protected]>
This patchset was compile tested on :
16:42:48 #538 (v4.7.10) completed with status SUCCESS 16:42:48 #543 (v4.1.52) completed with status SUCCESS 16:42:48 #531 (v4.14.79) completed with status SUCCESS 16:42:48 #533 (v4.12.14) completed with status SUCCESS 16:42:48 #537 (v4.8.17) completed with status SUCCESS 16:42:48 #528 (v4.17.19) completed with status SUCCESS 16:42:48 #535 (v4.10.17) completed with status SUCCESS 16:42:48 #539 (v4.6.7) completed with status SUCCESS 16:42:48 #544 (v4.2.8) completed with status SUCCESS 16:42:48 #534 (v4.11.12) completed with status SUCCESS 16:42:48 #525 (v4.20-rc1) completed with status SUCCESS 16:42:48 #526 (v4.19.1) completed with status SUCCESS 16:42:48 #542 (v4.3.6) completed with status SUCCESS 16:42:48 #532 (v4.13.16) completed with status SUCCESS 16:42:48 #545 (v4.0.9) completed with status SUCCESS 16:42:48 #546 (v3.19.8) completed with status SUCCESS 16:42:48 #540 (v4.5.7) completed with status SUCCESS 16:42:48 #536 (v4.9.135) completed with status SUCCESS 16:42:48 #541 (v4.4.162) completed with status SUCCESS 16:42:48 #530 (v4.15.18) completed with status SUCCESS 16:42:48 #529 (v4.16.18) completed with status SUCCESS 16:42:48 #550 (v3.15.10) completed with status SUCCESS 16:42:48 #527 (v4.18.17) completed with status SUCCESS 16:42:48 #551 (v3.14.79) completed with status SUCCESS 16:42:48 #552 (v3.13.11) completed with status SUCCESS 16:42:48 #547 (v3.18.124) completed with status SUCCESS 16:42:48 #548 (v3.17.8) completed with status SUCCESS 16:42:48 #549 (v3.16.60) completed with status SUCCESS 16:42:48 #553 (v3.12.74) completed with status SUCCESS 16:42:48 #555 (v3.10.108) completed with status SUCCESS 16:42:48 #554 (v3.11.10) completed with status SUCCESS 16:42:48 #556 (v3.9.11) completed with status SUCCESS 16:42:48 #560 (v3.5.7) completed with status SUCCESS 16:42:48 #559 (v3.6.11) completed with status SUCCESS 16:42:48 #563 (v3.2.102) completed with status SUCCESS 16:42:48 #557 (v3.8.13) completed with status SUCCESS 16:42:48 #558 (v3.7.10) completed with status SUCCESS 16:42:48 #561 (v3.4.113) completed with status SUCCESS 16:42:48 #564 (v3.1.10) completed with status SUCCESS 16:42:48 #562 (v3.3.8) completed with status SUCCESS 16:42:48 #565 (v3.0.101) completed with status SUCCESS
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [RFC PATCH lttng-modules v2 01/30] Bump minimum kernel version to 3.0
Quoted 4 lines · ----- On Nov 8, 2018, at 4:59 PM, Michael Jeanson [email protected] wrote:
Quoted 3 lines · Michael Jeanson
Upstream Linux 3.0 was released 7 years ago, the oldest longterm release still supported is 3.16. On the distro kernels side, we still cover :
Quoted 8 lines
Quoted 8 lines
RHEL / CentOS 7 and up
SLES11 SP2 and up
SLES12 and up
Ubuntu 12.04 (Precise) and up
Debian 7 (Wheezy) and up
Fedora 16 and upSigned-off-by Michael Jeanson <[email protected]>
Great patchset! Can I get a pointer to a git branch containing this series I could pull from ?
Thanks,
Mathieu
Quoted 44 lines
This patchset was compile tested on :
16:42:48 #538 (v4.7.10) completed with status SUCCESS 16:42:48 #543 (v4.1.52) completed with status SUCCESS 16:42:48 #531 (v4.14.79) completed with status SUCCESS 16:42:48 #533 (v4.12.14) completed with status SUCCESS 16:42:48 #537 (v4.8.17) completed with status SUCCESS 16:42:48 #528 (v4.17.19) completed with status SUCCESS 16:42:48 #535 (v4.10.17) completed with status SUCCESS 16:42:48 #539 (v4.6.7) completed with status SUCCESS 16:42:48 #544 (v4.2.8) completed with status SUCCESS 16:42:48 #534 (v4.11.12) completed with status SUCCESS 16:42:48 #525 (v4.20-rc1) completed with status SUCCESS 16:42:48 #526 (v4.19.1) completed with status SUCCESS 16:42:48 #542 (v4.3.6) completed with status SUCCESS 16:42:48 #532 (v4.13.16) completed with status SUCCESS 16:42:48 #545 (v4.0.9) completed with status SUCCESS 16:42:48 #546 (v3.19.8) completed with status SUCCESS 16:42:48 #540 (v4.5.7) completed with status SUCCESS 16:42:48 #536 (v4.9.135) completed with status SUCCESS 16:42:48 #541 (v4.4.162) completed with status SUCCESS 16:42:48 #530 (v4.15.18) completed with status SUCCESS 16:42:48 #529 (v4.16.18) completed with status SUCCESS 16:42:48 #550 (v3.15.10) completed with status SUCCESS 16:42:48 #527 (v4.18.17) completed with status SUCCESS 16:42:48 #551 (v3.14.79) completed with status SUCCESS 16:42:48 #552 (v3.13.11) completed with status SUCCESS 16:42:48 #547 (v3.18.124) completed with status SUCCESS 16:42:48 #548 (v3.17.8) completed with status SUCCESS 16:42:48 #549 (v3.16.60) completed with status SUCCESS 16:42:48 #553 (v3.12.74) completed with status SUCCESS 16:42:48 #555 (v3.10.108) completed with status SUCCESS 16:42:48 #554 (v3.11.10) completed with status SUCCESS 16:42:48 #556 (v3.9.11) completed with status SUCCESS 16:42:48 #560 (v3.5.7) completed with status SUCCESS 16:42:48 #559 (v3.6.11) completed with status SUCCESS 16:42:48 #563 (v3.2.102) completed with status SUCCESS 16:42:48 #557 (v3.8.13) completed with status SUCCESS 16:42:48 #558 (v3.7.10) completed with status SUCCESS 16:42:48 #561 (v3.4.113) completed with status SUCCESS 16:42:48 #564 (v3.1.10) completed with status SUCCESS 16:42:48 #562 (v3.3.8) completed with status SUCCESS 16:42:48 #565 (v3.0.101) completed with status SUCCESS
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [RFC PATCH lttng-modules v2 01/30] Bump minimum kernel version to 3.0
Quoted 14 lines · Mathieu Desnoyers
Quoted 11 lines · ----- On Nov 8, 2018, at 4:59 PM, Michael Jeanson [email protected] wrote:
Quoted 10 lines · Michael Jeanson
Upstream Linux 3.0 was released 7 years ago, the oldest longterm release still supported is 3.16. On the distro kernels side, we still cover :
RHEL / CentOS 7 and up
SLES11 SP2 and up
SLES12 and up
Ubuntu 12.04 (Precise) and up
Debian 7 (Wheezy) and up
Fedora 16 and up
Quoted 8 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Michael Jeanson <[email protected]>Great patchset! Can I get a pointer to a git branch containing this series I could pull from ?
Thanks,
Mathieu
Here you go : https://github.com/mjeanson/lttng-modules/tree/kernel3.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Mathieu Desnoyers
AppliedRe: [RFC PATCH lttng-modules v2 01/30] Bump minimum kernel version to 3.0
Merged, thanks!
Mathieu
Quoted 25 lines · ----- On Nov 8, 2018, at 5:09 PM, Michael Jeanson [email protected] wrote:
Quoted 14 lines · Mathieu Desnoyers
Quoted 11 lines · ----- On Nov 8, 2018, at 4:59 PM, Michael Jeanson [email protected] wrote:
Quoted 10 lines · Michael Jeanson
Upstream Linux 3.0 was released 7 years ago, the oldest longterm release still supported is 3.16. On the distro kernels side, we still cover :
RHEL / CentOS 7 and up
SLES11 SP2 and up
SLES12 and up
Ubuntu 12.04 (Precise) and up
Debian 7 (Wheezy) and up
Fedora 16 and upQuoted 8 lines
Quoted 1 line
Quoted 1 line
Signed-off-by Michael Jeanson <[email protected]>Great patchset! Can I get a pointer to a git branch containing this series I could pull from ?
Thanks,
Mathieu
Here you go : https://github.com/mjeanson/lttng-modules/tree/kernel3.0
Signature · 3 lines
Mathieu Desnoyers EfficiOS Inc. http://www.efficios.com