diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-02-21 14:05:48 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-03-03 21:28:29 -0500 |
commit | fe7d4ccd1d7748bc9919c1bdee1e8286776f75ff (patch) | |
tree | 0d55a8de27712c409441c9b20844163c295ad07b | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) |
regmap: async: Add tracepoints for async I/O
Trace when we start and complete async writes, and when we start and
finish blocking for their completion. This is useful for performance
analysis of the resulting I/O patterns.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
-rw-r--r-- | drivers/base/regmap/regmap.c | 8 | ||||
-rw-r--r-- | include/trace/events/regmap.h | 48 |
2 files changed, 56 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c index 3d2367501fd0..7c6d3be137ba 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c | |||
@@ -999,6 +999,8 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg, | |||
999 | if (!async) | 999 | if (!async) |
1000 | return -ENOMEM; | 1000 | return -ENOMEM; |
1001 | 1001 | ||
1002 | trace_regmap_async_write_start(map->dev, reg, val_len); | ||
1003 | |||
1002 | async->work_buf = kzalloc(map->format.buf_size, | 1004 | async->work_buf = kzalloc(map->format.buf_size, |
1003 | GFP_KERNEL | GFP_DMA); | 1005 | GFP_KERNEL | GFP_DMA); |
1004 | if (!async->work_buf) { | 1006 | if (!async->work_buf) { |
@@ -1640,6 +1642,8 @@ void regmap_async_complete_cb(struct regmap_async *async, int ret) | |||
1640 | struct regmap *map = async->map; | 1642 | struct regmap *map = async->map; |
1641 | bool wake; | 1643 | bool wake; |
1642 | 1644 | ||
1645 | trace_regmap_async_io_complete(map->dev); | ||
1646 | |||
1643 | spin_lock(&map->async_lock); | 1647 | spin_lock(&map->async_lock); |
1644 | 1648 | ||
1645 | list_del(&async->list); | 1649 | list_del(&async->list); |
@@ -1686,6 +1690,8 @@ int regmap_async_complete(struct regmap *map) | |||
1686 | if (!map->bus->async_write) | 1690 | if (!map->bus->async_write) |
1687 | return 0; | 1691 | return 0; |
1688 | 1692 | ||
1693 | trace_regmap_async_complete_start(map->dev); | ||
1694 | |||
1689 | wait_event(map->async_waitq, regmap_async_is_done(map)); | 1695 | wait_event(map->async_waitq, regmap_async_is_done(map)); |
1690 | 1696 | ||
1691 | spin_lock_irqsave(&map->async_lock, flags); | 1697 | spin_lock_irqsave(&map->async_lock, flags); |
@@ -1693,6 +1699,8 @@ int regmap_async_complete(struct regmap *map) | |||
1693 | map->async_ret = 0; | 1699 | map->async_ret = 0; |
1694 | spin_unlock_irqrestore(&map->async_lock, flags); | 1700 | spin_unlock_irqrestore(&map->async_lock, flags); |
1695 | 1701 | ||
1702 | trace_regmap_async_complete_done(map->dev); | ||
1703 | |||
1696 | return ret; | 1704 | return ret; |
1697 | } | 1705 | } |
1698 | EXPORT_SYMBOL_GPL(regmap_async_complete); | 1706 | EXPORT_SYMBOL_GPL(regmap_async_complete); |
diff --git a/include/trace/events/regmap.h b/include/trace/events/regmap.h index 41a7dbd570e2..a43a2f67bd8e 100644 --- a/include/trace/events/regmap.h +++ b/include/trace/events/regmap.h | |||
@@ -175,6 +175,54 @@ DEFINE_EVENT(regmap_bool, regmap_cache_bypass, | |||
175 | 175 | ||
176 | ); | 176 | ); |
177 | 177 | ||
178 | DECLARE_EVENT_CLASS(regmap_async, | ||
179 | |||
180 | TP_PROTO(struct device *dev), | ||
181 | |||
182 | TP_ARGS(dev), | ||
183 | |||
184 | TP_STRUCT__entry( | ||
185 | __string( name, dev_name(dev) ) | ||
186 | ), | ||
187 | |||
188 | TP_fast_assign( | ||
189 | __assign_str(name, dev_name(dev)); | ||
190 | ), | ||
191 | |||
192 | TP_printk("%s", __get_str(name)) | ||
193 | ); | ||
194 | |||
195 | DEFINE_EVENT(regmap_block, regmap_async_write_start, | ||
196 | |||
197 | TP_PROTO(struct device *dev, unsigned int reg, int count), | ||
198 | |||
199 | TP_ARGS(dev, reg, count) | ||
200 | ); | ||
201 | |||
202 | DEFINE_EVENT(regmap_async, regmap_async_io_complete, | ||
203 | |||
204 | TP_PROTO(struct device *dev), | ||
205 | |||
206 | TP_ARGS(dev) | ||
207 | |||
208 | ); | ||
209 | |||
210 | DEFINE_EVENT(regmap_async, regmap_async_complete_start, | ||
211 | |||
212 | TP_PROTO(struct device *dev), | ||
213 | |||
214 | TP_ARGS(dev) | ||
215 | |||
216 | ); | ||
217 | |||
218 | DEFINE_EVENT(regmap_async, regmap_async_complete_done, | ||
219 | |||
220 | TP_PROTO(struct device *dev), | ||
221 | |||
222 | TP_ARGS(dev) | ||
223 | |||
224 | ); | ||
225 | |||
178 | #endif /* _TRACE_REGMAP_H */ | 226 | #endif /* _TRACE_REGMAP_H */ |
179 | 227 | ||
180 | /* This part must be outside protection */ | 228 | /* This part must be outside protection */ |