From nobody Thu Nov 6 08:32:58 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; dkim=fail spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497524246856804.316845658479; Thu, 15 Jun 2017 03:57:26 -0700 (PDT) Received: from localhost ([::1]:53142 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSSr-000310-Ck for importer@patchew.org; Thu, 15 Jun 2017 06:57:25 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40832) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLSP0-0008E8-Iz for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLSOz-0007Xz-FO for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:26 -0400 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:33445) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLSOz-0007Xl-61 for qemu-devel@nongnu.org; Thu, 15 Jun 2017 06:53:25 -0400 Received: by mail-wr0-x243.google.com with SMTP id x23so2767556wrb.0 for ; Thu, 15 Jun 2017 03:53:24 -0700 (PDT) Received: from 640k.lan (94-39-191-51.adsl-ull.clienti.tiscali.it. [94.39.191.51]) by smtp.gmail.com with ESMTPSA id f21sm3258597wra.5.2017.06.15.03.53.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 15 Jun 2017 03:53:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references; bh=QG3dh/HZq48i248ECw/JIWdlVw725aNNkfwPADGT6ns=; b=HyjyeDZQ68sEUUQAvDeNm9BmNQm9OLY0watKrwbESBtI1q7pMneFoGc7pQeA58RUC+ 6tUq9R201eKfty3Mfd8jt8otoN/qmnhaKUPVYGSzxbvQw9YNmLC62CxAs5du8MlROgd9 iNVuAEZfhsrn+uPF+yfIocMOR8TUs2WGKfIb+KCc478nYsIRiX+iYPj/vs+Qd4TxRQ2Y 4IUfKG5tRPzh3dD0OFxePJsA6aCKsy900aaKn9r6jOyUSa+lmv8LBon1JAL5zEqrPxOZ 7y59vSYl2okNSyk2PgS+9H87fdU6K+v7N3mgBHFt3PmCt9YvVvU9iPIzjg25UXhDOvDv FQRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=QG3dh/HZq48i248ECw/JIWdlVw725aNNkfwPADGT6ns=; b=kyq1nM+gOSOj+YKZbX3UOPPbIOYE5pkn2f7v2buOJS3ZkWhpp/PsWeZkcxQnnnwiYw cpwHdI5LiA077x5iA32FNgAOuhGVXKODjPAOtw8W4qYUU4yxL2N5+VVmQ4jKuEuYjea8 Y6QBa9yl0KBEzlCCj3up/XjYjbM0/GAVzWJOuezPRKuvPnLJsO15duiO7CQbY5OfbH+L 2b4bk3xufd8UkFSe91hchdbYKoZ8cveYlJgybhITOjgvyFOWnh+mrKJR/V8V+nvSyhZH XgG5mVrlJvwl14ToF5DuLH86uFdPZ0cIhh1/XWgXp93kDlMZ+g5uoKMyEtPhXqYkayAu EtxQ== X-Gm-Message-State: AKS2vOyEpF6dP030dvF1j9zgeL8wwbVWj6J2FTlRDgFop0yLAOaLuQMj Kgw2hUZHZLzEZ0lGqwU= X-Received: by 10.223.180.65 with SMTP id v1mr3061004wrd.126.1497524003878; Thu, 15 Jun 2017 03:53:23 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Thu, 15 Jun 2017 12:52:32 +0200 Message-Id: <1497523981-38449-13-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> References: <1497523981-38449-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 12/41] megasas: do not read SCSI req parameters more than once from frame X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- hw/scsi/megasas.c | 60 ++++++++++++++++++++++++---------------------------= ---- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 38e0a2f..135662d 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1653,42 +1653,39 @@ static int megasas_handle_scsi(MegasasState *s, Meg= asasCmd *cmd, int frame_cmd) { uint8_t *cdb; + int target_id, lun_id, cdb_len; bool is_write; struct SCSIDevice *sdev =3D NULL; bool is_logical =3D (frame_cmd =3D=3D MFI_CMD_LD_SCSI_IO); =20 cdb =3D cmd->frame->pass.cdb; + target_id =3D cmd->frame->header.target_id; + lun_id =3D cmd->frame->header.lun_id; + cdb_len =3D cmd->frame->header.cdb_len; =20 if (is_logical) { - if (cmd->frame->header.target_id >=3D MFI_MAX_LD || - cmd->frame->header.lun_id !=3D 0) { + if (target_id >=3D MFI_MAX_LD || lun_id !=3D 0) { trace_megasas_scsi_target_not_present( - mfi_frame_desc[frame_cmd], is_logical, - cmd->frame->header.target_id, cmd->frame->header.lun_id); + mfi_frame_desc[frame_cmd], is_logical, target_id, lun_id); return MFI_STAT_DEVICE_NOT_FOUND; } } - sdev =3D scsi_device_find(&s->bus, 0, cmd->frame->header.target_id, - cmd->frame->header.lun_id); + sdev =3D scsi_device_find(&s->bus, 0, target_id, lun_id); =20 cmd->iov_size =3D 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, - cmd->frame->header.target_id, - cmd->frame->header.lun_id, sdev, cmd->iov_si= ze); + target_id, lun_id, sdev, cmd->iov_size); =20 if (!sdev || (megasas_is_jbod(s) && is_logical)) { trace_megasas_scsi_target_not_present( - mfi_frame_desc[frame_cmd], is_logical, - cmd->frame->header.target_id, cmd->frame->header.lun_id); + mfi_frame_desc[frame_cmd], is_logical, target_id, lun_id); return MFI_STAT_DEVICE_NOT_FOUND; } =20 - if (cmd->frame->header.cdb_len > 16) { + if (cdb_len > 16) { trace_megasas_scsi_invalid_cdb_len( mfi_frame_desc[frame_cmd], is_logical, - cmd->frame->header.target_id, cmd->frame->header.lun_id, - cmd->frame->header.cdb_len); + target_id, lun_id, cdb_len); megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE)); cmd->frame->header.scsi_status =3D CHECK_CONDITION; s->event_count++; @@ -1702,12 +1699,10 @@ static int megasas_handle_scsi(MegasasState *s, Meg= asasCmd *cmd, return MFI_STAT_SCSI_DONE_WITH_ERROR; } =20 - cmd->req =3D scsi_req_new(sdev, cmd->index, - cmd->frame->header.lun_id, cdb, cmd); + cmd->req =3D scsi_req_new(sdev, cmd->index, lun_id, cdb, cmd); if (!cmd->req) { trace_megasas_scsi_req_alloc_failed( - mfi_frame_desc[frame_cmd], - cmd->frame->header.target_id, cmd->frame->header.lun_id); + mfi_frame_desc[frame_cmd], target_id, lun_id); megasas_write_sense(cmd, SENSE_CODE(NO_SENSE)); cmd->frame->header.scsi_status =3D BUSY; s->event_count++; @@ -1736,35 +1731,33 @@ static int megasas_handle_io(MegasasState *s, Megas= asCmd *cmd, int frame_cmd) uint8_t cdb[16]; int len; struct SCSIDevice *sdev =3D NULL; + int target_id, lun_id, cdb_len; =20 lba_count =3D le32_to_cpu(cmd->frame->io.header.data_len); lba_start_lo =3D le32_to_cpu(cmd->frame->io.lba_lo); lba_start_hi =3D le32_to_cpu(cmd->frame->io.lba_hi); lba_start =3D ((uint64_t)lba_start_hi << 32) | lba_start_lo; =20 - if (cmd->frame->header.target_id < MFI_MAX_LD && - cmd->frame->header.lun_id =3D=3D 0) { - sdev =3D scsi_device_find(&s->bus, 0, cmd->frame->header.target_id, - cmd->frame->header.lun_id); + target_id =3D cmd->frame->header.target_id; + lun_id =3D cmd->frame->header.lun_id; + cdb_len =3D cmd->frame->header.cdb_len; + + if (target_id < MFI_MAX_LD && lun_id =3D=3D 0) { + sdev =3D scsi_device_find(&s->bus, 0, target_id, lun_id); } =20 trace_megasas_handle_io(cmd->index, - mfi_frame_desc[frame_cmd], - cmd->frame->header.target_id, - cmd->frame->header.lun_id, + mfi_frame_desc[frame_cmd], target_id, lun_id, (unsigned long)lba_start, (unsigned long)lba_c= ount); if (!sdev) { trace_megasas_io_target_not_present(cmd->index, - mfi_frame_desc[frame_cmd], - cmd->frame->header.target_id, cmd->frame->header.lun_id); + mfi_frame_desc[frame_cmd], target_id, lun_id); return MFI_STAT_DEVICE_NOT_FOUND; } =20 - if (cmd->frame->header.cdb_len > 16) { + if (cdb_len > 16) { trace_megasas_scsi_invalid_cdb_len( - mfi_frame_desc[frame_cmd], 1, - cmd->frame->header.target_id, cmd->frame->header.lun_id, - cmd->frame->header.cdb_len); + mfi_frame_desc[frame_cmd], 1, target_id, lun_id, cdb_len); megasas_write_sense(cmd, SENSE_CODE(INVALID_OPCODE)); cmd->frame->header.scsi_status =3D CHECK_CONDITION; s->event_count++; @@ -1781,11 +1774,10 @@ static int megasas_handle_io(MegasasState *s, Megas= asCmd *cmd, int frame_cmd) =20 megasas_encode_lba(cdb, lba_start, lba_count, is_write); cmd->req =3D scsi_req_new(sdev, cmd->index, - cmd->frame->header.lun_id, cdb, cmd); + lun_id, cdb, cmd); if (!cmd->req) { trace_megasas_scsi_req_alloc_failed( - mfi_frame_desc[frame_cmd], - cmd->frame->header.target_id, cmd->frame->header.lun_id); + mfi_frame_desc[frame_cmd], target_id, lun_id); megasas_write_sense(cmd, SENSE_CODE(NO_SENSE)); cmd->frame->header.scsi_status =3D BUSY; s->event_count++; --=20 1.8.3.1