Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1672640 > unrolled thread
| Started by | Johannes Thumshirn <jthumshirn@suse.de> |
|---|---|
| First post | 2017-06-22 15:50 +0200 |
| Last post | 2017-06-22 16:30 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-22 15:50 +0200
Re: [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock Hannes Reinecke <hare@suse.de> - 2017-06-22 16:00 +0200
Re: [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock John Garry <john.garry@huawei.com> - 2017-06-22 16:30 +0200
Re: [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock Johannes Thumshirn <jthumshirn@suse.de> - 2017-06-22 16:30 +0200
| From | Johannes Thumshirn <jthumshirn@suse.de> |
|---|---|
| Date | 2017-06-22 15:50 +0200 |
| Subject | [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock |
| Message-ID | <tVaEG-5pO-5@gated-at.bofh.it> |
In qla2xx_start_scsi_mq() and qla2xx_dif_start_scsi_mq() we grab the
qpair->qp_lock but do access members of the qpair before having the lock.
Re-order the locking sequence to have all read and write access to qpair
members under the qpair->qp_lock.
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
drivers/scsi/qla2xxx/qla_iocb.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 8404f17f3c6c..425ca1646a9a 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -1770,10 +1770,6 @@ qla2xxx_start_scsi_mq(srb_t *sp)
struct qla_hw_data *ha = vha->hw;
struct qla_qpair *qpair = sp->qpair;
- /* Setup qpair pointers */
- rsp = qpair->rsp;
- req = qpair->req;
-
/* So we know we haven't pci_map'ed anything yet */
tot_dsds = 0;
@@ -1788,6 +1784,10 @@ qla2xxx_start_scsi_mq(srb_t *sp)
/* Acquire qpair specific lock */
spin_lock_irqsave(&qpair->qp_lock, flags);
+ /* Setup qpair pointers */
+ rsp = qpair->rsp;
+ req = qpair->req;
+
/* Check for room in outstanding command list. */
handle = req->current_outstanding_cmd;
for (index = 1; index < req->num_outstanding_cmds; index++) {
@@ -1924,24 +1924,33 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
#define QDSS_GOT_Q_SPACE BIT_0
+ /* Acquire ring specific lock */
+ spin_lock_irqsave(&qpair->qp_lock, flags);
+
/* Check for host side state */
if (!qpair->online) {
cmd->result = DID_NO_CONNECT << 16;
+ spin_unlock_irqrestore(&qpair->qp_lock, flags);
return QLA_INTERFACE_ERROR;
}
if (!qpair->difdix_supported &&
scsi_get_prot_op(cmd) != SCSI_PROT_NORMAL) {
cmd->result = DID_NO_CONNECT << 16;
+ spin_unlock_irqrestore(&qpair->qp_lock, flags);
return QLA_INTERFACE_ERROR;
}
+ spin_unlock_irqrestore(&qpair->qp_lock, flags);
+
/* Only process protection or >16 cdb in this routine */
if (scsi_get_prot_op(cmd) == SCSI_PROT_NORMAL) {
if (cmd->cmd_len <= 16)
return qla2xxx_start_scsi_mq(sp);
}
+ spin_lock_irqsave(&qpair->qp_lock, flags);
+
/* Setup qpair pointers */
rsp = qpair->rsp;
req = qpair->req;
@@ -1957,9 +1966,6 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
vha->marker_needed = 0;
}
- /* Acquire ring specific lock */
- spin_lock_irqsave(&qpair->qp_lock, flags);
-
/* Check for room in outstanding command list. */
handle = req->current_outstanding_cmd;
for (index = 1; index < req->num_outstanding_cmds; index++) {
--
2.12.3
[toc] | [next] | [standalone]
| From | Hannes Reinecke <hare@suse.de> |
|---|---|
| Date | 2017-06-22 16:00 +0200 |
| Subject | Re: [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock |
| Message-ID | <tVaOm-5tA-3@gated-at.bofh.it> |
| In reply to | #1672640 |
On 06/22/2017 03:43 PM, Johannes Thumshirn wrote:
> In qla2xx_start_scsi_mq() and qla2xx_dif_start_scsi_mq() we grab the
> qpair->qp_lock but do access members of the qpair before having the lock.
> Re-order the locking sequence to have all read and write access to qpair
> members under the qpair->qp_lock.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
> drivers/scsi/qla2xxx/qla_iocb.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
> index 8404f17f3c6c..425ca1646a9a 100644
> --- a/drivers/scsi/qla2xxx/qla_iocb.c
> +++ b/drivers/scsi/qla2xxx/qla_iocb.c
> @@ -1770,10 +1770,6 @@ qla2xxx_start_scsi_mq(srb_t *sp)
> struct qla_hw_data *ha = vha->hw;
> struct qla_qpair *qpair = sp->qpair;
>
> - /* Setup qpair pointers */
> - rsp = qpair->rsp;
> - req = qpair->req;
> -
> /* So we know we haven't pci_map'ed anything yet */
> tot_dsds = 0;
>
> @@ -1788,6 +1784,10 @@ qla2xxx_start_scsi_mq(srb_t *sp)
> /* Acquire qpair specific lock */
> spin_lock_irqsave(&qpair->qp_lock, flags);
>
> + /* Setup qpair pointers */
> + rsp = qpair->rsp;
> + req = qpair->req;
> +
> /* Check for room in outstanding command list. */
> handle = req->current_outstanding_cmd;
> for (index = 1; index < req->num_outstanding_cmds; index++) {
> @@ -1924,24 +1924,33 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
>
> #define QDSS_GOT_Q_SPACE BIT_0
>
> + /* Acquire ring specific lock */
> + spin_lock_irqsave(&qpair->qp_lock, flags);
> +
> /* Check for host side state */
> if (!qpair->online) {
> cmd->result = DID_NO_CONNECT << 16;
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> return QLA_INTERFACE_ERROR;
> }
>
> if (!qpair->difdix_supported &&
> scsi_get_prot_op(cmd) != SCSI_PROT_NORMAL) {
> cmd->result = DID_NO_CONNECT << 16;
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> return QLA_INTERFACE_ERROR;
> }
>
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> +
> /* Only process protection or >16 cdb in this routine */
> if (scsi_get_prot_op(cmd) == SCSI_PROT_NORMAL) {
> if (cmd->cmd_len <= 16)
> return qla2xxx_start_scsi_mq(sp);
> }
>
Not sure if that is required; at worst we're missing a device being
online; difdix support is probably not changing that often to be
warranted being protected with a lock here.
So I'd rather omit spinlocks here.
Cheers,
Hannes
--
Dr. Hannes Reinecke Teamlead Storage & Networking
hare@suse.de +49 911 74053 688
SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: F. Imendörffer, J. Smithard, J. Guild, D. Upmanyu, G. Norton
HRB 21284 (AG Nürnberg)
[toc] | [prev] | [next] | [standalone]
| From | John Garry <john.garry@huawei.com> |
|---|---|
| Date | 2017-06-22 16:30 +0200 |
| Subject | Re: [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock |
| Message-ID | <tVbhn-5Uv-5@gated-at.bofh.it> |
| In reply to | #1672640 |
On 22/06/2017 14:43, Johannes Thumshirn wrote:
> In qla2xx_start_scsi_mq() and qla2xx_dif_start_scsi_mq() we grab the
> qpair->qp_lock but do access members of the qpair before having the lock.
> Re-order the locking sequence to have all read and write access to qpair
> members under the qpair->qp_lock.
>
> Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
> ---
> drivers/scsi/qla2xxx/qla_iocb.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
> index 8404f17f3c6c..425ca1646a9a 100644
> --- a/drivers/scsi/qla2xxx/qla_iocb.c
> +++ b/drivers/scsi/qla2xxx/qla_iocb.c
> @@ -1770,10 +1770,6 @@ qla2xxx_start_scsi_mq(srb_t *sp)
> struct qla_hw_data *ha = vha->hw;
> struct qla_qpair *qpair = sp->qpair;
>
> - /* Setup qpair pointers */
> - rsp = qpair->rsp;
> - req = qpair->req;
Can you check the call to qla2x00_marker() before the spinlock grab,
which takes rsp and req as parameters?
> -
> /* So we know we haven't pci_map'ed anything yet */
> tot_dsds = 0;
>
> @@ -1788,6 +1784,10 @@ qla2xxx_start_scsi_mq(srb_t *sp)
> /* Acquire qpair specific lock */
> spin_lock_irqsave(&qpair->qp_lock, flags);
>
> + /* Setup qpair pointers */
> + rsp = qpair->rsp;
> + req = qpair->req;
> +
> /* Check for room in outstanding command list. */
> handle = req->current_outstanding_cmd;
> for (index = 1; index < req->num_outstanding_cmds; index++) {
> @@ -1924,24 +1924,33 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
>
> #define QDSS_GOT_Q_SPACE BIT_0
>
> + /* Acquire ring specific lock */
> + spin_lock_irqsave(&qpair->qp_lock, flags);
> +
> /* Check for host side state */
> if (!qpair->online) {
> cmd->result = DID_NO_CONNECT << 16;
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> return QLA_INTERFACE_ERROR;
> }
>
> if (!qpair->difdix_supported &&
> scsi_get_prot_op(cmd) != SCSI_PROT_NORMAL) {
> cmd->result = DID_NO_CONNECT << 16;
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> return QLA_INTERFACE_ERROR;
> }
>
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> +
> /* Only process protection or >16 cdb in this routine */
> if (scsi_get_prot_op(cmd) == SCSI_PROT_NORMAL) {
> if (cmd->cmd_len <= 16)
> return qla2xxx_start_scsi_mq(sp);
> }
>
> + spin_lock_irqsave(&qpair->qp_lock, flags);
> +
> /* Setup qpair pointers */
> rsp = qpair->rsp;
> req = qpair->req;
> @@ -1957,9 +1966,6 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
> vha->marker_needed = 0;
> }
>
> - /* Acquire ring specific lock */
> - spin_lock_irqsave(&qpair->qp_lock, flags);
> -
> /* Check for room in outstanding command list. */
> handle = req->current_outstanding_cmd;
> for (index = 1; index < req->num_outstanding_cmds; index++) {
>
[toc] | [prev] | [next] | [standalone]
| From | Johannes Thumshirn <jthumshirn@suse.de> |
|---|---|
| Date | 2017-06-22 16:30 +0200 |
| Subject | Re: [PATCH] qla2xxx: Protect access to qpair members with qpair->qp_lock |
| Message-ID | <tVbhp-5Uv-39@gated-at.bofh.it> |
| In reply to | #1672671 |
On Thu, Jun 22, 2017 at 03:19:27PM +0100, John Garry wrote: > On 22/06/2017 14:43, Johannes Thumshirn wrote: > >In qla2xx_start_scsi_mq() and qla2xx_dif_start_scsi_mq() we grab the > >qpair->qp_lock but do access members of the qpair before having the lock. > >Re-order the locking sequence to have all read and write access to qpair > >members under the qpair->qp_lock. > > > >Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de> > >--- > > drivers/scsi/qla2xxx/qla_iocb.c | 20 +++++++++++++------- > > 1 file changed, 13 insertions(+), 7 deletions(-) > > > >diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c > >index 8404f17f3c6c..425ca1646a9a 100644 > >--- a/drivers/scsi/qla2xxx/qla_iocb.c > >+++ b/drivers/scsi/qla2xxx/qla_iocb.c > >@@ -1770,10 +1770,6 @@ qla2xxx_start_scsi_mq(srb_t *sp) > > struct qla_hw_data *ha = vha->hw; > > struct qla_qpair *qpair = sp->qpair; > > > >- /* Setup qpair pointers */ > >- rsp = qpair->rsp; > >- req = qpair->req; > > Can you check the call to qla2x00_marker() before the spinlock grab, which > takes rsp and req as parameters? Good catch, thanks. -- Johannes Thumshirn Storage jthumshirn@suse.de +49 911 74053 689 SUSE LINUX GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg) Key fingerprint = EC38 9CAB C2C4 F25D 8600 D0D0 0393 969D 2D76 0850
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web