Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[karo-tx-linux.git] / block / blk-mq-tag.h

diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h
index b602e3fa66ea0ad5aad11dd99dbb53bb681ec223..98696a65d4d45243d45a406c866c1cf93ff89c97 100644 (file)
--- a/block/blk-mq-tag.h
+++ b/block/blk-mq-tag.h
@@ -1,7 +1,32 @@
 #ifndef INT_BLK_MQ_TAG_H
 #define INT_BLK_MQ_TAG_H
 
-#include <linux/percpu_ida.h>
+#include "blk-mq.h"
+
+enum {
+       BT_WAIT_QUEUES  = 8,
+       BT_WAIT_BATCH   = 8,
+};
+
+struct bt_wait_state {
+       atomic_t wait_cnt;
+       wait_queue_head_t wait;
+} ____cacheline_aligned_in_smp;
+
+#define TAG_TO_INDEX(bt, tag)  ((tag) >> (bt)->bits_per_word)
+#define TAG_TO_BIT(bt, tag)    ((tag) & ((1 << (bt)->bits_per_word) - 1))
+
+struct blk_mq_bitmap_tags {
+       unsigned int depth;
+       unsigned int wake_cnt;
+       unsigned int bits_per_word;
+
+       unsigned int map_nr;
+       struct blk_align_bitmap *map;
+
+       unsigned int wake_index;
+       struct bt_wait_state *bs;
+};
 
 /*
  * Tag address space map.
@@ -9,11 +34,11 @@
 struct blk_mq_tags {
        unsigned int nr_tags;
        unsigned int nr_reserved_tags;
-       unsigned int nr_batch_move;
-       unsigned int nr_max_cache;
 
-       struct percpu_ida free_tags;
-       struct percpu_ida reserved_tags;
+       atomic_t active_queues;
+
+       struct blk_mq_bitmap_tags bitmap_tags;
+       struct blk_mq_bitmap_tags breserved_tags;
 
        struct request **rqs;
        struct list_head page_list;
@@ -23,12 +48,12 @@ struct blk_mq_tags {
 extern struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags, unsigned int reserved_tags, int node);
 extern void blk_mq_free_tags(struct blk_mq_tags *tags);
 
-extern unsigned int blk_mq_get_tag(struct blk_mq_tags *tags, gfp_t gfp, bool reserved);
-extern void blk_mq_wait_for_tags(struct blk_mq_tags *tags);
-extern void blk_mq_put_tag(struct blk_mq_tags *tags, unsigned int tag);
-extern void blk_mq_tag_busy_iter(struct blk_mq_tags *tags, void (*fn)(void *data, unsigned long *), void *data);
+extern unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data);
+extern void blk_mq_put_tag(struct blk_mq_hw_ctx *hctx, unsigned int tag, unsigned int *last_tag);
 extern bool blk_mq_has_free_tags(struct blk_mq_tags *tags);
 extern ssize_t blk_mq_tag_sysfs_show(struct blk_mq_tags *tags, char *page);
+extern void blk_mq_tag_init_last_tag(struct blk_mq_tags *tags, unsigned int *last_tag);
+extern int blk_mq_tag_update_depth(struct blk_mq_tags *tags, unsigned int depth);
 
 enum {
        BLK_MQ_TAG_CACHE_MIN    = 1,
@@ -41,4 +66,23 @@ enum {
        BLK_MQ_TAG_MAX          = BLK_MQ_TAG_FAIL - 1,
 };
 
+extern bool __blk_mq_tag_busy(struct blk_mq_hw_ctx *);
+extern void __blk_mq_tag_idle(struct blk_mq_hw_ctx *);
+
+static inline bool blk_mq_tag_busy(struct blk_mq_hw_ctx *hctx)
+{
+       if (!(hctx->flags & BLK_MQ_F_TAG_SHARED))
+               return false;
+
+       return __blk_mq_tag_busy(hctx);
+}
+
+static inline void blk_mq_tag_idle(struct blk_mq_hw_ctx *hctx)
+{
+       if (!(hctx->flags & BLK_MQ_F_TAG_SHARED))
+               return;
+
+       __blk_mq_tag_idle(hctx);
+}
+
 #endif