From e68322f3615fa6c8dbf25a0860b44af181ac99ec Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 26 Oct 2020 17:03:23 -0400 Subject: [PATCH] fix: ext4: fast commit recovery path (v5.10) See upstream commit : commit 8016e29f4362e285f0f7e38fadc61a5b7bdfdfa2 Author: Harshad Shirwadkar Date: Thu Oct 15 13:37:59 2020 -0700 ext4: fast commit recovery path This patch adds fast commit recovery path support for Ext4 file system. We add several helper functions that are similar in spirit to e2fsprogs journal recovery path handlers. Example of such functions include - a simple block allocator, idempotent block bitmap update function etc. Using these routines and the fast commit log in the fast commit area, the recovery path (ext4_fc_replay()) performs fast commit log recovery. Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers Change-Id: Ia65cf44e108f2df0b458f0d335f33a8f18f50baa --- include/instrumentation/events/ext4.h | 41 +++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h index 5a61962b..a643abd9 100644 --- a/include/instrumentation/events/ext4.h +++ b/include/instrumentation/events/ext4.h @@ -1274,6 +1274,18 @@ LTTNG_TRACEPOINT_EVENT(ext4_ext_load_extent, ) ) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) +LTTNG_TRACEPOINT_EVENT(ext4_load_inode, + TP_PROTO(struct super_block *sb, unsigned long ino), + + TP_ARGS(sb, ino), + + TP_FIELDS( + ctf_integer(dev_t, dev, sb->s_dev) + ctf_integer(ino_t, ino, ino) + ) +) +#else LTTNG_TRACEPOINT_EVENT(ext4_load_inode, TP_PROTO(struct inode *inode), @@ -1284,6 +1296,7 @@ LTTNG_TRACEPOINT_EVENT(ext4_load_inode, ctf_integer(ino_t, ino, inode->i_ino) ) ) +#endif #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0)) @@ -1895,6 +1908,34 @@ LTTNG_TRACEPOINT_EVENT(ext4_es_shrink_exit, #endif +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,0)) +LTTNG_TRACEPOINT_EVENT(ext4_fc_replay_scan, + TP_PROTO(struct super_block *sb, int error, int off), + + TP_ARGS(sb, error, off), + + TP_FIELDS( + ctf_integer(dev_t, dev, sb->s_dev) + ctf_integer(int, error, error) + ctf_integer(int, off, off) + ) +) + +LTTNG_TRACEPOINT_EVENT(ext4_fc_replay, + TP_PROTO(struct super_block *sb, int tag, int ino, int priv1, int priv2), + + TP_ARGS(sb, tag, ino, priv1, priv2), + + TP_FIELDS( + ctf_integer(dev_t, dev, sb->s_dev) + ctf_integer(int, tag, tag) + ctf_integer(int, ino, ino) + ctf_integer(int, priv1, priv1) + ctf_integer(int, priv2, priv2) + ) +) +#endif + #endif /* LTTNG_TRACE_EXT4_H */ /* This part must be outside protection */ -- 2.34.1