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

Pull block fixes from Jens Axboe:

 - the virtio_blk stack DMA corruption fix from Christoph, fixing and
   issue with VMAP stacks.

 - O_DIRECT blkbits calculation fix from Chandan.

 - discard regression fix from Christoph.

 - queue init error handling fixes for nbd and virtio_blk, from Omar and
   Jeff.

 - two small nvme fixes, from Christoph and Guilherme.

 - rename of blk_queue_zone_size and bdev_zone_size to _sectors instead,
   to more closely follow what we do in other places in the block layer.
   This interface is new for this series, so let's get the naming right
   before releasing a kernel with this feature. From Damien.

* 'for-linus' of git://git.kernel.dk/linux-block:
  block: don't try to discard from __blkdev_issue_zeroout
  sd: remove __data_len hack for WRITE SAME
  nvme: use blk_rq_payload_bytes
  scsi: use blk_rq_payload_bytes
  block: add blk_rq_payload_bytes
  block: Rename blk_queue_zone_size and bdev_zone_size
  nvme: apply DELAY_BEFORE_CHK_RDY quirk at probe time too
  nvme-rdma: fix nvme_rdma_queue_is_ready
  virtio_blk: fix panic in initialization error path
  nbd: blk_mq_init_queue returns an error code on failure, not NULL
  virtio_blk: avoid DMA to stack for the sense buffer
  do_direct_IO: Use inode->i_blkbits to compute block count to be cleaned

2 files changed, 9 insertions, 4 deletions

diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 38c576f76d36..50a2020b5b72 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -1042,6 +1042,7 @@ static int __init nbd_init(void)
                 return -ENOMEM;
 
         for (i = 0; i < nbds_max; i++) {
+                struct request_queue *q;
                 struct gendisk *disk = alloc_disk(1 << part_shift);
                 if (!disk)
                         goto out;
@@ -1067,12 +1068,13 @@ static int __init nbd_init(void)
                  * every gendisk to have its very own request_queue struct.
                  * These structs are big so we dynamically allocate them.
                  */
-                disk->queue = blk_mq_init_queue(&nbd_dev[i].tag_set);
-                if (!disk->queue) {
+                q = blk_mq_init_queue(&nbd_dev[i].tag_set);
+                if (IS_ERR(q)) {
                         blk_mq_free_tag_set(&nbd_dev[i].tag_set);
                         put_disk(disk);
                         goto out;
                 }
+                disk->queue = q;
 
                 /*
                  * Tell the block layer that we are not a rotational device
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 5545a679abd8..10332c24f961 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -56,6 +56,7 @@ struct virtblk_req {
         struct virtio_blk_outhdr out_hdr;
         struct virtio_scsi_inhdr in_hdr;
         u8 status;
+        u8 sense[SCSI_SENSE_BUFFERSIZE];
         struct scatterlist sg[];
 };
 
@@ -102,7 +103,8 @@ static int __virtblk_add_req(struct virtqueue *vq,
         }
 
         if (type == cpu_to_virtio32(vq->vdev, VIRTIO_BLK_T_SCSI_CMD)) {
-                sg_init_one(&sense, vbr->req->sense, SCSI_SENSE_BUFFERSIZE);
+                memcpy(vbr->sense, vbr->req->sense, SCSI_SENSE_BUFFERSIZE);
+                sg_init_one(&sense, vbr->sense, SCSI_SENSE_BUFFERSIZE);
                 sgs[num_out + num_in++] = &sense;
                 sg_init_one(&inhdr, &vbr->in_hdr, sizeof(vbr->in_hdr));
                 sgs[num_out + num_in++] = &inhdr;
@@ -628,11 +630,12 @@ static int virtblk_probe(struct virtio_device *vdev)
         if (err)
                 goto out_put_disk;
 
-        q = vblk->disk->queue = blk_mq_init_queue(&vblk->tag_set);
+        q = blk_mq_init_queue(&vblk->tag_set);
         if (IS_ERR(q)) {
                 err = -ENOMEM;
                 goto out_free_tags;
         }
+        vblk->disk->queue = q;
 
         q->queuedata = vblk;