X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=instrumentation%2Fevents%2Flttng-module%2Fext4.h;h=b9586a754f3c643f5da8ff3dd9e21bb5ac6c7bbc;hb=369708f464bedc0682151df9308cebfa14dbdb2b;hp=e87b5340942de2390126dc03ebcd94ac09595755;hpb=6ec43db836429730c1431809049197a4fbe820fa;p=lttng-modules.git diff --git a/instrumentation/events/lttng-module/ext4.h b/instrumentation/events/lttng-module/ext4.h index e87b5340..b9586a75 100644 --- a/instrumentation/events/lttng-module/ext4.h +++ b/instrumentation/events/lttng-module/ext4.h @@ -1,3 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ #undef TRACE_SYSTEM #define TRACE_SYSTEM ext4 @@ -6,7 +7,6 @@ #include #include -#include #ifndef _TRACE_EXT4_DEF_ #define _TRACE_EXT4_DEF_ @@ -16,17 +16,11 @@ struct ext4_prealloc_space; struct ext4_inode_info; struct mpage_da_data; struct ext4_map_blocks; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) struct ext4_extent; #endif -#endif #define EXT4_I(inode) (container_of(inode, struct ext4_inode_info, vfs_inode)) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) #define TP_MODE_T __u16 -#else -#define TP_MODE_T umode_t -#endif LTTNG_TRACEPOINT_EVENT(ext4_free_inode, TP_PROTO(struct inode *inode), @@ -36,13 +30,8 @@ LTTNG_TRACEPOINT_EVENT(ext4_free_inode, TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0)) ctf_integer(uid_t, uid, i_uid_read(inode)) ctf_integer(gid_t, gid, i_gid_read(inode)) -#else - ctf_integer(uid_t, uid, inode->i_uid) - ctf_integer(gid_t, gid, inode->i_gid) -#endif ctf_integer(__u64, blocks, inode->i_blocks) ctf_integer(TP_MODE_T, mode, inode->i_mode) ) @@ -73,7 +62,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), @@ -106,7 +94,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_mark_inode_dirty, TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ) ) @@ -121,7 +109,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate, ctf_integer(loff_t, new_size, new_size) ) ) -#endif LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, @@ -202,20 +189,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), @@ -229,22 +202,12 @@ 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) ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages, TP_PROTO(struct inode *inode, pgoff_t first_page, struct writeback_control *wbc), @@ -260,32 +223,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages, ) ) -#else - -LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages, - TP_PROTO(struct inode *inode, struct mpage_da_data *mpd), - - TP_ARGS(inode, mpd), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(__u64, b_blocknr, mpd->b_blocknr) - ctf_integer(__u32, b_size, mpd->b_size) - ctf_integer(__u32, b_state, mpd->b_state) - 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 - ) -) - -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent, TP_PROTO(struct inode *inode, struct ext4_map_blocks *map), @@ -300,8 +237,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_write_pages_extent, ) ) -#endif - LTTNG_TRACEPOINT_EVENT(ext4_da_writepages_result, TP_PROTO(struct inode *inode, struct writeback_control *wbc, int ret, int pages_written), @@ -315,22 +250,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), @@ -343,14 +266,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, @@ -366,8 +287,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__page_op, ext4_releasepage, TP_ARGS(page) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(ext4_invalidatepage_op, TP_PROTO(struct page *page, unsigned int offset, unsigned int length), @@ -394,26 +313,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4_invalidatepage_op, ext4_journalled_invalida TP_ARGS(page, offset, length) ) -#else - -LTTNG_TRACEPOINT_EVENT(ext4_invalidatepage, - TP_PROTO(struct page *page, unsigned long offset), - - TP_ARGS(page, offset), - - TP_FIELDS( - ctf_integer(dev_t, dev, page->mapping->host->i_sb->s_dev) - ctf_integer(ino_t, ino, page->mapping->host->i_ino) - ctf_integer(pgoff_t, index, page->index) - ctf_integer(unsigned long, offset, offset) - - ) -) - -#endif - -#endif - LTTNG_TRACEPOINT_EVENT(ext4_discard_blocks, TP_PROTO(struct super_block *sb, unsigned long long blk, unsigned long long count), @@ -460,47 +359,14 @@ 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), -#endif TP_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) ) @@ -508,39 +374,12 @@ LTTNG_TRACEPOINT_EVENT(ext4_mb_release_inode_pa, 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), -#else - TP_PROTO(struct ext4_allocation_context *ac, - struct ext4_prealloc_space *pa), - - TP_ARGS(ac, pa), -#endif 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) ) @@ -608,62 +447,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), -#endif TP_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), -#endif TP_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) -#endif ctf_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), @@ -675,7 +486,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), @@ -698,7 +508,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_alloc_da_blocks, ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) ctf_integer(unsigned int, data_blocks, EXT4_I(inode)->i_reserved_data_blocks) - ctf_integer(unsigned int, meta_blocks, EXT4_I(inode)->i_reserved_meta_blocks) ) ) @@ -751,7 +560,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, @@ -759,33 +567,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, @@ -793,16 +586,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, @@ -810,14 +597,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), @@ -831,19 +612,11 @@ LTTNG_TRACEPOINT_EVENT(ext4_forget, ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34)) LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) TP_PROTO(struct inode *inode, int used_blocks, int quota_claim), TP_ARGS(inode, used_blocks, quota_claim), -#else - TP_PROTO(struct inode *inode, int used_blocks), - - TP_ARGS(inode, used_blocks), -#endif TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) @@ -852,18 +625,11 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_update_reserve_space, ctf_integer(int, used_blocks, used_blocks) ctf_integer(int, reserved_data_blocks, EXT4_I(inode)->i_reserved_data_blocks) - ctf_integer(int, reserved_meta_blocks, - EXT4_I(inode)->i_reserved_meta_blocks) - ctf_integer(int, allocated_meta_blocks, - EXT4_I(inode)->i_allocated_meta_blocks) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) ctf_integer(int, quota_claim, quota_claim) -#endif ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, TP_PROTO(struct inode *inode), @@ -875,30 +641,9 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, ctf_integer(__u64, i_blocks, inode->i_blocks) ctf_integer(int, reserved_data_blocks, EXT4_I(inode)->i_reserved_data_blocks) - ctf_integer(int, reserved_meta_blocks, - EXT4_I(inode)->i_reserved_meta_blocks) ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ -LTTNG_TRACEPOINT_EVENT(ext4_da_reserve_space, - TP_PROTO(struct inode *inode, int md_needed), - - TP_ARGS(inode, md_needed), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(__u64, i_blocks, inode->i_blocks) - ctf_integer(int, md_needed, md_needed) - ctf_integer(int, reserved_data_blocks, - EXT4_I(inode)->i_reserved_data_blocks) - ctf_integer(int, reserved_meta_blocks, - EXT4_I(inode)->i_reserved_meta_blocks) - ctf_integer(TP_MODE_T, mode, inode->i_mode) - ) -) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0)) */ LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, TP_PROTO(struct inode *inode, int freed_blocks), @@ -912,16 +657,10 @@ LTTNG_TRACEPOINT_EVENT(ext4_da_release_space, ctf_integer(int, freed_blocks, freed_blocks) ctf_integer(int, reserved_data_blocks, EXT4_I(inode)->i_reserved_data_blocks) - ctf_integer(int, reserved_meta_blocks, - EXT4_I(inode)->i_reserved_meta_blocks) - ctf_integer(int, allocated_meta_blocks, - EXT4_I(inode)->i_allocated_meta_blocks) ctf_integer(TP_MODE_T, mode, inode->i_mode) ) ) -#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), @@ -946,9 +685,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), @@ -1008,8 +745,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_fallocate_exit, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(ext4__fallocate_mode, TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode), @@ -1045,41 +780,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__fallocate_mode, ext4_zero_range, TP_ARGS(inode, offset, len, mode) ) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ - -LTTNG_TRACEPOINT_EVENT(ext4_fallocate_enter, - TP_PROTO(struct inode *inode, loff_t offset, loff_t len, int mode), - - TP_ARGS(inode, offset, len, mode), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(loff_t, pos, offset) - ctf_integer(loff_t, len, len) - ctf_integer(int, mode, mode) - ) -) - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - -LTTNG_TRACEPOINT_EVENT(ext4_punch_hole, - TP_PROTO(struct inode *inode, loff_t offset, loff_t len), - - TP_ARGS(inode, offset, len), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(loff_t, pos, offset) - ctf_integer(loff_t, len, len) - ) -) - -#endif /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) */ - -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0)) */ - LTTNG_TRACEPOINT_EVENT(ext4_unlink_enter, TP_PROTO(struct inode *parent, struct dentry *dentry), @@ -1131,7 +831,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__truncate, ext4_truncate_exit, TP_ARGS(inode) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) /* 'ux' is the uninitialized extent. */ LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_enter, TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, @@ -1173,7 +872,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_convert_to_initialized_fastpath, ctf_integer(ext4_fsblk_t, i_pblk, ext4_ext_pblock(ix)) ) ) -#endif LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_enter, TP_PROTO(struct inode *inode, ext4_lblk_t lblk, @@ -1204,8 +902,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_enter, ext4_ind_map_blocks_ente TP_ARGS(inode, lblk, len, flags) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit, TP_PROTO(struct inode *inode, unsigned flags, struct ext4_map_blocks *map, int ret), @@ -1238,70 +934,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit, TP_ARGS(inode, flags, map, ret) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) - -LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit, - TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret), - - TP_ARGS(inode, map, ret), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_fsblk_t, pblk, map->m_pblk) - ctf_integer(ext4_lblk_t, lblk, map->m_lblk) - ctf_integer(unsigned int, len, map->m_len) - ctf_integer(unsigned int, mflags, map->m_flags) - ctf_integer(int, ret, ret) - ) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ext_map_blocks_exit, - TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret), - - TP_ARGS(inode, map, ret) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit, - TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int ret), - - TP_ARGS(inode, map, ret) -) - -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */ - -LTTNG_TRACEPOINT_EVENT_CLASS(ext4__map_blocks_exit, - TP_PROTO(struct inode *inode, ext4_lblk_t lblk, - ext4_fsblk_t pblk, unsigned int len, int ret), - - TP_ARGS(inode, lblk, pblk, len, ret), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_fsblk_t, pblk, pblk) - ctf_integer(ext4_lblk_t, lblk, lblk) - ctf_integer(unsigned int, len, len) - ctf_integer(int, ret, ret) - ) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ext_map_blocks_exit, - TP_PROTO(struct inode *inode, ext4_lblk_t lblk, - ext4_fsblk_t pblk, unsigned len, int ret), - - TP_ARGS(inode, lblk, pblk, len, ret) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__map_blocks_exit, ext4_ind_map_blocks_exit, - TP_PROTO(struct inode *inode, ext4_lblk_t lblk, - ext4_fsblk_t pblk, unsigned len, int ret), - - TP_ARGS(inode, lblk, pblk, len, ret) -) - -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */ - LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent, TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_fsblk_t pblk), @@ -1325,21 +957,19 @@ LTTNG_TRACEPOINT_EVENT(ext4_load_inode, ctf_integer(ino_t, ino, inode->i_ino) ) ) -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) LTTNG_TRACEPOINT_EVENT(ext4_journal_start, TP_PROTO(struct super_block *sb, int blocks, int rsv_blocks, - unsigned long IP), + int revoke_creds, unsigned long IP), - TP_ARGS(sb, blocks, rsv_blocks, IP), + TP_ARGS(sb, blocks, rsv_blocks, revoke_creds, IP), TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, blocks, blocks) ctf_integer(int, rsv_blocks, rsv_blocks) + ctf_integer(int, revoke_creds, revoke_creds) ) ) @@ -1350,86 +980,21 @@ LTTNG_TRACEPOINT_EVENT(ext4_journal_start_reserved, TP_FIELDS( ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) + ctf_integer_hex(unsigned long, ip, IP) ctf_integer(int, blocks, blocks) ) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,1,0)) - -LTTNG_TRACEPOINT_EVENT(ext4_journal_start, - TP_PROTO(struct super_block *sb, int nblocks, unsigned long IP), - - TP_ARGS(sb, nblocks, IP), - - TP_FIELDS( - ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(unsigned long, ip, IP) - ctf_integer(int, nblocks, nblocks) - ) -) - -LTTNG_TRACEPOINT_EVENT_CLASS(ext4__trim, - TP_PROTO(struct super_block *sb, - ext4_group_t group, - ext4_grpblk_t start, - ext4_grpblk_t len), - - TP_ARGS(sb, group, start, len), - - TP_FIELDS( - ctf_integer(int, dev_major, MAJOR(sb->s_dev)) - ctf_integer(int, dev_minor, MINOR(sb->s_dev)) - ctf_integer(__u32, group, group) - ctf_integer(int, start, start) - ctf_integer(int, len, len) - ) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__trim, ext4_trim_extent, - - TP_PROTO(struct super_block *sb, - ext4_group_t group, - ext4_grpblk_t start, - ext4_grpblk_t len), - - TP_ARGS(sb, group, start, len) -) - -LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__trim, ext4_trim_all_free, - - TP_PROTO(struct super_block *sb, - ext4_group_t group, - ext4_grpblk_t start, - ext4_grpblk_t len), - - TP_ARGS(sb, group, start, len) -) -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)) - LTTNG_TRACEPOINT_EVENT(ext4_ext_handle_uninitialized_extents, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, int flags, unsigned int allocated, ext4_fsblk_t newblock), TP_ARGS(inode, map, flags, allocated, newblock), -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */ - TP_PROTO(struct inode *inode, struct ext4_map_blocks *map, - unsigned int allocated, ext4_fsblk_t newblock), - - TP_ARGS(inode, map, allocated, newblock), -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */ TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) ctf_integer(int, flags, flags) -#else /* #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */ - ctf_integer(int, flags, map->m_flags) -#endif /* #else #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)) */ ctf_integer(ext4_lblk_t, lblk, map->m_lblk) ctf_integer(ext4_fsblk_t, pblk, map->m_pblk) ctf_integer(unsigned int, len, map->m_len) @@ -1526,91 +1091,47 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_show_extent, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks, - TP_PROTO(struct inode *inode, struct ext4_extent *ex, - ext4_lblk_t from, ext4_fsblk_t to, - long long partial_cluster), + TP_PROTO(struct inode *inode, struct ext4_extent *ex, + ext4_lblk_t from, ext4_fsblk_t to, + struct partial_cluster *pc), - TP_ARGS(inode, ex, from, to, partial_cluster), + TP_ARGS(inode, ex, from, to, pc), TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) ctf_integer(ext4_lblk_t, from, from) ctf_integer(ext4_lblk_t, to, to) - ctf_integer(long long, partial, partial_cluster) ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex)) ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block)) ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex)) + ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu) + ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk) + ctf_integer(int, pc_state, pc->state) ) ) -#else - -LTTNG_TRACEPOINT_EVENT(ext4_remove_blocks, - TP_PROTO(struct inode *inode, struct ext4_extent *ex, - ext4_lblk_t from, ext4_fsblk_t to, - ext4_fsblk_t partial_cluster), - - TP_ARGS(inode, ex, from, to, partial_cluster), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, from, from) - ctf_integer(ext4_lblk_t, to, to) - ctf_integer(ext4_fsblk_t, partial, partial_cluster) - ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex)) - ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block)) - ctf_integer(unsigned short, ee_len, ext4_ext_get_actual_len(ex)) - ) -) - -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf, TP_PROTO(struct inode *inode, ext4_lblk_t start, struct ext4_extent *ex, - long long partial_cluster), + struct partial_cluster *pc), - TP_ARGS(inode, start, ex, partial_cluster), + TP_ARGS(inode, start, ex, pc), TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(long long, partial, partial_cluster) ctf_integer(ext4_lblk_t, start, start) ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block)) ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex)) ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex)) + ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu) + ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk) + ctf_integer(int, pc_state, pc->state) ) ) -#else - -LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_leaf, - TP_PROTO(struct inode *inode, ext4_lblk_t start, - struct ext4_extent *ex, ext4_fsblk_t partial_cluster), - - TP_ARGS(inode, start, ex, partial_cluster), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(long long, partial, partial_cluster) - ctf_integer(ext4_lblk_t, start, start) - ctf_integer(ext4_lblk_t, ee_lblk, le32_to_cpu(ex->ee_block)) - ctf_integer(ext4_fsblk_t, ee_pblk, ext4_ext_pblock(ex)) - ctf_integer(short, ee_len, ext4_ext_get_actual_len(ex)) - ) -) - -#endif - LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_idx, TP_PROTO(struct inode *inode, ext4_fsblk_t pblk), @@ -1623,8 +1144,6 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_rm_idx, ) ) -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space, TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end, int depth), @@ -1640,30 +1159,11 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space, ) ) -#else - -LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space, - TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth), - - TP_ARGS(inode, start, depth), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, start, start) - ctf_integer(int, depth, depth) - ) -) - -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done, TP_PROTO(struct inode *inode, ext4_lblk_t start, ext4_lblk_t end, - int depth, long long partial, __le16 eh_entries), + int depth, struct partial_cluster *pc, __le16 eh_entries), - TP_ARGS(inode, start, end, depth, partial, eh_entries), + TP_ARGS(inode, start, end, depth, pc, eh_entries), TP_FIELDS( ctf_integer(dev_t, dev, inode->i_sb->s_dev) @@ -1671,35 +1171,13 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done, ctf_integer(ext4_lblk_t, start, start) ctf_integer(ext4_lblk_t, end, end) ctf_integer(int, depth, depth) - ctf_integer(long long, partial, partial) ctf_integer(unsigned short, eh_entries, le16_to_cpu(eh_entries)) + ctf_integer(ext4_fsblk_t, pc_pclu, pc->pclu) + ctf_integer(ext4_lblk_t, pc_lblk, pc->lblk) + ctf_integer(int, pc_state, pc->state) ) ) -#else - -LTTNG_TRACEPOINT_EVENT(ext4_ext_remove_space_done, - TP_PROTO(struct inode *inode, ext4_lblk_t start, int depth, - ext4_lblk_t partial, unsigned short eh_entries), - - TP_ARGS(inode, start, depth, partial, eh_entries), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, start, start) - ctf_integer(int, depth, depth) - ctf_integer(ext4_lblk_t, partial, partial) - ctf_integer(unsigned short, eh_entries, eh_entries) - ) -) - -#endif - -#endif - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) - LTTNG_TRACEPOINT_EVENT_CLASS(ext4__es_extent, TP_PROTO(struct inode *inode, struct extent_status *es), @@ -1727,118 +1205,6 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__es_extent, ext4_es_cache_extent, TP_ARGS(inode, es) ) -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3,11,0)) - -LTTNG_TRACEPOINT_EVENT(ext4_es_insert_extent, - TP_PROTO(struct inode *inode, struct extent_status *es), - - TP_ARGS(inode, es), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, lblk, es->es_lblk) - ctf_integer(ext4_lblk_t, len, es->es_len) - ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es)) - ctf_integer(char, status, ext4_es_status(es) >> 60) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_remove_extent, - TP_PROTO(struct inode *inode, ext4_lblk_t lblk, ext4_lblk_t len), - - TP_ARGS(inode, lblk, len), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(loff_t, lblk, lblk) - ctf_integer(loff_t, len, len) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_find_delayed_extent_range_enter, - TP_PROTO(struct inode *inode, ext4_lblk_t lblk), - - TP_ARGS(inode, lblk), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, lblk, lblk) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_find_delayed_extent_range_exit, - TP_PROTO(struct inode *inode, struct extent_status *es), - - TP_ARGS(inode, es), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, lblk, es->es_lblk) - ctf_integer(ext4_lblk_t, len, es->es_len) - ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es)) - ctf_integer(char, status, ext4_es_status(es) >> 60) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_lookup_extent_enter, - TP_PROTO(struct inode *inode, ext4_lblk_t lblk), - - TP_ARGS(inode, lblk), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, lblk, lblk) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_lookup_extent_exit, - TP_PROTO(struct inode *inode, struct extent_status *es, - int found), - - TP_ARGS(inode, es, found), - - TP_FIELDS( - ctf_integer(dev_t, dev, inode->i_sb->s_dev) - ctf_integer(ino_t, ino, inode->i_ino) - ctf_integer(ext4_lblk_t, lblk, es->es_lblk) - ctf_integer(ext4_lblk_t, len, es->es_len) - ctf_integer(ext4_fsblk_t, pblk, ext4_es_pblock(es)) - ctf_integer(char, status, ext4_es_status(es) >> 60) - ctf_integer(int, found, found) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_enter, - TP_PROTO(struct super_block *sb, int nr_to_scan, int cache_cnt), - - TP_ARGS(sb, nr_to_scan, cache_cnt), - - TP_FIELDS( - ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(int, nr_to_scan, nr_to_scan) - ctf_integer(int, cache_cnt, cache_cnt) - ) -) - -LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, - TP_PROTO(struct super_block *sb, int shrunk_nr, int cache_cnt), - - TP_ARGS(sb, shrunk_nr, cache_cnt), - - TP_FIELDS( - ctf_integer(dev_t, dev, sb->s_dev) - ctf_integer(int, shrunk_nr, shrunk_nr) - ctf_integer(int, cache_cnt, cache_cnt) - ) -) - -#endif - #endif /* LTTNG_TRACE_EXT4_H */ /* This part must be outside protection */