korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-11 21:14:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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: a407c59339 ("scsi: libfc: Fixup disc_mutex handling")
Signed-off-by: Hannes Reinecke <hare@suse.com>
Acked-by: Johannes Thumshirn <jth@kernel.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Hannes Reinecke 2018-07-04 13:59:16 +02:00 committed by Martin K. Petersen
parent ee35624e1e
commit fa519f701d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/libfc/fc_disc.c
View File

@ -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. * discovery, reverify or log them in. Otherwise, log them out.
* Skip ports which were never discovered. These are the dNS port * Skip ports which were never discovered. These are the dNS port
* and ports which were created by PLOGI. * 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(rdata, &disc->rports, peers) {
list_for_each_entry_rcu(rdata, &disc->rports, peers) {
if (!kref_get_unless_zero(&rdata->kref)) if (!kref_get_unless_zero(&rdata->kref))
continue; continue;
if (rdata->disc_id) { 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); kref_put(&rdata->kref, fc_rport_destroy);
} }
rcu_read_unlock();
mutex_unlock(&disc->disc_mutex); mutex_unlock(&disc->disc_mutex);
disc->disc_callback(lport, event); disc->disc_callback(lport, event);
mutex_lock(&disc->disc_mutex); mutex_lock(&disc->disc_mutex);