| .. | .. |
|---|
| 35 | 35 | EM( WB_REASON_SYNC, "sync") \ |
|---|
| 36 | 36 | EM( WB_REASON_PERIODIC, "periodic") \ |
|---|
| 37 | 37 | EM( WB_REASON_LAPTOP_TIMER, "laptop_timer") \ |
|---|
| 38 | | - EM( WB_REASON_FREE_MORE_MEM, "free_more_memory") \ |
|---|
| 39 | 38 | EM( WB_REASON_FS_FREE_SPACE, "fs_free_space") \ |
|---|
| 40 | 39 | EMe(WB_REASON_FORKER_THREAD, "forker_thread") |
|---|
| 41 | 40 | |
|---|
| .. | .. |
|---|
| 52 | 51 | |
|---|
| 53 | 52 | struct wb_writeback_work; |
|---|
| 54 | 53 | |
|---|
| 55 | | -TRACE_EVENT(writeback_dirty_page, |
|---|
| 54 | +DECLARE_EVENT_CLASS(writeback_page_template, |
|---|
| 56 | 55 | |
|---|
| 57 | 56 | TP_PROTO(struct page *page, struct address_space *mapping), |
|---|
| 58 | 57 | |
|---|
| .. | .. |
|---|
| 60 | 59 | |
|---|
| 61 | 60 | TP_STRUCT__entry ( |
|---|
| 62 | 61 | __array(char, name, 32) |
|---|
| 63 | | - __field(unsigned long, ino) |
|---|
| 62 | + __field(ino_t, ino) |
|---|
| 64 | 63 | __field(pgoff_t, index) |
|---|
| 65 | 64 | ), |
|---|
| 66 | 65 | |
|---|
| .. | .. |
|---|
| 68 | 67 | strscpy_pad(__entry->name, |
|---|
| 69 | 68 | bdi_dev_name(mapping ? inode_to_bdi(mapping->host) : |
|---|
| 70 | 69 | NULL), 32); |
|---|
| 71 | | - __entry->ino = mapping ? mapping->host->i_ino : 0; |
|---|
| 70 | + __entry->ino = (mapping && mapping->host) ? mapping->host->i_ino : 0; |
|---|
| 72 | 71 | __entry->index = page->index; |
|---|
| 73 | 72 | ), |
|---|
| 74 | 73 | |
|---|
| 75 | 74 | TP_printk("bdi %s: ino=%lu index=%lu", |
|---|
| 76 | 75 | __entry->name, |
|---|
| 77 | | - __entry->ino, |
|---|
| 76 | + (unsigned long)__entry->ino, |
|---|
| 78 | 77 | __entry->index |
|---|
| 79 | 78 | ) |
|---|
| 79 | +); |
|---|
| 80 | + |
|---|
| 81 | +DEFINE_EVENT(writeback_page_template, writeback_dirty_page, |
|---|
| 82 | + |
|---|
| 83 | + TP_PROTO(struct page *page, struct address_space *mapping), |
|---|
| 84 | + |
|---|
| 85 | + TP_ARGS(page, mapping) |
|---|
| 86 | +); |
|---|
| 87 | + |
|---|
| 88 | +DEFINE_EVENT(writeback_page_template, wait_on_page_writeback, |
|---|
| 89 | + |
|---|
| 90 | + TP_PROTO(struct page *page, struct address_space *mapping), |
|---|
| 91 | + |
|---|
| 92 | + TP_ARGS(page, mapping) |
|---|
| 80 | 93 | ); |
|---|
| 81 | 94 | |
|---|
| 82 | 95 | DECLARE_EVENT_CLASS(writeback_dirty_inode_template, |
|---|
| .. | .. |
|---|
| 87 | 100 | |
|---|
| 88 | 101 | TP_STRUCT__entry ( |
|---|
| 89 | 102 | __array(char, name, 32) |
|---|
| 90 | | - __field(unsigned long, ino) |
|---|
| 103 | + __field(ino_t, ino) |
|---|
| 91 | 104 | __field(unsigned long, state) |
|---|
| 92 | 105 | __field(unsigned long, flags) |
|---|
| 93 | 106 | ), |
|---|
| .. | .. |
|---|
| 104 | 117 | |
|---|
| 105 | 118 | TP_printk("bdi %s: ino=%lu state=%s flags=%s", |
|---|
| 106 | 119 | __entry->name, |
|---|
| 107 | | - __entry->ino, |
|---|
| 120 | + (unsigned long)__entry->ino, |
|---|
| 108 | 121 | show_inode_state(__entry->state), |
|---|
| 109 | 122 | show_inode_state(__entry->flags) |
|---|
| 110 | 123 | ) |
|---|
| .. | .. |
|---|
| 134 | 147 | #ifdef CREATE_TRACE_POINTS |
|---|
| 135 | 148 | #ifdef CONFIG_CGROUP_WRITEBACK |
|---|
| 136 | 149 | |
|---|
| 137 | | -static inline unsigned int __trace_wb_assign_cgroup(struct bdi_writeback *wb) |
|---|
| 150 | +static inline ino_t __trace_wb_assign_cgroup(struct bdi_writeback *wb) |
|---|
| 138 | 151 | { |
|---|
| 139 | | - return wb->memcg_css->cgroup->kn->id.ino; |
|---|
| 152 | + return cgroup_ino(wb->memcg_css->cgroup); |
|---|
| 140 | 153 | } |
|---|
| 141 | 154 | |
|---|
| 142 | | -static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *wbc) |
|---|
| 155 | +static inline ino_t __trace_wbc_assign_cgroup(struct writeback_control *wbc) |
|---|
| 143 | 156 | { |
|---|
| 144 | 157 | if (wbc->wb) |
|---|
| 145 | 158 | return __trace_wb_assign_cgroup(wbc->wb); |
|---|
| 146 | 159 | else |
|---|
| 147 | | - return -1U; |
|---|
| 160 | + return 1; |
|---|
| 148 | 161 | } |
|---|
| 149 | 162 | #else /* CONFIG_CGROUP_WRITEBACK */ |
|---|
| 150 | 163 | |
|---|
| 151 | | -static inline unsigned int __trace_wb_assign_cgroup(struct bdi_writeback *wb) |
|---|
| 164 | +static inline ino_t __trace_wb_assign_cgroup(struct bdi_writeback *wb) |
|---|
| 152 | 165 | { |
|---|
| 153 | | - return -1U; |
|---|
| 166 | + return 1; |
|---|
| 154 | 167 | } |
|---|
| 155 | 168 | |
|---|
| 156 | | -static inline unsigned int __trace_wbc_assign_cgroup(struct writeback_control *wbc) |
|---|
| 169 | +static inline ino_t __trace_wbc_assign_cgroup(struct writeback_control *wbc) |
|---|
| 157 | 170 | { |
|---|
| 158 | | - return -1U; |
|---|
| 171 | + return 1; |
|---|
| 159 | 172 | } |
|---|
| 160 | 173 | |
|---|
| 161 | 174 | #endif /* CONFIG_CGROUP_WRITEBACK */ |
|---|
| 162 | 175 | #endif /* CREATE_TRACE_POINTS */ |
|---|
| 176 | + |
|---|
| 177 | +#ifdef CONFIG_CGROUP_WRITEBACK |
|---|
| 178 | +TRACE_EVENT(inode_foreign_history, |
|---|
| 179 | + |
|---|
| 180 | + TP_PROTO(struct inode *inode, struct writeback_control *wbc, |
|---|
| 181 | + unsigned int history), |
|---|
| 182 | + |
|---|
| 183 | + TP_ARGS(inode, wbc, history), |
|---|
| 184 | + |
|---|
| 185 | + TP_STRUCT__entry( |
|---|
| 186 | + __array(char, name, 32) |
|---|
| 187 | + __field(ino_t, ino) |
|---|
| 188 | + __field(ino_t, cgroup_ino) |
|---|
| 189 | + __field(unsigned int, history) |
|---|
| 190 | + ), |
|---|
| 191 | + |
|---|
| 192 | + TP_fast_assign( |
|---|
| 193 | + strscpy_pad(__entry->name, bdi_dev_name(inode_to_bdi(inode)), 32); |
|---|
| 194 | + __entry->ino = inode->i_ino; |
|---|
| 195 | + __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc); |
|---|
| 196 | + __entry->history = history; |
|---|
| 197 | + ), |
|---|
| 198 | + |
|---|
| 199 | + TP_printk("bdi %s: ino=%lu cgroup_ino=%lu history=0x%x", |
|---|
| 200 | + __entry->name, |
|---|
| 201 | + (unsigned long)__entry->ino, |
|---|
| 202 | + (unsigned long)__entry->cgroup_ino, |
|---|
| 203 | + __entry->history |
|---|
| 204 | + ) |
|---|
| 205 | +); |
|---|
| 206 | + |
|---|
| 207 | +TRACE_EVENT(inode_switch_wbs, |
|---|
| 208 | + |
|---|
| 209 | + TP_PROTO(struct inode *inode, struct bdi_writeback *old_wb, |
|---|
| 210 | + struct bdi_writeback *new_wb), |
|---|
| 211 | + |
|---|
| 212 | + TP_ARGS(inode, old_wb, new_wb), |
|---|
| 213 | + |
|---|
| 214 | + TP_STRUCT__entry( |
|---|
| 215 | + __array(char, name, 32) |
|---|
| 216 | + __field(ino_t, ino) |
|---|
| 217 | + __field(ino_t, old_cgroup_ino) |
|---|
| 218 | + __field(ino_t, new_cgroup_ino) |
|---|
| 219 | + ), |
|---|
| 220 | + |
|---|
| 221 | + TP_fast_assign( |
|---|
| 222 | + strscpy_pad(__entry->name, bdi_dev_name(old_wb->bdi), 32); |
|---|
| 223 | + __entry->ino = inode->i_ino; |
|---|
| 224 | + __entry->old_cgroup_ino = __trace_wb_assign_cgroup(old_wb); |
|---|
| 225 | + __entry->new_cgroup_ino = __trace_wb_assign_cgroup(new_wb); |
|---|
| 226 | + ), |
|---|
| 227 | + |
|---|
| 228 | + TP_printk("bdi %s: ino=%lu old_cgroup_ino=%lu new_cgroup_ino=%lu", |
|---|
| 229 | + __entry->name, |
|---|
| 230 | + (unsigned long)__entry->ino, |
|---|
| 231 | + (unsigned long)__entry->old_cgroup_ino, |
|---|
| 232 | + (unsigned long)__entry->new_cgroup_ino |
|---|
| 233 | + ) |
|---|
| 234 | +); |
|---|
| 235 | + |
|---|
| 236 | +TRACE_EVENT(track_foreign_dirty, |
|---|
| 237 | + |
|---|
| 238 | + TP_PROTO(struct page *page, struct bdi_writeback *wb), |
|---|
| 239 | + |
|---|
| 240 | + TP_ARGS(page, wb), |
|---|
| 241 | + |
|---|
| 242 | + TP_STRUCT__entry( |
|---|
| 243 | + __array(char, name, 32) |
|---|
| 244 | + __field(u64, bdi_id) |
|---|
| 245 | + __field(ino_t, ino) |
|---|
| 246 | + __field(unsigned int, memcg_id) |
|---|
| 247 | + __field(ino_t, cgroup_ino) |
|---|
| 248 | + __field(ino_t, page_cgroup_ino) |
|---|
| 249 | + ), |
|---|
| 250 | + |
|---|
| 251 | + TP_fast_assign( |
|---|
| 252 | + struct address_space *mapping = page_mapping(page); |
|---|
| 253 | + struct inode *inode = mapping ? mapping->host : NULL; |
|---|
| 254 | + |
|---|
| 255 | + strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); |
|---|
| 256 | + __entry->bdi_id = wb->bdi->id; |
|---|
| 257 | + __entry->ino = inode ? inode->i_ino : 0; |
|---|
| 258 | + __entry->memcg_id = wb->memcg_css->id; |
|---|
| 259 | + __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); |
|---|
| 260 | + __entry->page_cgroup_ino = cgroup_ino(page->mem_cgroup->css.cgroup); |
|---|
| 261 | + ), |
|---|
| 262 | + |
|---|
| 263 | + TP_printk("bdi %s[%llu]: ino=%lu memcg_id=%u cgroup_ino=%lu page_cgroup_ino=%lu", |
|---|
| 264 | + __entry->name, |
|---|
| 265 | + __entry->bdi_id, |
|---|
| 266 | + (unsigned long)__entry->ino, |
|---|
| 267 | + __entry->memcg_id, |
|---|
| 268 | + (unsigned long)__entry->cgroup_ino, |
|---|
| 269 | + (unsigned long)__entry->page_cgroup_ino |
|---|
| 270 | + ) |
|---|
| 271 | +); |
|---|
| 272 | + |
|---|
| 273 | +TRACE_EVENT(flush_foreign, |
|---|
| 274 | + |
|---|
| 275 | + TP_PROTO(struct bdi_writeback *wb, unsigned int frn_bdi_id, |
|---|
| 276 | + unsigned int frn_memcg_id), |
|---|
| 277 | + |
|---|
| 278 | + TP_ARGS(wb, frn_bdi_id, frn_memcg_id), |
|---|
| 279 | + |
|---|
| 280 | + TP_STRUCT__entry( |
|---|
| 281 | + __array(char, name, 32) |
|---|
| 282 | + __field(ino_t, cgroup_ino) |
|---|
| 283 | + __field(unsigned int, frn_bdi_id) |
|---|
| 284 | + __field(unsigned int, frn_memcg_id) |
|---|
| 285 | + ), |
|---|
| 286 | + |
|---|
| 287 | + TP_fast_assign( |
|---|
| 288 | + strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); |
|---|
| 289 | + __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); |
|---|
| 290 | + __entry->frn_bdi_id = frn_bdi_id; |
|---|
| 291 | + __entry->frn_memcg_id = frn_memcg_id; |
|---|
| 292 | + ), |
|---|
| 293 | + |
|---|
| 294 | + TP_printk("bdi %s: cgroup_ino=%lu frn_bdi_id=%u frn_memcg_id=%u", |
|---|
| 295 | + __entry->name, |
|---|
| 296 | + (unsigned long)__entry->cgroup_ino, |
|---|
| 297 | + __entry->frn_bdi_id, |
|---|
| 298 | + __entry->frn_memcg_id |
|---|
| 299 | + ) |
|---|
| 300 | +); |
|---|
| 301 | +#endif |
|---|
| 163 | 302 | |
|---|
| 164 | 303 | DECLARE_EVENT_CLASS(writeback_write_inode_template, |
|---|
| 165 | 304 | |
|---|
| .. | .. |
|---|
| 169 | 308 | |
|---|
| 170 | 309 | TP_STRUCT__entry ( |
|---|
| 171 | 310 | __array(char, name, 32) |
|---|
| 172 | | - __field(unsigned long, ino) |
|---|
| 311 | + __field(ino_t, ino) |
|---|
| 173 | 312 | __field(int, sync_mode) |
|---|
| 174 | | - __field(unsigned int, cgroup_ino) |
|---|
| 313 | + __field(ino_t, cgroup_ino) |
|---|
| 175 | 314 | ), |
|---|
| 176 | 315 | |
|---|
| 177 | 316 | TP_fast_assign( |
|---|
| .. | .. |
|---|
| 182 | 321 | __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc); |
|---|
| 183 | 322 | ), |
|---|
| 184 | 323 | |
|---|
| 185 | | - TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%u", |
|---|
| 324 | + TP_printk("bdi %s: ino=%lu sync_mode=%d cgroup_ino=%lu", |
|---|
| 186 | 325 | __entry->name, |
|---|
| 187 | | - __entry->ino, |
|---|
| 326 | + (unsigned long)__entry->ino, |
|---|
| 188 | 327 | __entry->sync_mode, |
|---|
| 189 | | - __entry->cgroup_ino |
|---|
| 328 | + (unsigned long)__entry->cgroup_ino |
|---|
| 190 | 329 | ) |
|---|
| 191 | 330 | ); |
|---|
| 192 | 331 | |
|---|
| .. | .. |
|---|
| 216 | 355 | __field(int, range_cyclic) |
|---|
| 217 | 356 | __field(int, for_background) |
|---|
| 218 | 357 | __field(int, reason) |
|---|
| 219 | | - __field(unsigned int, cgroup_ino) |
|---|
| 358 | + __field(ino_t, cgroup_ino) |
|---|
| 220 | 359 | ), |
|---|
| 221 | 360 | TP_fast_assign( |
|---|
| 222 | 361 | strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); |
|---|
| .. | .. |
|---|
| 230 | 369 | __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); |
|---|
| 231 | 370 | ), |
|---|
| 232 | 371 | TP_printk("bdi %s: sb_dev %d:%d nr_pages=%ld sync_mode=%d " |
|---|
| 233 | | - "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%u", |
|---|
| 372 | + "kupdate=%d range_cyclic=%d background=%d reason=%s cgroup_ino=%lu", |
|---|
| 234 | 373 | __entry->name, |
|---|
| 235 | 374 | MAJOR(__entry->sb_dev), MINOR(__entry->sb_dev), |
|---|
| 236 | 375 | __entry->nr_pages, |
|---|
| .. | .. |
|---|
| 239 | 378 | __entry->range_cyclic, |
|---|
| 240 | 379 | __entry->for_background, |
|---|
| 241 | 380 | __print_symbolic(__entry->reason, WB_WORK_REASON), |
|---|
| 242 | | - __entry->cgroup_ino |
|---|
| 381 | + (unsigned long)__entry->cgroup_ino |
|---|
| 243 | 382 | ) |
|---|
| 244 | 383 | ); |
|---|
| 245 | 384 | #define DEFINE_WRITEBACK_WORK_EVENT(name) \ |
|---|
| .. | .. |
|---|
| 269 | 408 | TP_ARGS(wb), |
|---|
| 270 | 409 | TP_STRUCT__entry( |
|---|
| 271 | 410 | __array(char, name, 32) |
|---|
| 272 | | - __field(unsigned int, cgroup_ino) |
|---|
| 411 | + __field(ino_t, cgroup_ino) |
|---|
| 273 | 412 | ), |
|---|
| 274 | 413 | TP_fast_assign( |
|---|
| 275 | 414 | strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); |
|---|
| 276 | 415 | __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); |
|---|
| 277 | 416 | ), |
|---|
| 278 | | - TP_printk("bdi %s: cgroup_ino=%u", |
|---|
| 417 | + TP_printk("bdi %s: cgroup_ino=%lu", |
|---|
| 279 | 418 | __entry->name, |
|---|
| 280 | | - __entry->cgroup_ino |
|---|
| 419 | + (unsigned long)__entry->cgroup_ino |
|---|
| 281 | 420 | ) |
|---|
| 282 | 421 | ); |
|---|
| 283 | 422 | #define DEFINE_WRITEBACK_EVENT(name) \ |
|---|
| .. | .. |
|---|
| 315 | 454 | __field(int, range_cyclic) |
|---|
| 316 | 455 | __field(long, range_start) |
|---|
| 317 | 456 | __field(long, range_end) |
|---|
| 318 | | - __field(unsigned int, cgroup_ino) |
|---|
| 457 | + __field(ino_t, cgroup_ino) |
|---|
| 319 | 458 | ), |
|---|
| 320 | 459 | |
|---|
| 321 | 460 | TP_fast_assign( |
|---|
| .. | .. |
|---|
| 334 | 473 | |
|---|
| 335 | 474 | TP_printk("bdi %s: towrt=%ld skip=%ld mode=%d kupd=%d " |
|---|
| 336 | 475 | "bgrd=%d reclm=%d cyclic=%d " |
|---|
| 337 | | - "start=0x%lx end=0x%lx cgroup_ino=%u", |
|---|
| 476 | + "start=0x%lx end=0x%lx cgroup_ino=%lu", |
|---|
| 338 | 477 | __entry->name, |
|---|
| 339 | 478 | __entry->nr_to_write, |
|---|
| 340 | 479 | __entry->pages_skipped, |
|---|
| .. | .. |
|---|
| 345 | 484 | __entry->range_cyclic, |
|---|
| 346 | 485 | __entry->range_start, |
|---|
| 347 | 486 | __entry->range_end, |
|---|
| 348 | | - __entry->cgroup_ino |
|---|
| 487 | + (unsigned long)__entry->cgroup_ino |
|---|
| 349 | 488 | ) |
|---|
| 350 | 489 | ) |
|---|
| 351 | 490 | |
|---|
| .. | .. |
|---|
| 367 | 506 | __field(long, age) |
|---|
| 368 | 507 | __field(int, moved) |
|---|
| 369 | 508 | __field(int, reason) |
|---|
| 370 | | - __field(unsigned int, cgroup_ino) |
|---|
| 509 | + __field(ino_t, cgroup_ino) |
|---|
| 371 | 510 | ), |
|---|
| 372 | 511 | TP_fast_assign( |
|---|
| 373 | 512 | strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32); |
|---|
| .. | .. |
|---|
| 377 | 516 | __entry->reason = work->reason; |
|---|
| 378 | 517 | __entry->cgroup_ino = __trace_wb_assign_cgroup(wb); |
|---|
| 379 | 518 | ), |
|---|
| 380 | | - TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%u", |
|---|
| 519 | + TP_printk("bdi %s: older=%lu age=%ld enqueue=%d reason=%s cgroup_ino=%lu", |
|---|
| 381 | 520 | __entry->name, |
|---|
| 382 | 521 | __entry->older, /* dirtied_before in jiffies */ |
|---|
| 383 | 522 | __entry->age, /* dirtied_before in relative milliseconds */ |
|---|
| 384 | 523 | __entry->moved, |
|---|
| 385 | 524 | __print_symbolic(__entry->reason, WB_WORK_REASON), |
|---|
| 386 | | - __entry->cgroup_ino |
|---|
| 525 | + (unsigned long)__entry->cgroup_ino |
|---|
| 387 | 526 | ) |
|---|
| 388 | 527 | ); |
|---|
| 389 | 528 | |
|---|
| .. | .. |
|---|
| 400 | 539 | TP_STRUCT__entry( |
|---|
| 401 | 540 | __field(unsigned long, nr_dirty) |
|---|
| 402 | 541 | __field(unsigned long, nr_writeback) |
|---|
| 403 | | - __field(unsigned long, nr_unstable) |
|---|
| 404 | 542 | __field(unsigned long, background_thresh) |
|---|
| 405 | 543 | __field(unsigned long, dirty_thresh) |
|---|
| 406 | 544 | __field(unsigned long, dirty_limit) |
|---|
| .. | .. |
|---|
| 411 | 549 | TP_fast_assign( |
|---|
| 412 | 550 | __entry->nr_dirty = global_node_page_state(NR_FILE_DIRTY); |
|---|
| 413 | 551 | __entry->nr_writeback = global_node_page_state(NR_WRITEBACK); |
|---|
| 414 | | - __entry->nr_unstable = global_node_page_state(NR_UNSTABLE_NFS); |
|---|
| 415 | 552 | __entry->nr_dirtied = global_node_page_state(NR_DIRTIED); |
|---|
| 416 | 553 | __entry->nr_written = global_node_page_state(NR_WRITTEN); |
|---|
| 417 | 554 | __entry->background_thresh = background_thresh; |
|---|
| .. | .. |
|---|
| 419 | 556 | __entry->dirty_limit = global_wb_domain.dirty_limit; |
|---|
| 420 | 557 | ), |
|---|
| 421 | 558 | |
|---|
| 422 | | - TP_printk("dirty=%lu writeback=%lu unstable=%lu " |
|---|
| 559 | + TP_printk("dirty=%lu writeback=%lu " |
|---|
| 423 | 560 | "bg_thresh=%lu thresh=%lu limit=%lu " |
|---|
| 424 | 561 | "dirtied=%lu written=%lu", |
|---|
| 425 | 562 | __entry->nr_dirty, |
|---|
| 426 | 563 | __entry->nr_writeback, |
|---|
| 427 | | - __entry->nr_unstable, |
|---|
| 428 | 564 | __entry->background_thresh, |
|---|
| 429 | 565 | __entry->dirty_thresh, |
|---|
| 430 | 566 | __entry->dirty_limit, |
|---|
| .. | .. |
|---|
| 451 | 587 | __field(unsigned long, dirty_ratelimit) |
|---|
| 452 | 588 | __field(unsigned long, task_ratelimit) |
|---|
| 453 | 589 | __field(unsigned long, balanced_dirty_ratelimit) |
|---|
| 454 | | - __field(unsigned int, cgroup_ino) |
|---|
| 590 | + __field(ino_t, cgroup_ino) |
|---|
| 455 | 591 | ), |
|---|
| 456 | 592 | |
|---|
| 457 | 593 | TP_fast_assign( |
|---|
| .. | .. |
|---|
| 469 | 605 | TP_printk("bdi %s: " |
|---|
| 470 | 606 | "write_bw=%lu awrite_bw=%lu dirty_rate=%lu " |
|---|
| 471 | 607 | "dirty_ratelimit=%lu task_ratelimit=%lu " |
|---|
| 472 | | - "balanced_dirty_ratelimit=%lu cgroup_ino=%u", |
|---|
| 608 | + "balanced_dirty_ratelimit=%lu cgroup_ino=%lu", |
|---|
| 473 | 609 | __entry->bdi, |
|---|
| 474 | 610 | __entry->write_bw, /* write bandwidth */ |
|---|
| 475 | 611 | __entry->avg_write_bw, /* avg write bandwidth */ |
|---|
| .. | .. |
|---|
| 477 | 613 | __entry->dirty_ratelimit, /* base ratelimit */ |
|---|
| 478 | 614 | __entry->task_ratelimit, /* ratelimit with position control */ |
|---|
| 479 | 615 | __entry->balanced_dirty_ratelimit, /* the balanced ratelimit */ |
|---|
| 480 | | - __entry->cgroup_ino |
|---|
| 616 | + (unsigned long)__entry->cgroup_ino |
|---|
| 481 | 617 | ) |
|---|
| 482 | 618 | ); |
|---|
| 483 | 619 | |
|---|
| .. | .. |
|---|
| 515 | 651 | __field( long, pause) |
|---|
| 516 | 652 | __field(unsigned long, period) |
|---|
| 517 | 653 | __field( long, think) |
|---|
| 518 | | - __field(unsigned int, cgroup_ino) |
|---|
| 654 | + __field(ino_t, cgroup_ino) |
|---|
| 519 | 655 | ), |
|---|
| 520 | 656 | |
|---|
| 521 | 657 | TP_fast_assign( |
|---|
| .. | .. |
|---|
| 547 | 683 | "bdi_setpoint=%lu bdi_dirty=%lu " |
|---|
| 548 | 684 | "dirty_ratelimit=%lu task_ratelimit=%lu " |
|---|
| 549 | 685 | "dirtied=%u dirtied_pause=%u " |
|---|
| 550 | | - "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%u", |
|---|
| 686 | + "paused=%lu pause=%ld period=%lu think=%ld cgroup_ino=%lu", |
|---|
| 551 | 687 | __entry->bdi, |
|---|
| 552 | 688 | __entry->limit, |
|---|
| 553 | 689 | __entry->setpoint, |
|---|
| .. | .. |
|---|
| 562 | 698 | __entry->pause, /* ms */ |
|---|
| 563 | 699 | __entry->period, /* ms */ |
|---|
| 564 | 700 | __entry->think, /* ms */ |
|---|
| 565 | | - __entry->cgroup_ino |
|---|
| 701 | + (unsigned long)__entry->cgroup_ino |
|---|
| 566 | 702 | ) |
|---|
| 567 | 703 | ); |
|---|
| 568 | 704 | |
|---|
| .. | .. |
|---|
| 573 | 709 | |
|---|
| 574 | 710 | TP_STRUCT__entry( |
|---|
| 575 | 711 | __array(char, name, 32) |
|---|
| 576 | | - __field(unsigned long, ino) |
|---|
| 712 | + __field(ino_t, ino) |
|---|
| 577 | 713 | __field(unsigned long, state) |
|---|
| 578 | 714 | __field(unsigned long, dirtied_when) |
|---|
| 579 | | - __field(unsigned int, cgroup_ino) |
|---|
| 715 | + __field(ino_t, cgroup_ino) |
|---|
| 580 | 716 | ), |
|---|
| 581 | 717 | |
|---|
| 582 | 718 | TP_fast_assign( |
|---|
| .. | .. |
|---|
| 588 | 724 | __entry->cgroup_ino = __trace_wb_assign_cgroup(inode_to_wb(inode)); |
|---|
| 589 | 725 | ), |
|---|
| 590 | 726 | |
|---|
| 591 | | - TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%u", |
|---|
| 727 | + TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu cgroup_ino=%lu", |
|---|
| 592 | 728 | __entry->name, |
|---|
| 593 | | - __entry->ino, |
|---|
| 729 | + (unsigned long)__entry->ino, |
|---|
| 594 | 730 | show_inode_state(__entry->state), |
|---|
| 595 | 731 | __entry->dirtied_when, |
|---|
| 596 | 732 | (jiffies - __entry->dirtied_when) / HZ, |
|---|
| 597 | | - __entry->cgroup_ino |
|---|
| 733 | + (unsigned long)__entry->cgroup_ino |
|---|
| 598 | 734 | ) |
|---|
| 599 | 735 | ); |
|---|
| 600 | 736 | |
|---|
| .. | .. |
|---|
| 644 | 780 | |
|---|
| 645 | 781 | TP_STRUCT__entry( |
|---|
| 646 | 782 | __array(char, name, 32) |
|---|
| 647 | | - __field(unsigned long, ino) |
|---|
| 783 | + __field(ino_t, ino) |
|---|
| 648 | 784 | __field(unsigned long, state) |
|---|
| 649 | 785 | __field(unsigned long, dirtied_when) |
|---|
| 650 | 786 | __field(unsigned long, writeback_index) |
|---|
| 651 | 787 | __field(long, nr_to_write) |
|---|
| 652 | 788 | __field(unsigned long, wrote) |
|---|
| 653 | | - __field(unsigned int, cgroup_ino) |
|---|
| 789 | + __field(ino_t, cgroup_ino) |
|---|
| 654 | 790 | ), |
|---|
| 655 | 791 | |
|---|
| 656 | 792 | TP_fast_assign( |
|---|
| .. | .. |
|---|
| 666 | 802 | ), |
|---|
| 667 | 803 | |
|---|
| 668 | 804 | TP_printk("bdi %s: ino=%lu state=%s dirtied_when=%lu age=%lu " |
|---|
| 669 | | - "index=%lu to_write=%ld wrote=%lu cgroup_ino=%u", |
|---|
| 805 | + "index=%lu to_write=%ld wrote=%lu cgroup_ino=%lu", |
|---|
| 670 | 806 | __entry->name, |
|---|
| 671 | | - __entry->ino, |
|---|
| 807 | + (unsigned long)__entry->ino, |
|---|
| 672 | 808 | show_inode_state(__entry->state), |
|---|
| 673 | 809 | __entry->dirtied_when, |
|---|
| 674 | 810 | (jiffies - __entry->dirtied_when) / HZ, |
|---|
| 675 | 811 | __entry->writeback_index, |
|---|
| 676 | 812 | __entry->nr_to_write, |
|---|
| 677 | 813 | __entry->wrote, |
|---|
| 678 | | - __entry->cgroup_ino |
|---|
| 814 | + (unsigned long)__entry->cgroup_ino |
|---|
| 679 | 815 | ) |
|---|
| 680 | 816 | ); |
|---|
| 681 | 817 | |
|---|
| .. | .. |
|---|
| 700 | 836 | |
|---|
| 701 | 837 | TP_STRUCT__entry( |
|---|
| 702 | 838 | __field( dev_t, dev ) |
|---|
| 703 | | - __field(unsigned long, ino ) |
|---|
| 839 | + __field( ino_t, ino ) |
|---|
| 704 | 840 | __field(unsigned long, state ) |
|---|
| 705 | 841 | __field( __u16, mode ) |
|---|
| 706 | 842 | __field(unsigned long, dirtied_when ) |
|---|
| .. | .. |
|---|
| 716 | 852 | |
|---|
| 717 | 853 | TP_printk("dev %d,%d ino %lu dirtied %lu state %s mode 0%o", |
|---|
| 718 | 854 | MAJOR(__entry->dev), MINOR(__entry->dev), |
|---|
| 719 | | - __entry->ino, __entry->dirtied_when, |
|---|
| 855 | + (unsigned long)__entry->ino, __entry->dirtied_when, |
|---|
| 720 | 856 | show_inode_state(__entry->state), __entry->mode) |
|---|
| 721 | 857 | ); |
|---|
| 722 | 858 | |
|---|