* iscsi: make mutex for target scanning and unbinding per-session
@ 2016-11-07 18:22 Chris Leech
[not found] ` <1478542920-24460-1-git-send-email-cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-11-10 23:22 ` Mike Christie
0 siblings, 2 replies; 6+ messages in thread
From: Chris Leech @ 2016-11-07 18:22 UTC (permalink / raw)
To: linux-scsi-u79uwXL29TY76Z2rM5mHXA,
open-iscsi-/JYPxA39Uh5TLH3MbocFFw, lduncan-IBi9RG/b67k
Currently the iSCSI transport class synchronises target scanning and
unbinding with a host level mutex. For multi-session hosts (offloading
iSCSI HBAs) connecting to storage arrays that may implement one
target-per-lun, this can result in the target scan work for hundreds of
sessions being serialized behind a single mutex. With slow enough
response times, this can cause scan requests initiated from userspace to
block on the mutex long enough to trigger 120 sec hung task warnings.
I can't see any reason not to move this to a session level mutex and let
the target scans run in parallel, speeding up connecting to a large
number of targets. Note that as iscsi_tcp creates a virtual host for
each session, software iSCSI is effectively doing this already.
Signed-off-by: Chris Leech <cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
drivers/scsi/scsi_transport_iscsi.c | 19 ++++++-------------
include/scsi/scsi_transport_iscsi.h | 2 +-
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 42bca61..83c90fa 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -1568,7 +1568,6 @@ static int iscsi_setup_host(struct transport_container *tc, struct device *dev,
memset(ihost, 0, sizeof(*ihost));
atomic_set(&ihost->nr_scans, 0);
- mutex_init(&ihost->mutex);
iscsi_bsg_host_add(shost, ihost);
/* ignore any bsg add error - we just can't do sgio */
@@ -1789,8 +1788,6 @@ static int iscsi_user_scan_session(struct device *dev, void *data)
{
struct iscsi_scan_data *scan_data = data;
struct iscsi_cls_session *session;
- struct Scsi_Host *shost;
- struct iscsi_cls_host *ihost;
unsigned long flags;
unsigned int id;
@@ -1801,10 +1798,7 @@ static int iscsi_user_scan_session(struct device *dev, void *data)
ISCSI_DBG_TRANS_SESSION(session, "Scanning session\n");
- shost = iscsi_session_to_shost(session);
- ihost = shost->shost_data;
-
- mutex_lock(&ihost->mutex);
+ mutex_lock(&session->mutex);
spin_lock_irqsave(&session->lock, flags);
if (session->state != ISCSI_SESSION_LOGGED_IN) {
spin_unlock_irqrestore(&session->lock, flags);
@@ -1823,7 +1817,7 @@ static int iscsi_user_scan_session(struct device *dev, void *data)
}
user_scan_exit:
- mutex_unlock(&ihost->mutex);
+ mutex_unlock(&session->mutex);
ISCSI_DBG_TRANS_SESSION(session, "Completed session scan\n");
return 0;
}
@@ -2001,26 +1995,24 @@ static void __iscsi_unbind_session(struct work_struct *work)
struct iscsi_cls_session *session =
container_of(work, struct iscsi_cls_session,
unbind_work);
- struct Scsi_Host *shost = iscsi_session_to_shost(session);
- struct iscsi_cls_host *ihost = shost->shost_data;
unsigned long flags;
unsigned int target_id;
ISCSI_DBG_TRANS_SESSION(session, "Unbinding session\n");
/* Prevent new scans and make sure scanning is not in progress */
- mutex_lock(&ihost->mutex);
+ mutex_lock(&session->mutex);
spin_lock_irqsave(&session->lock, flags);
if (session->target_id == ISCSI_MAX_TARGET) {
spin_unlock_irqrestore(&session->lock, flags);
- mutex_unlock(&ihost->mutex);
+ mutex_unlock(&session->mutex);
return;
}
target_id = session->target_id;
session->target_id = ISCSI_MAX_TARGET;
spin_unlock_irqrestore(&session->lock, flags);
- mutex_unlock(&ihost->mutex);
+ mutex_unlock(&session->mutex);
if (session->ida_used)
ida_simple_remove(&iscsi_sess_ida, target_id);
@@ -2053,6 +2045,7 @@ iscsi_alloc_session(struct Scsi_Host *shost, struct iscsi_transport *transport,
INIT_WORK(&session->unbind_work, __iscsi_unbind_session);
INIT_WORK(&session->scan_work, iscsi_scan_session);
spin_lock_init(&session->lock);
+ mutex_init(&session->mutex);
/* this is released in the dev's release function */
scsi_host_get(shost);
diff --git a/include/scsi/scsi_transport_iscsi.h b/include/scsi/scsi_transport_iscsi.h
index 6183d20..acf9d9d 100644
--- a/include/scsi/scsi_transport_iscsi.h
+++ b/include/scsi/scsi_transport_iscsi.h
@@ -238,6 +238,7 @@ struct iscsi_cls_session {
struct work_struct unblock_work;
struct work_struct scan_work;
struct work_struct unbind_work;
+ struct mutex mutex;
/* recovery fields */
int recovery_tmo;
@@ -272,7 +273,6 @@ struct iscsi_cls_session {
struct iscsi_cls_host {
atomic_t nr_scans;
- struct mutex mutex;
struct request_queue *bsg_q;
uint32_t port_speed;
uint32_t port_state;
--
2.7.4
--
You received this message because you are subscribed to the Google Groups "open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To post to this group, send email to open-iscsi-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
Visit this group at https://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply related [flat|nested] 6+ messages in thread[parent not found: <1478542920-24460-1-git-send-email-cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>]
* Re: iscsi: make mutex for target scanning and unbinding per-session
[not found] ` <1478542920-24460-1-git-send-email-cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2016-11-10 18:00 ` The Lee-Man
2016-11-10 21:22 ` Chris Leech
0 siblings, 1 reply; 6+ messages in thread
From: The Lee-Man @ 2016-11-10 18:00 UTC (permalink / raw)
To: open-iscsi; +Cc: linux-scsi-u79uwXL29TY76Z2rM5mHXA, lduncan-IBi9RG/b67k
[-- Attachment #1.1: Type: text/plain, Size: 6446 bytes --]
On Monday, November 7, 2016 at 11:22:23 AM UTC-7, Chris Leech wrote:
>
> Currently the iSCSI transport class synchronises target scanning and
> unbinding with a host level mutex. For multi-session hosts (offloading
> iSCSI HBAs) connecting to storage arrays that may implement one
> target-per-lun, this can result in the target scan work for hundreds of
> sessions being serialized behind a single mutex. With slow enough
> response times, this can cause scan requests initiated from userspace to
> block on the mutex long enough to trigger 120 sec hung task warnings.
>
> I can't see any reason not to move this to a session level mutex and let
> the target scans run in parallel, speeding up connecting to a large
> number of targets. Note that as iscsi_tcp creates a virtual host for
> each session, software iSCSI is effectively doing this already.
>
I understood the reason for this mutex was to protect against the case
where there are multiple paths to a target. In such cases, you can get
simultaneous access to sysfs attributes (files), which can cause errors,
i.e. two threads trying to write an attribute at the same time, or one
changing an attribute while another reads or removes it.
I worry that changing it will not address those issues.
[Side note: we *really* need a test suite that somehow includes
cases like this.]
>
> Signed-off-by: Chris Leech <cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
> ---
> drivers/scsi/scsi_transport_iscsi.c | 19 ++++++-------------
> include/scsi/scsi_transport_iscsi.h | 2 +-
> 2 files changed, 7 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/scsi/scsi_transport_iscsi.c
> b/drivers/scsi/scsi_transport_iscsi.c
> index 42bca61..83c90fa 100644
> --- a/drivers/scsi/scsi_transport_iscsi.c
> +++ b/drivers/scsi/scsi_transport_iscsi.c
> @@ -1568,7 +1568,6 @@ static int iscsi_setup_host(struct
> transport_container *tc, struct device *dev,
>
> memset(ihost, 0, sizeof(*ihost));
> atomic_set(&ihost->nr_scans, 0);
> - mutex_init(&ihost->mutex);
>
> iscsi_bsg_host_add(shost, ihost);
> /* ignore any bsg add error - we just can't do sgio */
> @@ -1789,8 +1788,6 @@ static int iscsi_user_scan_session(struct device
> *dev, void *data)
> {
> struct iscsi_scan_data *scan_data = data;
> struct iscsi_cls_session *session;
> - struct Scsi_Host *shost;
> - struct iscsi_cls_host *ihost;
> unsigned long flags;
> unsigned int id;
>
> @@ -1801,10 +1798,7 @@ static int iscsi_user_scan_session(struct device
> *dev, void *data)
>
> ISCSI_DBG_TRANS_SESSION(session, "Scanning session\n");
>
> - shost = iscsi_session_to_shost(session);
> - ihost = shost->shost_data;
> -
> - mutex_lock(&ihost->mutex);
> + mutex_lock(&session->mutex);
> spin_lock_irqsave(&session->lock, flags);
> if (session->state != ISCSI_SESSION_LOGGED_IN) {
> spin_unlock_irqrestore(&session->lock, flags);
> @@ -1823,7 +1817,7 @@ static int iscsi_user_scan_session(struct device
> *dev, void *data)
> }
>
> user_scan_exit:
> - mutex_unlock(&ihost->mutex);
> + mutex_unlock(&session->mutex);
> ISCSI_DBG_TRANS_SESSION(session, "Completed session scan\n");
> return 0;
> }
> @@ -2001,26 +1995,24 @@ static void __iscsi_unbind_session(struct
> work_struct *work)
> struct iscsi_cls_session *session =
> container_of(work, struct iscsi_cls_session,
> unbind_work);
> - struct Scsi_Host *shost = iscsi_session_to_shost(session);
> - struct iscsi_cls_host *ihost = shost->shost_data;
> unsigned long flags;
> unsigned int target_id;
>
> ISCSI_DBG_TRANS_SESSION(session, "Unbinding session\n");
>
> /* Prevent new scans and make sure scanning is not in progress */
> - mutex_lock(&ihost->mutex);
> + mutex_lock(&session->mutex);
> spin_lock_irqsave(&session->lock, flags);
> if (session->target_id == ISCSI_MAX_TARGET) {
> spin_unlock_irqrestore(&session->lock, flags);
> - mutex_unlock(&ihost->mutex);
> + mutex_unlock(&session->mutex);
> return;
> }
>
> target_id = session->target_id;
> session->target_id = ISCSI_MAX_TARGET;
> spin_unlock_irqrestore(&session->lock, flags);
> - mutex_unlock(&ihost->mutex);
> + mutex_unlock(&session->mutex);
>
> if (session->ida_used)
> ida_simple_remove(&iscsi_sess_ida, target_id);
> @@ -2053,6 +2045,7 @@ iscsi_alloc_session(struct Scsi_Host *shost, struct
> iscsi_transport *transport,
> INIT_WORK(&session->unbind_work, __iscsi_unbind_session);
> INIT_WORK(&session->scan_work, iscsi_scan_session);
> spin_lock_init(&session->lock);
> + mutex_init(&session->mutex);
>
> /* this is released in the dev's release function */
> scsi_host_get(shost);
> diff --git a/include/scsi/scsi_transport_iscsi.h
> b/include/scsi/scsi_transport_iscsi.h
> index 6183d20..acf9d9d 100644
> --- a/include/scsi/scsi_transport_iscsi.h
> +++ b/include/scsi/scsi_transport_iscsi.h
> @@ -238,6 +238,7 @@ struct iscsi_cls_session {
> struct work_struct unblock_work;
> struct work_struct scan_work;
> struct work_struct unbind_work;
> + struct mutex mutex;
>
> /* recovery fields */
> int recovery_tmo;
> @@ -272,7 +273,6 @@ struct iscsi_cls_session {
>
> struct iscsi_cls_host {
> atomic_t nr_scans;
> - struct mutex mutex;
> struct request_queue *bsg_q;
> uint32_t port_speed;
> uint32_t port_state;
> --
> 2.7.4
>
>
--
You received this message because you are subscribed to the Google Groups "open-iscsi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
To post to this group, send email to open-iscsi-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
Visit this group at https://groups.google.com/group/open-iscsi.
For more options, visit https://groups.google.com/d/optout.
[-- Attachment #1.2: Type: text/html, Size: 8654 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: iscsi: make mutex for target scanning and unbinding per-session
2016-11-10 18:00 ` The Lee-Man
@ 2016-11-10 21:22 ` Chris Leech
0 siblings, 0 replies; 6+ messages in thread
From: Chris Leech @ 2016-11-10 21:22 UTC (permalink / raw)
To: open-iscsi; +Cc: linux-scsi, lduncan
On Thu, Nov 10, 2016 at 10:00:54AM -0800, The Lee-Man wrote:
> On Monday, November 7, 2016 at 11:22:23 AM UTC-7, Chris Leech wrote:
> >
> > Currently the iSCSI transport class synchronises target scanning and
> > unbinding with a host level mutex. For multi-session hosts (offloading
> > iSCSI HBAs) connecting to storage arrays that may implement one
> > target-per-lun, this can result in the target scan work for hundreds of
> > sessions being serialized behind a single mutex. With slow enough
> > response times, this can cause scan requests initiated from userspace to
> > block on the mutex long enough to trigger 120 sec hung task warnings.
> >
> > I can't see any reason not to move this to a session level mutex and let
> > the target scans run in parallel, speeding up connecting to a large
> > number of targets. Note that as iscsi_tcp creates a virtual host for
> > each session, software iSCSI is effectively doing this already.
> >
>
> I understood the reason for this mutex was to protect against the case
> where there are multiple paths to a target. In such cases, you can get
> simultaneous access to sysfs attributes (files), which can cause errors,
> i.e. two threads trying to write an attribute at the same time, or one
> changing an attribute while another reads or removes it.
This particular mutex is only serializing scanning targets for devices,
and used in __iscsi_unbind_session to ensure that no scans are in
progress adding new scsi devices while we're trying to remove a target.
> I worry that changing it will not address those issues.
>
> [Side note: we *really* need a test suite that somehow includes
> cases like this.]
>
> >
> > Signed-off-by: Chris Leech <cleech@redhat.com>
> > ---
> > drivers/scsi/scsi_transport_iscsi.c | 19 ++++++-------------
> > include/scsi/scsi_transport_iscsi.h | 2 +-
> > 2 files changed, 7 insertions(+), 14 deletions(-)
> >
> > diff --git a/drivers/scsi/scsi_transport_iscsi.c
> > b/drivers/scsi/scsi_transport_iscsi.c
> > index 42bca61..83c90fa 100644
> > --- a/drivers/scsi/scsi_transport_iscsi.c
> > +++ b/drivers/scsi/scsi_transport_iscsi.c
> > @@ -1568,7 +1568,6 @@ static int iscsi_setup_host(struct
> > transport_container *tc, struct device *dev,
> >
> > memset(ihost, 0, sizeof(*ihost));
> > atomic_set(&ihost->nr_scans, 0);
> > - mutex_init(&ihost->mutex);
> >
> > iscsi_bsg_host_add(shost, ihost);
> > /* ignore any bsg add error - we just can't do sgio */
> > @@ -1789,8 +1788,6 @@ static int iscsi_user_scan_session(struct device
> > *dev, void *data)
> > {
> > struct iscsi_scan_data *scan_data = data;
> > struct iscsi_cls_session *session;
> > - struct Scsi_Host *shost;
> > - struct iscsi_cls_host *ihost;
> > unsigned long flags;
> > unsigned int id;
> >
> > @@ -1801,10 +1798,7 @@ static int iscsi_user_scan_session(struct device
> > *dev, void *data)
> >
> > ISCSI_DBG_TRANS_SESSION(session, "Scanning session\n");
> >
> > - shost = iscsi_session_to_shost(session);
> > - ihost = shost->shost_data;
> > -
> > - mutex_lock(&ihost->mutex);
> > + mutex_lock(&session->mutex);
> > spin_lock_irqsave(&session->lock, flags);
> > if (session->state != ISCSI_SESSION_LOGGED_IN) {
> > spin_unlock_irqrestore(&session->lock, flags);
> > @@ -1823,7 +1817,7 @@ static int iscsi_user_scan_session(struct device
> > *dev, void *data)
> > }
> >
> > user_scan_exit:
> > - mutex_unlock(&ihost->mutex);
> > + mutex_unlock(&session->mutex);
> > ISCSI_DBG_TRANS_SESSION(session, "Completed session scan\n");
> > return 0;
> > }
> > @@ -2001,26 +1995,24 @@ static void __iscsi_unbind_session(struct
> > work_struct *work)
> > struct iscsi_cls_session *session =
> > container_of(work, struct iscsi_cls_session,
> > unbind_work);
> > - struct Scsi_Host *shost = iscsi_session_to_shost(session);
> > - struct iscsi_cls_host *ihost = shost->shost_data;
> > unsigned long flags;
> > unsigned int target_id;
> >
> > ISCSI_DBG_TRANS_SESSION(session, "Unbinding session\n");
> >
> > /* Prevent new scans and make sure scanning is not in progress */
> > - mutex_lock(&ihost->mutex);
> > + mutex_lock(&session->mutex);
> > spin_lock_irqsave(&session->lock, flags);
> > if (session->target_id == ISCSI_MAX_TARGET) {
> > spin_unlock_irqrestore(&session->lock, flags);
> > - mutex_unlock(&ihost->mutex);
> > + mutex_unlock(&session->mutex);
> > return;
> > }
> >
> > target_id = session->target_id;
> > session->target_id = ISCSI_MAX_TARGET;
> > spin_unlock_irqrestore(&session->lock, flags);
> > - mutex_unlock(&ihost->mutex);
> > + mutex_unlock(&session->mutex);
> >
> > if (session->ida_used)
> > ida_simple_remove(&iscsi_sess_ida, target_id);
> > @@ -2053,6 +2045,7 @@ iscsi_alloc_session(struct Scsi_Host *shost, struct
> > iscsi_transport *transport,
> > INIT_WORK(&session->unbind_work, __iscsi_unbind_session);
> > INIT_WORK(&session->scan_work, iscsi_scan_session);
> > spin_lock_init(&session->lock);
> > + mutex_init(&session->mutex);
> >
> > /* this is released in the dev's release function */
> > scsi_host_get(shost);
> > diff --git a/include/scsi/scsi_transport_iscsi.h
> > b/include/scsi/scsi_transport_iscsi.h
> > index 6183d20..acf9d9d 100644
> > --- a/include/scsi/scsi_transport_iscsi.h
> > +++ b/include/scsi/scsi_transport_iscsi.h
> > @@ -238,6 +238,7 @@ struct iscsi_cls_session {
> > struct work_struct unblock_work;
> > struct work_struct scan_work;
> > struct work_struct unbind_work;
> > + struct mutex mutex;
> >
> > /* recovery fields */
> > int recovery_tmo;
> > @@ -272,7 +273,6 @@ struct iscsi_cls_session {
> >
> > struct iscsi_cls_host {
> > atomic_t nr_scans;
> > - struct mutex mutex;
> > struct request_queue *bsg_q;
> > uint32_t port_speed;
> > uint32_t port_state;
> > --
> > 2.7.4
> >
> >
>
> --
> You received this message because you are subscribed to the Google Groups "open-iscsi" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to open-iscsi+unsubscribe@googlegroups.com.
> To post to this group, send email to open-iscsi@googlegroups.com.
> Visit this group at https://groups.google.com/group/open-iscsi.
> For more options, visit https://groups.google.com/d/optout.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: iscsi: make mutex for target scanning and unbinding per-session
2016-11-07 18:22 iscsi: make mutex for target scanning and unbinding per-session Chris Leech
[not found] ` <1478542920-24460-1-git-send-email-cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
@ 2016-11-10 23:22 ` Mike Christie
[not found] ` <58250144.2050009-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
1 sibling, 1 reply; 6+ messages in thread
From: Mike Christie @ 2016-11-10 23:22 UTC (permalink / raw)
To: open-iscsi, linux-scsi, lduncan
On 11/07/2016 12:22 PM, Chris Leech wrote:
> Currently the iSCSI transport class synchronises target scanning and
> unbinding with a host level mutex. For multi-session hosts (offloading
> iSCSI HBAs) connecting to storage arrays that may implement one
> target-per-lun, this can result in the target scan work for hundreds of
> sessions being serialized behind a single mutex. With slow enough
Does this patch alone help or is there a scsi piece too?
There is also scsi_host->scan_mutex taken in the scsi layer during
scsi_scan_target, so it is serialized there too. It seems like this
patch would move that problem one layer down.
>
> @@ -1801,10 +1798,7 @@ static int iscsi_user_scan_session(struct device *dev, void *data)
>
> ISCSI_DBG_TRANS_SESSION(session, "Scanning session\n");
>
> - shost = iscsi_session_to_shost(session);
> - ihost = shost->shost_data;
> -
> - mutex_lock(&ihost->mutex);
> + mutex_lock(&session->mutex);
> spin_lock_irqsave(&session->lock, flags);
> if (session->state != ISCSI_SESSION_LOGGED_IN) {
> spin_unlock_irqrestore(&session->lock, flags);
> @@ -1823,7 +1817,7 @@ static int iscsi_user_scan_session(struct device *dev, void *data)
> }
The patch will allow you to remove other sessions while scanning is
running, so it could still be a good idea.
I think I originally added the mutex because we did our own loop over a
list of the host's sessions. If a unbind were to occur at the same time
then it would be freed while scanning. We changed the user scan to use
device_for_each_child so that will grab a reference to the session so
the memory will not be freed now. It now just makes sure that scsi
target removal and iscsi_remove_session wait until the scan is done.
On a related note, you can remove all the iscsi_scan_session code. We do
not use it anymore. qla4xxx used to do async scans in the kernel with
that code but does not anymore. In the future someone will also not ask
why we grab the mutex around one scan and not the other.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-11-11 5:01 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-07 18:22 iscsi: make mutex for target scanning and unbinding per-session Chris Leech
[not found] ` <1478542920-24460-1-git-send-email-cleech-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-11-10 18:00 ` The Lee-Man
2016-11-10 21:22 ` Chris Leech
2016-11-10 23:22 ` Mike Christie
[not found] ` <58250144.2050009-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2016-11-11 1:13 ` Chris Leech
2016-11-11 5:01 ` Mike Christie
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).