Commit 91a26209 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:

 - a xen-blkfront fix from Bhavesh with a multiqueue fix when
   detaching/re-attaching

 - a few important NVMe fixes, including a revert for a sysfs fix that
   caused some user space confusion

 - two bcache fixes by way of Michael Lyle

 - a loop regression fix, fixing an issue with lost writes on DAX.

* tag 'for-linus-20180309' of git://git.kernel.dk/linux-block:
  loop: Fix lost writes caused by missing flag
  nvme_fc: rework sqsize handling
  nvme-fabrics: Ignore nr_io_queues option for discovery controllers
  xen-blkfront: move negotiate_mq to cover all cases of new VBDs
  Revert "nvme: create 'slaves' and 'holders' entries for hidden controllers"
  bcache: don't attach backing with duplicate UUID
  bcache: fix crashes in duplicate cache device register
  nvme: pci: pass max vectors as num_possible_cpus() to pci_alloc_irq_vectors
  nvme-pci: Fix EEH failure on ppc
parents b3b25b1d 1d037577

drivers/block/loop.c

+1 −1
Original line number Diff line number Diff line
@@ -266,7 +266,7 @@ static int lo_write_bvec(struct file *file, struct bio_vec *bvec, loff_t *ppos) 
	struct iov_iter i;

	ssize_t bw;



	iov_iter_bvec(&i, ITER_BVEC, bvec, 1, bvec->bv_len);

	iov_iter_bvec(&i, ITER_BVEC | WRITE, bvec, 1, bvec->bv_len);



	file_start_write(file);

	bw = vfs_iter_write(file, &i, ppos, 0);

drivers/block/xen-blkfront.c

+8 −9
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ static DEFINE_SPINLOCK(minor_lock); 


static int blkfront_setup_indirect(struct blkfront_ring_info *rinfo);

static void blkfront_gather_backend_features(struct blkfront_info *info);

static int negotiate_mq(struct blkfront_info *info);



static int get_id_from_freelist(struct blkfront_ring_info *rinfo)

{
@@ -1774,11 +1775,18 @@ static int talk_to_blkback(struct xenbus_device *dev, 
	unsigned int i, max_page_order;

	unsigned int ring_page_order;



	if (!info)

		return -ENODEV;



	max_page_order = xenbus_read_unsigned(info->xbdev->otherend,

					      "max-ring-page-order", 0);

	ring_page_order = min(xen_blkif_max_ring_order, max_page_order);

	info->nr_ring_pages = 1 << ring_page_order;



	err = negotiate_mq(info);

	if (err)

		goto destroy_blkring;



	for (i = 0; i < info->nr_rings; i++) {

		struct blkfront_ring_info *rinfo = &info->rinfo[i];
@@ -1978,11 +1986,6 @@ static int blkfront_probe(struct xenbus_device *dev, 
	}



	info->xbdev = dev;

	err = negotiate_mq(info);

	if (err) {

		kfree(info);

		return err;

	}



	mutex_init(&info->mutex);

	info->vdevice = vdevice;
@@ -2099,10 +2102,6 @@ static int blkfront_resume(struct xenbus_device *dev) 


	blkif_free(info, info->connected == BLKIF_STATE_CONNECTED);



	err = negotiate_mq(info);

	if (err)

		return err;



	err = talk_to_blkback(dev, info);

	if (!err)

		blk_mq_update_nr_hw_queues(&info->tag_set, info->nr_rings);

drivers/md/bcache/super.c

+21 −6
Original line number Diff line number Diff line
@@ -963,6 +963,7 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c, 
	uint32_t rtime = cpu_to_le32(get_seconds());

	struct uuid_entry *u;

	char buf[BDEVNAME_SIZE];

	struct cached_dev *exist_dc, *t;



	bdevname(dc->bdev, buf);
@@ -987,6 +988,16 @@ int bch_cached_dev_attach(struct cached_dev *dc, struct cache_set *c, 
		return -EINVAL;

	}



	/* Check whether already attached */

	list_for_each_entry_safe(exist_dc, t, &c->cached_devs, list) {

		if (!memcmp(dc->sb.uuid, exist_dc->sb.uuid, 16)) {

			pr_err("Tried to attach %s but duplicate UUID already attached",

				buf);



			return -EINVAL;

		}

	}



	u = uuid_find(c, dc->sb.uuid);



	if (u &&
@@ -1204,7 +1215,7 @@ static void register_bdev(struct cache_sb *sb, struct page *sb_page, 


	return;

err:

	pr_notice("error opening %s: %s", bdevname(bdev, name), err);

	pr_notice("error %s: %s", bdevname(bdev, name), err);

	bcache_device_stop(&dc->disk);

}
@@ -1883,6 +1894,8 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, 
	const char *err = NULL; /* must be set for any error case */

	int ret = 0;



	bdevname(bdev, name);



	memcpy(&ca->sb, sb, sizeof(struct cache_sb));

	ca->bdev = bdev;

	ca->bdev->bd_holder = ca;
@@ -1891,11 +1904,12 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, 
	bio_first_bvec_all(&ca->sb_bio)->bv_page = sb_page;

	get_page(sb_page);



	if (blk_queue_discard(bdev_get_queue(ca->bdev)))

	if (blk_queue_discard(bdev_get_queue(bdev)))

		ca->discard = CACHE_DISCARD(&ca->sb);



	ret = cache_alloc(ca);

	if (ret != 0) {

		blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);

		if (ret == -ENOMEM)

			err = "cache_alloc(): -ENOMEM";

		else
@@ -1918,14 +1932,14 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, 
		goto out;

	}



	pr_info("registered cache device %s", bdevname(bdev, name));

	pr_info("registered cache device %s", name);



out:

	kobject_put(&ca->kobj);



err:

	if (err)

		pr_notice("error opening %s: %s", bdevname(bdev, name), err);

		pr_notice("error %s: %s", name, err);



	return ret;

}
@@ -2014,6 +2028,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, 
	if (err)

		goto err_close;



	err = "failed to register device";

	if (SB_IS_BDEV(sb)) {

		struct cached_dev *dc = kzalloc(sizeof(*dc), GFP_KERNEL);

		if (!dc)
@@ -2028,7 +2043,7 @@ static ssize_t register_bcache(struct kobject *k, struct kobj_attribute *attr, 
			goto err_close;



		if (register_cache(sb, sb_page, bdev, ca) != 0)

			goto err_close;

			goto err;

	}

out:

	if (sb_page)
@@ -2041,7 +2056,7 @@ out: 
err_close:

	blkdev_put(bdev, FMODE_READ|FMODE_WRITE|FMODE_EXCL);

err:

	pr_info("error opening %s: %s", path, err);

	pr_info("error %s: %s", path, err);

	ret = -EINVAL;

	goto out;

}

drivers/nvme/host/core.c

+0 −2
Original line number Diff line number Diff line
@@ -3033,7 +3033,6 @@ static void nvme_alloc_ns(struct nvme_ctrl *ctrl, unsigned nsid) 
			ns->disk->disk_name);



	nvme_mpath_add_disk(ns->head);

	nvme_mpath_add_disk_links(ns);

	return;

 out_unlink_ns:

	mutex_lock(&ctrl->subsys->lock);
@@ -3053,7 +3052,6 @@ static void nvme_ns_remove(struct nvme_ns *ns) 
		return;



	if (ns->disk && ns->disk->flags & GENHD_FL_UP) {

		nvme_mpath_remove_disk_links(ns);

		sysfs_remove_group(&disk_to_dev(ns->disk)->kobj,

					&nvme_ns_id_attr_group);

		if (ns->ndev)

drivers/nvme/host/fabrics.c

+5 −0
Original line number Diff line number Diff line
@@ -650,6 +650,11 @@ static int nvmf_parse_options(struct nvmf_ctrl_options *opts, 
				ret = -EINVAL;

				goto out;

			}

			if (opts->discovery_nqn) {

				pr_debug("Ignoring nr_io_queues value for discovery controller\n");

				break;

			}



			opts->nr_io_queues = min_t(unsigned int,

					num_online_cpus(), token);

			break;

CRA Git | Maintained and supported by SUSTech CRA and CCSE