mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

megasas: do not read SCSI req parameters more than once from frame

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-06-01 17:25:03 +02:00
parent 36c327a69d
commit b356807fcd
1 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
hw/scsi/megasas.c
View File

@ -1653,42 +1653,39 @@ static int megasas_handle_scsi(MegasasState *s, MegasasCmd *cmd,
int frame_cmd) int frame_cmd)
{ {
uint8_t *cdb; uint8_t *cdb;
int target_id, lun_id, cdb_len;
bool is_write; bool is_write;
struct SCSIDevice *sdev = NULL; struct SCSIDevice *sdev = NULL;
bool is_logical = (frame_cmd == MFI_CMD_LD_SCSI_IO); bool is_logical = (frame_cmd == MFI_CMD_LD_SCSI_IO);
cdb = cmd->frame->pass.cdb; cdb = cmd->frame->pass.cdb;
target_id = cmd->frame->header.target_id;
lun_id = cmd->frame->header.lun_id;
cdb_len = cmd->frame->header.cdb_len;
if (is_logical) { if (is_logical) {
if (cmd->frame->header.target_id >= MFI_MAX_LD || if (target_id >= MFI_MAX_LD || lun_id != 0) {
cmd->frame->header.lun_id != 0) {
trace_megasas_scsi_target_not_present( trace_megasas_scsi_target_not_present(
mfi_frame_desc[frame_cmd], is_logical, mfi_frame_desc[frame_cmd], is_logical, target_id, lun_id);
cmd->frame->header.target_id, cmd->frame->header.lun_id);
return MFI_STAT_DEVICE_NOT_FOUND; return MFI_STAT_DEVICE_NOT_FOUND;
} }
} }
sdev = scsi_device_find(&s->bus, 0, cmd->frame->header.target_id, sdev = scsi_device_find(&s->bus, 0, target_id, lun_id);
cmd->frame->header.lun_id);
cmd->iov_size = le32_to_cpu(cmd->frame->header.data_len); cmd->iov_size = le32_to_cpu(cmd->frame->header.data_len);
trace_megasas_handle_scsi(mfi_frame_desc[cmd->frame->header.frame_cmd],
trace_megasas_handle_scsi(mfi_frame_desc[frame_cmd], is_logical, trace_megasas_handle_scsi(mfi_frame_desc[frame_cmd], is_logical,
cmd->frame->header.target_id, target_id, lun_id, sdev, cmd->iov_size);
cmd->frame->header.lun_id, sdev, cmd->iov_size);
if (!sdev || (megasas_is_jbod(s) && is_logical)) { if (!sdev || (megasas_is_jbod(s) && is_logical)) {
trace_megasas_scsi_target_not_present( trace_megasas_scsi_target_not_present(
mfi_frame_desc[frame_cmd], is_logical, mfi_frame_desc[frame_cmd], is_logical, target_id, lun_id);
cmd->frame->header.target_id, cmd->frame->header.lun_id);
return MFI_STAT_DEVICE_NOT_FOUND; return MFI_STAT_DEVICE_NOT_FOUND;
} }
if (cmd->frame->header.cdb_len > 16) { if (cdb_len > 16) {
trace_megasas_scsi_invalid_cdb_len( trace_megasas_scsi_invalid_cdb_len(
mfi_frame_desc[frame_cmd], is_logical, mfi_frame_desc[frame_cmd], is_logical,
cmd->frame->header.target_id, cmd->frame->header.lun_id, target_id, lun_id, cdb_len);
cmd->frame->header.cdb_len);
megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE)); megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE));
cmd->frame->header.scsi_status = CHECK_CONDITION; cmd->frame->header.scsi_status = CHECK_CONDITION;
s->event_count++; s->event_count++;
@ -1702,12 +1699,10 @@ static int megasas_handle_scsi(MegasasState *s, MegasasCmd *cmd,
return MFI_STAT_SCSI_DONE_WITH_ERROR; return MFI_STAT_SCSI_DONE_WITH_ERROR;
} }
cmd->req = scsi_req_new(sdev, cmd->index, cmd->req = scsi_req_new(sdev, cmd->index, lun_id, cdb, cmd);
cmd->frame->header.lun_id, cdb, cmd);
if (!cmd->req) { if (!cmd->req) {
trace_megasas_scsi_req_alloc_failed( trace_megasas_scsi_req_alloc_failed(
mfi_frame_desc[frame_cmd], mfi_frame_desc[frame_cmd], target_id, lun_id);
cmd->frame->header.target_id, cmd->frame->header.lun_id);
megasas_write_sense(cmd, SENSE_CODE(NO_SENSE)); megasas_write_sense(cmd, SENSE_CODE(NO_SENSE));
cmd->frame->header.scsi_status = BUSY; cmd->frame->header.scsi_status = BUSY;
s->event_count++; s->event_count++;
@ -1736,35 +1731,33 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
uint8_t cdb[16]; uint8_t cdb[16];
int len; int len;
struct SCSIDevice *sdev = NULL; struct SCSIDevice *sdev = NULL;
int target_id, lun_id, cdb_len;
lba_count = le32_to_cpu(cmd->frame->io.header.data_len); lba_count = le32_to_cpu(cmd->frame->io.header.data_len);
lba_start_lo = le32_to_cpu(cmd->frame->io.lba_lo); lba_start_lo = le32_to_cpu(cmd->frame->io.lba_lo);
lba_start_hi = le32_to_cpu(cmd->frame->io.lba_hi); lba_start_hi = le32_to_cpu(cmd->frame->io.lba_hi);
lba_start = ((uint64_t)lba_start_hi << 32) | lba_start_lo; lba_start = ((uint64_t)lba_start_hi << 32) | lba_start_lo;
if (cmd->frame->header.target_id < MFI_MAX_LD && target_id = cmd->frame->header.target_id;
cmd->frame->header.lun_id == 0) { lun_id = cmd->frame->header.lun_id;
sdev = scsi_device_find(&s->bus, 0, cmd->frame->header.target_id, cdb_len = cmd->frame->header.cdb_len;
cmd->frame->header.lun_id);
if (target_id < MFI_MAX_LD && lun_id == 0) {
sdev = scsi_device_find(&s->bus, 0, target_id, lun_id);
} }
trace_megasas_handle_io(cmd->index, trace_megasas_handle_io(cmd->index,
mfi_frame_desc[frame_cmd], mfi_frame_desc[frame_cmd], target_id, lun_id,
cmd->frame->header.target_id,
cmd->frame->header.lun_id,
(unsigned long)lba_start, (unsigned long)lba_count); (unsigned long)lba_start, (unsigned long)lba_count);
if (!sdev) { if (!sdev) {
trace_megasas_io_target_not_present(cmd->index, trace_megasas_io_target_not_present(cmd->index,
mfi_frame_desc[frame_cmd], mfi_frame_desc[frame_cmd], target_id, lun_id);
cmd->frame->header.target_id, cmd->frame->header.lun_id);
return MFI_STAT_DEVICE_NOT_FOUND; return MFI_STAT_DEVICE_NOT_FOUND;
} }
if (cmd->frame->header.cdb_len > 16) { if (cdb_len > 16) {
trace_megasas_scsi_invalid_cdb_len( trace_megasas_scsi_invalid_cdb_len(
mfi_frame_desc[frame_cmd], 1, mfi_frame_desc[frame_cmd], 1, target_id, lun_id, cdb_len);
cmd->frame->header.target_id, cmd->frame->header.lun_id,
cmd->frame->header.cdb_len);
megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE)); megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE));
cmd->frame->header.scsi_status = CHECK_CONDITION; cmd->frame->header.scsi_status = CHECK_CONDITION;
s->event_count++; s->event_count++;
@ -1781,11 +1774,10 @@ static int megasas_handle_io(MegasasState *s, MegasasCmd *cmd, int frame_cmd)
megasas_encode_lba(cdb, lba_start, lba_count, is_write); megasas_encode_lba(cdb, lba_start, lba_count, is_write);
cmd->req = scsi_req_new(sdev, cmd->index, cmd->req = scsi_req_new(sdev, cmd->index,
cmd->frame->header.lun_id, cdb, cmd); lun_id, cdb, cmd);
if (!cmd->req) { if (!cmd->req) {
trace_megasas_scsi_req_alloc_failed( trace_megasas_scsi_req_alloc_failed(
mfi_frame_desc[frame_cmd], mfi_frame_desc[frame_cmd], target_id, lun_id);
cmd->frame->header.target_id, cmd->frame->header.lun_id);
megasas_write_sense(cmd, SENSE_CODE(NO_SENSE)); megasas_write_sense(cmd, SENSE_CODE(NO_SENSE));
cmd->frame->header.scsi_status = BUSY; cmd->frame->header.scsi_status = BUSY;
s->event_count++; s->event_count++;