block: ensure bios return from blk_get_request are properly initialized

blk_get_request is used for BLOCK_PC and similar passthrough requests.
Currently we always need to call blk_rq_set_block_pc or an open coded
version of it to allow appending bios using the request mapping helpers
later on, which is a somewhat awkward API.  Instead move the
initialization part of blk_rq_set_block_pc into blk_get_request, so that
we always have a safe to use request.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/block/blk-core.c b/block/blk-core.c
index dd325638e1028d150ef17b9ddd8e4cc826d25d85..4d8794925fe94d029d1c6a10258ca134e2f3c55c 100644 (file)
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -1294,10 +1294,15 @@ static struct request *blk_old_get_request(struct request_queue *q, int rw,
 
        spin_lock_irq(q->queue_lock);
        rq = get_request(q, rw, 0, NULL, gfp_mask);
 
        spin_lock_irq(q->queue_lock);
        rq = get_request(q, rw, 0, NULL, gfp_mask);

-       if (IS_ERR(rq))
+       if (IS_ERR(rq)) {

                spin_unlock_irq(q->queue_lock);
                spin_unlock_irq(q->queue_lock);

-       /* q->queue_lock is unlocked at this point */
+               return rq;
+       }

 
 

+       /* q->queue_lock is unlocked at this point */
+       rq->__data_len = 0;
+       rq->__sector = (sector_t) -1;
+       rq->bio = rq->biotail = NULL;

        return rq;
 }
 
        return rq;
 }
 


@@ -1377,9 +1382,6 @@ EXPORT_SYMBOL(blk_make_request);
 void blk_rq_set_block_pc(struct request *rq)
 {
        rq->cmd_type = REQ_TYPE_BLOCK_PC;
 void blk_rq_set_block_pc(struct request *rq)
 {
        rq->cmd_type = REQ_TYPE_BLOCK_PC;

-       rq->__data_len = 0;
-       rq->__sector = (sector_t) -1;
-       rq->bio = rq->biotail = NULL;

        memset(rq->__cmd, 0, sizeof(rq->__cmd));
 }
 EXPORT_SYMBOL(blk_rq_set_block_pc);
        memset(rq->__cmd, 0, sizeof(rq->__cmd));
 }
 EXPORT_SYMBOL(blk_rq_set_block_pc);

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7aa60c4f56fd066a566a8feb378c3f2130cd50fc..8f4fac87a39590a54719a49941f7420cc7aa4f3f 100644 (file)
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -263,6 +263,10 @@ struct request *blk_mq_alloc_request(struct request_queue *q, int rw,
                blk_queue_exit(q);
                return ERR_PTR(-EWOULDBLOCK);
        }
                blk_queue_exit(q);
                return ERR_PTR(-EWOULDBLOCK);
        }

+
+       rq->__data_len = 0;
+       rq->__sector = (sector_t) -1;
+       rq->bio = rq->biotail = NULL;

        return rq;
 }
 EXPORT_SYMBOL(blk_mq_alloc_request);
        return rq;
 }
 EXPORT_SYMBOL(blk_mq_alloc_request);

diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index a85a14355efabdf5723277af7c7b0db4ac8a89ac..1523e05c46fc95b29c47af3b51ebdc9f93af9029 100644 (file)
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -243,7 +243,6 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str)
        req = blk_get_request(q, READ, GFP_KERNEL);
        if (IS_ERR(req))
                return PTR_ERR(req);
        req = blk_get_request(q, READ, GFP_KERNEL);
        if (IS_ERR(req))
                return PTR_ERR(req);

-       blk_rq_set_block_pc(req);

        req->cmd_type = REQ_TYPE_DRV_PRIV;
 
        err = blk_rq_map_kern(q, req, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL);
        req->cmd_type = REQ_TYPE_DRV_PRIV;
 
        err = blk_rq_map_kern(q, req, id_str, VIRTIO_BLK_ID_BYTES, GFP_KERNEL);

diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index cf4b75088876165e8ea7d702e23004040954a63e..9f0ec3b4659fcfeeede6cee056fc19e6e22be8b9 100644 (file)
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -222,10 +222,6 @@ struct request *nvme_alloc_request(struct request_queue *q,
 
        req->cmd_type = REQ_TYPE_DRV_PRIV;
        req->cmd_flags |= REQ_FAILFAST_DRIVER;
 
        req->cmd_type = REQ_TYPE_DRV_PRIV;
        req->cmd_flags |= REQ_FAILFAST_DRIVER;

-       req->__data_len = 0;
-       req->__sector = (sector_t) -1;
-       req->bio = req->biotail = NULL;
-

        req->cmd = (unsigned char *)cmd;
        req->cmd_len = sizeof(struct nvme_command);
 
        req->cmd = (unsigned char *)cmd;
        req->cmd_len = sizeof(struct nvme_command);