ntfs3: add mount and log replay tracepoints

Add ntfs3 tracepoints for mount and log replay paths.

This adds trace events for ntfs_fill_super(), ntfs_init_from_boot(),
and log_replay() to help observe mount setup, boot sector parsing,
and $LogFile replay results.

Signed-off-by: Baolin Liu <liubaolin@kylinos.cn>
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
This commit is contained in:
Baolin Liu 2026-08-20 17:04:58 +08:00 committed by Konstantin Komarov
parent 351817226f
commit 857c06086a
No known key found for this signature in database
GPG Key ID: A9B0331F832407B6
4 changed files with 99 additions and 1 deletions

View File

@ -19502,6 +19502,7 @@ W: http://www.paragon-software.com/
T: git https://github.com/Paragon-Software-Group/linux-ntfs3.git
F: Documentation/filesystems/ntfs3.rst
F: fs/ntfs3/
F: include/trace/events/ntfs3.h
NTSYNC SYNCHRONIZATION PRIMITIVE DRIVER
M: Elizabeth Figura <zfigura@codeweavers.com>

View File

@ -14,6 +14,7 @@
#include "debug.h"
#include "ntfs.h"
#include "ntfs_fs.h"
#include <trace/events/ntfs3.h>
/*
* LOG FILE structs
@ -5418,6 +5419,8 @@ int log_replay(struct ntfs_inode *ni, bool *initialized)
else if (log->set_dirty)
ntfs_set_state(sbi, NTFS_DIRTY_ERROR);
trace_ntfs3_log_replay(&ni->vfs_inode, *initialized, err);
kfree(log);
return err;

View File

@ -78,6 +78,9 @@
#include "lib/lib.h"
#endif
#define CREATE_TRACE_POINTS
#include <trace/events/ntfs3.h>
#ifdef CONFIG_PRINTK
/*
* ntfs_printk - Trace warnings/notices/errors.
@ -991,7 +994,7 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,
{
struct ntfs_sb_info *sbi = sb->s_fs_info;
int err;
u32 mb, gb, boot_sector_size, sct_per_clst, record_size;
u32 mb, gb, boot_sector_size = 0, sct_per_clst, record_size;
u64 sectors, clusters, mlcn, mlcn2, mft_pos, mft2_pos, dev_size0;
struct NTFS_BOOT *boot;
struct buffer_head *bh;
@ -1264,6 +1267,8 @@ static int ntfs_init_from_boot(struct super_block *sb, u32 sector_size,
}
out:
trace_ntfs3_init_from_boot(sb, sector_size, boot_sector_size,
!!boot_block, err);
brelse(bh);
if (err == -EINVAL && !boot_block && dev_size0 > PAGE_SHIFT) {
@ -1782,12 +1787,16 @@ static int ntfs_fill_super(struct super_block *sb, struct fs_context *fc)
}
ntfs_create_procdir(sb);
trace_ntfs3_fill_super(sb, ro, sbi->cluster_size, sbi->record_size,
sbi->index_size, 0);
return 0;
put_inode_out:
iput(inode);
out:
trace_ntfs3_fill_super(sb, ro, sbi->cluster_size, sbi->record_size,
sbi->index_size, err);
/* sbi->options == options */
if (options) {
put_mount_options(sbi->options);

View File

@ -0,0 +1,85 @@
/* SPDX-License-Identifier: GPL-2.0 */
#undef TRACE_SYSTEM
#define TRACE_SYSTEM ntfs3
#if !defined(_TRACE_NTFS3_H) || defined(TRACE_HEADER_MULTI_READ)
#define _TRACE_NTFS3_H
#include <linux/fs.h>
#include <linux/tracepoint.h>
TRACE_EVENT(ntfs3_fill_super,
TP_PROTO(struct super_block *sb, bool ro, u32 cluster_size,
u32 record_size, u32 index_size, int err),
TP_ARGS(sb, ro, cluster_size, record_size, index_size, err),
TP_STRUCT__entry(
__field(dev_t, dev)
__field(u32, cluster_size)
__field(u32, record_size)
__field(u32, index_size)
__field(int, err)
__field(bool, ro)
),
TP_fast_assign(
__entry->dev = sb->s_bdev->bd_dev;
__entry->cluster_size = cluster_size;
__entry->record_size = record_size;
__entry->index_size = index_size;
__entry->err = err;
__entry->ro = ro;
),
TP_printk("dev=(%d,%d) ro=%d cluster=%u record=%u index=%u err=%d",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ro,
__entry->cluster_size, __entry->record_size,
__entry->index_size, __entry->err)
);
TRACE_EVENT(ntfs3_init_from_boot,
TP_PROTO(struct super_block *sb, u32 media_sector_size,
u32 boot_sector_size, bool used_alt_boot, int err),
TP_ARGS(sb, media_sector_size, boot_sector_size, used_alt_boot, err),
TP_STRUCT__entry(
__field(dev_t, dev)
__field(u32, media_sector_size)
__field(u32, boot_sector_size)
__field(int, err)
__field(bool, used_alt_boot)
),
TP_fast_assign(
__entry->dev = sb->s_bdev->bd_dev;
__entry->media_sector_size = media_sector_size;
__entry->boot_sector_size = boot_sector_size;
__entry->err = err;
__entry->used_alt_boot = used_alt_boot;
),
TP_printk("dev=(%d,%d) media_sector=%u boot_sector=%u alt_boot=%d err=%d",
MAJOR(__entry->dev), MINOR(__entry->dev),
__entry->media_sector_size, __entry->boot_sector_size,
__entry->used_alt_boot, __entry->err)
);
TRACE_EVENT(ntfs3_log_replay,
TP_PROTO(struct inode *inode, bool initialized, int err),
TP_ARGS(inode, initialized, err),
TP_STRUCT__entry(
__field(unsigned long, ino)
__field(loff_t, size)
__field(dev_t, dev)
__field(int, err)
__field(bool, initialized)
),
TP_fast_assign(
__entry->ino = inode->i_ino;
__entry->size = i_size_read(inode);
__entry->dev = inode->i_sb->s_dev;
__entry->err = err;
__entry->initialized = initialized;
),
TP_printk("dev=(%d,%d) ino=%lu size=%lld initialized=%d err=%d",
MAJOR(__entry->dev), MINOR(__entry->dev), __entry->ino,
__entry->size, __entry->initialized, __entry->err)
);
#endif /* _TRACE_NTFS3_H */
#include <trace/define_trace.h>