History

Merge branch 'akpm' (patches from Andrew)

Pull updates from Andrew Morton: "Most of -mm and quite a number of other subsystems: hotfixes, scripts, ocfs2, misc, lib, binfmt, init, reiserfs, exec, dma-mapping, kcov. MM is fairly quiet this time. Holidays, I assume" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (118 commits) kcov: ignore fault-inject and stacktrace include/linux/io-mapping.h-mapping: use PHYS_PFN() macro in io_mapping_map_atomic_wc() execve: warn if process starts with executable stack reiserfs: prevent NULL pointer dereference in reiserfs_insert_item() init/main.c: fix misleading "This architecture does not have kernel memory protection" message init/main.c: fix quoted value handling in unknown_bootoption init/main.c: remove unnecessary repair_env_string in do_initcall_level init/main.c: log arguments and environment passed to init fs/binfmt_elf.c: coredump: allow process with empty address space to coredump fs/binfmt_elf.c: coredump: delete duplicated overflow check fs/binfmt_elf.c: coredump: allocate core ELF header on stack fs/binfmt_elf.c: make BAD_ADDR() unlikely fs/binfmt_elf.c: better codegen around current->mm fs/binfmt_elf.c: don't copy ELF header around fs/binfmt_elf.c: fix ->start_code calculation fs/binfmt_elf.c: smaller code generation around auxv vector fill lib/find_bit.c: uninline helper _find_next_bit() lib/find_bit.c: join _find_next_bit{_le} uapi: rename ext2_swab() to swab() and share globally in swab.h lib/scatterlist.c: adjust indentation in __sg_alloc_table ...

Linus Torvalds committed 6 years ago

Commit 7eec11d2 parents ddaefe8 43e76af136 files · +2724 −1293Browse files

Showing the changes to include/trace (2 of 136 files). Show all

Unified · Split

2 files
  1. include/trace/events/kmem.h +2 −2
  2. include/trace/events/writeback.h +17 −20
include/trace/events/kmem.h+2−2
@@ -88,8 +88,8 @@ DECLARE_EVENT_CLASS(kmem_alloc_node, · 87 unmodified lines
88 __entry->node = node;88 __entry->node = node;
89 ),89 ),
90 90
91 TP_printk("call_site=%lx ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d",91 TP_printk("call_site=%pS ptr=%p bytes_req=%zu bytes_alloc=%zu gfp_flags=%s node=%d",
92 __entry->call_site,92 (void *)__entry->call_site,
93 __entry->ptr,93 __entry->ptr,
94 __entry->bytes_req,94 __entry->bytes_req,
95 __entry->bytes_alloc,95 __entry->bytes_alloc,
include/trace/events/writeback.h+17−20
@@ -67,8 +67,8 @@ DECLARE_EVENT_CLASS(writeback_page_template, · 66 unmodified lines
67 67
68 TP_fast_assign(68 TP_fast_assign(
69 strscpy_pad(__entry->name,69 strscpy_pad(__entry->name,
70 mapping ? dev_name(inode_to_bdi(mapping->host)->dev) : "(unknown)",70 bdi_dev_name(mapping ? inode_to_bdi(mapping->host) :
71 32);71 NULL), 32);
72 __entry->ino = mapping ? mapping->host->i_ino : 0;72 __entry->ino = mapping ? mapping->host->i_ino : 0;
73 __entry->index = page->index;73 __entry->index = page->index;
74 ),74 ),
@@ -111,8 +111,7 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template, · 36 unmodified lines
111 struct backing_dev_info *bdi = inode_to_bdi(inode);111 struct backing_dev_info *bdi = inode_to_bdi(inode);
112 112
113 /* may be called for files on pseudo FSes w/ unregistered bdi */113 /* may be called for files on pseudo FSes w/ unregistered bdi */
114 strscpy_pad(__entry->name,114 strscpy_pad(__entry->name, bdi_dev_name(bdi), 32);
115 bdi->dev ? dev_name(bdi->dev) : "(unknown)", 32);
116 __entry->ino = inode->i_ino;115 __entry->ino = inode->i_ino;
117 __entry->state = inode->i_state;116 __entry->state = inode->i_state;
118 __entry->flags = flags;117 __entry->flags = flags;
@@ -193,7 +192,7 @@ TRACE_EVENT(inode_foreign_history, · 74 unmodified lines
193 ),192 ),
194 193
195 TP_fast_assign(194 TP_fast_assign(
196 strncpy(__entry->name, dev_name(inode_to_bdi(inode)->dev), 32);195 strncpy(__entry->name, bdi_dev_name(inode_to_bdi(inode)), 32);
197 __entry->ino = inode->i_ino;196 __entry->ino = inode->i_ino;
198 __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);197 __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);
199 __entry->history = history;198 __entry->history = history;
@@ -222,7 +221,7 @@ TRACE_EVENT(inode_switch_wbs, · 22 unmodified lines
222 ),221 ),
223 222
224 TP_fast_assign(223 TP_fast_assign(
225 strncpy(__entry->name, dev_name(old_wb->bdi->dev), 32);224 strncpy(__entry->name, bdi_dev_name(old_wb->bdi), 32);
226 __entry->ino = inode->i_ino;225 __entry->ino = inode->i_ino;
227 __entry->old_cgroup_ino = __trace_wb_assign_cgroup(old_wb);226 __entry->old_cgroup_ino = __trace_wb_assign_cgroup(old_wb);
228 __entry->new_cgroup_ino = __trace_wb_assign_cgroup(new_wb);227 __entry->new_cgroup_ino = __trace_wb_assign_cgroup(new_wb);
@@ -255,7 +254,7 @@ TRACE_EVENT(track_foreign_dirty, · 26 unmodified lines
255 struct address_space *mapping = page_mapping(page);254 struct address_space *mapping = page_mapping(page);
256 struct inode *inode = mapping ? mapping->host : NULL;255 struct inode *inode = mapping ? mapping->host : NULL;
257 256
258 strncpy(__entry->name, dev_name(wb->bdi->dev), 32);257 strncpy(__entry->name, bdi_dev_name(wb->bdi), 32);
259 __entry->bdi_id = wb->bdi->id;258 __entry->bdi_id = wb->bdi->id;
260 __entry->ino = inode ? inode->i_ino : 0;259 __entry->ino = inode ? inode->i_ino : 0;
261 __entry->memcg_id = wb->memcg_css->id;260 __entry->memcg_id = wb->memcg_css->id;
@@ -288,7 +287,7 @@ TRACE_EVENT(flush_foreign, · 26 unmodified lines
288 ),287 ),
289 288
290 TP_fast_assign(289 TP_fast_assign(
291 strncpy(__entry->name, dev_name(wb->bdi->dev), 32);290 strncpy(__entry->name, bdi_dev_name(wb->bdi), 32);
292 __entry->cgroup_ino = __trace_wb_assign_cgroup(wb);291 __entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
293 __entry->frn_bdi_id = frn_bdi_id;292 __entry->frn_bdi_id = frn_bdi_id;
294 __entry->frn_memcg_id = frn_memcg_id;293 __entry->frn_memcg_id = frn_memcg_id;
@@ -318,7 +317,7 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template, · 23 unmodified lines
318 317
319 TP_fast_assign(318 TP_fast_assign(
320 strscpy_pad(__entry->name,319 strscpy_pad(__entry->name,
321 dev_name(inode_to_bdi(inode)->dev), 32);320 bdi_dev_name(inode_to_bdi(inode)), 32);
322 __entry->ino = inode->i_ino;321 __entry->ino = inode->i_ino;
323 __entry->sync_mode = wbc->sync_mode;322 __entry->sync_mode = wbc->sync_mode;
324 __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);323 __entry->cgroup_ino = __trace_wbc_assign_cgroup(wbc);
@@ -361,9 +360,7 @@ DECLARE_EVENT_CLASS(writeback_work_class, · 36 unmodified lines
361 __field(ino_t, cgroup_ino)360 __field(ino_t, cgroup_ino)
362 ),361 ),
363 TP_fast_assign(362 TP_fast_assign(
364 strscpy_pad(__entry->name,363 strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
365 wb->bdi->dev ? dev_name(wb->bdi->dev) :
366 "(unknown)", 32);
367 __entry->nr_pages = work->nr_pages;364 __entry->nr_pages = work->nr_pages;
368 __entry->sb_dev = work->sb ? work->sb->s_dev : 0;365 __entry->sb_dev = work->sb ? work->sb->s_dev : 0;
369 __entry->sync_mode = work->sync_mode;366 __entry->sync_mode = work->sync_mode;
@@ -416,7 +413,7 @@ DECLARE_EVENT_CLASS(writeback_class, · 46 unmodified lines
416 __field(ino_t, cgroup_ino)413 __field(ino_t, cgroup_ino)
417 ),414 ),
418 TP_fast_assign(415 TP_fast_assign(
419 strscpy_pad(__entry->name, dev_name(wb->bdi->dev), 32);416 strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
420 __entry->cgroup_ino = __trace_wb_assign_cgroup(wb);417 __entry->cgroup_ino = __trace_wb_assign_cgroup(wb);
421 ),418 ),
422 TP_printk("bdi %s: cgroup_ino=%lu",419 TP_printk("bdi %s: cgroup_ino=%lu",
@@ -438,7 +435,7 @@ TRACE_EVENT(writeback_bdi_register, · 15 unmodified lines
438 __array(char, name, 32)435 __array(char, name, 32)
439 ),436 ),
440 TP_fast_assign(437 TP_fast_assign(
441 strscpy_pad(__entry->name, dev_name(bdi->dev), 32);438 strscpy_pad(__entry->name, bdi_dev_name(bdi), 32);
442 ),439 ),
443 TP_printk("bdi %s",440 TP_printk("bdi %s",
444 __entry->name441 __entry->name
@@ -463,7 +460,7 @@ DECLARE_EVENT_CLASS(wbc_class, · 18 unmodified lines
463 ),460 ),
464 461
465 TP_fast_assign(462 TP_fast_assign(
466 strscpy_pad(__entry->name, dev_name(bdi->dev), 32);463 strscpy_pad(__entry->name, bdi_dev_name(bdi), 32);
467 __entry->nr_to_write = wbc->nr_to_write;464 __entry->nr_to_write = wbc->nr_to_write;
468 __entry->pages_skipped = wbc->pages_skipped;465 __entry->pages_skipped = wbc->pages_skipped;
469 __entry->sync_mode = wbc->sync_mode;466 __entry->sync_mode = wbc->sync_mode;
@@ -514,7 +511,7 @@ TRACE_EVENT(writeback_queue_io, · 44 unmodified lines
514 ),511 ),
515 TP_fast_assign(512 TP_fast_assign(
516 unsigned long *older_than_this = work->older_than_this;513 unsigned long *older_than_this = work->older_than_this;
517 strscpy_pad(__entry->name, dev_name(wb->bdi->dev), 32);514 strscpy_pad(__entry->name, bdi_dev_name(wb->bdi), 32);
518 __entry->older = older_than_this ? *older_than_this : 0;515 __entry->older = older_than_this ? *older_than_this : 0;
519 __entry->age = older_than_this ?516 __entry->age = older_than_this ?
520 (jiffies - *older_than_this) * 1000 / HZ : -1;517 (jiffies - *older_than_this) * 1000 / HZ : -1;
@@ -600,7 +597,7 @@ TRACE_EVENT(bdi_dirty_ratelimit, · 79 unmodified lines
600 ),597 ),
601 598
602 TP_fast_assign(599 TP_fast_assign(
603 strscpy_pad(__entry->bdi, dev_name(wb->bdi->dev), 32);600 strscpy_pad(__entry->bdi, bdi_dev_name(wb->bdi), 32);
604 __entry->write_bw = KBps(wb->write_bandwidth);601 __entry->write_bw = KBps(wb->write_bandwidth);
605 __entry->avg_write_bw = KBps(wb->avg_write_bandwidth);602 __entry->avg_write_bw = KBps(wb->avg_write_bandwidth);
606 __entry->dirty_rate = KBps(dirty_rate);603 __entry->dirty_rate = KBps(dirty_rate);
@@ -665,7 +662,7 @@ TRACE_EVENT(balance_dirty_pages, · 58 unmodified lines
665 662
666 TP_fast_assign(663 TP_fast_assign(
667 unsigned long freerun = (thresh + bg_thresh) / 2;664 unsigned long freerun = (thresh + bg_thresh) / 2;
668 strscpy_pad(__entry->bdi, dev_name(wb->bdi->dev), 32);665 strscpy_pad(__entry->bdi, bdi_dev_name(wb->bdi), 32);
669 666
670 __entry->limit = global_wb_domain.dirty_limit;667 __entry->limit = global_wb_domain.dirty_limit;
671 __entry->setpoint = (global_wb_domain.dirty_limit +668 __entry->setpoint = (global_wb_domain.dirty_limit +
@@ -726,7 +723,7 @@ TRACE_EVENT(writeback_sb_inodes_requeue, · 54 unmodified lines
726 723
727 TP_fast_assign(724 TP_fast_assign(
728 strscpy_pad(__entry->name,725 strscpy_pad(__entry->name,
729 dev_name(inode_to_bdi(inode)->dev), 32);726 bdi_dev_name(inode_to_bdi(inode)), 32);
730 __entry->ino = inode->i_ino;727 __entry->ino = inode->i_ino;
731 __entry->state = inode->i_state;728 __entry->state = inode->i_state;
732 __entry->dirtied_when = inode->dirtied_when;729 __entry->dirtied_when = inode->dirtied_when;
@@ -800,7 +797,7 @@ DECLARE_EVENT_CLASS(writeback_single_inode_template, · 67 unmodified lines
800 797
801 TP_fast_assign(798 TP_fast_assign(
802 strscpy_pad(__entry->name,799 strscpy_pad(__entry->name,
803 dev_name(inode_to_bdi(inode)->dev), 32);800 bdi_dev_name(inode_to_bdi(inode)), 32);
804 __entry->ino = inode->i_ino;801 __entry->ino = inode->i_ino;
805 __entry->state = inode->i_state;802 __entry->state = inode->i_state;
806 __entry->dirtied_when = inode->dirtied_when;803 __entry->dirtied_when = inode->dirtied_when;