Allows messages to be inserted into blktrace streams.
Showing the changes to include/linux (1 of 2 files). Show all
Unified · Split
| @@ -55,6 +55,7 @@ enum blktrace_act { · 54 unmodified lines | ||
| 55 | 55 | enum blktrace_notify { |
| 56 | 56 | __BLK_TN_PROCESS = 0, /* establish pid/name mapping */ |
| 57 | 57 | __BLK_TN_TIMESTAMP, /* include system clock */ |
| 58 | + __BLK_TN_MESSAGE, /* Character string message */ | |
| 58 | 59 | }; |
| 59 | 60 | |
| 60 | 61 | |
| @@ -79,6 +80,7 @@ enum blktrace_notify { · 18 unmodified lines | ||
| 79 | 80 | |
| 80 | 81 | #define BLK_TN_PROCESS (__BLK_TN_PROCESS | BLK_TC_ACT(BLK_TC_NOTIFY)) |
| 81 | 82 | #define BLK_TN_TIMESTAMP (__BLK_TN_TIMESTAMP | BLK_TC_ACT(BLK_TC_NOTIFY)) |
| 83 | +#define BLK_TN_MESSAGE (__BLK_TN_MESSAGE | BLK_TC_ACT(BLK_TC_NOTIFY)) | |
| 82 | 84 | |
| 83 | 85 | #define BLK_IO_TRACE_MAGIC 0x65617400 |
| 84 | 86 | #define BLK_IO_TRACE_VERSION 0x07 |
| @@ -149,7 +151,28 @@ extern void blk_trace_shutdown(struct request_queue *); · 64 unmodified lines | ||
| 149 | 151 | extern void __blk_add_trace(struct blk_trace *, sector_t, int, int, u32, int, int, void *); |
| 150 | 152 | extern int do_blk_trace_setup(struct request_queue *q, |
| 151 | 153 | char *name, dev_t dev, struct blk_user_trace_setup *buts); |
| 154 | +extern void __trace_note_message(struct blk_trace *, const char *fmt, ...); | |
| 152 | 155 | |
| 156 | +/** | |
| 157 | + * blk_add_trace_msg - Add a (simple) message to the blktrace stream | |
| 158 | + * @q: queue the io is for | |
| 159 | + * @fmt: format to print message in | |
| 160 | + * args... Variable argument list for format | |
| 161 | + * | |
| 162 | + * Description: | |
| 163 | + * Records a (simple) message onto the blktrace stream. | |
| 164 | + * | |
| 165 | + * NOTE: BLK_TN_MAX_MSG characters are output at most. | |
| 166 | + * NOTE: Can not use 'static inline' due to presence of var args... | |
| 167 | + * | |
| 168 | + **/ | |
| 169 | +#define blk_add_trace_msg(q, fmt, ...) \ | |
| 170 | + do { \ | |
| 171 | + struct blk_trace *bt = (q)->blk_trace; \ | |
| 172 | + if (unlikely(bt)) \ | |
| 173 | + __trace_note_message(bt, fmt, ##__VA_ARGS__); \ | |
| 174 | + } while (0) | |
| 175 | +#define BLK_TN_MAX_MSG 1024 | |
| 153 | 176 | |
| 154 | 177 | /** |
| 155 | 178 | * blk_add_trace_rq - Add a trace for a request oriented action |
| @@ -299,6 +322,8 @@ extern int blk_trace_remove(struct request_queue *q); · 143 unmodified lines | ||
| 299 | 322 | #define blk_trace_setup(q, name, dev, arg) (-ENOTTY) |
| 300 | 323 | #define blk_trace_startstop(q, start) (-ENOTTY) |
| 301 | 324 | #define blk_trace_remove(q) (-ENOTTY) |
| 325 | +#define blk_add_trace_msg(q, fmt, ...) do { } while (0) | |
| 326 | + | |
| 302 | 327 | #endif /* CONFIG_BLK_DEV_IO_TRACE */ |
| 303 | 328 | #endif /* __KERNEL__ */ |
| 304 | 329 | #endif |