From nobody Mon May 13 19:38:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1597504073; cv=none; d=zohomail.com; s=zohoarc; b=cawmke721q02CPq4e1ZnZknv5AAm1uuo9gV6rHYfJHpgaBDsTIocSDhoxtqJWRehl1skmcCO+eNmfCmxvxpMjVsWqYPWtHYSlIxwfBQl6aXalDpQWxLzcvfngkrJzi5jSFKCPasEiTVPvBaRE+T2Ar2kWYRxcLm71wWAgvO4USM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597504073; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=W4LN/xZpHEZmo9POvKUpY0DPWTuEFUi8n4lDp6jU9qE=; b=keIp0pQ9RCthvEpdip6/r9W12XL6LF6PhYlYHLvIH3MC71LdqAPa/OwRvwTCVTRbnW50Auu2kL2W5mTCDvCDgUNOtppF5El0izSktt+RTyJOHR7q74H6TTC9cM/RWusShq9e+8QURZ5jTHTKZ0Fyqji1pR7kOT5ziJ5aDeRVWaE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597504073446807.7527920205473; Sat, 15 Aug 2020 08:07:53 -0700 (PDT) Received: from localhost ([::1]:48542 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6xmi-0003rB-9D for importer@patchew.org; Sat, 15 Aug 2020 11:07:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50688) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6xlM-0002AJ-UM for qemu-devel@nongnu.org; Sat, 15 Aug 2020 11:06:28 -0400 Received: from mail-m9763.mail.163.com ([123.126.97.63]:41318) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6xlJ-0007SE-G0 for qemu-devel@nongnu.org; Sat, 15 Aug 2020 11:06:28 -0400 Received: from localhost.localdomain (unknown [115.204.244.155]) by smtp1 (Coremail) with SMTP id GdxpCgA3w4MF7zdfSkGDAA--.134S5; Sat, 15 Aug 2020 22:20:00 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=W4LN/xZpHEZmo9POvK UpY0DPWTuEFUi8n4lDp6jU9qE=; b=fT+8YfYnQtTwQsd4DquO1va4bVxxURMoGu /MPWtaRamd3ubLj2Wkh0H8A3s96HvUUa1ua0DyX+bgsUlMu43t+0kct9w9cffvTy umbN4rILS3URTKlD3FXXXKl4RPxwGxL1JjzyehlBPh+RRJRVuaemumuG/XD5pfXU xUrICPwjs= From: Li Qiang To: hare@suse.com, pbonzini@redhat.com, fam@euphon.net Subject: [PATCH 1/2] hw: megasas: return -1 when 'megasas_map_sgl' fails Date: Sat, 15 Aug 2020 07:19:39 -0700 Message-Id: <20200815141940.44025-2-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200815141940.44025-1-liq3ea@163.com> References: <20200815141940.44025-1-liq3ea@163.com> X-CM-TRANSID: GdxpCgA3w4MF7zdfSkGDAA--.134S5 X-Coremail-Antispam: 1Uf129KBjvdXoW7JF4DZrWrWrW8XrW3uryxuFg_yoWDuFc_Aw 1093WkJr47Zr47J3sYqw1jyr12qwnrXFyDAr4aqasxAw13GasrGw4DX39rZFWkCw48urs8 twnayrZxAws5WjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU1b18JUUUUU== X-Originating-IP: [115.204.244.155] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBoRGBbVQHLOqJ+AAAs4 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=123.126.97.63; envelope-from=liq3ea@163.com; helo=mail-m9763.mail.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/15 03:37:13 X-ACL-Warn: Detected OS = Linux 3.1-3.10 X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" The caller of 'megasas_map_sgl' will only check if the return is zero or not. If it return 0 it means success, as in the next patch we will consider 'iov_count=3D0' is an error, so let's return -1 to indicate a failure. Signed-off-by: Li Qiang --- hw/scsi/megasas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 5cfd1bf22e..d6c9680c36 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -281,7 +281,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd = *cmd, union mfi_sgl *sgl) if (iov_count > MEGASAS_MAX_SGE) { trace_megasas_iovec_sgl_overflow(cmd->index, iov_count, MEGASAS_MAX_SGE); - return iov_count; + return -1; } pci_dma_sglist_init(&cmd->qsg, PCI_DEVICE(s), iov_count); for (i =3D 0; i < iov_count; i++) { @@ -311,7 +311,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd = *cmd, union mfi_sgl *sgl) return 0; unmap: qemu_sglist_destroy(&cmd->qsg); - return iov_count - i; + return -1; } =20 /* --=20 2.17.1 From nobody Mon May 13 19:38:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=163.com ARC-Seal: i=1; a=rsa-sha256; t=1597505128; cv=none; d=zohomail.com; s=zohoarc; b=jsBUFNxFpUxKcAH1qOGKec6flqelx/1DycSs7Xb8ogtlnIJ9Fvb6k2U5TAUutd69rtNAL3/uGIv4xXaqAkg7C2pcHxfiHGoJS8Wnwa52vP/MzsrgdIwtD4NSqBo/hER9taE2pLsApcQvSF0VpCpkTDsPwIcRhG8j3A8TOHgRrXw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1597505128; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=q3vzNOSRd+lMhnoEh3YEXZ1Y413ZtAnFXeZsmgnFmVo=; b=eLRoh1i7XbX85TLXBJqx288zISFQ8UpUbpVBQ2TFPWK4/tx+OoajHm92aCebMhCMPf3+cZ7EkAfUUlYSY0qlL3rW10pSSBXrZOxkOXOoyar175BvbpU5rATR4/wDJggq7ElhyFC7xXdAu4w5YKN/2h5RY0bKcsHFVmfhqD9Q52I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1597505127973397.28006941129684; Sat, 15 Aug 2020 08:25:27 -0700 (PDT) Received: from localhost ([::1]:57644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6y3i-0005t4-Qo for importer@patchew.org; Sat, 15 Aug 2020 11:25:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k6y0X-00010p-Oc; Sat, 15 Aug 2020 11:22:09 -0400 Received: from m12-16.163.com ([220.181.12.16]:33856) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k6y0S-0002gv-3U; Sat, 15 Aug 2020 11:22:09 -0400 Received: from localhost.localdomain (unknown [115.204.244.155]) by smtp1 (Coremail) with SMTP id GdxpCgA3w4MF7zdfSkGDAA--.134S6; Sat, 15 Aug 2020 22:20:06 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=q3vzNOSRd+lMhnoEh3 YEXZ1Y413ZtAnFXeZsmgnFmVo=; b=dMWk640tgwuJlwFyl7xRPbQObRHRkQOuxQ fbf9mCzkLvXRPPN3hEMRKC6ZX6cR5WDm2RKlYZ8mon++O392gj1ffEMR5i6L2krd Q7ylYRZbXdHflFWxvGGYvDhgzDTnQqA0So7/xkLrmKNlXiPj42KKh761YQFprY1t HrMnlyxAc= From: Li Qiang To: hare@suse.com, pbonzini@redhat.com, fam@euphon.net Subject: [PATCH 2/2] hw: megasas: consider 'iov_count=0' is an error in megasas_map_sgl Date: Sat, 15 Aug 2020 07:19:40 -0700 Message-Id: <20200815141940.44025-3-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200815141940.44025-1-liq3ea@163.com> References: <20200815141940.44025-1-liq3ea@163.com> X-CM-TRANSID: GdxpCgA3w4MF7zdfSkGDAA--.134S6 X-Coremail-Antispam: 1Uf129KBjvdXoW7XF4rWr47GF4DJrWrurWrGrg_yoWkCwc_Cw 1kX397XF4qqr4IgrySkrsxAr1IgwnFvFyDArsaq3srAw1xta4xKa1DZ340van3J39ruFn8 GrZaqrZxArs8ZjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8leHDUUUUU== X-Originating-IP: [115.204.244.155] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBoRaBbVQHLOqKKQAAst Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=220.181.12.16; envelope-from=liq3ea@163.com; helo=m12-16.163.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/15 04:08:01 X-ACL-Warn: Detected OS = Linux 3.1-3.10 [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org, qemu-block@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @163.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently in 'megasas_map_sgl' when 'iov_count=3D0' will just return success however the 'cmd' doens't contain any iov. This will cause the assert in 'scsi_dma_complete' failed. This is because in 'dma_blk_cb' the 'dbs->sg_cur_index =3D=3D dbs->sg->nsg' will be true and just call 'dma_complete'. However now there is no aiocb returned. This fixes the LP#1878263: -->https://bugs.launchpad.net/qemu/+bug/1878263 Reported-by: Alexander Bulekov Signed-off-by: Li Qiang --- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index d6c9680c36..9562c58a2d 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -278,7 +278,7 @@ static int megasas_map_sgl(MegasasState *s, MegasasCmd = *cmd, union mfi_sgl *sgl) =20 cmd->flags =3D le16_to_cpu(cmd->frame->header.flags); iov_count =3D cmd->frame->header.sge_count; - if (iov_count > MEGASAS_MAX_SGE) { + if (!iov_count || iov_count > MEGASAS_MAX_SGE) { trace_megasas_iovec_sgl_overflow(cmd->index, iov_count, MEGASAS_MAX_SGE); return -1; --=20 2.17.1