8 files changed, 311 insertions, 127 deletions

diff --git a/include/trace/events/compaction.h b/include/trace/events/compaction.h
index c6814b917bdf..9a6a3fe0fb51 100644
--- a/include/trace/events/compaction.h
+++ b/include/trace/events/compaction.h
@@ -11,39 +11,55 @@
 
 DECLARE_EVENT_CLASS(mm_compaction_isolate_template,
 
-        TP_PROTO(unsigned long nr_scanned,
+        TP_PROTO(
+                unsigned long start_pfn,
+                unsigned long end_pfn,
+                unsigned long nr_scanned,
                 unsigned long nr_taken),
 
-        TP_ARGS(nr_scanned, nr_taken),
+        TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken),
 
         TP_STRUCT__entry(
+                __field(unsigned long, start_pfn)
+                __field(unsigned long, end_pfn)
                 __field(unsigned long, nr_scanned)
                 __field(unsigned long, nr_taken)
         ),
 
         TP_fast_assign(
+                __entry->start_pfn = start_pfn;
+                __entry->end_pfn = end_pfn;
                 __entry->nr_scanned = nr_scanned;
                 __entry->nr_taken = nr_taken;
         ),
 
-        TP_printk("nr_scanned=%lu nr_taken=%lu",
+        TP_printk("range=(0x%lx ~ 0x%lx) nr_scanned=%lu nr_taken=%lu",
+                __entry->start_pfn,
+                __entry->end_pfn,
                 __entry->nr_scanned,
                 __entry->nr_taken)
 );
 
 DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_migratepages,
 
-        TP_PROTO(unsigned long nr_scanned,
+        TP_PROTO(
+                unsigned long start_pfn,
+                unsigned long end_pfn,
+                unsigned long nr_scanned,
                 unsigned long nr_taken),
 
-        TP_ARGS(nr_scanned, nr_taken)
+        TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
 );
 
 DEFINE_EVENT(mm_compaction_isolate_template, mm_compaction_isolate_freepages,
-        TP_PROTO(unsigned long nr_scanned,
+
+        TP_PROTO(
+                unsigned long start_pfn,
+                unsigned long end_pfn,
+                unsigned long nr_scanned,
                 unsigned long nr_taken),
 
-        TP_ARGS(nr_scanned, nr_taken)
+        TP_ARGS(start_pfn, end_pfn, nr_scanned, nr_taken)
 );
 
 TRACE_EVENT(mm_compaction_migratepages,
@@ -85,47 +101,198 @@ TRACE_EVENT(mm_compaction_migratepages,
 );
 
 TRACE_EVENT(mm_compaction_begin,
-        TP_PROTO(unsigned long zone_start, unsigned long migrate_start,
-                unsigned long free_start, unsigned long zone_end),
+        TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn,
+                unsigned long free_pfn, unsigned long zone_end, bool sync),
 
-        TP_ARGS(zone_start, migrate_start, free_start, zone_end),
+        TP_ARGS(zone_start, migrate_pfn, free_pfn, zone_end, sync),
 
         TP_STRUCT__entry(
                 __field(unsigned long, zone_start)
-                __field(unsigned long, migrate_start)
-                __field(unsigned long, free_start)
+                __field(unsigned long, migrate_pfn)
+                __field(unsigned long, free_pfn)
                 __field(unsigned long, zone_end)
+                __field(bool, sync)
         ),
 
         TP_fast_assign(
                 __entry->zone_start = zone_start;
-                __entry->migrate_start = migrate_start;
-                __entry->free_start = free_start;
+                __entry->migrate_pfn = migrate_pfn;
+                __entry->free_pfn = free_pfn;
                 __entry->zone_end = zone_end;
+                __entry->sync = sync;
         ),
 
-        TP_printk("zone_start=%lu migrate_start=%lu free_start=%lu zone_end=%lu",
+        TP_printk("zone_start=0x%lx migrate_pfn=0x%lx free_pfn=0x%lx zone_end=0x%lx, mode=%s",
                 __entry->zone_start,
-                __entry->migrate_start,
-                __entry->free_start,
-                __entry->zone_end)
+                __entry->migrate_pfn,
+                __entry->free_pfn,
+                __entry->zone_end,
+                __entry->sync ? "sync" : "async")
 );
 
 TRACE_EVENT(mm_compaction_end,
-        TP_PROTO(int status),
+        TP_PROTO(unsigned long zone_start, unsigned long migrate_pfn,
+                unsigned long free_pfn, unsigned long zone_end, bool sync,
+                int status),
 
-        TP_ARGS(status),
+        TP_ARGS(zone_start, migrate_pfn, free_pfn, zone_end, sync, status),
 
         TP_STRUCT__entry(
+                __field(unsigned long, zone_start)
+                __field(unsigned long, migrate_pfn)
+                __field(unsigned long, free_pfn)
+                __field(unsigned long, zone_end)
+                __field(bool, sync)
                 __field(int, status)
         ),
 
         TP_fast_assign(
+                __entry->zone_start = zone_start;
+                __entry->migrate_pfn = migrate_pfn;
+                __entry->free_pfn = free_pfn;
+                __entry->zone_end = zone_end;
+                __entry->sync = sync;
                 __entry->status = status;
         ),
 
-        TP_printk("status=%d", __entry->status)
+        TP_printk("zone_start=0x%lx migrate_pfn=0x%lx free_pfn=0x%lx zone_end=0x%lx, mode=%s status=%s",
+                __entry->zone_start,
+                __entry->migrate_pfn,
+                __entry->free_pfn,
+                __entry->zone_end,
+                __entry->sync ? "sync" : "async",
+                compaction_status_string[__entry->status])
+);
+
+TRACE_EVENT(mm_compaction_try_to_compact_pages,
+
+        TP_PROTO(
+                int order,
+                gfp_t gfp_mask,
+                enum migrate_mode mode),
+
+        TP_ARGS(order, gfp_mask, mode),
+
+        TP_STRUCT__entry(
+                __field(int, order)
+                __field(gfp_t, gfp_mask)
+                __field(enum migrate_mode, mode)
+        ),
+
+        TP_fast_assign(
+                __entry->order = order;
+                __entry->gfp_mask = gfp_mask;
+                __entry->mode = mode;
+        ),
+
+        TP_printk("order=%d gfp_mask=0x%x mode=%d",
+                __entry->order,
+                __entry->gfp_mask,
+                (int)__entry->mode)
+);
+
+DECLARE_EVENT_CLASS(mm_compaction_suitable_template,
+
+        TP_PROTO(struct zone *zone,
+                int order,
+                int ret),
+
+        TP_ARGS(zone, order, ret),
+
+        TP_STRUCT__entry(
+                __field(int, nid)
+                __field(char *, name)
+                __field(int, order)
+                __field(int, ret)
+        ),
+
+        TP_fast_assign(
+                __entry->nid = zone_to_nid(zone);
+                __entry->name = (char *)zone->name;
+                __entry->order = order;
+                __entry->ret = ret;
+        ),
+
+        TP_printk("node=%d zone=%-8s order=%d ret=%s",
+                __entry->nid,
+                __entry->name,
+                __entry->order,
+                compaction_status_string[__entry->ret])
+);
+
+DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_finished,
+
+        TP_PROTO(struct zone *zone,
+                int order,
+                int ret),
+
+        TP_ARGS(zone, order, ret)
+);
+
+DEFINE_EVENT(mm_compaction_suitable_template, mm_compaction_suitable,
+
+        TP_PROTO(struct zone *zone,
+                int order,
+                int ret),
+
+        TP_ARGS(zone, order, ret)
+);
+
+#ifdef CONFIG_COMPACTION
+DECLARE_EVENT_CLASS(mm_compaction_defer_template,
+
+        TP_PROTO(struct zone *zone, int order),
+
+        TP_ARGS(zone, order),
+
+        TP_STRUCT__entry(
+                __field(int, nid)
+                __field(char *, name)
+                __field(int, order)
+                __field(unsigned int, considered)
+                __field(unsigned int, defer_shift)
+                __field(int, order_failed)
+        ),
+
+        TP_fast_assign(
+                __entry->nid = zone_to_nid(zone);
+                __entry->name = (char *)zone->name;
+                __entry->order = order;
+                __entry->considered = zone->compact_considered;
+                __entry->defer_shift = zone->compact_defer_shift;
+                __entry->order_failed = zone->compact_order_failed;
+        ),
+
+        TP_printk("node=%d zone=%-8s order=%d order_failed=%d consider=%u limit=%lu",
+                __entry->nid,
+                __entry->name,
+                __entry->order,
+                __entry->order_failed,
+                __entry->considered,
+                1UL << __entry->defer_shift)
+);
+
+DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_deferred,
+
+        TP_PROTO(struct zone *zone, int order),
+
+        TP_ARGS(zone, order)
+);
+
+DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_defer_compaction,
+
+        TP_PROTO(struct zone *zone, int order),
+
+        TP_ARGS(zone, order)
+);
+
+DEFINE_EVENT(mm_compaction_defer_template, mm_compaction_defer_reset,
+
+        TP_PROTO(struct zone *zone, int order),
+
+        TP_ARGS(zone, order)
 );
+#endif
 
 #endif /* _TRACE_COMPACTION_H */
 
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h
index bbc4de9baef7..5422dbfaf97d 100644
--- a/include/trace/events/f2fs.h
+++ b/include/trace/events/f2fs.h
@@ -72,6 +72,7 @@
 #define show_cpreason(type)                                             \
         __print_symbolic(type,                                          \
                 { CP_UMOUNT,    "Umount" },                             \
+                { CP_FASTBOOT,  "Fastboot" },                           \
                 { CP_SYNC,      "Sync" },                               \
                 { CP_DISCARD,   "Discard" })
 
@@ -148,14 +149,14 @@ DEFINE_EVENT(f2fs__inode, f2fs_sync_file_enter,
 
 TRACE_EVENT(f2fs_sync_file_exit,
 
-        TP_PROTO(struct inode *inode, bool need_cp, int datasync, int ret),
+        TP_PROTO(struct inode *inode, int need_cp, int datasync, int ret),
 
         TP_ARGS(inode, need_cp, datasync, ret),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
                 __field(ino_t,  ino)
-                __field(bool,   need_cp)
+                __field(int,    need_cp)
                 __field(int,    datasync)
                 __field(int,    ret)
         ),
@@ -190,7 +191,7 @@ TRACE_EVENT(f2fs_sync_fs,
 
         TP_fast_assign(
                 __entry->dev    = sb->s_dev;
-                __entry->dirty  = F2FS_SB(sb)->s_dirty;
+                __entry->dirty  = is_sbi_flag_set(F2FS_SB(sb), SBI_IS_DIRTY);
                 __entry->wait   = wait;
         ),
 
@@ -440,38 +441,6 @@ TRACE_EVENT(f2fs_truncate_partial_nodes,
                 __entry->err)
 );
 
-TRACE_EVENT_CONDITION(f2fs_submit_page_bio,
-
-        TP_PROTO(struct page *page, sector_t blkaddr, int type),
-
-        TP_ARGS(page, blkaddr, type),
-
-        TP_CONDITION(page->mapping),
-
-        TP_STRUCT__entry(
-                __field(dev_t,  dev)
-                __field(ino_t,  ino)
-                __field(pgoff_t,        index)
-                __field(sector_t,       blkaddr)
-                __field(int,    type)
-        ),
-
-        TP_fast_assign(
-                __entry->dev            = page->mapping->host->i_sb->s_dev;
-                __entry->ino            = page->mapping->host->i_ino;
-                __entry->index          = page->index;
-                __entry->blkaddr        = blkaddr;
-                __entry->type           = type;
-        ),
-
-        TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
-                "blkaddr = 0x%llx, bio_type = %s%s",
-                show_dev_ino(__entry),
-                (unsigned long)__entry->index,
-                (unsigned long long)__entry->blkaddr,
-                show_bio_type(__entry->type))
-);
-
 TRACE_EVENT(f2fs_get_data_block,
         TP_PROTO(struct inode *inode, sector_t iblock,
                                 struct buffer_head *bh, int ret),
@@ -680,11 +649,63 @@ TRACE_EVENT(f2fs_reserve_new_block,
                 __entry->ofs_in_node)
 );
 
+DECLARE_EVENT_CLASS(f2fs__submit_page_bio,
+
+        TP_PROTO(struct page *page, struct f2fs_io_info *fio),
+
+        TP_ARGS(page, fio),
+
+        TP_STRUCT__entry(
+                __field(dev_t, dev)
+                __field(ino_t, ino)
+                __field(pgoff_t, index)
+                __field(block_t, blkaddr)
+                __field(int, rw)
+                __field(int, type)
+        ),
+
+        TP_fast_assign(
+                __entry->dev            = page->mapping->host->i_sb->s_dev;
+                __entry->ino            = page->mapping->host->i_ino;
+                __entry->index          = page->index;
+                __entry->blkaddr        = fio->blk_addr;
+                __entry->rw             = fio->rw;
+                __entry->type           = fio->type;
+        ),
+
+        TP_printk("dev = (%d,%d), ino = %lu, page_index = 0x%lx, "
+                "blkaddr = 0x%llx, rw = %s%s, type = %s",
+                show_dev_ino(__entry),
+                (unsigned long)__entry->index,
+                (unsigned long long)__entry->blkaddr,
+                show_bio_type(__entry->rw),
+                show_block_type(__entry->type))
+);
+
+DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_bio,
+
+        TP_PROTO(struct page *page, struct f2fs_io_info *fio),
+
+        TP_ARGS(page, fio),
+
+        TP_CONDITION(page->mapping)
+);
+
+DEFINE_EVENT_CONDITION(f2fs__submit_page_bio, f2fs_submit_page_mbio,
+
+        TP_PROTO(struct page *page, struct f2fs_io_info *fio),
+
+        TP_ARGS(page, fio),
+
+        TP_CONDITION(page->mapping)
+);
+
 DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
-        TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),
+        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
+                                                struct bio *bio),
 
-        TP_ARGS(sb, rw, type, bio),
+        TP_ARGS(sb, fio, bio),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
@@ -696,8 +717,8 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
         TP_fast_assign(
                 __entry->dev            = sb->s_dev;
-                __entry->rw             = rw;
-                __entry->type           = type;
+                __entry->rw             = fio->rw;
+                __entry->type           = fio->type;
                 __entry->sector         = bio->bi_iter.bi_sector;
                 __entry->size           = bio->bi_iter.bi_size;
         ),
@@ -712,18 +733,20 @@ DECLARE_EVENT_CLASS(f2fs__submit_bio,
 
 DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_write_bio,
 
-        TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),
+        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
+                                                        struct bio *bio),
 
-        TP_ARGS(sb, rw, type, bio),
+        TP_ARGS(sb, fio, bio),
 
         TP_CONDITION(bio)
 );
 
 DEFINE_EVENT_CONDITION(f2fs__submit_bio, f2fs_submit_read_bio,
 
-        TP_PROTO(struct super_block *sb, int rw, int type, struct bio *bio),
+        TP_PROTO(struct super_block *sb, struct f2fs_io_info *fio,
+                                                        struct bio *bio),
 
-        TP_ARGS(sb, rw, type, bio),
+        TP_ARGS(sb, fio, bio),
 
         TP_CONDITION(bio)
 );
@@ -916,38 +939,6 @@ TRACE_EVENT(f2fs_writepages,
                 __entry->for_sync)
 );
 
-TRACE_EVENT(f2fs_submit_page_mbio,
-
-        TP_PROTO(struct page *page, int rw, int type, block_t blk_addr),
-
-        TP_ARGS(page, rw, type, blk_addr),
-
-        TP_STRUCT__entry(
-                __field(dev_t,  dev)
-                __field(ino_t,  ino)
-                __field(int, rw)
-                __field(int, type)
-                __field(pgoff_t, index)
-                __field(block_t, block)
-        ),
-
-        TP_fast_assign(
-                __entry->dev    = page->mapping->host->i_sb->s_dev;
-                __entry->ino    = page->mapping->host->i_ino;
-                __entry->rw     = rw;
-                __entry->type   = type;
-                __entry->index  = page->index;
-                __entry->block  = blk_addr;
-        ),
-
-        TP_printk("dev = (%d,%d), ino = %lu, %s%s, %s, index = %lu, blkaddr = 0x%llx",
-                show_dev_ino(__entry),
-                show_bio_type(__entry->rw),
-                show_block_type(__entry->type),
-                (unsigned long)__entry->index,
-                (unsigned long long)__entry->block)
-);
-
 TRACE_EVENT(f2fs_write_checkpoint,
 
         TP_PROTO(struct super_block *sb, int reason, char *msg),
@@ -998,14 +989,15 @@ TRACE_EVENT(f2fs_issue_discard,
 
 TRACE_EVENT(f2fs_issue_flush,
 
-        TP_PROTO(struct super_block *sb, bool nobarrier, bool flush_merge),
+        TP_PROTO(struct super_block *sb, unsigned int nobarrier,
+                                        unsigned int flush_merge),
 
         TP_ARGS(sb, nobarrier, flush_merge),
 
         TP_STRUCT__entry(
                 __field(dev_t,  dev)
-                __field(bool, nobarrier)
-                __field(bool, flush_merge)
+                __field(unsigned int, nobarrier)
+                __field(unsigned int, flush_merge)
         ),
 
         TP_fast_assign(
diff --git a/include/trace/events/iommu.h b/include/trace/events/iommu.h
index a8f5c32d174b..2c7befb10f13 100644
--- a/include/trace/events/iommu.h
+++ b/include/trace/events/iommu.h
@@ -83,7 +83,7 @@ DEFINE_EVENT(iommu_device_event, detach_device_from_domain,
         TP_ARGS(dev)
 );
 
-DECLARE_EVENT_CLASS(iommu_map_unmap,
+TRACE_EVENT(map,
 
         TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
 
@@ -92,7 +92,7 @@ DECLARE_EVENT_CLASS(iommu_map_unmap,
         TP_STRUCT__entry(
                 __field(u64, iova)
                 __field(u64, paddr)
-                __field(int, size)
+                __field(size_t, size)
         ),
 
         TP_fast_assign(
@@ -101,26 +101,31 @@ DECLARE_EVENT_CLASS(iommu_map_unmap,
                 __entry->size = size;
         ),
 
-        TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=0x%x",
+        TP_printk("IOMMU: iova=0x%016llx paddr=0x%016llx size=%zu",
                         __entry->iova, __entry->paddr, __entry->size
         )
 );
 
-DEFINE_EVENT(iommu_map_unmap, map,
+TRACE_EVENT(unmap,
 
-        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
-
-        TP_ARGS(iova, paddr, size)
-);
+        TP_PROTO(unsigned long iova, size_t size, size_t unmapped_size),
 
-DEFINE_EVENT_PRINT(iommu_map_unmap, unmap,
+        TP_ARGS(iova, size, unmapped_size),
 
-        TP_PROTO(unsigned long iova, phys_addr_t paddr, size_t size),
+        TP_STRUCT__entry(
+                __field(u64, iova)
+                __field(size_t, size)
+                __field(size_t, unmapped_size)
+        ),
 
-        TP_ARGS(iova, paddr, size),
+        TP_fast_assign(
+                __entry->iova = iova;
+                __entry->size = size;
+                __entry->unmapped_size = unmapped_size;
+        ),
 
-        TP_printk("IOMMU: iova=0x%016llx size=0x%x",
-                        __entry->iova, __entry->size
+        TP_printk("IOMMU: iova=0x%016llx size=%zu unmapped_size=%zu",
+                        __entry->iova, __entry->size, __entry->unmapped_size
         )
 );
 
diff --git a/include/trace/events/kmem.h b/include/trace/events/kmem.h
index aece1346ceb7..4ad10baecd4d 100644
--- a/include/trace/events/kmem.h
+++ b/include/trace/events/kmem.h
@@ -268,11 +268,11 @@ TRACE_EVENT(mm_page_alloc_extfrag,
 
         TP_PROTO(struct page *page,
                 int alloc_order, int fallback_order,
-                int alloc_migratetype, int fallback_migratetype, int new_migratetype),
+                int alloc_migratetype, int fallback_migratetype),
 
         TP_ARGS(page,
                 alloc_order, fallback_order,
-                alloc_migratetype, fallback_migratetype, new_migratetype),
+                alloc_migratetype, fallback_migratetype),
 
         TP_STRUCT__entry(
                 __field(        struct page *,  page                    )
@@ -289,7 +289,8 @@ TRACE_EVENT(mm_page_alloc_extfrag,
                 __entry->fallback_order         = fallback_order;
                 __entry->alloc_migratetype      = alloc_migratetype;
                 __entry->fallback_migratetype   = fallback_migratetype;
-                __entry->change_ownership       = (new_migratetype == alloc_migratetype);
+                __entry->change_ownership       = (alloc_migratetype ==
+                                        get_pageblock_migratetype(page));
         ),
 
         TP_printk("page=%p pfn=%lu alloc_order=%d fallback_order=%d pageblock_order=%d alloc_migratetype=%d fallback_migratetype=%d fragmenting=%d change_ownership=%d",
diff --git a/include/trace/events/kvm.h b/include/trace/events/kvm.h
index 86b399c66c3d..a44062da684b 100644
--- a/include/trace/events/kvm.h
+++ b/include/trace/events/kvm.h
@@ -37,6 +37,25 @@ TRACE_EVENT(kvm_userspace_exit,
                   __entry->errno < 0 ? -__entry->errno : __entry->reason)
 );
 
+TRACE_EVENT(kvm_vcpu_wakeup,
+            TP_PROTO(__u64 ns, bool waited),
+            TP_ARGS(ns, waited),
+
+        TP_STRUCT__entry(
+                __field(        __u64,          ns              )
+                __field(        bool,           waited          )
+        ),
+
+        TP_fast_assign(
+                __entry->ns             = ns;
+                __entry->waited         = waited;
+        ),
+
+        TP_printk("%s time %lld ns",
+                  __entry->waited ? "wait" : "poll",
+                  __entry->ns)
+);
+
 #if defined(CONFIG_HAVE_KVM_IRQFD)
 TRACE_EVENT(kvm_set_irq,
         TP_PROTO(unsigned int gsi, int level, int irq_source_id),
diff --git a/include/trace/events/net.h b/include/trace/events/net.h
index 1de256b35807..49cc7c3de252 100644
--- a/include/trace/events/net.h
+++ b/include/trace/events/net.h
@@ -40,9 +40,9 @@ TRACE_EVENT(net_dev_start_xmit,
                 __assign_str(name, dev->name);
                 __entry->queue_mapping = skb->queue_mapping;
                 __entry->skbaddr = skb;
-                __entry->vlan_tagged = vlan_tx_tag_present(skb);
+                __entry->vlan_tagged = skb_vlan_tag_present(skb);
                 __entry->vlan_proto = ntohs(skb->vlan_proto);
-                __entry->vlan_tci = vlan_tx_tag_get(skb);
+                __entry->vlan_tci = skb_vlan_tag_get(skb);
                 __entry->protocol = ntohs(skb->protocol);
                 __entry->ip_summed = skb->ip_summed;
                 __entry->len = skb->len;
@@ -174,9 +174,9 @@ DECLARE_EVENT_CLASS(net_dev_rx_verbose_template,
 #endif
                 __entry->queue_mapping = skb->queue_mapping;
                 __entry->skbaddr = skb;
-                __entry->vlan_tagged = vlan_tx_tag_present(skb);
+                __entry->vlan_tagged = skb_vlan_tag_present(skb);
                 __entry->vlan_proto = ntohs(skb->vlan_proto);
-                __entry->vlan_tci = vlan_tx_tag_get(skb);
+                __entry->vlan_tci = skb_vlan_tag_get(skb);
                 __entry->protocol = ntohs(skb->protocol);
                 __entry->ip_summed = skb->ip_summed;
                 __entry->hash = skb->hash;
diff --git a/include/trace/events/tlb.h b/include/trace/events/tlb.h
index 13391d288107..0e7635765153 100644
--- a/include/trace/events/tlb.h
+++ b/include/trace/events/tlb.h
@@ -13,11 +13,13 @@
         { TLB_LOCAL_SHOOTDOWN,          "local shootdown" },            \
         { TLB_LOCAL_MM_SHOOTDOWN,       "local mm shootdown" }
 
-TRACE_EVENT(tlb_flush,
+TRACE_EVENT_CONDITION(tlb_flush,
 
         TP_PROTO(int reason, unsigned long pages),
         TP_ARGS(reason, pages),
 
+        TP_CONDITION(cpu_online(smp_processor_id())),
+
         TP_STRUCT__entry(
                 __field(          int, reason)
                 __field(unsigned long,  pages)
diff --git a/include/trace/events/writeback.h b/include/trace/events/writeback.h
index 5ecb4c234625..5a14ead59696 100644
--- a/include/trace/events/writeback.h
+++ b/include/trace/events/writeback.h
@@ -49,7 +49,7 @@ TRACE_EVENT(writeback_dirty_page,
 
         TP_fast_assign(
                 strncpy(__entry->name,
-                        mapping ? dev_name(mapping->backing_dev_info->dev) : "(unknown)", 32);
+                        mapping ? dev_name(inode_to_bdi(mapping->host)->dev) : "(unknown)", 32);
                 __entry->ino = mapping ? mapping->host->i_ino : 0;
                 __entry->index = page->index;
         ),
@@ -75,7 +75,7 @@ DECLARE_EVENT_CLASS(writeback_dirty_inode_template,
         ),
 
         TP_fast_assign(
-                struct backing_dev_info *bdi = inode->i_mapping->backing_dev_info;
+                struct backing_dev_info *bdi = inode_to_bdi(inode);
 
                 /* may be called for files on pseudo FSes w/ unregistered bdi */
                 strncpy(__entry->name,
@@ -128,7 +128,7 @@ DECLARE_EVENT_CLASS(writeback_write_inode_template,
 
         TP_fast_assign(
                 strncpy(__entry->name,
-                        dev_name(inode->i_mapping->backing_dev_info->dev), 32);
+                        dev_name(inode_to_bdi(inode)->dev), 32);
                 __entry->ino            = inode->i_ino;
                 __entry->sync_mode      = wbc->sync_mode;
         ),
@@ -168,10 +168,8 @@ DECLARE_EVENT_CLASS(writeback_work_class,
                 __field(int, reason)
         ),
         TP_fast_assign(
-                struct device *dev = bdi->dev;
-                if (!dev)
-                        dev = default_backing_dev_info.dev;
-                strncpy(__entry->name, dev_name(dev), 32);
+                strncpy(__entry->name,
+                        bdi->dev ? dev_name(bdi->dev) : "(unknown)", 32);
                 __entry->nr_pages = work->nr_pages;
                 __entry->sb_dev = work->sb ? work->sb->s_dev : 0;
                 __entry->sync_mode = work->sync_mode;