Merge tag 'trace-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[firefly-linux-kernel-4.4.55.git] / block / blk-mq.h

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 5e5a378962b7346fa019c37ef6ccbef9ac78b4ad..26460884c6cd835202e90b2d5985c827495ca626 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -32,13 +32,14 @@ void blk_mq_drain_queue(struct request_queue *q);
 void blk_mq_free_queue(struct request_queue *q);
 void blk_mq_clone_flush_request(struct request *flush_rq,
                struct request *orig_rq);
+int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);
 
 /*
  * CPU hotplug helpers
  */
 struct blk_mq_cpu_notifier;
 void blk_mq_init_cpu_notifier(struct blk_mq_cpu_notifier *notifier,
-                             void (*fn)(void *, unsigned long, unsigned int),
+                             int (*fn)(void *, unsigned long, unsigned int),
                              void *data);
 void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier);
 void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *notifier);
@@ -51,6 +52,13 @@ void blk_mq_disable_hotplug(void);
  */
 extern unsigned int *blk_mq_make_queue_map(struct blk_mq_tag_set *set);
 extern int blk_mq_update_queue_map(unsigned int *map, unsigned int nr_queues);
+extern int blk_mq_hw_queue_to_node(unsigned int *map, unsigned int);
+
+/*
+ * sysfs helpers
+ */
+extern int blk_mq_sysfs_register(struct request_queue *q);
+extern void blk_mq_sysfs_unregister(struct request_queue *q);
 
 /*
  * Basic implementation of sparser bitmap, allowing the user to spread
@@ -61,4 +69,49 @@ struct blk_align_bitmap {
        unsigned long depth;
 } ____cacheline_aligned_in_smp;
 
+static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
+                                          unsigned int cpu)
+{
+       return per_cpu_ptr(q->queue_ctx, cpu);
+}
+
+/*
+ * This assumes per-cpu software queueing queues. They could be per-node
+ * as well, for instance. For now this is hardcoded as-is. Note that we don't
+ * care about preemption, since we know the ctx's are persistent. This does
+ * mean that we can't rely on ctx always matching the currently running CPU.
+ */
+static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
+{
+       return __blk_mq_get_ctx(q, get_cpu());
+}
+
+static inline void blk_mq_put_ctx(struct blk_mq_ctx *ctx)
+{
+       put_cpu();
+}
+
+struct blk_mq_alloc_data {
+       /* input parameter */
+       struct request_queue *q;
+       gfp_t gfp;
+       bool reserved;
+
+       /* input & output parameter */
+       struct blk_mq_ctx *ctx;
+       struct blk_mq_hw_ctx *hctx;
+};
+
+static inline void blk_mq_set_alloc_data(struct blk_mq_alloc_data *data,
+               struct request_queue *q, gfp_t gfp, bool reserved,
+               struct blk_mq_ctx *ctx,
+               struct blk_mq_hw_ctx *hctx)
+{
+       data->q = q;
+       data->gfp = gfp;
+       data->reserved = reserved;
+       data->ctx = ctx;
+       data->hctx = hctx;
+}
+
 #endif