Skip to content

K
Kernel

openeuler / Kernel
大约 2 年 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 41e5afe5 编写于 作者: Q Quinn Tran 提交者： Martin K. Petersen
浏览文件
操作

scsi: qla2xxx: Fix exchange oversubscription 

In large environment, it is possible to experience command timeout and
escalation of path recovery. Currently the driver does not track the number
of exchanges/commands sent to FW. If there is a delay for commands at the
head of the queue, then this will create back pressure for commands at the
back of the queue.

Check for exchange availability before command submission.

Fixes: 89c72f42 ("scsi: qla2xxx: Add IOCB resource tracking")
Signed-off-by: NQuinn Tran <qutran@marvell.com>
Signed-off-by: NNilesh Javali <njavali@marvell.com>
Reviewed-by: NHimanshu Madhani <himanshu.madhani@oracle.com>
Signed-off-by: NMartin K. Petersen <martin.petersen@oracle.com>
上级 c75e6aef
隐藏空白更改
内联 并排
Showing with 88 addition and 36 deletion
drivers/scsi/qla2xxx/qla_def.h
浏览文件 @ 41e5afe5
...@@ -660,7 +660,7 @@ enum { ...@@ -660,7 +660,7 @@ enum {
struct iocb_resource { struct iocb_resource {
u8 res_type; u8 res_type;
u8 pad; u8 exch_cnt;
u16 iocb_cnt; u16 iocb_cnt;
}; };
...@@ -3721,6 +3721,10 @@ struct qla_fw_resources { ...@@ -3721,6 +3721,10 @@ struct qla_fw_resources {
u16 iocbs_limit; u16 iocbs_limit;
u16 iocbs_qp_limit; u16 iocbs_qp_limit;
u16 iocbs_used; u16 iocbs_used;
u16 exch_total;
u16 exch_limit;
u16 exch_used;
u16 pad;
}; };
#define QLA_IOCB_PCT_LIMIT 95 #define QLA_IOCB_PCT_LIMIT 95
......
drivers/scsi/qla2xxx/qla_edif.c
浏览文件 @ 41e5afe5
...@@ -2989,9 +2989,10 @@ qla28xx_start_scsi_edif(srb_t *sp) ...@@ -2989,9 +2989,10 @@ qla28xx_start_scsi_edif(srb_t *sp)
tot_dsds = nseg; tot_dsds = nseg;
req_cnt = qla24xx_calc_iocbs(vha, tot_dsds); req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
sp->iores.res_type = RESOURCE_INI; sp->iores.res_type = RESOURCE_IOCB | RESOURCE_EXCH;
sp->iores.exch_cnt = 1;
sp->iores.iocb_cnt = req_cnt; sp->iores.iocb_cnt = req_cnt;
if (qla_get_iocbs(sp->qpair, &sp->iores)) if (qla_get_fw_resources(sp->qpair, &sp->iores))
goto queuing_error; goto queuing_error;
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
...@@ -3185,7 +3186,7 @@ qla28xx_start_scsi_edif(srb_t *sp) ...@@ -3185,7 +3186,7 @@ qla28xx_start_scsi_edif(srb_t *sp)
mempool_free(sp->u.scmd.ct6_ctx, ha->ctx_mempool); mempool_free(sp->u.scmd.ct6_ctx, ha->ctx_mempool);
sp->u.scmd.ct6_ctx = NULL; sp->u.scmd.ct6_ctx = NULL;
} }
qla_put_iocbs(sp->qpair, &sp->iores); qla_put_fw_resources(sp->qpair, &sp->iores);
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
......
drivers/scsi/qla2xxx/qla_init.c
浏览文件 @ 41e5afe5
...@@ -128,12 +128,14 @@ static void qla24xx_abort_iocb_timeout(void *data) ...@@ -128,12 +128,14 @@ static void qla24xx_abort_iocb_timeout(void *data)
sp->cmd_sp)) { sp->cmd_sp)) {
qpair->req->outstanding_cmds[handle] = NULL; qpair->req->outstanding_cmds[handle] = NULL;
cmdsp_found = 1; cmdsp_found = 1;
qla_put_fw_resources(qpair, &sp->cmd_sp->iores);
} }
/* removing the abort */ /* removing the abort */
if (qpair->req->outstanding_cmds[handle] == sp) { if (qpair->req->outstanding_cmds[handle] == sp) {
qpair->req->outstanding_cmds[handle] = NULL; qpair->req->outstanding_cmds[handle] = NULL;
sp_found = 1; sp_found = 1;
qla_put_fw_resources(qpair, &sp->iores);
break; break;
} }
} }
...@@ -2000,6 +2002,7 @@ qla2x00_tmf_iocb_timeout(void *data) ...@@ -2000,6 +2002,7 @@ qla2x00_tmf_iocb_timeout(void *data)
for (h = 1; h < sp->qpair->req->num_outstanding_cmds; h++) { for (h = 1; h < sp->qpair->req->num_outstanding_cmds; h++) {
if (sp->qpair->req->outstanding_cmds[h] == sp) { if (sp->qpair->req->outstanding_cmds[h] == sp) {
sp->qpair->req->outstanding_cmds[h] = NULL; sp->qpair->req->outstanding_cmds[h] = NULL;
qla_put_fw_resources(sp->qpair, &sp->iores);
break; break;
} }
} }
...@@ -3943,6 +3946,12 @@ void qla_init_iocb_limit(scsi_qla_host_t *vha) ...@@ -3943,6 +3946,12 @@ void qla_init_iocb_limit(scsi_qla_host_t *vha)
ha->base_qpair->fwres.iocbs_limit = limit; ha->base_qpair->fwres.iocbs_limit = limit;
ha->base_qpair->fwres.iocbs_qp_limit = limit / num_qps; ha->base_qpair->fwres.iocbs_qp_limit = limit / num_qps;
ha->base_qpair->fwres.iocbs_used = 0; ha->base_qpair->fwres.iocbs_used = 0;
ha->base_qpair->fwres.exch_total = ha->orig_fw_xcb_count;
ha->base_qpair->fwres.exch_limit = (ha->orig_fw_xcb_count *
QLA_IOCB_PCT_LIMIT) / 100;
ha->base_qpair->fwres.exch_used = 0;
for (i = 0; i < ha->max_qpairs; i++) { for (i = 0; i < ha->max_qpairs; i++) {
if (ha->queue_pair_map[i]) { if (ha->queue_pair_map[i]) {
ha->queue_pair_map[i]->fwres.iocbs_total = ha->queue_pair_map[i]->fwres.iocbs_total =
...@@ -3951,6 +3960,10 @@ void qla_init_iocb_limit(scsi_qla_host_t *vha) ...@@ -3951,6 +3960,10 @@ void qla_init_iocb_limit(scsi_qla_host_t *vha)
ha->queue_pair_map[i]->fwres.iocbs_qp_limit = ha->queue_pair_map[i]->fwres.iocbs_qp_limit =
limit / num_qps; limit / num_qps;
ha->queue_pair_map[i]->fwres.iocbs_used = 0; ha->queue_pair_map[i]->fwres.iocbs_used = 0;
ha->queue_pair_map[i]->fwres.exch_total = ha->orig_fw_xcb_count;
ha->queue_pair_map[i]->fwres.exch_limit =
(ha->orig_fw_xcb_count * QLA_IOCB_PCT_LIMIT) / 100;
ha->queue_pair_map[i]->fwres.exch_used = 0;
} }
} }
} }
......
drivers/scsi/qla2xxx/qla_inline.h
浏览文件 @ 41e5afe5
...@@ -380,13 +380,16 @@ qla2xxx_get_fc4_priority(struct scsi_qla_host *vha) ...@@ -380,13 +380,16 @@ qla2xxx_get_fc4_priority(struct scsi_qla_host *vha)
enum { enum {
RESOURCE_NONE, RESOURCE_NONE,
RESOURCE_INI, RESOURCE_IOCB = BIT_0,
RESOURCE_EXCH = BIT_1, /* exchange */
RESOURCE_FORCE = BIT_2,
}; };
static inline int static inline int
qla_get_iocbs(struct qla_qpair *qp, struct iocb_resource *iores) qla_get_fw_resources(struct qla_qpair *qp, struct iocb_resource *iores)
{ {
u16 iocbs_used, i; u16 iocbs_used, i;
u16 exch_used;
struct qla_hw_data *ha = qp->vha->hw; struct qla_hw_data *ha = qp->vha->hw;
if (!ql2xenforce_iocb_limit) { if (!ql2xenforce_iocb_limit) {
...@@ -394,10 +397,7 @@ qla_get_iocbs(struct qla_qpair *qp, struct iocb_resource *iores) ...@@ -394,10 +397,7 @@ qla_get_iocbs(struct qla_qpair *qp, struct iocb_resource *iores)
return 0; return 0;
} }
if ((iores->iocb_cnt + qp->fwres.iocbs_used) < qp->fwres.iocbs_qp_limit) { if ((iores->iocb_cnt + qp->fwres.iocbs_used) >= qp->fwres.iocbs_qp_limit) {
qp->fwres.iocbs_used += iores->iocb_cnt;
return 0;
} else {
/* no need to acquire qpair lock. It's just rough calculation */ /* no need to acquire qpair lock. It's just rough calculation */
iocbs_used = ha->base_qpair->fwres.iocbs_used; iocbs_used = ha->base_qpair->fwres.iocbs_used;
for (i = 0; i < ha->max_qpairs; i++) { for (i = 0; i < ha->max_qpairs; i++) {
...@@ -405,30 +405,48 @@ qla_get_iocbs(struct qla_qpair *qp, struct iocb_resource *iores) ...@@ -405,30 +405,48 @@ qla_get_iocbs(struct qla_qpair *qp, struct iocb_resource *iores)
iocbs_used += ha->queue_pair_map[i]->fwres.iocbs_used; iocbs_used += ha->queue_pair_map[i]->fwres.iocbs_used;
} }
if ((iores->iocb_cnt + iocbs_used) < qp->fwres.iocbs_limit) { if ((iores->iocb_cnt + iocbs_used) >= qp->fwres.iocbs_limit) {
qp->fwres.iocbs_used += iores->iocb_cnt; iores->res_type = RESOURCE_NONE;
return 0; return -ENOSPC;
} else { }
}
if (iores->res_type & RESOURCE_EXCH) {
exch_used = ha->base_qpair->fwres.exch_used;
for (i = 0; i < ha->max_qpairs; i++) {
if (ha->queue_pair_map[i])
exch_used += ha->queue_pair_map[i]->fwres.exch_used;
}
if ((exch_used + iores->exch_cnt) >= qp->fwres.exch_limit) {
iores->res_type = RESOURCE_NONE; iores->res_type = RESOURCE_NONE;
return -ENOSPC; return -ENOSPC;
} }
} }
qp->fwres.iocbs_used += iores->iocb_cnt;
qp->fwres.exch_used += iores->exch_cnt;
return 0;
} }
static inline void static inline void
qla_put_iocbs(struct qla_qpair *qp, struct iocb_resource *iores) qla_put_fw_resources(struct qla_qpair *qp, struct iocb_resource *iores)
{ {
switch (iores->res_type) { if (iores->res_type & RESOURCE_IOCB) {
case RESOURCE_NONE:
break;
default:
if (qp->fwres.iocbs_used >= iores->iocb_cnt) { if (qp->fwres.iocbs_used >= iores->iocb_cnt) {
qp->fwres.iocbs_used -= iores->iocb_cnt; qp->fwres.iocbs_used -= iores->iocb_cnt;
} else { } else {
// should not happen /* should not happen */
qp->fwres.iocbs_used = 0; qp->fwres.iocbs_used = 0;
} }
break; }
if (iores->res_type & RESOURCE_EXCH) {
if (qp->fwres.exch_used >= iores->exch_cnt) {
qp->fwres.exch_used -= iores->exch_cnt;
} else {
/* should not happen */
qp->fwres.exch_used = 0;
}
} }
iores->res_type = RESOURCE_NONE; iores->res_type = RESOURCE_NONE;
} }
......
drivers/scsi/qla2xxx/qla_iocb.c
浏览文件 @ 41e5afe5
...@@ -1589,9 +1589,10 @@ qla24xx_start_scsi(srb_t *sp) ...@@ -1589,9 +1589,10 @@ qla24xx_start_scsi(srb_t *sp)
tot_dsds = nseg; tot_dsds = nseg;
req_cnt = qla24xx_calc_iocbs(vha, tot_dsds); req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
sp->iores.res_type = RESOURCE_INI; sp->iores.res_type = RESOURCE_IOCB | RESOURCE_EXCH;
sp->iores.exch_cnt = 1;
sp->iores.iocb_cnt = req_cnt; sp->iores.iocb_cnt = req_cnt;
if (qla_get_iocbs(sp->qpair, &sp->iores)) if (qla_get_fw_resources(sp->qpair, &sp->iores))
goto queuing_error; goto queuing_error;
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
...@@ -1678,7 +1679,7 @@ qla24xx_start_scsi(srb_t *sp) ...@@ -1678,7 +1679,7 @@ qla24xx_start_scsi(srb_t *sp)
if (tot_dsds) if (tot_dsds)
scsi_dma_unmap(cmd); scsi_dma_unmap(cmd);
qla_put_iocbs(sp->qpair, &sp->iores); qla_put_fw_resources(sp->qpair, &sp->iores);
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
...@@ -1793,9 +1794,10 @@ qla24xx_dif_start_scsi(srb_t *sp) ...@@ -1793,9 +1794,10 @@ qla24xx_dif_start_scsi(srb_t *sp)
tot_prot_dsds = nseg; tot_prot_dsds = nseg;
tot_dsds += nseg; tot_dsds += nseg;
sp->iores.res_type = RESOURCE_INI; sp->iores.res_type = RESOURCE_IOCB | RESOURCE_EXCH;
sp->iores.exch_cnt = 1;
sp->iores.iocb_cnt = qla24xx_calc_iocbs(vha, tot_dsds); sp->iores.iocb_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
if (qla_get_iocbs(sp->qpair, &sp->iores)) if (qla_get_fw_resources(sp->qpair, &sp->iores))
goto queuing_error; goto queuing_error;
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
...@@ -1883,7 +1885,7 @@ qla24xx_dif_start_scsi(srb_t *sp) ...@@ -1883,7 +1885,7 @@ qla24xx_dif_start_scsi(srb_t *sp)
} }
/* Cleanup will be performed by the caller (queuecommand) */ /* Cleanup will be performed by the caller (queuecommand) */
qla_put_iocbs(sp->qpair, &sp->iores); qla_put_fw_resources(sp->qpair, &sp->iores);
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
...@@ -1952,9 +1954,10 @@ qla2xxx_start_scsi_mq(srb_t *sp) ...@@ -1952,9 +1954,10 @@ qla2xxx_start_scsi_mq(srb_t *sp)
tot_dsds = nseg; tot_dsds = nseg;
req_cnt = qla24xx_calc_iocbs(vha, tot_dsds); req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
sp->iores.res_type = RESOURCE_INI; sp->iores.res_type = RESOURCE_IOCB | RESOURCE_EXCH;
sp->iores.exch_cnt = 1;
sp->iores.iocb_cnt = req_cnt; sp->iores.iocb_cnt = req_cnt;
if (qla_get_iocbs(sp->qpair, &sp->iores)) if (qla_get_fw_resources(sp->qpair, &sp->iores))
goto queuing_error; goto queuing_error;
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
...@@ -2041,7 +2044,7 @@ qla2xxx_start_scsi_mq(srb_t *sp) ...@@ -2041,7 +2044,7 @@ qla2xxx_start_scsi_mq(srb_t *sp)
if (tot_dsds) if (tot_dsds)
scsi_dma_unmap(cmd); scsi_dma_unmap(cmd);
qla_put_iocbs(sp->qpair, &sp->iores); qla_put_fw_resources(sp->qpair, &sp->iores);
spin_unlock_irqrestore(&qpair->qp_lock, flags); spin_unlock_irqrestore(&qpair->qp_lock, flags);
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
...@@ -2171,9 +2174,10 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) ...@@ -2171,9 +2174,10 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
tot_prot_dsds = nseg; tot_prot_dsds = nseg;
tot_dsds += nseg; tot_dsds += nseg;
sp->iores.res_type = RESOURCE_INI; sp->iores.res_type = RESOURCE_IOCB | RESOURCE_EXCH;
sp->iores.exch_cnt = 1;
sp->iores.iocb_cnt = qla24xx_calc_iocbs(vha, tot_dsds); sp->iores.iocb_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
if (qla_get_iocbs(sp->qpair, &sp->iores)) if (qla_get_fw_resources(sp->qpair, &sp->iores))
goto queuing_error; goto queuing_error;
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
...@@ -2260,7 +2264,7 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp) ...@@ -2260,7 +2264,7 @@ qla2xxx_dif_start_scsi_mq(srb_t *sp)
} }
/* Cleanup will be performed by the caller (queuecommand) */ /* Cleanup will be performed by the caller (queuecommand) */
qla_put_iocbs(sp->qpair, &sp->iores); qla_put_fw_resources(sp->qpair, &sp->iores);
spin_unlock_irqrestore(&qpair->qp_lock, flags); spin_unlock_irqrestore(&qpair->qp_lock, flags);
return QLA_FUNCTION_FAILED; return QLA_FUNCTION_FAILED;
......
drivers/scsi/qla2xxx/qla_isr.c
浏览文件 @ 41e5afe5
...@@ -3197,7 +3197,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt) ...@@ -3197,7 +3197,7 @@ qla2x00_status_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, void *pkt)
} }
return; return;
} }
qla_put_iocbs(sp->qpair, &sp->iores); qla_put_fw_resources(sp->qpair, &sp->iores);
if (sp->cmd_type != TYPE_SRB) { if (sp->cmd_type != TYPE_SRB) {
req->outstanding_cmds[handle] = NULL; req->outstanding_cmds[handle] = NULL;
...@@ -3618,7 +3618,6 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt) ...@@ -3618,7 +3618,6 @@ qla2x00_error_entry(scsi_qla_host_t *vha, struct rsp_que *rsp, sts_entry_t *pkt)
default: default:
sp = qla2x00_get_sp_from_handle(vha, func, req, pkt); sp = qla2x00_get_sp_from_handle(vha, func, req, pkt);
if (sp) { if (sp) {
qla_put_iocbs(sp->qpair, &sp->iores);
sp->done(sp, res); sp->done(sp, res);
return 0; return 0;
} }
......
drivers/scsi/qla2xxx/qla_nvme.c
浏览文件 @ 41e5afe5
...@@ -428,13 +428,24 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) ...@@ -428,13 +428,24 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)
goto queuing_error; goto queuing_error;
} }
req_cnt = qla24xx_calc_iocbs(vha, tot_dsds); req_cnt = qla24xx_calc_iocbs(vha, tot_dsds);
sp->iores.res_type = RESOURCE_IOCB | RESOURCE_EXCH;
sp->iores.exch_cnt = 1;
sp->iores.iocb_cnt = req_cnt;
if (qla_get_fw_resources(sp->qpair, &sp->iores)) {
rval = -EBUSY;
goto queuing_error;
}
if (req->cnt < (req_cnt + 2)) { if (req->cnt < (req_cnt + 2)) {
if (IS_SHADOW_REG_CAPABLE(ha)) { if (IS_SHADOW_REG_CAPABLE(ha)) {
cnt = *req->out_ptr; cnt = *req->out_ptr;
} else { } else {
cnt = rd_reg_dword_relaxed(req->req_q_out); cnt = rd_reg_dword_relaxed(req->req_q_out);
if (qla2x00_check_reg16_for_disconnect(vha, cnt)) if (qla2x00_check_reg16_for_disconnect(vha, cnt)) {
rval = -EBUSY;
goto queuing_error; goto queuing_error;
}
} }
if (req->ring_index < cnt) if (req->ring_index < cnt)
...@@ -583,6 +594,8 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp) ...@@ -583,6 +594,8 @@ static inline int qla2x00_start_nvme_mq(srb_t *sp)
qla24xx_process_response_queue(vha, rsp); qla24xx_process_response_queue(vha, rsp);
queuing_error: queuing_error:
if (rval)
qla_put_fw_resources(sp->qpair, &sp->iores);
spin_unlock_irqrestore(&qpair->qp_lock, flags); spin_unlock_irqrestore(&qpair->qp_lock, flags);
return rval; return rval;
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或