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

Commit fa519f70 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: libfc: fixup 'sleeping function called from invalid context' 



fc_rport_login() will be calling mutex_lock() while running inside an
RCU-protected section, triggering the warning 'sleeping function called
from invalid context'.  To fix this we can drop the rcu functions here
altogether as the disc mutex protecting the list itself is already held,
preventing any list manipulation.

Fixes: a407c593 ("scsi: libfc: Fixup disc_mutex handling")
Signed-off-by: default avatarHannes Reinecke <hare@suse.com>
Acked-by: default avatarJohannes Thumshirn <jth@kernel.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent ee35624e

drivers/scsi/libfc/fc_disc.c

+4 −3
Original line number Diff line number Diff line
@@ -287,9 +287,11 @@ static void fc_disc_done(struct fc_disc *disc, enum fc_disc_event event) 
	 * discovery, reverify or log them in.	Otherwise, log them out.

	 * Skip ports which were never discovered.  These are the dNS port

	 * and ports which were created by PLOGI.

	 *

	 * We don't need to use the _rcu variant here as the rport list

	 * is protected by the disc mutex which is already held on entry.

	 */

	rcu_read_lock();

	list_for_each_entry_rcu(rdata, &disc->rports, peers) {

	list_for_each_entry(rdata, &disc->rports, peers) {

		if (!kref_get_unless_zero(&rdata->kref))

			continue;

		if (rdata->disc_id) {
@@ -300,7 +302,6 @@ static void fc_disc_done(struct fc_disc *disc, enum fc_disc_event event) 
		}

		kref_put(&rdata->kref, fc_rport_destroy);

	}

	rcu_read_unlock();

	mutex_unlock(&disc->disc_mutex);

	disc->disc_callback(lport, event);

	mutex_lock(&disc->disc_mutex);