nvme-multipath: split bios with the ns_head bio_set before submitting
authorHannes Reinecke <hare@suse.de>
Tue, 30 Apr 2019 16:57:09 +0000 (18:57 +0200)
committerChristoph Hellwig <hch@lst.de>
Wed, 1 May 2019 13:17:15 +0000 (09:17 -0400)
If the bio is moved to a different queue via blk_steal_bios() and
the original queue is destroyed in nvme_remove_ns() we'll be ending
with a crash in bio_endio() as the mempool for the split bio bvecs
had already been destroyed.
So split the bio using the original queue (which will remain during the
lifetime of the bio) before sending it down to the underlying device.

Signed-off-by: Hannes Reinecke <hare@suse.com>
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
drivers/nvme/host/multipath.c

index f0716f6ce41fa2a1ad993e45adba9148d7f0c120..e6ddc83223df5c423a8a555ffc38d2c49b694426 100644 (file)
@@ -232,6 +232,14 @@ static blk_qc_t nvme_ns_head_make_request(struct request_queue *q,
        blk_qc_t ret = BLK_QC_T_NONE;
        int srcu_idx;
 
+       /*
+        * The namespace might be going away and the bio might
+        * be moved to a different queue via blk_steal_bios(),
+        * so we need to use the bio_split pool from the original
+        * queue to allocate the bvecs from.
+        */
+       blk_queue_split(q, &bio);
+
        srcu_idx = srcu_read_lock(&head->srcu);
        ns = nvme_find_path(head);
        if (likely(ns)) {