[CIFS] Add dynamic trace points for flush and fsync

Commit Message

Steve French Feb. 6, 2020, 12:29 a.m. UTC

Makes it easier to debug errors on writeback that happen later,
and are being returned on flush or fsync

For example:
  writetest-17829 [002] .... 13583.407859: cifs_flush_err: ino=90 rc=-28

Comments

Pavel Shilovsky Feb. 6, 2020, 6:17 p.m. UTC | #1

ср, 5 февр. 2020 г. в 16:32, Steve French <[e-mail]>:
>
> Makes it easier to debug errors on writeback that happen later,
> and are being returned on flush or fsync
>
> For example:
>   writetest-17829 [002] .... 13583.407859: cifs_flush_err: ino=90 rc=-28

The patch is missing to add a similar tracepoint to cifs_strict_fsync().

--
Best regards,
Pavel Shilovsky

Steve French Feb. 6, 2020, 10:12 p.m. UTC | #2

cifs_strict_fsync already gets traced for most cases for entry and
exit since we have a dynamic trace point in get_xid and free_xid (for
enter and exit) ie trace_smb3_enter and trace_smb3_exit and
trace_smb3_exit_err




On Thu, Feb 6, 2020 at 12:17 PM Pavel Shilovsky <[e-mail]> wrote:
>
> ср, 5 февр. 2020 г. в 16:32, Steve French <[e-mail]>:
> >
> > Makes it easier to debug errors on writeback that happen later,
> > and are being returned on flush or fsync
> >
> > For example:
> >   writetest-17829 [002] .... 13583.407859: cifs_flush_err: ino=90 rc=-28
>
> The patch is missing to add a similar tracepoint to cifs_strict_fsync().
>
> --
> Best regards,
> Pavel Shilovsky

Patch

From f2bf09e97b47c7b13e8a918f560f6082e9bc8f8a Mon Sep 17 00:00:00 2001
From: Steve French <[e-mail]>
Date: Wed, 5 Feb 2020 18:22:37 -0600
Subject: [PATCH] cifs: Add tracepoints for errors on flush or fsync

Makes it easier to debug errors on writeback that happen later,
and are being returned on flush or fsync

For example:
  writetest-17829 [002] .... 13583.407859: cifs_flush_err: ino=90 rc=-28

Signed-off-by: Steve French <[e-mail]>
---
 fs/cifs/file.c  |  7 +++++--
 fs/cifs/trace.h | 27 +++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index 79e6f4f55b9b..99ea7b2a06a5 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2632,8 +2632,10 @@  int cifs_fsync(struct file *file, loff_t start, loff_t end, int datasync)
 	struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
 
 	rc = file_write_and_wait_range(file, start, end);
-	if (rc)
+	if (rc) {
+		trace_cifs_fsync_err(file_inode(file)->i_ino, rc);
 		return rc;
+	}
 
 	xid = get_xid();
 
@@ -2666,7 +2668,8 @@  int cifs_flush(struct file *file, fl_owner_t id)
 		rc = filemap_write_and_wait(inode->i_mapping);
 
 	cifs_dbg(FYI, "Flush inode %p file %p rc %d\n", inode, file, rc);
-
+	if (rc)
+		trace_cifs_flush_err(inode->i_ino, rc);
 	return rc;
 }
 
diff --git a/fs/cifs/trace.h b/fs/cifs/trace.h
index e7e350b13d6a..4cb0d5f7ce45 100644
--- a/fs/cifs/trace.h
+++ b/fs/cifs/trace.h
@@ -547,6 +547,33 @@  DEFINE_EVENT(smb3_exit_err_class, smb3_##name,    \
 
 DEFINE_SMB3_EXIT_ERR_EVENT(exit_err);
 
+
+DECLARE_EVENT_CLASS(smb3_sync_err_class,
+	TP_PROTO(unsigned long ino,
+		int	rc),
+	TP_ARGS(ino, rc),
+	TP_STRUCT__entry(
+		__field(unsigned long, ino)
+		__field(int, rc)
+	),
+	TP_fast_assign(
+		__entry->ino = ino;
+		__entry->rc = rc;
+	),
+	TP_printk("\tino=%lu rc=%d",
+		__entry->ino, __entry->rc)
+)
+
+#define DEFINE_SMB3_SYNC_ERR_EVENT(name)          \
+DEFINE_EVENT(smb3_sync_err_class, cifs_##name,    \
+	TP_PROTO(unsigned long ino,		\
+		int	rc),			\
+	TP_ARGS(ino, rc))
+
+DEFINE_SMB3_SYNC_ERR_EVENT(fsync_err);
+DEFINE_SMB3_SYNC_ERR_EVENT(flush_err);
+
+
 DECLARE_EVENT_CLASS(smb3_enter_exit_class,
 	TP_PROTO(unsigned int xid,
 		const char *func_name),
-- 
2.20.1