Unverified Commit 303dc005 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!7510 [sync] PR-7407: nvme-fc: do not wait in vain when unloading module 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/7407 
 
PR sync from: Baogen Shang <baogen.shang@outlook.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/56XWGIJR43M5CZDWGK75PW3SVZ3GVUIP/ 
 
https://gitee.com/openeuler/kernel/issues/I9J6AL 
 
Link:https://gitee.com/openeuler/kernel/pulls/7510

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 85e329a0 78fb29d9

drivers/nvme/host/fc.c

+6 −41
Original line number Diff line number Diff line
@@ -220,11 +220,6 @@ static LIST_HEAD(nvme_fc_lport_list); 
static DEFINE_IDA(nvme_fc_local_port_cnt);

static DEFINE_IDA(nvme_fc_ctrl_cnt);



static struct workqueue_struct *nvme_fc_wq;



static bool nvme_fc_waiting_to_unload;

static DECLARE_COMPLETION(nvme_fc_unload_proceed);



/*

 * These items are short-term. They will eventually be moved into

 * a generic FC class. See comments in module init.
@@ -254,8 +249,6 @@ nvme_fc_free_lport(struct kref *ref) 
	/* remove from transport list */

	spin_lock_irqsave(&nvme_fc_lock, flags);

	list_del(&lport->port_list);

	if (nvme_fc_waiting_to_unload && list_empty(&nvme_fc_lport_list))

		complete(&nvme_fc_unload_proceed);

	spin_unlock_irqrestore(&nvme_fc_lock, flags);



	ida_simple_remove(&nvme_fc_local_port_cnt, lport->localport.port_num);
@@ -3823,10 +3816,6 @@ static int __init nvme_fc_init_module(void) 
{

	int ret;



	nvme_fc_wq = alloc_workqueue("nvme_fc_wq", WQ_MEM_RECLAIM, 0);

	if (!nvme_fc_wq)

		return -ENOMEM;



	/*

	 * NOTE:

	 * It is expected that in the future the kernel will combine
@@ -3844,7 +3833,7 @@ static int __init nvme_fc_init_module(void) 
	ret = class_register(&fc_class);

	if (ret) {

		pr_err("couldn't register class fc\n");

		goto out_destroy_wq;

		return ret;

	}



	/*
@@ -3868,8 +3857,6 @@ static int __init nvme_fc_init_module(void) 
	device_destroy(&fc_class, MKDEV(0, 0));

out_destroy_class:

	class_unregister(&fc_class);

out_destroy_wq:

	destroy_workqueue(nvme_fc_wq);



	return ret;

}
@@ -3889,45 +3876,23 @@ nvme_fc_delete_controllers(struct nvme_fc_rport *rport) 
	spin_unlock(&rport->lock);

}



static void

nvme_fc_cleanup_for_unload(void)

static void __exit nvme_fc_exit_module(void)

{

	struct nvme_fc_lport *lport;

	struct nvme_fc_rport *rport;



	list_for_each_entry(lport, &nvme_fc_lport_list, port_list) {

		list_for_each_entry(rport, &lport->endp_list, endp_list) {

			nvme_fc_delete_controllers(rport);

		}

	}

}



static void __exit nvme_fc_exit_module(void)

{

	unsigned long flags;

	bool need_cleanup = false;



	spin_lock_irqsave(&nvme_fc_lock, flags);

	nvme_fc_waiting_to_unload = true;

	if (!list_empty(&nvme_fc_lport_list)) {

		need_cleanup = true;

		nvme_fc_cleanup_for_unload();

	}

	list_for_each_entry(lport, &nvme_fc_lport_list, port_list)

		list_for_each_entry(rport, &lport->endp_list, endp_list)

			nvme_fc_delete_controllers(rport);

	spin_unlock_irqrestore(&nvme_fc_lock, flags);

	if (need_cleanup) {

		pr_info("%s: waiting for ctlr deletes\n", __func__);

		wait_for_completion(&nvme_fc_unload_proceed);

		pr_info("%s: ctrl deletes complete\n", __func__);

	}

	flush_workqueue(nvme_delete_wq);



	nvmf_unregister_transport(&nvme_fc_transport);



	ida_destroy(&nvme_fc_local_port_cnt);

	ida_destroy(&nvme_fc_ctrl_cnt);



	device_destroy(&fc_class, MKDEV(0, 0));

	class_unregister(&fc_class);

	destroy_workqueue(nvme_fc_wq);

}



module_init(nvme_fc_init_module);