From nobody Wed Nov 5 17:41:33 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; 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 1496751608405926.2070738906094; Tue, 6 Jun 2017 05:20:08 -0700 (PDT) Received: from localhost ([::1]:38143 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIDSw-0003We-Ns for importer@patchew.org; Tue, 06 Jun 2017 08:20:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56987) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIDQy-0001wW-89 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 08:18:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIDQw-0005I1-Tc for qemu-devel@nongnu.org; Tue, 06 Jun 2017 08:18:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34524) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIDQw-0005Hp-LH for qemu-devel@nongnu.org; Tue, 06 Jun 2017 08:18:02 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE5A580C02; Tue, 6 Jun 2017 12:18:01 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-117-248.ams2.redhat.com [10.36.117.248]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v56CHmME003973; Tue, 6 Jun 2017 08:18:00 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com AE5A580C02 Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx02.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=pbonzini@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com AE5A580C02 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 6 Jun 2017 14:17:46 +0200 Message-Id: <20170606121747.25356-7-pbonzini@redhat.com> In-Reply-To: <20170606121747.25356-1-pbonzini@redhat.com> References: <20170606121747.25356-1-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Tue, 06 Jun 2017 12:18:01 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 6/7] 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: , Cc: zyy4013@stu.ouc.edu.cn, hare@suse.de, ppandit@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: 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 38e0a2f5ef..135662df31 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 2.13.0