Merge branch 'for-4.9/block-smp' of git://git.kernel.dk/linux-block

[cascardo/linux.git] / include / linux / blk-mq.h

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index b3d1a7f..535ab2e 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -56,6 +56,7 @@ struct blk_mq_hw_ctx {
 };
 
 struct blk_mq_tag_set {
 };
 
 struct blk_mq_tag_set {

+       unsigned int            *mq_map;

        struct blk_mq_ops       *ops;
        unsigned int            nr_hw_queues;
        unsigned int            queue_depth;    /* max hw supported */
        struct blk_mq_ops       *ops;
        unsigned int            nr_hw_queues;
        unsigned int            queue_depth;    /* max hw supported */


@@ -79,7 +80,6 @@ struct blk_mq_queue_data {
 };
 
 typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, const struct blk_mq_queue_data *);
 };
 
 typedef int (queue_rq_fn)(struct blk_mq_hw_ctx *, const struct blk_mq_queue_data *);

-typedef struct blk_mq_hw_ctx *(map_queue_fn)(struct request_queue *, const int);

 typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool);
 typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int);
 typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);
 typedef enum blk_eh_timer_return (timeout_fn)(struct request *, bool);
 typedef int (init_hctx_fn)(struct blk_mq_hw_ctx *, void *, unsigned int);
 typedef void (exit_hctx_fn)(struct blk_mq_hw_ctx *, unsigned int);


@@ -93,6 +93,7 @@ typedef void (busy_iter_fn)(struct blk_mq_hw_ctx *, struct request *, void *,
                bool);
 typedef void (busy_tag_iter_fn)(struct request *, void *, bool);
 typedef int (poll_fn)(struct blk_mq_hw_ctx *, unsigned int);
                bool);
 typedef void (busy_tag_iter_fn)(struct request *, void *, bool);
 typedef int (poll_fn)(struct blk_mq_hw_ctx *, unsigned int);

+typedef int (map_queues_fn)(struct blk_mq_tag_set *set);

 
 
 struct blk_mq_ops {
 
 
 struct blk_mq_ops {


@@ -101,11 +102,6 @@ struct blk_mq_ops {
         */
        queue_rq_fn             *queue_rq;
 
         */
        queue_rq_fn             *queue_rq;
 

-       /*
-        * Map to specific hardware queue
-        */
-       map_queue_fn            *map_queue;
-

        /*
         * Called on request timeout
         */
        /*
         * Called on request timeout
         */


@@ -138,6 +134,8 @@ struct blk_mq_ops {
        init_request_fn         *init_request;
        exit_request_fn         *exit_request;
        reinit_request_fn       *reinit_request;
        init_request_fn         *init_request;
        exit_request_fn         *exit_request;
        reinit_request_fn       *reinit_request;

+
+       map_queues_fn           *map_queues;

 };
 
 enum {
 };
 
 enum {


@@ -149,6 +147,7 @@ enum {
        BLK_MQ_F_TAG_SHARED     = 1 << 1,
        BLK_MQ_F_SG_MERGE       = 1 << 2,
        BLK_MQ_F_DEFER_ISSUE    = 1 << 4,
        BLK_MQ_F_TAG_SHARED     = 1 << 1,
        BLK_MQ_F_SG_MERGE       = 1 << 2,
        BLK_MQ_F_DEFER_ISSUE    = 1 << 4,

+       BLK_MQ_F_BLOCKING       = 1 << 5,

        BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,
        BLK_MQ_F_ALLOC_POLICY_BITS = 1,
 
        BLK_MQ_F_ALLOC_POLICY_START_BIT = 8,
        BLK_MQ_F_ALLOC_POLICY_BITS = 1,
 


@@ -192,7 +191,6 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw,
 struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int op,
                unsigned int flags, unsigned int hctx_idx);
 struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag);
 struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int op,
                unsigned int flags, unsigned int hctx_idx);
 struct request *blk_mq_tag_to_rq(struct blk_mq_tags *tags, unsigned int tag);

-struct cpumask *blk_mq_tags_cpumask(struct blk_mq_tags *tags);

 
 enum {
        BLK_MQ_UNIQUE_TAG_BITS = 16,
 
 enum {
        BLK_MQ_UNIQUE_TAG_BITS = 16,


@@ -211,7 +209,6 @@ static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag)
        return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;
 }
 
        return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;
 }
 

-struct blk_mq_hw_ctx *blk_mq_map_queue(struct request_queue *, const int ctx_index);

 
 int blk_mq_request_started(struct request *rq);
 void blk_mq_start_request(struct request *rq);
 
 int blk_mq_request_started(struct request *rq);
 void blk_mq_start_request(struct request *rq);