Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost

Pull virtio/vhost updates from Michael Tsirkin:
"Features, fixes, cleanups:

   - discard in virtio blk

   - misc fixes and cleanups"

* tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  vhost: correct the related warning message
  vhost: split structs into a separate header file
  virtio: remove deprecated VIRTIO_PCI_CONFIG()
  vhost/vsock: switch to a mutex for vhost_vsock_hash
  virtio_blk: add discard and write zeroes support

diff --combined drivers/block/virtio_blk.c
index 912c4265e592dcc1c7603f78351f6becf4f55f54,0f39efb4b3aaffa599940a4877230b64b1dbf433..b16a887bbd02a8b7715fb85a812c73f75a2d25fe
--- 1/drivers/block/virtio_blk.c
--- 2/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@@ -18,6 -18,7 +18,7 @@@
  
  #define PART_BITS 4
  #define VQ_NAME_LEN 16
+ #define MAX_DISCARD_SEGMENTS 256u
  
  static int major;
  static DEFINE_IDA(vd_index_ida);
@@@ -172,10 -173,48 +173,48 @@@ static int virtblk_add_req(struct virtq
        return virtqueue_add_sgs(vq, sgs, num_out, num_in, vbr, GFP_ATOMIC);
  }
  
+ static int virtblk_setup_discard_write_zeroes(struct request *req, bool unmap)
+ {
+       unsigned short segments = blk_rq_nr_discard_segments(req);
+       unsigned short n = 0;
+       struct virtio_blk_discard_write_zeroes *range;
+       struct bio *bio;
+       u32 flags = 0;
+ 
+       if (unmap)
+               flags |= VIRTIO_BLK_WRITE_ZEROES_FLAG_UNMAP;
+ 
+       range = kmalloc_array(segments, sizeof(*range), GFP_ATOMIC);
+       if (!range)
+               return -ENOMEM;
+ 
+       __rq_for_each_bio(bio, req) {
+               u64 sector = bio->bi_iter.bi_sector;
+               u32 num_sectors = bio->bi_iter.bi_size >> SECTOR_SHIFT;
+ 
+               range[n].flags = cpu_to_le32(flags);
+               range[n].num_sectors = cpu_to_le32(num_sectors);
+               range[n].sector = cpu_to_le64(sector);
+               n++;
+       }
+ 
+       req->special_vec.bv_page = virt_to_page(range);
+       req->special_vec.bv_offset = offset_in_page(range);
+       req->special_vec.bv_len = sizeof(*range) * segments;
+       req->rq_flags |= RQF_SPECIAL_PAYLOAD;
+ 
+       return 0;
+ }
+ 
  static inline void virtblk_request_done(struct request *req)
  {
        struct virtblk_req *vbr = blk_mq_rq_to_pdu(req);
  
+       if (req->rq_flags & RQF_SPECIAL_PAYLOAD) {
+               kfree(page_address(req->special_vec.bv_page) +
+                     req->special_vec.bv_offset);
+       }
+ 
        switch (req_op(req)) {
        case REQ_OP_SCSI_IN:
        case REQ_OP_SCSI_OUT:
@@@ -214,20 -253,6 +253,20 @@@ static void virtblk_done(struct virtque
        spin_unlock_irqrestore(&vblk->vqs[qid].lock, flags);
  }
  
 +static void virtio_commit_rqs(struct blk_mq_hw_ctx *hctx)
 +{
 +      struct virtio_blk *vblk = hctx->queue->queuedata;
 +      struct virtio_blk_vq *vq = &vblk->vqs[hctx->queue_num];
 +      bool kick;
 +
 +      spin_lock_irq(&vq->lock);
 +      kick = virtqueue_kick_prepare(vq->vq);
 +      spin_unlock_irq(&vq->lock);
 +
 +      if (kick)
 +              virtqueue_notify(vq->vq);
 +}
 +
  static blk_status_t virtio_queue_rq(struct blk_mq_hw_ctx *hctx,
                           const struct blk_mq_queue_data *bd)
  {
@@@ -239,6 -264,7 +278,7 @@@
        int qid = hctx->queue_num;
        int err;
        bool notify = false;
+       bool unmap = false;
        u32 type;
  
        BUG_ON(req->nr_phys_segments + 2 > vblk->sg_elems);
@@@ -251,6 -277,13 +291,13 @@@
        case REQ_OP_FLUSH:
                type = VIRTIO_BLK_T_FLUSH;
                break;
+       case REQ_OP_DISCARD:
+               type = VIRTIO_BLK_T_DISCARD;
+               break;
+       case REQ_OP_WRITE_ZEROES:
+               type = VIRTIO_BLK_T_WRITE_ZEROES;
+               unmap = !(req->cmd_flags & REQ_NOUNMAP);
+               break;
        case REQ_OP_SCSI_IN:
        case REQ_OP_SCSI_OUT:
                type = VIRTIO_BLK_T_SCSI_CMD;
@@@ -270,6 -303,12 +317,12 @@@
  
        blk_mq_start_request(req);
  
+       if (type == VIRTIO_BLK_T_DISCARD || type == VIRTIO_BLK_T_WRITE_ZEROES) {
+               err = virtblk_setup_discard_write_zeroes(req, unmap);
+               if (err)
+                       return BLK_STS_RESOURCE;
+       }
+ 
        num = blk_rq_map_sg(hctx->queue, req, vbr->sg);
        if (num) {
                if (rq_data_dir(req) == WRITE)
@@@ -638,7 -677,7 +691,7 @@@ static int virtblk_map_queues(struct bl
  {
        struct virtio_blk *vblk = set->driver_data;
  
 -      return blk_mq_virtio_map_queues(set, vblk->vdev, 0);
 +      return blk_mq_virtio_map_queues(&set->map[0], vblk->vdev, 0);
  }
  
  #ifdef CONFIG_VIRTIO_BLK_SCSI
@@@ -652,7 -691,6 +705,7 @@@ static void virtblk_initialize_rq(struc
  
  static const struct blk_mq_ops virtio_mq_ops = {
        .queue_rq       = virtio_queue_rq,
 +      .commit_rqs     = virtio_commit_rqs,
        .complete       = virtblk_request_done,
        .init_request   = virtblk_init_request,
  #ifdef CONFIG_VIRTIO_BLK_SCSI
@@@ -817,6 -855,32 +870,32 @@@ static int virtblk_probe(struct virtio_
        if (!err && opt_io_size)
                blk_queue_io_opt(q, blk_size * opt_io_size);
  
+       if (virtio_has_feature(vdev, VIRTIO_BLK_F_DISCARD)) {
+               q->limits.discard_granularity = blk_size;
+ 
+               virtio_cread(vdev, struct virtio_blk_config,
+                            discard_sector_alignment, &v);
+               q->limits.discard_alignment = v ? v << SECTOR_SHIFT : 0;
+ 
+               virtio_cread(vdev, struct virtio_blk_config,
+                            max_discard_sectors, &v);
+               blk_queue_max_discard_sectors(q, v ? v : UINT_MAX);
+ 
+               virtio_cread(vdev, struct virtio_blk_config, max_discard_seg,
+                            &v);
+               blk_queue_max_discard_segments(q,
+                                              min_not_zero(v,
+                                                           MAX_DISCARD_SEGMENTS));
+ 
+               blk_queue_flag_set(QUEUE_FLAG_DISCARD, q);
+       }
+ 
+       if (virtio_has_feature(vdev, VIRTIO_BLK_F_WRITE_ZEROES)) {
+               virtio_cread(vdev, struct virtio_blk_config,
+                            max_write_zeroes_sectors, &v);
+               blk_queue_max_write_zeroes_sectors(q, v ? v : UINT_MAX);
+       }
+ 
        virtblk_update_capacity(vblk, false);
        virtio_device_ready(vdev);
  
@@@ -910,14 -974,14 +989,14 @@@ static unsigned int features_legacy[] 
        VIRTIO_BLK_F_SCSI,
  #endif
        VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_CONFIG_WCE,
-       VIRTIO_BLK_F_MQ,
+       VIRTIO_BLK_F_MQ, VIRTIO_BLK_F_DISCARD, VIRTIO_BLK_F_WRITE_ZEROES,
  }
  ;
  static unsigned int features[] = {
        VIRTIO_BLK_F_SEG_MAX, VIRTIO_BLK_F_SIZE_MAX, VIRTIO_BLK_F_GEOMETRY,
        VIRTIO_BLK_F_RO, VIRTIO_BLK_F_BLK_SIZE,
        VIRTIO_BLK_F_FLUSH, VIRTIO_BLK_F_TOPOLOGY, VIRTIO_BLK_F_CONFIG_WCE,
-       VIRTIO_BLK_F_MQ,
+       VIRTIO_BLK_F_MQ, VIRTIO_BLK_F_DISCARD, VIRTIO_BLK_F_WRITE_ZEROES,
  };
  
  static struct virtio_driver virtio_blk = {

diff --combined drivers/vhost/scsi.c
index a08472ae5b1b67fd2caa26189b22de9f09effb85,b459b6919b91efa25d1be74726a6db39343ab4c3..8e10ab436d1f13bbf38c8f15dcfcb06c4fc3ab46
--- 1/drivers/vhost/scsi.c
--- 2/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@@ -285,6 -285,11 +285,6 @@@ static int vhost_scsi_check_false(struc
        return 0;
  }
  
 -static char *vhost_scsi_get_fabric_name(void)
 -{
 -      return "vhost";
 -}
 -
  static char *vhost_scsi_get_fabric_wwn(struct se_portal_group *se_tpg)
  {
        struct vhost_scsi_tpg *tpg = container_of(se_tpg,
@@@ -884,7 -889,7 +884,7 @@@ vhost_scsi_get_req(struct vhost_virtque
  
        if (unlikely(!copy_from_iter_full(vc->req, vc->req_size,
                                          &vc->out_iter))) {
-               vq_err(vq, "Faulted on copy_from_iter\n");
+               vq_err(vq, "Faulted on copy_from_iter_full\n");
        } else if (unlikely(*vc->lunp != 1)) {
                /* virtio-scsi spec requires byte 0 of the lun to be 1 */
                vq_err(vq, "Illegal virtio-scsi lun: %u\n", *vc->lunp);
@@@ -1436,7 -1441,7 +1436,7 @@@ vhost_scsi_set_endpoint(struct vhost_sc
                        se_tpg = &tpg->se_tpg;
                        ret = target_depend_item(&se_tpg->tpg_group.cg_item);
                        if (ret) {
-                               pr_warn("configfs_depend_item() failed: %d\n", ret);
+                               pr_warn("target_depend_item() failed: %d\n", ret);
                                kfree(vs_tpg);
                                mutex_unlock(&tpg->tv_tpg_mutex);
                                goto out;
@@@ -2284,7 -2289,8 +2284,7 @@@ static struct configfs_attribute *vhost
  
  static const struct target_core_fabric_ops vhost_scsi_ops = {
        .module                         = THIS_MODULE,
 -      .name                           = "vhost",
 -      .get_fabric_name                = vhost_scsi_get_fabric_name,
 +      .fabric_name                    = "vhost",
        .tpg_get_wwn                    = vhost_scsi_get_fabric_wwn,
        .tpg_get_tag                    = vhost_scsi_get_tpgt,
        .tpg_check_demo_mode            = vhost_scsi_check_true,