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

Commit 2c2b66ae authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Martin K. Petersen
Browse files

scsi: bnx2fc: Prevent recursive cpuhotplug locking 



The BNX2FC module init/exit code installs/removes the hotplug callbacks with
the cpu hotplug lock held. This worked with the old CPU locking
implementation which allowed recursive locking, but with the new percpu
rwsem based mechanism this is not longer allowed.

Use the _cpuslocked() variants to fix this.

Reported-by: default avatarkernel test robot <fengguang.wu@intel.com>
Acked-by: default avatarChad Dupuis <chad.dupuis@cavium.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 8addebc1

drivers/scsi/bnx2fc/bnx2fc_fcoe.c

+8 −7
Original line number Diff line number Diff line
@@ -2766,14 +2766,15 @@ static int __init bnx2fc_mod_init(void) 
	for_each_online_cpu(cpu)

		bnx2fc_percpu_thread_create(cpu);



	rc = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,

	rc = cpuhp_setup_state_nocalls_cpuslocked(CPUHP_AP_ONLINE_DYN,

						  "scsi/bnx2fc:online",

						  bnx2fc_cpu_online, NULL);

	if (rc < 0)

		goto stop_threads;

	bnx2fc_online_state = rc;



	cpuhp_setup_state_nocalls(CPUHP_SCSI_BNX2FC_DEAD, "scsi/bnx2fc:dead",

	cpuhp_setup_state_nocalls_cpuslocked(CPUHP_SCSI_BNX2FC_DEAD,

					     "scsi/bnx2fc:dead",

					     NULL, bnx2fc_cpu_dead);

	put_online_cpus();
@@ -2850,8 +2851,8 @@ static void __exit bnx2fc_mod_exit(void) 
		bnx2fc_percpu_thread_destroy(cpu);

	}



	cpuhp_remove_state_nocalls(bnx2fc_online_state);

	cpuhp_remove_state_nocalls(CPUHP_SCSI_BNX2FC_DEAD);

	cpuhp_remove_state_nocalls_cpuslocked(bnx2fc_online_state);

	cpuhp_remove_state_nocalls_cpuslocked(CPUHP_SCSI_BNX2FC_DEAD);



	put_online_cpus();