Commit 0473976c authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge branch 'nvme-5.4-rc7' of git://git.infradead.org/nvme into for-linus 

Pull NVMe fixes from Keith:

"We have a few late nvme fixes for a couple device removal kernel
 crashes, and a compat fix for a new ioctl introduced during this merge
 window."

* 'nvme-5.4-rc7' of git://git.infradead.org/nvme:
  nvme: change nvme_passthru_cmd64 to explicitly mark rsvd
  nvme-multipath: fix crash in nvme_mpath_clear_ctrl_paths
  nvme-rdma: fix a segmentation fault during module unload
parents 41591a51 0d6eeb1f

drivers/nvme/host/multipath.c

+2 −0
Original line number Diff line number Diff line
@@ -158,9 +158,11 @@ void nvme_mpath_clear_ctrl_paths(struct nvme_ctrl *ctrl) 
	struct nvme_ns *ns;



	mutex_lock(&ctrl->scan_lock);

	down_read(&ctrl->namespaces_rwsem);

	list_for_each_entry(ns, &ctrl->namespaces, list)

		if (nvme_mpath_clear_current_path(ns))

			kblockd_schedule_work(&ns->head->requeue_work);

	up_read(&ctrl->namespaces_rwsem);

	mutex_unlock(&ctrl->scan_lock);

}

drivers/nvme/host/rdma.c

+8 −0
Original line number Diff line number Diff line
@@ -2133,8 +2133,16 @@ err_unreg_client: 


static void __exit nvme_rdma_cleanup_module(void)

{

	struct nvme_rdma_ctrl *ctrl;



	nvmf_unregister_transport(&nvme_rdma_transport);

	ib_unregister_client(&nvme_rdma_ib_client);



	mutex_lock(&nvme_rdma_ctrl_mutex);

	list_for_each_entry(ctrl, &nvme_rdma_ctrl_list, list)

		nvme_delete_ctrl(&ctrl->ctrl);

	mutex_unlock(&nvme_rdma_ctrl_mutex);

	flush_workqueue(nvme_delete_wq);

}



module_init(nvme_rdma_init_module);

include/uapi/linux/nvme_ioctl.h

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ struct nvme_passthru_cmd64 { 
	__u32	cdw14;

	__u32	cdw15;

	__u32	timeout_ms;

	__u32   rsvd2;

	__u64	result;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE