* [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock
@ 2017-06-23 7:10 Johannes Thumshirn
2017-06-28 1:32 ` Martin K. Petersen
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2017-06-23 7:10 UTC (permalink / raw)
To: Martin K . Petersen
Cc: Linux SCSI Mailinglist, Linux Kernel Mailinglist,
qla2xxx-upstream, Himanshu Madhani, Hannes Reinecke, John Garry,
Johannes Thumshirn
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 | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
Changes to v1:
* Use __qla2x00_marker() instead of qla2x00_marker which is fit to be called
with the qp_lock held (John)
* Don't protect qpair->online and qpair->difdix_supported as it's not
needed (Hannes)
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 8404f17f3c6c..c64036ddd365 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -1770,6 +1770,9 @@ qla2xxx_start_scsi_mq(srb_t *sp)
struct qla_hw_data *ha = vha->hw;
struct qla_qpair *qpair = sp->qpair;
+ /* Acquire qpair specific lock */
+ spin_lock_irqsave(&qpair->qp_lock, flags);
+
/* Setup qpair pointers */
rsp = qpair->rsp;
req = qpair->req;
@@ -1779,15 +1782,14 @@ qla2xxx_start_scsi_mq(srb_t *sp)
/* Send marker if required */
if (vha->marker_needed != 0) {
- if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
- QLA_SUCCESS)
+ if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
+ QLA_SUCCESS) {
+ spin_unlock_irqrestore(&qpair->qp_lock, flags);
return QLA_FUNCTION_FAILED;
+ }
vha->marker_needed = 0;
}
- /* Acquire qpair 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++) {
@@ -1942,6 +1944,8 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
return qla2xxx_start_scsi_mq(sp);
}
+ spin_lock_irqsave(&qpair->qp_lock, flags);
+
/* Setup qpair pointers */
rsp = qpair->rsp;
req = qpair->req;
@@ -1951,15 +1955,14 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
/* Send marker if required */
if (vha->marker_needed != 0) {
- if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
- QLA_SUCCESS)
+ if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
+ QLA_SUCCESS) {
+ spin_unlock_irqrestore(&qpair->qp_lock, flags);
return QLA_FUNCTION_FAILED;
+ }
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
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock
2017-06-23 7:10 [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock Johannes Thumshirn
@ 2017-06-28 1:32 ` Martin K. Petersen
2017-06-28 1:44 ` Madhani, Himanshu
2017-06-28 16:33 ` Madhani, Himanshu
2017-07-01 20:50 ` Martin K. Petersen
2 siblings, 1 reply; 5+ messages in thread
From: Martin K. Petersen @ 2017-06-28 1:32 UTC (permalink / raw)
To: Johannes Thumshirn
Cc: Martin K . Petersen, Linux SCSI Mailinglist,
Linux Kernel Mailinglist, qla2xxx-upstream, Himanshu Madhani,
Hannes Reinecke, John Garry
> 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.
Cavium folks, please review!
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock
2017-06-28 1:32 ` Martin K. Petersen
@ 2017-06-28 1:44 ` Madhani, Himanshu
0 siblings, 0 replies; 5+ messages in thread
From: Madhani, Himanshu @ 2017-06-28 1:44 UTC (permalink / raw)
To: Martin K. Petersen, Johannes Thumshirn
Cc: Linux SCSI Mailinglist, Linux Kernel Mailinglist,
Dept-Eng QLA2xxx Upstream, Hannes Reinecke, John Garry
Hi Martin,
On 6/27/17, 6:32 PM, "Martin K. Petersen" <martin.petersen@oracle.com> 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.
Cavium folks, please review!
I am testing it internally, will update by tomorrow.
--
Martin K. Petersen Oracle Linux Engineering
Thanks,
Himanshu
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock
2017-06-23 7:10 [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock Johannes Thumshirn
2017-06-28 1:32 ` Martin K. Petersen
@ 2017-06-28 16:33 ` Madhani, Himanshu
2017-07-01 20:50 ` Martin K. Petersen
2 siblings, 0 replies; 5+ messages in thread
From: Madhani, Himanshu @ 2017-06-28 16:33 UTC (permalink / raw)
To: Johannes Thumshirn
Cc: Martin K . Petersen, Linux SCSI Mailinglist,
Linux Kernel Mailinglist, Dept-Eng QLA2xxx Upstream,
Hannes Reinecke, John Garry
> On Jun 23, 2017, at 12:10 AM, Johannes Thumshirn <jthumshirn@suse.de> 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 | 23 +++++++++++++----------
> 1 file changed, 13 insertions(+), 10 deletions(-)
>
> Changes to v1:
> * Use __qla2x00_marker() instead of qla2x00_marker which is fit to be called
> with the qp_lock held (John)
> * Don't protect qpair->online and qpair->difdix_supported as it's not
> needed (Hannes)
>
> diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
> index 8404f17f3c6c..c64036ddd365 100644
> --- a/drivers/scsi/qla2xxx/qla_iocb.c
> +++ b/drivers/scsi/qla2xxx/qla_iocb.c
> @@ -1770,6 +1770,9 @@ qla2xxx_start_scsi_mq(srb_t *sp)
> struct qla_hw_data *ha = vha->hw;
> struct qla_qpair *qpair = sp->qpair;
>
> + /* Acquire qpair specific lock */
> + spin_lock_irqsave(&qpair->qp_lock, flags);
> +
> /* Setup qpair pointers */
> rsp = qpair->rsp;
> req = qpair->req;
> @@ -1779,15 +1782,14 @@ qla2xxx_start_scsi_mq(srb_t *sp)
>
> /* Send marker if required */
> if (vha->marker_needed != 0) {
> - if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
> - QLA_SUCCESS)
> + if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
> + QLA_SUCCESS) {
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> return QLA_FUNCTION_FAILED;
> + }
> vha->marker_needed = 0;
> }
>
> - /* Acquire qpair 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++) {
> @@ -1942,6 +1944,8 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
> return qla2xxx_start_scsi_mq(sp);
> }
>
> + spin_lock_irqsave(&qpair->qp_lock, flags);
> +
> /* Setup qpair pointers */
> rsp = qpair->rsp;
> req = qpair->req;
> @@ -1951,15 +1955,14 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
>
> /* Send marker if required */
> if (vha->marker_needed != 0) {
> - if (qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
> - QLA_SUCCESS)
> + if (__qla2x00_marker(vha, req, rsp, 0, 0, MK_SYNC_ALL) !=
> + QLA_SUCCESS) {
> + spin_unlock_irqrestore(&qpair->qp_lock, flags);
> return QLA_FUNCTION_FAILED;
> + }
> 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
>
Looks Good.
Acked-By: Himanshu Madhani <himanshu.madhani@cavium.com>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock
2017-06-23 7:10 [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock Johannes Thumshirn
2017-06-28 1:32 ` Martin K. Petersen
2017-06-28 16:33 ` Madhani, Himanshu
@ 2017-07-01 20:50 ` Martin K. Petersen
2 siblings, 0 replies; 5+ messages in thread
From: Martin K. Petersen @ 2017-07-01 20:50 UTC (permalink / raw)
To: Johannes Thumshirn
Cc: Martin K . Petersen, Linux SCSI Mailinglist,
Linux Kernel Mailinglist, qla2xxx-upstream, Himanshu Madhani,
Hannes Reinecke, John Garry
Johannes,
> 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.
Applied to 4.13/scsi-queue.
--
Martin K. Petersen Oracle Linux Engineering
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-07-01 20:50 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-23 7:10 [PATCH v2] qla2xxx: Protect access to qpair members with qpair->qp_lock Johannes Thumshirn
2017-06-28 1:32 ` Martin K. Petersen
2017-06-28 1:44 ` Madhani, Himanshu
2017-06-28 16:33 ` Madhani, Himanshu
2017-07-01 20:50 ` Martin K. Petersen
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).