iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[SCSI] lpfc 8.3.39: Fixed crash when processing bsg's sg list with high memory pages

Browse Source 
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
James Smart 2013-04-17 20:17:26 -04:00 committed by James Bottomley
parent 5688d67055
commit d5ce53b7dd
2 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/scsi/lpfc/lpfc_bsg.c
View File

@ -219,26 +219,35 @@ lpfc_bsg_copy_data(struct lpfc_dmabuf *dma_buffers,
unsigned int transfer_bytes, bytes_copied = 0; unsigned int transfer_bytes, bytes_copied = 0;
unsigned int sg_offset, dma_offset; unsigned int sg_offset, dma_offset;
unsigned char *dma_address, *sg_address; unsigned char *dma_address, *sg_address;
struct scatterlist *sgel;
LIST_HEAD(temp_list); LIST_HEAD(temp_list);
struct sg_mapping_iter miter;
unsigned long flags;
unsigned int sg_flags = SG_MITER_ATOMIC;
bool sg_valid;
list_splice_init(&dma_buffers->list, &temp_list); list_splice_init(&dma_buffers->list, &temp_list);
list_add(&dma_buffers->list, &temp_list); list_add(&dma_buffers->list, &temp_list);
sg_offset = 0; sg_offset = 0;
sgel = bsg_buffers->sg_list; if (to_buffers)
sg_flags |= SG_MITER_FROM_SG;
else
sg_flags |= SG_MITER_TO_SG;
sg_miter_start(&miter, bsg_buffers->sg_list, bsg_buffers->sg_cnt,
sg_flags);
local_irq_save(flags);
sg_valid = sg_miter_next(&miter);
list_for_each_entry(mp, &temp_list, list) { list_for_each_entry(mp, &temp_list, list) {
dma_offset = 0; dma_offset = 0;
while (bytes_to_transfer && sgel && while (bytes_to_transfer && sg_valid &&
(dma_offset < LPFC_BPL_SIZE)) { (dma_offset < LPFC_BPL_SIZE)) {
dma_address = mp->virt + dma_offset; dma_address = mp->virt + dma_offset;
if (sg_offset) { if (sg_offset) {
/* Continue previous partial transfer of sg */ /* Continue previous partial transfer of sg */
sg_address = sg_virt(sgel) + sg_offset; sg_address = miter.addr + sg_offset;
transfer_bytes = sgel->length - sg_offset; transfer_bytes = miter.length - sg_offset;
} else { } else {
sg_address = sg_virt(sgel); sg_address = miter.addr;
transfer_bytes = sgel->length; transfer_bytes = miter.length;
} }
if (bytes_to_transfer < transfer_bytes) if (bytes_to_transfer < transfer_bytes)
transfer_bytes = bytes_to_transfer; transfer_bytes = bytes_to_transfer;
@ -252,12 +261,14 @@ lpfc_bsg_copy_data(struct lpfc_dmabuf *dma_buffers,
sg_offset += transfer_bytes; sg_offset += transfer_bytes;
bytes_to_transfer -= transfer_bytes; bytes_to_transfer -= transfer_bytes;
bytes_copied += transfer_bytes; bytes_copied += transfer_bytes;
if (sg_offset >= sgel->length) { if (sg_offset >= miter.length) {
sg_offset = 0; sg_offset = 0;
sgel = sg_next(sgel); sg_valid = sg_miter_next(&miter);
} }
} }
} }
sg_miter_stop(&miter);
local_irq_restore(flags);
list_del_init(&dma_buffers->list); list_del_init(&dma_buffers->list);
list_splice(&temp_list, &dma_buffers->list); list_splice(&temp_list, &dma_buffers->list);
return bytes_copied; return bytes_copied;
@ -471,6 +482,7 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job)
cmdiocbq->context1 = dd_data; cmdiocbq->context1 = dd_data;
cmdiocbq->context2 = cmp; cmdiocbq->context2 = cmp;
cmdiocbq->context3 = bmp; cmdiocbq->context3 = bmp;
cmdiocbq->context_un.ndlp = ndlp;
dd_data->type = TYPE_IOCB; dd_data->type = TYPE_IOCB;
dd_data->set_job = job; dd_data->set_job = job;
dd_data->context_un.iocb.cmdiocbq = cmdiocbq; dd_data->context_un.iocb.cmdiocbq = cmdiocbq;
@ -1508,6 +1520,7 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag,
ctiocb->context1 = dd_data; ctiocb->context1 = dd_data;
ctiocb->context2 = cmp; ctiocb->context2 = cmp;
ctiocb->context3 = bmp; ctiocb->context3 = bmp;
ctiocb->context_un.ndlp = ndlp;
ctiocb->iocb_cmpl = lpfc_issue_ct_rsp_cmp; ctiocb->iocb_cmpl = lpfc_issue_ct_rsp_cmp;
dd_data->type = TYPE_IOCB; dd_data->type = TYPE_IOCB;

3
drivers/scsi/lpfc/lpfc_sli.c
View File

@ -927,8 +927,7 @@ __lpfc_sli_get_sglq(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq)
} else if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) && } else if ((piocbq->iocb.ulpCommand == CMD_GEN_REQUEST64_CR) &&
!(piocbq->iocb_flag & LPFC_IO_LIBDFC)) !(piocbq->iocb_flag & LPFC_IO_LIBDFC))
ndlp = piocbq->context_un.ndlp; ndlp = piocbq->context_un.ndlp;
else if ((piocbq->iocb.ulpCommand == CMD_ELS_REQUEST64_CR) && else if (piocbq->iocb_flag & LPFC_IO_LIBDFC)
(piocbq->iocb_flag & LPFC_IO_LIBDFC))
ndlp = piocbq->context_un.ndlp; ndlp = piocbq->context_un.ndlp;
else else
ndlp = piocbq->context1; ndlp = piocbq->context1;