Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package lttng-modules for openSUSE:Factory checked in at 2022-05-19 22:49:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lttng-modules (Old) and /work/SRC/openSUSE:Factory/.lttng-modules.new.1538 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lttng-modules" Thu May 19 22:49:27 2022 rev:3 rq:978013 version:2.13.3 Changes: -------- --- /work/SRC/openSUSE:Factory/lttng-modules/lttng-modules.changes 2022-01-20 00:13:20.886628264 +0100 +++ /work/SRC/openSUSE:Factory/.lttng-modules.new.1538/lttng-modules.changes 2022-05-19 22:49:46.238369543 +0200 @@ -1,0 +2,21 @@ +Wed May 18 20:23:14 UTC 2022 - Alexei Sorokin <[email protected]> + +- Update to version 2.13.3: + * Fix: incorrect in/out direction for syscall exit. + * Fix: net: socket: rename SKB_DROP_REASON_SOCKET_FILTER (v5.17). + * Fix: net: skb: introduce kfree_skb_reason() (v5.17). + * Fix: random: rather than entropy_store abstraction, use global + (v5.17). + * Fix: btrfs: pass fs_info to trace_btrfs_transaction_commit + (v5.17). + * Fix: mm: compaction: fix the migration stats in + trace_mm_compaction_migratepages() (v5.17). + * Fix: block: remove the ->rq_disk field in struct request + (v5.17). + * Fix: block: remove GENHD_FL_SUPPRESS_PARTITION_INFO (v5.17). + * Document expected ISO8601 time formats in ABI header. + * Fix: lttng ABI: lttng_counter_ioctl() tainted scalar. + * Fix: sample discarded events count before reserve. + * Cleanup: comment alignment in ring buffer config.h. + +------------------------------------------------------------------- Old: ---- lttng-modules-2.13.1.tar.bz2 lttng-modules-2.13.1.tar.bz2.asc New: ---- lttng-modules-2.13.3.tar.bz2 lttng-modules-2.13.3.tar.bz2.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lttng-modules.spec ++++++ --- /var/tmp/diff_new_pack.92kTvK/_old 2022-05-19 22:49:47.378371004 +0200 +++ /var/tmp/diff_new_pack.92kTvK/_new 2022-05-19 22:49:47.378371004 +0200 @@ -17,7 +17,7 @@ Name: lttng-modules -Version: 2.13.1 +Version: 2.13.3 Release: 0 Summary: Licensing information for package lttng-modules License: GPL-2.0-only AND LGPL-2.1-only AND MIT ++++++ lttng-modules-2.13.1.tar.bz2 -> lttng-modules-2.13.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/ChangeLog new/lttng-modules-2.13.3/ChangeLog --- old/lttng-modules-2.13.1/ChangeLog 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/ChangeLog 2022-03-25 19:06:26.000000000 +0100 @@ -1,3 +1,20 @@ +2022-03-25 (National Waffle Day) LTTng modules 2.13.3 + * Document expected ISO8601 time formats in ABI header + * Fix: lttng ABI: lttng_counter_ioctl() tainted scalar + * Fix: sample discarded events count before reserve + * Cleanup: comment alignment in ring buffer config.h + +2022-03-07 (National Cereal Day) LTTng modules 2.13.2 + * Fix: incorrect in/out direction for syscall exit + * fix: net: socket: rename SKB_DROP_REASON_SOCKET_FILTER (v5.17) + * fix: net: skb: introduce kfree_skb_reason() (v5.17) + * fix: random: rather than entropy_store abstraction, use global (v5.17) + * fix: btrfs: pass fs_info to trace_btrfs_transaction_commit (v5.17) + * fix: mm: compaction: fix the migration stats in trace_mm_compaction_migratepages() (v5.17) + * fix: block: remove the ->rq_disk field in struct request (v5.17) + * fix: block: remove GENHD_FL_SUPPRESS_PARTITION_INFO (v5.17) + * Copyright ownership transfer + 2022-01-05 (National Bird Day) LTTng modules 2.13.1 * fix: mm: move kvmalloc-related functions to slab.h (v5.16) * fix: block: don't call blk_status_to_errno in blk_update_request (v5.16) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/instrumentation/events/block.h new/lttng-modules-2.13.3/include/instrumentation/events/block.h --- old/lttng-modules-2.13.1/include/instrumentation/events/block.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/instrumentation/events/block.h 2022-03-25 19:06:26.000000000 +0100 @@ -310,7 +310,31 @@ ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +/** + * block_rq_requeue - place block IO request back on a queue + * @rq: block IO operation request + * + * The block operation request @rq is being placed back into queue + * @q. For some reason the request was not completed and needs to be + * put back in the queue. + */ +LTTNG_TRACEPOINT_EVENT(block_rq_requeue, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq), + + TP_FIELDS( + ctf_integer(dev_t, dev, + rq->q->disk ? disk_devt(rq->q->disk) : 0) + ctf_integer(sector_t, sector, blk_rq_trace_sector(rq)) + ctf_integer(unsigned int, nr_sector, blk_rq_trace_nr_sectors(rq)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) /** * block_rq_requeue - place block IO request back on a queue * @rq: block IO operation request @@ -380,7 +404,24 @@ * do for the request. If @rq->bio is non-NULL then there is * additional work required to complete the request. */ -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT(block_rq_complete, + + TP_PROTO(struct request *rq, blk_status_t error, unsigned int nr_bytes), + + TP_ARGS(rq, error, nr_bytes), + + TP_FIELDS( + ctf_integer(dev_t, dev, + rq->q->disk ? disk_devt(rq->q->disk) : 0) + ctf_integer(sector_t, sector, blk_rq_pos(rq)) + ctf_integer(unsigned int, nr_sector, nr_bytes >> 9) + ctf_integer(int, error, blk_status_to_errno(error)) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), nr_bytes) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,16,0)) LTTNG_TRACEPOINT_EVENT(block_rq_complete, TP_PROTO(struct request *rq, blk_status_t error, unsigned int nr_bytes), @@ -519,7 +560,26 @@ #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,15,0)) */ -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, + + TP_PROTO(struct request *rq), + + TP_ARGS(rq), + + TP_FIELDS( + ctf_integer(dev_t, dev, + rq->q->disk ? disk_devt(rq->q->disk) : 0) + ctf_integer(sector_t, sector, blk_rq_trace_sector(rq)) + ctf_integer(unsigned int, nr_sector, blk_rq_trace_nr_sectors(rq)) + ctf_integer(unsigned int, bytes, blk_rq_bytes(rq)) + ctf_integer(pid_t, tid, current->pid) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) + ctf_array_text(char, comm, current->comm, TASK_COMM_LEN) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) LTTNG_TRACEPOINT_EVENT_CLASS(block_rq, TP_PROTO(struct request *rq), @@ -1513,7 +1573,34 @@ ) #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +/** + * block_rq_remap - map request for a block operation request + * @rq: block IO operation request + * @dev: device for the operation + * @from: original sector for the operation + * + * The block operation request @rq in @q has been remapped. The block + * operation request @rq holds the current information and @from hold + * the original sector. + */ +LTTNG_TRACEPOINT_EVENT(block_rq_remap, + + TP_PROTO(struct request *rq, dev_t dev, sector_t from), + + TP_ARGS(rq, dev, from), + + TP_FIELDS( + ctf_integer(dev_t, dev, disk_devt(rq->q->disk)) + ctf_integer(sector_t, sector, blk_rq_pos(rq)) + ctf_integer(unsigned int, nr_sector, blk_rq_sectors(rq)) + ctf_integer(dev_t, old_dev, dev) + ctf_integer(sector_t, old_sector, from) + blk_rwbs_ctf_integer(unsigned int, rwbs, + lttng_req_op(rq), lttng_req_rw(rq), blk_rq_bytes(rq)) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,11,0)) /** * block_rq_remap - map request for a block operation request * @rq: block IO operation request diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/instrumentation/events/btrfs.h new/lttng-modules-2.13.3/include/instrumentation/events/btrfs.h --- old/lttng-modules-2.13.1/include/instrumentation/events/btrfs.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/instrumentation/events/btrfs.h 2022-03-25 19:06:26.000000000 +0100 @@ -43,7 +43,19 @@ #define lttng_fs_info_fsid fs_info->fsid #endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \ +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, + + TP_PROTO(const struct btrfs_fs_info *fs_info), + + TP_ARGS(fs_info), + + TP_FIELDS( + ctf_integer(u64, generation, fs_info->generation) + ctf_integer(u64, root_objectid, BTRFS_ROOT_TREE_OBJECTID) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ @@ -59,7 +71,25 @@ ctf_integer(u64, root_objectid, root->root_key.objectid) ) ) +#else +LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, + + TP_PROTO(struct btrfs_root *root), + + TP_ARGS(root), + + TP_FIELDS( + ctf_integer(u64, generation, root->fs_info->generation) + ctf_integer(u64, root_objectid, root->root_key.objectid) + ) +) +#endif +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,14,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,73,5,0,0, 4,4,73,6,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,82,6,0,0, 4,4,82,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,92,6,0,0, 4,4,92,7,0,0) || \ + LTTNG_SLE_KERNEL_RANGE(4,4,103,6,0,0, 4,5,0,0,0,0)) LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode, TP_PROTO(const struct inode *inode), @@ -99,18 +129,6 @@ TP_ARGS(inode) ) #else -LTTNG_TRACEPOINT_EVENT(btrfs_transaction_commit, - - TP_PROTO(struct btrfs_root *root), - - TP_ARGS(root), - - TP_FIELDS( - ctf_integer(u64, generation, root->fs_info->generation) - ctf_integer(u64, root_objectid, root->root_key.objectid) - ) -) - LTTNG_TRACEPOINT_EVENT_CLASS(btrfs__inode, TP_PROTO(struct inode *inode), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/instrumentation/events/compaction.h new/lttng-modules-2.13.3/include/instrumentation/events/compaction.h --- old/lttng-modules-2.13.1/include/instrumentation/events/compaction.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/instrumentation/events/compaction.h 2022-03-25 19:06:26.000000000 +0100 @@ -97,7 +97,20 @@ #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ -#if LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \ +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_all, + unsigned int nr_succeeded), + + TP_ARGS(nr_all, nr_succeeded), + + TP_FIELDS( + ctf_integer(unsigned long, nr_migrated, nr_succeeded) + ctf_integer(unsigned long, nr_failed, nr_all - nr_succeeded) + ) +) +#elif LTTNG_KERNEL_RANGE(3,12,30, 3,13,0) || \ LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,16,0)) LTTNG_TRACEPOINT_EVENT_CODE_MAP(mm_compaction_migratepages, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/instrumentation/events/random.h new/lttng-modules-2.13.3/include/instrumentation/events/random.h --- old/lttng-modules-2.13.1/include/instrumentation/events/random.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/instrumentation/events/random.h 2022-03-25 19:06:26.000000000 +0100 @@ -8,6 +8,36 @@ #include <lttng/tracepoint-event.h> #include <linux/writeback.h> +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes, + TP_PROTO(int bytes, unsigned long IP), + + TP_ARGS(bytes, IP), + + TP_FIELDS( + ctf_integer(int, bytes, bytes) + ctf_integer_hex(unsigned long, IP, IP) + ) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes, + + random_mix_pool_bytes, + + TP_PROTO(int bytes, unsigned long IP), + + TP_ARGS(bytes, IP) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__mix_pool_bytes, mix_pool_bytes_nolock, + + random_mix_pool_bytes_nolock, + + TP_PROTO(int bytes, unsigned long IP), + + TP_ARGS(bytes, IP) +) +#else LTTNG_TRACEPOINT_EVENT_CLASS(random__mix_pool_bytes, TP_PROTO(const char *pool_name, int bytes, unsigned long IP), @@ -37,8 +67,24 @@ TP_ARGS(pool_name, bytes, IP) ) +#endif -#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0)) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits, + + random_credit_entropy_bits, + + TP_PROTO(int bits, int entropy_count, unsigned long IP), + + TP_ARGS(bits, entropy_count, IP), + + TP_FIELDS( + ctf_integer(int, bits, bits) + ctf_integer(int, entropy_count, entropy_count) + ctf_integer_hex(unsigned long, IP, IP) + ) +) +#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,2,0)) LTTNG_TRACEPOINT_EVENT_MAP(credit_entropy_bits, random_credit_entropy_bits, @@ -89,6 +135,38 @@ ) ) +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy, + TP_PROTO(int nbytes, int entropy_count, unsigned long IP), + + TP_ARGS(nbytes, entropy_count, IP), + + TP_FIELDS( + ctf_integer(int, nbytes, nbytes) + ctf_integer(int, entropy_count, entropy_count) + ctf_integer_hex(unsigned long, IP, IP) + ) +) + + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy, + + random_extract_entropy, + + TP_PROTO(int nbytes, int entropy_count, unsigned long IP), + + TP_ARGS(nbytes, entropy_count, IP) +) + +LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(random__extract_entropy, extract_entropy_user, + + random_extract_entropy_user, + + TP_PROTO(int nbytes, int entropy_count, unsigned long IP), + + TP_ARGS(nbytes, entropy_count, IP) +) +#else LTTNG_TRACEPOINT_EVENT_CLASS(random__extract_entropy, TP_PROTO(const char *pool_name, int nbytes, int entropy_count, unsigned long IP), @@ -123,6 +201,7 @@ TP_ARGS(pool_name, nbytes, entropy_count, IP) ) +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/instrumentation/events/skb.h new/lttng-modules-2.13.3/include/instrumentation/events/skb.h --- old/lttng-modules-2.13.1/include/instrumentation/events/skb.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/instrumentation/events/skb.h 2022-03-25 19:06:26.000000000 +0100 @@ -13,6 +13,36 @@ /* * Tracepoint for free an sk_buff: */ +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +LTTNG_TRACEPOINT_ENUM(skb_drop_reason, + TP_ENUM_VALUES( + ctf_enum_value("NOT_SPECIFIED", SKB_DROP_REASON_NOT_SPECIFIED) + ctf_enum_value("NO_SOCKET", SKB_DROP_REASON_NO_SOCKET) + ctf_enum_value("PKT_TOO_SMALL", SKB_DROP_REASON_PKT_TOO_SMALL) + ctf_enum_value("TCP_CSUM", SKB_DROP_REASON_TCP_CSUM) + ctf_enum_value("SOCKET_FILTER", SKB_DROP_REASON_SOCKET_FILTER) + ctf_enum_value("UDP_CSUM", SKB_DROP_REASON_UDP_CSUM) + ctf_enum_value("MAX", SKB_DROP_REASON_MAX) + ) +) + +LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, + + skb_kfree, + + TP_PROTO(struct sk_buff *skb, void *location, + enum skb_drop_reason reason), + + TP_ARGS(skb, location, reason), + + TP_FIELDS( + ctf_integer_hex(void *, skbaddr, skb) + ctf_integer_hex(void *, location, location) + ctf_integer_network(unsigned short, protocol, skb->protocol) + ctf_enum(skb_drop_reason, uint8_t, reason, reason) + ) +) +#else LTTNG_TRACEPOINT_EVENT_MAP(kfree_skb, skb_kfree, @@ -27,6 +57,7 @@ ctf_integer_network(unsigned short, protocol, skb->protocol) ) ) +#endif LTTNG_TRACEPOINT_EVENT_MAP(consume_skb, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c new/lttng-modules-2.13.3/include/instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c --- old/lttng-modules-2.13.1/include/instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/instrumentation/syscalls/lttng-syscalls-extractor/lttng-syscalls-extractor.c 2022-03-25 19:06:26.000000000 +0100 @@ -5,7 +5,7 @@ * Dump syscall metadata to console. * * Copyright 2011 Mathieu Desnoyers <[email protected]> - * Copyright 2011 Julien Desfossez <[email protected]> + * Copyright 2011 EfficiOS Inc. */ #include <linux/module.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/lttng/abi.h new/lttng-modules-2.13.3/include/lttng/abi.h --- old/lttng-modules-2.13.1/include/lttng/abi.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/lttng/abi.h 2022-03-25 19:06:26.000000000 +0100 @@ -22,6 +22,13 @@ #define LTTNG_KERNEL_ABI_SYM_NAME_LEN 256 #define LTTNG_KERNEL_ABI_SESSION_NAME_LEN 256 + +/* + * The expected iso8601 time formats are either: + * + * - YYYYmmddTHHMMSS+HHMM (20 characters + \0) + * - YYYY-mm-ddTHH:MM:SS+HH:MM (25 characters + \0) + */ #define LTTNG_KERNEL_ABI_SESSION_CREATION_TIME_ISO8601_LEN 26 enum lttng_kernel_abi_instrumentation { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/lttng/tracer.h new/lttng-modules-2.13.3/include/lttng/tracer.h --- old/lttng-modules-2.13.1/include/lttng/tracer.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/lttng/tracer.h 2022-03-25 19:06:26.000000000 +0100 @@ -28,7 +28,7 @@ #define LTTNG_MODULES_MAJOR_VERSION 2 #define LTTNG_MODULES_MINOR_VERSION 13 -#define LTTNG_MODULES_PATCHLEVEL_VERSION 1 +#define LTTNG_MODULES_PATCHLEVEL_VERSION 3 #define LTTNG_MODULES_EXTRAVERSION "" #define LTTNG_VERSION_NAME "Nordicit??" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/ringbuffer/config.h new/lttng-modules-2.13.3/include/ringbuffer/config.h --- old/lttng-modules-2.13.1/include/ringbuffer/config.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/ringbuffer/config.h 2022-03-25 19:06:26.000000000 +0100 @@ -44,7 +44,8 @@ void (*buffer_begin) (struct lttng_kernel_ring_buffer *buf, u64 tsc, unsigned int subbuf_idx); void (*buffer_end) (struct lttng_kernel_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx, unsigned long data_size); + unsigned int subbuf_idx, unsigned long data_size, + const struct lttng_kernel_ring_buffer_ctx *ctx); /* Optional callbacks (can be set to NULL) */ @@ -184,11 +185,19 @@ u64 tsc; /* time-stamp counter value */ unsigned int rflags; /* reservation flags */ - struct lttng_kernel_ring_buffer *buf; /* + struct lttng_kernel_ring_buffer *buf; /* * buffer corresponding to processor id * for this channel */ struct lttng_kernel_ring_buffer_backend_pages *backend_pages; + + /* + * Records lost counts are only loaded into these fields before + * reserving the last bytes from the ring buffer. + */ + unsigned long records_lost_full; + unsigned long records_lost_wrap; + unsigned long records_lost_big; }; /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/ringbuffer/frontend.h new/lttng-modules-2.13.3/include/ringbuffer/frontend.h --- old/lttng-modules-2.13.1/include/ringbuffer/frontend.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/ringbuffer/frontend.h 2022-03-25 19:06:26.000000000 +0100 @@ -201,26 +201,26 @@ static inline unsigned long lib_ring_buffer_get_records_lost_full( - const struct lttng_kernel_ring_buffer_config *config, - struct lttng_kernel_ring_buffer *buf) + const struct lttng_kernel_ring_buffer_config *config __attribute__((unused)), + const struct lttng_kernel_ring_buffer_ctx *ctx) { - return v_read(config, &buf->records_lost_full); + return ctx->priv.records_lost_full; } static inline unsigned long lib_ring_buffer_get_records_lost_wrap( - const struct lttng_kernel_ring_buffer_config *config, - struct lttng_kernel_ring_buffer *buf) + const struct lttng_kernel_ring_buffer_config *config __attribute__((unused)), + const struct lttng_kernel_ring_buffer_ctx *ctx) { - return v_read(config, &buf->records_lost_wrap); + return ctx->priv.records_lost_wrap; } static inline unsigned long lib_ring_buffer_get_records_lost_big( - const struct lttng_kernel_ring_buffer_config *config, - struct lttng_kernel_ring_buffer *buf) + const struct lttng_kernel_ring_buffer_config *config __attribute__((unused)), + const struct lttng_kernel_ring_buffer_ctx *ctx) { - return v_read(config, &buf->records_lost_big); + return ctx->priv.records_lost_big; } static inline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/ringbuffer/frontend_api.h new/lttng-modules-2.13.3/include/ringbuffer/frontend_api.h --- old/lttng-modules-2.13.1/include/ringbuffer/frontend_api.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/ringbuffer/frontend_api.h 2022-03-25 19:06:26.000000000 +0100 @@ -280,7 +280,7 @@ commit_count = v_read(config, &cc_hot->cc); lib_ring_buffer_check_deliver(config, buf, chan, offset_end - 1, - commit_count, endidx, ctx->priv.tsc); + commit_count, endidx, ctx); /* * Update used size at each commit. It's needed only for extracting * ring_buffer buffers from vmcore, after crash. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/ringbuffer/frontend_internal.h new/lttng-modules-2.13.3/include/ringbuffer/frontend_internal.h --- old/lttng-modules-2.13.1/include/ringbuffer/frontend_internal.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/ringbuffer/frontend_internal.h 2022-03-25 19:06:26.000000000 +0100 @@ -148,7 +148,7 @@ unsigned long offset, unsigned long commit_count, unsigned long idx, - u64 tsc); + const struct lttng_kernel_ring_buffer_ctx *ctx); extern void lib_ring_buffer_switch_remote(struct lttng_kernel_ring_buffer *buf); @@ -277,7 +277,7 @@ unsigned long offset, unsigned long commit_count, unsigned long idx, - u64 tsc) + const struct lttng_kernel_ring_buffer_ctx *ctx) { unsigned long old_commit_count = commit_count - chan->backend.subbuf_size; @@ -286,7 +286,7 @@ if (unlikely((buf_trunc(offset, chan) >> chan->backend.num_subbuf_order) - (old_commit_count & chan->commit_count_mask) == 0)) lib_ring_buffer_check_deliver_slow(config, buf, chan, offset, - commit_count, idx, tsc); + commit_count, idx, ctx); } /* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/include/wrapper/genhd.h new/lttng-modules-2.13.3/include/wrapper/genhd.h --- old/lttng-modules-2.13.1/include/wrapper/genhd.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/include/wrapper/genhd.h 2022-03-25 19:06:26.000000000 +0100 @@ -14,6 +14,12 @@ #include <linux/genhd.h> +#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,17,0)) +#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_HIDDEN +#else +#define LTTNG_GENHD_FL_HIDDEN GENHD_FL_SUPPRESS_PARTITION_INFO +#endif + #ifdef CONFIG_KALLSYMS_ALL #include <linux/kallsyms.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lib/ringbuffer/ring_buffer_frontend.c new/lttng-modules-2.13.3/src/lib/ringbuffer/ring_buffer_frontend.c --- old/lttng-modules-2.13.1/src/lib/ringbuffer/ring_buffer_frontend.c 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lib/ringbuffer/ring_buffer_frontend.c 2022-03-25 19:06:26.000000000 +0100 @@ -1582,14 +1582,14 @@ void lib_ring_buffer_switch_old_start(struct lttng_kernel_ring_buffer *buf, struct lttng_kernel_ring_buffer_channel *chan, struct switch_offsets *offsets, - u64 tsc) + const struct lttng_kernel_ring_buffer_ctx *ctx) { const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config; unsigned long oldidx = subbuf_index(offsets->old, chan); unsigned long commit_count; struct commit_counters_hot *cc_hot; - config->cb.buffer_begin(buf, tsc, oldidx); + config->cb.buffer_begin(buf, ctx->priv.tsc, oldidx); /* * Order all writes to buffer before the commit count update that will @@ -1609,7 +1609,7 @@ commit_count = v_read(config, &cc_hot->cc); /* Check if the written buffer has to be delivered */ lib_ring_buffer_check_deliver(config, buf, chan, offsets->old, - commit_count, oldidx, tsc); + commit_count, oldidx, ctx); lib_ring_buffer_write_commit_counter(config, buf, chan, offsets->old + config->cb.subbuffer_header_size(), commit_count, cc_hot); @@ -1627,7 +1627,7 @@ void lib_ring_buffer_switch_old_end(struct lttng_kernel_ring_buffer *buf, struct lttng_kernel_ring_buffer_channel *chan, struct switch_offsets *offsets, - u64 tsc) + const struct lttng_kernel_ring_buffer_ctx *ctx) { const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config; unsigned long oldidx = subbuf_index(offsets->old - 1, chan); @@ -1648,7 +1648,7 @@ * postponed until the commit counter is incremented for the * current space reservation. */ - *ts_end = tsc; + *ts_end = ctx->priv.tsc; /* * Order all writes to buffer and store to ts_end before the commit @@ -1667,7 +1667,7 @@ v_add(config, padding_size, &cc_hot->cc); commit_count = v_read(config, &cc_hot->cc); lib_ring_buffer_check_deliver(config, buf, chan, offsets->old - 1, - commit_count, oldidx, tsc); + commit_count, oldidx, ctx); lib_ring_buffer_write_commit_counter(config, buf, chan, offsets->old + padding_size, commit_count, cc_hot); @@ -1684,14 +1684,14 @@ void lib_ring_buffer_switch_new_start(struct lttng_kernel_ring_buffer *buf, struct lttng_kernel_ring_buffer_channel *chan, struct switch_offsets *offsets, - u64 tsc) + const struct lttng_kernel_ring_buffer_ctx *ctx) { const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config; unsigned long beginidx = subbuf_index(offsets->begin, chan); unsigned long commit_count; struct commit_counters_hot *cc_hot; - config->cb.buffer_begin(buf, tsc, beginidx); + config->cb.buffer_begin(buf, ctx->priv.tsc, beginidx); /* * Order all writes to buffer before the commit count update that will @@ -1711,7 +1711,7 @@ commit_count = v_read(config, &cc_hot->cc); /* Check if the written buffer has to be delivered */ lib_ring_buffer_check_deliver(config, buf, chan, offsets->begin, - commit_count, beginidx, tsc); + commit_count, beginidx, ctx); lib_ring_buffer_write_commit_counter(config, buf, chan, offsets->begin + config->cb.subbuffer_header_size(), commit_count, cc_hot); @@ -1729,7 +1729,7 @@ void lib_ring_buffer_switch_new_end(struct lttng_kernel_ring_buffer *buf, struct lttng_kernel_ring_buffer_channel *chan, struct switch_offsets *offsets, - u64 tsc) + const struct lttng_kernel_ring_buffer_ctx *ctx) { const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config; unsigned long endidx, data_size; @@ -1747,7 +1747,7 @@ * postponed until the commit counter is incremented for the * current space reservation. */ - *ts_end = tsc; + *ts_end = ctx->priv.tsc; } /* @@ -1760,7 +1760,7 @@ struct lttng_kernel_ring_buffer *buf, struct lttng_kernel_ring_buffer_channel *chan, struct switch_offsets *offsets, - u64 *tsc) + struct lttng_kernel_ring_buffer_ctx *ctx) { const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config; unsigned long off, reserve_commit_diff; @@ -1770,7 +1770,7 @@ offsets->switch_old_start = 0; off = subbuf_offset(offsets->begin, chan); - *tsc = config->cb.ring_buffer_clock_read(chan); + ctx->priv.tsc = config->cb.ring_buffer_clock_read(chan); /* * Ensure we flush the header of an empty subbuffer when doing the @@ -1852,6 +1852,13 @@ offsets->begin = subbuf_align(offsets->begin, chan); /* Note: old points to the next subbuf at offset 0 */ offsets->end = offsets->begin; + /* + * Populate the records lost counters prior to performing a + * sub-buffer switch. + */ + ctx->priv.records_lost_full = v_read(config, &buf->records_lost_full); + ctx->priv.records_lost_wrap = v_read(config, &buf->records_lost_wrap); + ctx->priv.records_lost_big = v_read(config, &buf->records_lost_big); return 0; } @@ -1867,9 +1874,9 @@ { struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan; const struct lttng_kernel_ring_buffer_config *config = &chan->backend.config; + struct lttng_kernel_ring_buffer_ctx ctx; struct switch_offsets offsets; unsigned long oldidx; - u64 tsc; offsets.size = 0; @@ -1878,7 +1885,7 @@ */ do { if (lib_ring_buffer_try_switch_slow(mode, buf, chan, &offsets, - &tsc)) + &ctx)) return; /* Switch not needed */ } while (v_cmpxchg(config, &buf->offset, offsets.old, offsets.end) != offsets.old); @@ -1889,7 +1896,7 @@ * records, never the opposite (missing a full TSC record when it would * be needed). */ - save_last_tsc(config, buf, tsc); + save_last_tsc(config, buf, ctx.priv.tsc); /* * Push the reader if necessary @@ -1903,14 +1910,14 @@ * May need to populate header start on SWITCH_FLUSH. */ if (offsets.switch_old_start) { - lib_ring_buffer_switch_old_start(buf, chan, &offsets, tsc); + lib_ring_buffer_switch_old_start(buf, chan, &offsets, &ctx); offsets.old += config->cb.subbuffer_header_size(); } /* * Switch old subbuffer. */ - lib_ring_buffer_switch_old_end(buf, chan, &offsets, tsc); + lib_ring_buffer_switch_old_end(buf, chan, &offsets, &ctx); } EXPORT_SYMBOL_GPL(lib_ring_buffer_switch_slow); @@ -2143,6 +2150,15 @@ */ offsets->switch_new_end = 1; /* For offsets->begin */ } + /* + * Populate the records lost counters when the space reservation + * may cause a sub-buffer switch. + */ + if (offsets->switch_new_end || offsets->switch_old_end) { + ctx->priv.records_lost_full = v_read(config, &buf->records_lost_full); + ctx->priv.records_lost_wrap = v_read(config, &buf->records_lost_wrap); + ctx->priv.records_lost_big = v_read(config, &buf->records_lost_big); + } return 0; } @@ -2219,17 +2235,17 @@ if (unlikely(offsets.switch_old_end)) { lib_ring_buffer_clear_noref(config, &buf->backend, subbuf_index(offsets.old - 1, chan)); - lib_ring_buffer_switch_old_end(buf, chan, &offsets, ctx->priv.tsc); + lib_ring_buffer_switch_old_end(buf, chan, &offsets, ctx); } /* * Populate new subbuffer. */ if (unlikely(offsets.switch_new_start)) - lib_ring_buffer_switch_new_start(buf, chan, &offsets, ctx->priv.tsc); + lib_ring_buffer_switch_new_start(buf, chan, &offsets, ctx); if (unlikely(offsets.switch_new_end)) - lib_ring_buffer_switch_new_end(buf, chan, &offsets, ctx->priv.tsc); + lib_ring_buffer_switch_new_end(buf, chan, &offsets, ctx); ctx->priv.slot_size = offsets.size; ctx->priv.pre_offset = offsets.begin; @@ -2281,7 +2297,7 @@ unsigned long offset, unsigned long commit_count, unsigned long idx, - u64 tsc) + const struct lttng_kernel_ring_buffer_ctx *ctx) { unsigned long old_commit_count = commit_count - chan->backend.subbuf_size; @@ -2341,7 +2357,7 @@ config->cb.buffer_end(buf, *ts_end, idx, lib_ring_buffer_get_data_size(config, buf, - idx)); + idx), ctx); /* * Increment the packet counter while we have exclusive diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-abi.c new/lttng-modules-2.13.3/src/lttng-abi.c --- old/lttng-modules-2.13.1/src/lttng-abi.c 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-abi.c 2022-03-25 19:06:26.000000000 +0100 @@ -650,6 +650,8 @@ if (validate_zeroed_padding(local_counter_read.padding, sizeof(local_counter_read.padding))) return -EINVAL; + if (local_counter_read.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX) + return -EINVAL; /* Cast all indexes into size_t. */ for (i = 0; i < local_counter_read.index.number_dimensions; i++) @@ -685,6 +687,8 @@ if (validate_zeroed_padding(local_counter_aggregate.padding, sizeof(local_counter_aggregate.padding))) return -EINVAL; + if (local_counter_aggregate.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX) + return -EINVAL; /* Cast all indexes into size_t. */ for (i = 0; i < local_counter_aggregate.index.number_dimensions; i++) @@ -716,6 +720,8 @@ if (validate_zeroed_padding(local_counter_clear.padding, sizeof(local_counter_clear.padding))) return -EINVAL; + if (local_counter_clear.index.number_dimensions > LTTNG_KERNEL_ABI_COUNTER_DIMENSION_MAX) + return -EINVAL; /* Cast all indexes into size_t. */ for (i = 0; i < local_counter_clear.index.number_dimensions; i++) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-ring-buffer-client.h new/lttng-modules-2.13.3/src/lttng-ring-buffer-client.h --- old/lttng-modules-2.13.1/src/lttng-ring-buffer-client.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-ring-buffer-client.h 2022-03-25 19:06:26.000000000 +0100 @@ -377,7 +377,8 @@ * subbuffer. data_size is between 1 and subbuf_size. */ static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx, unsigned long data_size) + unsigned int subbuf_idx, unsigned long data_size, + const struct lttng_kernel_ring_buffer_ctx *ctx) { struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan; struct packet_header *header = @@ -391,9 +392,9 @@ (uint64_t) data_size * CHAR_BIT; /* in bits */ header->ctx.packet_size = (uint64_t) PAGE_ALIGN(data_size) * CHAR_BIT; /* in bits */ - records_lost += lib_ring_buffer_get_records_lost_full(&client_config, buf); - records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf); - records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf); + records_lost += lib_ring_buffer_get_records_lost_full(&client_config, ctx); + records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, ctx); + records_lost += lib_ring_buffer_get_records_lost_big(&client_config, ctx); header->ctx.events_discarded = records_lost; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-ring-buffer-event-notifier-client.h new/lttng-modules-2.13.3/src/lttng-ring-buffer-event-notifier-client.h --- old/lttng-modules-2.13.1/src/lttng-ring-buffer-event-notifier-client.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-ring-buffer-event-notifier-client.h 2022-03-25 19:06:26.000000000 +0100 @@ -96,7 +96,8 @@ * subbuffer. data_size is between 1 and subbuf_size. */ static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx, unsigned long data_size) + unsigned int subbuf_idx, unsigned long data_size, + const struct lttng_kernel_ring_buffer_ctx *ctx) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-ring-buffer-metadata-client.h new/lttng-modules-2.13.3/src/lttng-ring-buffer-metadata-client.h --- old/lttng-modules-2.13.1/src/lttng-ring-buffer-metadata-client.h 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-ring-buffer-metadata-client.h 2022-03-25 19:06:26.000000000 +0100 @@ -110,7 +110,8 @@ * subbuffer. data_size is between 1 and subbuf_size. */ static void client_buffer_end(struct lttng_kernel_ring_buffer *buf, u64 tsc, - unsigned int subbuf_idx, unsigned long data_size) + unsigned int subbuf_idx, unsigned long data_size, + const struct lttng_kernel_ring_buffer_ctx *ctx) { struct lttng_kernel_ring_buffer_channel *chan = buf->backend.chan; struct metadata_packet_header *header = @@ -125,9 +126,9 @@ * We do not care about the records lost count, because the metadata * channel waits and retry. */ - (void) lib_ring_buffer_get_records_lost_full(&client_config, buf); - records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, buf); - records_lost += lib_ring_buffer_get_records_lost_big(&client_config, buf); + (void) lib_ring_buffer_get_records_lost_full(&client_config, ctx); + records_lost += lib_ring_buffer_get_records_lost_wrap(&client_config, ctx); + records_lost += lib_ring_buffer_get_records_lost_big(&client_config, ctx); WARN_ON_ONCE(records_lost != 0); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-statedump-impl.c new/lttng-modules-2.13.3/src/lttng-statedump-impl.c --- old/lttng-modules-2.13.1/src/lttng-statedump-impl.c 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-statedump-impl.c 2022-03-25 19:06:26.000000000 +0100 @@ -334,7 +334,7 @@ * suppressed */ if (get_capacity(disk) == 0 || - (disk->flags & GENHD_FL_SUPPRESS_PARTITION_INFO)) + (disk->flags & LTTNG_GENHD_FL_HIDDEN)) continue; ret = lttng_statedump_each_block_device(session, disk); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-syscalls-exit-compat-table.c new/lttng-modules-2.13.3/src/lttng-syscalls-exit-compat-table.c --- old/lttng-modules-2.13.1/src/lttng-syscalls-exit-compat-table.c 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-syscalls-exit-compat-table.c 2022-03-25 19:06:26.000000000 +0100 @@ -32,11 +32,11 @@ #define SC_EXIT #undef sc_in -#define sc_in(...) __VA_ARGS__ +#define sc_in(...) #undef sc_out -#define sc_out(...) +#define sc_out(...) __VA_ARGS__ #undef sc_inout -#define sc_inout(...) __VA_ARGS__ +#define sc_inout(...) __VA_ARGS__ #undef sc_exit #define sc_exit(...) __VA_ARGS__ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lttng-modules-2.13.1/src/lttng-syscalls-exit-table.c new/lttng-modules-2.13.3/src/lttng-syscalls-exit-table.c --- old/lttng-modules-2.13.1/src/lttng-syscalls-exit-table.c 2022-01-05 19:48:46.000000000 +0100 +++ new/lttng-modules-2.13.3/src/lttng-syscalls-exit-table.c 2022-03-25 19:06:26.000000000 +0100 @@ -32,11 +32,11 @@ #define SC_EXIT #undef sc_in -#define sc_in(...) __VA_ARGS__ +#define sc_in(...) #undef sc_out -#define sc_out(...) +#define sc_out(...) __VA_ARGS__ #undef sc_inout -#define sc_inout(...) __VA_ARGS__ +#define sc_inout(...) __VA_ARGS__ #undef sc_exit #define sc_exit(...) __VA_ARGS__
