From: Robert Love <robert.w.love@intel.com>
To: James.Bottomley@HansenPartnership.com, linux-scsi@vger.kernel.org
Subject: [PATCH 01/15] libfc: Hold disc mutex while processing gpn ft resp
Date: Fri, 03 Apr 2009 14:58:03 -0700 [thread overview]
Message-ID: <20090403215803.10856.23623.stgit@fritz> (raw)
In-Reply-To: <20090403215758.10856.6946.stgit@fritz>
From: Abhijeet Joglekar <abjoglek@cisco.com>
gpn_ft_resp processing currently does not hold the discovery lock.
disc_done() thus gets called from gpn_ft_resp or from gpn_ft_parse
without the lock held. This then sets disc->pending to zero or calls
gpn_ft_req() without disc_lock held.
- Hold disc mutex during gpn_ft resp processing
- In disc_done, release the disc mutex while calling lport callback
Signed-off-by: Abhijeet Joglekar <abjoglek@cisco.com>
Signed-off-by: Robert Love <robert.w.love@intel.com>
---
drivers/scsi/libfc/fc_disc.c | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/scsi/libfc/fc_disc.c b/drivers/scsi/libfc/fc_disc.c
index e57556e..4480630 100644
--- a/drivers/scsi/libfc/fc_disc.c
+++ b/drivers/scsi/libfc/fc_disc.c
@@ -461,21 +461,29 @@ static void fc_disc_del_target(struct fc_disc *disc, struct fc_rport *rport)
/**
* fc_disc_done() - Discovery has been completed
* @disc: FC discovery context
+ * Locking Note: This function expects that the disc mutex is locked before
+ * it is called. The discovery callback is then made with the lock released,
+ * and the lock is re-taken before returning from this function
*/
static void fc_disc_done(struct fc_disc *disc)
{
struct fc_lport *lport = disc->lport;
+ enum fc_disc_event event;
FC_DEBUG_DISC("Discovery complete for port (%6x)\n",
fc_host_port_id(lport->host));
- disc->disc_callback(lport, disc->event);
+ event = disc->event;
disc->event = DISC_EV_NONE;
if (disc->requested)
fc_disc_gpn_ft_req(disc);
else
disc->pending = 0;
+
+ mutex_unlock(&disc->disc_mutex);
+ disc->disc_callback(lport, event);
+ mutex_lock(&disc->disc_mutex);
}
/**
@@ -681,8 +689,8 @@ static void fc_disc_timeout(struct work_struct *work)
* @fp: response frame
* @lp_arg: Fibre Channel host port instance
*
- * Locking Note: This function expects that the disc_mutex is locked
- * before it is called.
+ * Locking Note: This function is called without disc mutex held, and
+ * should do all its processing with the mutex held
*/
static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
void *disc_arg)
@@ -695,11 +703,13 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
unsigned int len;
int error;
+ mutex_lock(&disc->disc_mutex);
FC_DEBUG_DISC("Received a GPN_FT response on port (%6x)\n",
fc_host_port_id(disc->lport->host));
if (IS_ERR(fp)) {
fc_disc_error(disc, fp);
+ mutex_unlock(&disc->disc_mutex);
return;
}
@@ -744,6 +754,8 @@ static void fc_disc_gpn_ft_resp(struct fc_seq *sp, struct fc_frame *fp,
disc->seq_count++;
}
fc_frame_free(fp);
+
+ mutex_unlock(&disc->disc_mutex);
}
/**
next prev parent reply other threads:[~2009-04-03 21:58 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-03 21:57 [PATCH 00/15] Open-FCoE updates (fixes and a feature) for 2.6.30 merge window Robert Love
2009-04-03 21:58 ` Robert Love [this message]
2009-04-03 21:58 ` [PATCH 02/15] libfc: Do not retry if the new state is not the same as old state Robert Love
2009-04-03 21:58 ` [PATCH 03/15] libfc: Track rogue remote ports Robert Love
2009-04-03 21:58 ` [PATCH 04/15] libfc: During fabric logoff, flush the rport Q after logging off dns port Robert Love
2009-04-03 21:58 ` [PATCH 05/15] libfc: Change state to NONE in fc_lport_destroy Robert Love
2009-04-03 21:58 ` [PATCH 06/15] libfc: whenever queueing delete ev for rport, set state to NONE Robert Love
2009-04-03 21:58 ` [PATCH 07/15] fcoe: Add runtime debug logging with module parameter debug_logging Robert Love
2009-04-03 21:58 ` [PATCH 08/15] libfcoe: Add runtime debugging with module param debug_logging Robert Love
2009-04-03 21:58 ` [PATCH 09/15] libfc: Add runtime debugging with debug_logging module parameter Robert Love
2009-04-03 21:58 ` [PATCH 10/15] libfc: Convert debug statements in fc_lport.c to use new libfc debug macros Robert Love
2009-04-03 21:58 ` [PATCH 11/15] libfc: Convert debug statements in fc_disc.c " Robert Love
2009-04-03 21:59 ` [PATCH 12/15] libfc: Convert debug statements in fc_rport.c " Robert Love
2009-04-03 21:59 ` [PATCH 13/15] libfc: Convert debug statements in fc_fcp.c " Robert Love
2009-04-03 21:59 ` [PATCH 14/15] libfc: Convert debug statements in fc_exch.c " Robert Love
2009-04-03 21:59 ` [PATCH 15/15] libfc: Remove unused FC_DBG macro Robert Love
2009-04-03 22:14 ` [PATCH 00/15] Open-FCoE updates (fixes and a feature) for 2.6.30 merge window James Bottomley
2009-04-03 22:28 ` Love, Robert W
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090403215803.10856.23623.stgit@fritz \
--to=robert.w.love@intel.com \
--cc=James.Bottomley@HansenPartnership.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.