From: Christoph Hellwig <hch@lst.de>
To: "Darrick J . Wong" <darrick.wong@oracle.com>
Cc: Damien Le Moal <Damien.LeMoal@wdc.com>,
Andreas Gruenbacher <agruenba@redhat.com>,
linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 01/11] iomap: add tracing for the readpage / readpages
Date: Sun, 6 Oct 2019 17:45:58 +0200 [thread overview]
Message-ID: <20191006154608.24738-2-hch@lst.de> (raw)
In-Reply-To: <20191006154608.24738-1-hch@lst.de>
Lift the xfs code for tracing address space operations to the iomap
layer.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/iomap/Makefile | 16 ++++++++------
fs/iomap/buffered-io.c | 5 +++++
fs/iomap/trace.h | 49 ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 63 insertions(+), 7 deletions(-)
create mode 100644 fs/iomap/trace.h
diff --git a/fs/iomap/Makefile b/fs/iomap/Makefile
index 93cd11938bf5..eef2722d93a1 100644
--- a/fs/iomap/Makefile
+++ b/fs/iomap/Makefile
@@ -3,13 +3,15 @@
# Copyright (c) 2019 Oracle.
# All Rights Reserved.
#
-obj-$(CONFIG_FS_IOMAP) += iomap.o
-iomap-y += \
- apply.o \
- buffered-io.o \
- direct-io.o \
- fiemap.o \
- seek.o
+ccflags-y += -I $(srctree)/$(src) # needed for trace events
+
+obj-$(CONFIG_FS_IOMAP) += iomap.o
+iomap-y += trace.o \
+ apply.o \
+ buffered-io.o \
+ direct-io.o \
+ fiemap.o \
+ seek.o
iomap-$(CONFIG_SWAP) += swapfile.o
diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index e25901ae3ff4..fb209272765c 100644
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -16,6 +16,7 @@
#include <linux/bio.h>
#include <linux/sched/signal.h>
#include <linux/migrate.h>
+#include "trace.h"
#include "../internal.h"
@@ -293,6 +294,8 @@ iomap_readpage(struct page *page, const struct iomap_ops *ops)
unsigned poff;
loff_t ret;
+ trace_iomap_readpage(page->mapping->host, 1);
+
for (poff = 0; poff < PAGE_SIZE; poff += ret) {
ret = iomap_apply(inode, page_offset(page) + poff,
PAGE_SIZE - poff, 0, ops, &ctx,
@@ -389,6 +392,8 @@ iomap_readpages(struct address_space *mapping, struct list_head *pages,
loff_t last = page_offset(list_entry(pages->next, struct page, lru));
loff_t length = last - pos + PAGE_SIZE, ret = 0;
+ trace_iomap_readpages(mapping->host, nr_pages);
+
while (length > 0) {
ret = iomap_apply(mapping->host, pos, length, 0, ops,
&ctx, iomap_readpages_actor);
diff --git a/fs/iomap/trace.h b/fs/iomap/trace.h
new file mode 100644
index 000000000000..7798aeda7fb9
--- /dev/null
+++ b/fs/iomap/trace.h
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Copyright (c) 2009-2019, Christoph Hellwig
+ *
+ * NOTE: none of these tracepoints shall be consider a stable kernel ABI
+ * as they can change at any time.
+ */
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM iomap
+
+#if !defined(_IOMAP_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _IOMAP_TRACE_H
+
+#include <linux/tracepoint.h>
+
+struct inode;
+
+DECLARE_EVENT_CLASS(iomap_readpage_class,
+ TP_PROTO(struct inode *inode, int nr_pages),
+ TP_ARGS(inode, nr_pages),
+ TP_STRUCT__entry(
+ __field(dev_t, dev)
+ __field(u64, ino)
+ __field(int, nr_pages)
+ ),
+ TP_fast_assign(
+ __entry->dev = inode->i_sb->s_dev;
+ __entry->ino = inode->i_ino;
+ __entry->nr_pages = nr_pages;
+ ),
+ TP_printk("dev %d:%d ino 0x%llx nr_pages %d",
+ MAJOR(__entry->dev), MINOR(__entry->dev),
+ __entry->ino,
+ __entry->nr_pages)
+)
+
+#define DEFINE_READPAGE_EVENT(name) \
+DEFINE_EVENT(iomap_readpage_class, name, \
+ TP_PROTO(struct inode *inode, int nr_pages), \
+ TP_ARGS(inode, nr_pages))
+DEFINE_READPAGE_EVENT(iomap_readpage);
+DEFINE_READPAGE_EVENT(iomap_readpages);
+
+#endif /* _IOMAP_TRACE_H */
+
+#undef TRACE_INCLUDE_PATH
+#define TRACE_INCLUDE_PATH .
+#define TRACE_INCLUDE_FILE trace
+#include <trace/define_trace.h>
--
2.20.1
next prev parent reply other threads:[~2019-10-06 15:48 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-06 15:45 lift the xfs writepage code into iomap v6 Christoph Hellwig
2019-10-06 15:45 ` Christoph Hellwig [this message]
2019-10-06 22:43 ` [PATCH 01/11] iomap: add tracing for the readpage / readpages Darrick J. Wong
2019-10-07 5:48 ` Christoph Hellwig
2019-10-07 6:17 ` Christoph Hellwig
2019-10-07 15:23 ` Darrick J. Wong
2019-10-07 13:00 ` Brian Foster
2019-10-06 15:45 ` [PATCH 02/11] iomap: copy the xfs writeback code to iomap.c Christoph Hellwig
2019-10-07 21:43 ` Dave Chinner
2019-10-08 6:34 ` Christoph Hellwig
2019-10-08 7:37 ` Dave Chinner
2019-10-06 15:46 ` [PATCH 03/11] iomap: warn on inline maps in iomap_writepage_map Christoph Hellwig
2019-10-06 15:46 ` [PATCH 04/11] xfs: set IOMAP_F_NEW more carefully Christoph Hellwig
2019-10-06 15:46 ` [PATCH 05/11] iomap: zero newly allocated mapped blocks Christoph Hellwig
2019-10-07 21:46 ` Dave Chinner
2019-10-07 22:08 ` Dave Chinner
2019-10-06 15:46 ` [PATCH 06/11] xfs: remove the readpage / readpages tracing code Christoph Hellwig
2019-10-06 15:46 ` [PATCH 07/11] xfs: initialize iomap->flags in xfs_bmbt_to_iomap Christoph Hellwig
2019-10-06 15:46 ` [PATCH 08/11] xfs: use a struct iomap in xfs_writepage_ctx Christoph Hellwig
2019-10-07 21:54 ` Dave Chinner
2019-10-08 6:42 ` Christoph Hellwig
2019-10-06 15:46 ` [PATCH 09/11] xfs: remove the fork fields in the writepage_ctx and ioend Christoph Hellwig
2019-10-07 21:59 ` Dave Chinner
2019-10-08 6:12 ` Christoph Hellwig
2019-10-06 15:46 ` [PATCH 10/11] xfs: use the iomap writeback code Christoph Hellwig
2019-10-07 13:06 ` Brian Foster
2019-10-07 15:25 ` Darrick J. Wong
2019-10-06 15:46 ` [PATCH 11/11] iomap: move struct iomap_page out of iomap.h Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2019-10-01 7:11 lift the xfs writepage code into iomap v5 Christoph Hellwig
2019-10-01 7:11 ` [PATCH 01/11] iomap: add tracing for the readpage / readpages Christoph Hellwig
2019-10-01 15:23 ` Brian Foster
2019-10-01 20:52 ` Darrick J. Wong
2019-10-04 23:49 ` Darrick J. Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191006154608.24738-2-hch@lst.de \
--to=hch@lst.de \
--cc=Damien.LeMoal@wdc.com \
--cc=agruenba@redhat.com \
--cc=darrick.wong@oracle.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-xfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).