blk-mq: allow the hctx cpu hotplug notifier to return errors

Prepare this for the next patch which adds more smarts in the
plugging logic, so that we can save some memory.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-mq-cpu.c b/block/blk-mq-cpu.c
index 136ef8643bbade3dd2d5d84e35183c749bc00399..d2c253f71b8665cd333dd6c45dfe06f757dacb53 100644 (file)
--- a/block/blk-mq-cpu.c
+++ b/block/blk-mq-cpu.c
@@ -18,14 +18,18 @@ static int blk_mq_main_cpu_notify(struct notifier_block *self,
 {
        unsigned int cpu = (unsigned long) hcpu;
        struct blk_mq_cpu_notifier *notify;
+       int ret = NOTIFY_OK;
 
        raw_spin_lock(&blk_mq_cpu_notify_lock);
 
-       list_for_each_entry(notify, &blk_mq_cpu_notify_list, list)
-               notify->notify(notify->data, action, cpu);
+       list_for_each_entry(notify, &blk_mq_cpu_notify_list, list) {
+               ret = notify->notify(notify->data, action, cpu);
+               if (ret != NOTIFY_OK)
+                       break;
+       }
 
        raw_spin_unlock(&blk_mq_cpu_notify_lock);
-       return NOTIFY_OK;
+       return ret;
 }
 
 void blk_mq_register_cpu_notifier(struct blk_mq_cpu_notifier *notifier)
@@ -45,7 +49,7 @@ void blk_mq_unregister_cpu_notifier(struct blk_mq_cpu_notifier *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)
 {
        notifier->notify = fn;

diff --git a/block/blk-mq.c b/block/blk-mq.c
index ef7ed5e95d6d7587c0b69ce36f0e91d4b2bef31a..5a3683fc5bdb0e92586a89998e99e7fe3eb18b8d 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -1196,8 +1196,8 @@ void blk_mq_free_single_hw_queue(struct blk_mq_hw_ctx *hctx,
 }
 EXPORT_SYMBOL(blk_mq_free_single_hw_queue);
 
-static void blk_mq_hctx_notify(void *data, unsigned long action,
-                              unsigned int cpu)
+static int blk_mq_hctx_notify(void *data, unsigned long action,
+                             unsigned int cpu)
 {
        struct blk_mq_hw_ctx *hctx = data;
        struct request_queue *q = hctx->queue;
@@ -1205,7 +1205,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
        LIST_HEAD(tmp);
 
        if (action != CPU_DEAD && action != CPU_DEAD_FROZEN)
-               return;
+               return NOTIFY_OK;
 
        /*
         * Move ctx entries to new CPU, if this one is going away.
@@ -1220,7 +1220,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
        spin_unlock(&ctx->lock);
 
        if (list_empty(&tmp))
-               return;
+               return NOTIFY_OK;
 
        ctx = blk_mq_get_ctx(q);
        spin_lock(&ctx->lock);
@@ -1240,6 +1240,7 @@ static void blk_mq_hctx_notify(void *data, unsigned long action,
 
        blk_mq_run_hw_queue(hctx, true);
        blk_mq_put_ctx(ctx);
+       return NOTIFY_OK;
 }
 
 static void blk_mq_free_rq_map(struct blk_mq_tag_set *set,

diff --git a/block/blk-mq.h b/block/blk-mq.h
index 7db4fe4bd0021434246912ef9cdcbd1020e15e5d..491dbd4e93f5f7a0f34224a70852381b7eed9035 100644 (file)
--- a/block/blk-mq.h
+++ b/block/blk-mq.h
@@ -39,7 +39,7 @@ int blk_mq_update_nr_requests(struct request_queue *q, unsigned int nr);
  */
 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);

diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
index f45424453338ea4952c8f9e6a8461622cedb011c..4d2800567aadb6f98bff721914b6bda6c882c5fc 100644 (file)
--- a/include/linux/blk-mq.h
+++ b/include/linux/blk-mq.h
@@ -8,7 +8,7 @@ struct blk_mq_tags;
 struct blk_mq_cpu_notifier {
        struct list_head list;
        void *data;
-       void (*notify)(void *data, unsigned long action, unsigned int cpu);
+       int (*notify)(void *data, unsigned long action, unsigned int cpu);
 };
 
 struct blk_mq_ctxmap {