Merge branch 'for-3.15/drivers' of git://git.kernel.dk/linux-block

Pull block driver update from Jens Axboe:
 "On top of the core pull request, here's the pull request for the
  driver related changes for 3.15.  It contains:

   - Improvements for msi-x registration for block drivers (mtip32xx,
     skd, cciss, nvme) from Alexander Gordeev.

   - A round of cleanups and improvements for drbd from Andreas
     Gruenbacher and Rashika Kheria.

   - A round of clanups and improvements for bcache from Kent.

   - Removal of sleep_on() and friends in DAC960, ataflop, swim3 from
     Arnd Bergmann.

   - Bug fix for a bug in the mtip32xx async completion code from Sam
     Bradshaw.

   - Bug fix for accidentally bouncing IO on 32-bit platforms with
     mtip32xx from Felipe Franciosi"

* 'for-3.15/drivers' of git://git.kernel.dk/linux-block: (103 commits)
  bcache: remove nested function usage
  bcache: Kill bucket->gc_gen
  bcache: Kill unused freelist
  bcache: Rework btree cache reserve handling
  bcache: Kill btree_io_wq
  bcache: btree locking rework
  bcache: Fix a race when freeing btree nodes
  bcache: Add a real GC_MARK_RECLAIMABLE
  bcache: Add bch_keylist_init_single()
  bcache: Improve priority_stats
  bcache: Better alloc tracepoints
  bcache: Kill dead cgroup code
  bcache: stop moving_gc marking buckets that can't be moved.
  bcache: Fix moving_pred()
  bcache: Fix moving_gc deadlocking with a foreground write
  bcache: Fix discard granularity
  bcache: Fix another bug recovering from unclean shutdown
  bcache: Fix a bug recovering from unclean shutdown
  bcache: Fix a journalling reclaim after recovery bug
  bcache: Fix a null ptr deref in journal replay
  ...

1 files changed, 35 insertions, 17 deletions

diff --git a/include/trace/events/bcache.h b/include/trace/events/bcache.h
index 7110897c3dfa..c9c3c044b32f 100644
--- a/include/trace/events/bcache.h
+++ b/include/trace/events/bcache.h
@@ -399,26 +399,43 @@ TRACE_EVENT(bcache_keyscan,
 
 /* Allocator */
 
-TRACE_EVENT(bcache_alloc_invalidate,
-        TP_PROTO(struct cache *ca),
-        TP_ARGS(ca),
+TRACE_EVENT(bcache_invalidate,
+        TP_PROTO(struct cache *ca, size_t bucket),
+        TP_ARGS(ca, bucket),
 
         TP_STRUCT__entry(
-                __field(unsigned,       free                    )
-                __field(unsigned,       free_inc                )
-                __field(unsigned,       free_inc_size           )
-                __field(unsigned,       unused                  )
+                __field(unsigned,       sectors                 )
+                __field(dev_t,          dev                     )
+                __field(__u64,          offset                  )
         ),
 
         TP_fast_assign(
-                __entry->free           = fifo_used(&ca->free[RESERVE_NONE]);
-                __entry->free_inc       = fifo_used(&ca->free_inc);
-                __entry->free_inc_size  = ca->free_inc.size;
-                __entry->unused         = fifo_used(&ca->unused);
+                __entry->dev            = ca->bdev->bd_dev;
+                __entry->offset         = bucket << ca->set->bucket_bits;
+                __entry->sectors        = GC_SECTORS_USED(&ca->buckets[bucket]);
         ),
 
-        TP_printk("free %u free_inc %u/%u unused %u", __entry->free,
-                  __entry->free_inc, __entry->free_inc_size, __entry->unused)
+        TP_printk("invalidated %u sectors at %d,%d sector=%llu",
+                  __entry->sectors, MAJOR(__entry->dev),
+                  MINOR(__entry->dev), __entry->offset)
+);
+
+TRACE_EVENT(bcache_alloc,
+        TP_PROTO(struct cache *ca, size_t bucket),
+        TP_ARGS(ca, bucket),
+
+        TP_STRUCT__entry(
+                __field(dev_t,          dev                     )
+                __field(__u64,          offset                  )
+        ),
+
+        TP_fast_assign(
+                __entry->dev            = ca->bdev->bd_dev;
+                __entry->offset         = bucket << ca->set->bucket_bits;
+        ),
+
+        TP_printk("allocated %d,%d sector=%llu", MAJOR(__entry->dev),
+                  MINOR(__entry->dev), __entry->offset)
 );
 
 TRACE_EVENT(bcache_alloc_fail,
@@ -426,21 +443,22 @@ TRACE_EVENT(bcache_alloc_fail,
         TP_ARGS(ca, reserve),
 
         TP_STRUCT__entry(
+                __field(dev_t,          dev                     )
                 __field(unsigned,       free                    )
                 __field(unsigned,       free_inc                )
-                __field(unsigned,       unused                  )
                 __field(unsigned,       blocked                 )
         ),
 
         TP_fast_assign(
+                __entry->dev            = ca->bdev->bd_dev;
                 __entry->free           = fifo_used(&ca->free[reserve]);
                 __entry->free_inc       = fifo_used(&ca->free_inc);
-                __entry->unused         = fifo_used(&ca->unused);
                 __entry->blocked        = atomic_read(&ca->set->prio_blocked);
         ),
 
-        TP_printk("free %u free_inc %u unused %u blocked %u", __entry->free,
-                  __entry->free_inc, __entry->unused, __entry->blocked)
+        TP_printk("alloc fail %d,%d free %u free_inc %u blocked %u",
+                  MAJOR(__entry->dev), MINOR(__entry->dev), __entry->free,
+                  __entry->free_inc, __entry->blocked)
 );
 
 /* Background writeback */