Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 894e2164 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull block fixes from Jens Axboe:
 "A small collection of fixes that should go into this cycle.

   - a pull request from Christoph for NVMe, which ended up being
     manually applied to avoid pulling in newer bits in master. Mostly
     fibre channel fixes from James, but also a few fixes from Jon and
     Vijay

   - a pull request from Konrad, with just a single fix for xen-blkback
     from Gustavo.

   - a fuseblk bdi fix from Jan, fixing a regression in this series with
     the dynamic backing devices.

   - a blktrace fix from Shaohua, replacing sscanf() with kstrtoull().

   - a request leak fix for drbd from Lars, fixing a regression in the
     last series with the kref changes. This will go to stable as well"

* 'for-linus' of git://git.kernel.dk/linux-block:
  nvmet: release the sq ref on rdma read errors
  nvmet-fc: remove target cpu scheduling flag
  nvme-fc: stop queues on error detection
  nvme-fc: require target or discovery role for fc-nvme targets
  nvme-fc: correct port role bits
  nvme: unmap CMB and remove sysfs file in reset path
  blktrace: fix integer parse
  fuseblk: Fix warning in super_setup_bdi_name()
  block: xen-blkback: add null check to avoid null pointer dereference
  drbd: fix request leak introduced by locking/atomic, kref: Kill kref_sub()
parents ef82f1ad 549f01ae

drivers/block/drbd/drbd_req.c

+15 −12
Original line number Diff line number Diff line
@@ -315,24 +315,32 @@ void drbd_req_complete(struct drbd_request *req, struct bio_and_error *m) 
}



/* still holds resource->req_lock */

static int drbd_req_put_completion_ref(struct drbd_request *req, struct bio_and_error *m, int put)

static void drbd_req_put_completion_ref(struct drbd_request *req, struct bio_and_error *m, int put)

{

	struct drbd_device *device = req->device;

	D_ASSERT(device, m || (req->rq_state & RQ_POSTPONED));



	if (!put)

		return;



	if (!atomic_sub_and_test(put, &req->completion_ref))

		return 0;

		return;



	drbd_req_complete(req, m);



	/* local completion may still come in later,

	 * we need to keep the req object around. */

	if (req->rq_state & RQ_LOCAL_ABORTED)

		return;



	if (req->rq_state & RQ_POSTPONED) {

		/* don't destroy the req object just yet,

		 * but queue it for retry */

		drbd_restart_request(req);

		return 0;

		return;

	}



	return 1;

	kref_put(&req->kref, drbd_req_destroy);

}



static void set_if_null_req_next(struct drbd_peer_device *peer_device, struct drbd_request *req)
@@ -519,12 +527,8 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m, 
	if (req->i.waiting)

		wake_up(&device->misc_wait);



	if (c_put) {

		if (drbd_req_put_completion_ref(req, m, c_put))

	drbd_req_put_completion_ref(req, m, c_put);

	kref_put(&req->kref, drbd_req_destroy);

	} else {

		kref_put(&req->kref, drbd_req_destroy);

	}

}



static void drbd_report_io_error(struct drbd_device *device, struct drbd_request *req)
@@ -1366,8 +1370,7 @@ static void drbd_send_and_submit(struct drbd_device *device, struct drbd_request 
	}



out:

	if (drbd_req_put_completion_ref(req, &m, 1))

		kref_put(&req->kref, drbd_req_destroy);

	drbd_req_put_completion_ref(req, &m, 1);

	spin_unlock_irq(&resource->req_lock);



	/* Even though above is a kref_put(), this is safe.

drivers/block/xen-blkback/xenbus.c

+5 −3
Original line number Diff line number Diff line
@@ -504,11 +504,13 @@ static int xen_blkbk_remove(struct xenbus_device *dev) 


	dev_set_drvdata(&dev->dev, NULL);



	if (be->blkif)

	if (be->blkif) {

		xen_blkif_disconnect(be->blkif);



		/* Put the reference we set in xen_blkif_alloc(). */

		xen_blkif_put(be->blkif);

	}



	kfree(be->mode);

	kfree(be);

	return 0;

drivers/nvme/host/fc.c

+10 −0
Original line number Diff line number Diff line
@@ -1754,6 +1754,10 @@ nvme_fc_error_recovery(struct nvme_fc_ctrl *ctrl, char *errmsg) 
	dev_info(ctrl->ctrl.device,

		"NVME-FC{%d}: resetting controller\n", ctrl->cnum);



	/* stop the queues on error, cleanup is in reset thread */

	if (ctrl->queue_count > 1)

		nvme_stop_queues(&ctrl->ctrl);



	if (!nvme_change_ctrl_state(&ctrl->ctrl, NVME_CTRL_RECONNECTING)) {

		dev_err(ctrl->ctrl.device,

			"NVME-FC{%d}: error_recovery: Couldn't change state "
@@ -2720,6 +2724,12 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, 
	unsigned long flags;

	int ret, idx;



	if (!(rport->remoteport.port_role &

	    (FC_PORT_ROLE_NVME_DISCOVERY | FC_PORT_ROLE_NVME_TARGET))) {

		ret = -EBADR;

		goto out_fail;

	}



	ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);

	if (!ctrl) {

		ret = -ENOMEM;

drivers/nvme/host/pci.c

+6 −1
Original line number Diff line number Diff line
@@ -1506,6 +1506,11 @@ static inline void nvme_release_cmb(struct nvme_dev *dev) 
	if (dev->cmb) {

		iounmap(dev->cmb);

		dev->cmb = NULL;

		if (dev->cmbsz) {

			sysfs_remove_file_from_group(&dev->ctrl.device->kobj,

						     &dev_attr_cmb.attr, NULL);

			dev->cmbsz = 0;

		}

	}

}
@@ -1779,6 +1784,7 @@ static void nvme_pci_disable(struct nvme_dev *dev) 
{

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	nvme_release_cmb(dev);

	pci_free_irq_vectors(pdev);



	if (pci_is_enabled(pdev)) {
@@ -2184,7 +2190,6 @@ static void nvme_remove(struct pci_dev *pdev) 
	nvme_dev_disable(dev, true);

	nvme_dev_remove_admin(dev);

	nvme_free_queues(dev, 0);

	nvme_release_cmb(dev);

	nvme_release_prp_pools(dev);

	nvme_dev_unmap(dev);

	nvme_put_ctrl(&dev->ctrl);

drivers/nvme/target/core.c

+6 −0
Original line number Diff line number Diff line
@@ -529,6 +529,12 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, 
}

EXPORT_SYMBOL_GPL(nvmet_req_init);



void nvmet_req_uninit(struct nvmet_req *req)

{

	percpu_ref_put(&req->sq->ref);

}

EXPORT_SYMBOL_GPL(nvmet_req_uninit);



static inline bool nvmet_cc_en(u32 cc)

{

	return cc & 0x1;