Author: mav
Date: Mon May 6 19:08:03 2019
New Revision: 347198
URL: https://svnweb.freebsd.org/changeset/base/347198
Log:
Drop periph lock around cam_periph_unmapmem().
Since r345656 it may call copyout(), that may sleep.
MFC after: 3 days
Sponsored by: iXsystems, Inc.
Modified:
head/sys/cam/scsi/scsi_pass.c
head/sys/cam/scsi/scsi_sg.c
Modified: head/sys/cam/scsi/scsi_pass.c
==============================================================================
--- head/sys/cam/scsi/scsi_pass.c Mon May 6 18:50:08 2019
(r347197)
+++ head/sys/cam/scsi/scsi_pass.c Mon May 6 19:08:03 2019
(r347198)
@@ -2261,7 +2261,9 @@ passsendccb(struct cam_periph *periph, union ccb *ccb,
/* sense_flags */ SF_RETRY_UA | SF_NO_PRINT,
softc->device_stats);
+ cam_periph_unlock(periph);
cam_periph_unmapmem(ccb, &mapinfo);
+ cam_periph_lock(periph);
ccb->ccb_h.cbfcnp = NULL;
ccb->ccb_h.periph_priv = inccb->ccb_h.periph_priv;
Modified: head/sys/cam/scsi/scsi_sg.c
==============================================================================
--- head/sys/cam/scsi/scsi_sg.c Mon May 6 18:50:08 2019 (r347197)
+++ head/sys/cam/scsi/scsi_sg.c Mon May 6 19:08:03 2019 (r347198)
@@ -915,7 +915,9 @@ sgsendccb(struct cam_periph *periph, union ccb *ccb)
SF_RETRY_UA,
softc->device_stats);
+ cam_periph_unlock(periph);
cam_periph_unmapmem(ccb, &mapinfo);
+ cam_periph_lock(periph);
return (error);
}
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
