From nobody Wed May 8 21:28:00 2024 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.zohomail.com; dkim=pass; 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; dmarc=pass(p=none dis=none) header.from=oracle.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1541608144432910.7151831013573; Wed, 7 Nov 2018 08:29:04 -0800 (PST) Received: from localhost ([::1]:49137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQhT-0005iT-4K for importer@patchew.org; Wed, 07 Nov 2018 11:29:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKQfb-0003OL-Et for qemu-devel@nongnu.org; Wed, 07 Nov 2018 11:27:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKQcQ-00037H-2U for qemu-devel@nongnu.org; Wed, 07 Nov 2018 11:23:55 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:35842) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKQcO-00034J-4k for qemu-devel@nongnu.org; Wed, 07 Nov 2018 11:23:48 -0500 Received: from pps.filterd (userp2120.oracle.com [127.0.0.1]) by userp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id wA7GJQuK161840; Wed, 7 Nov 2018 16:23:42 GMT Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp2120.oracle.com with ESMTP id 2nh4aqvda5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Nov 2018 16:23:42 +0000 Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id wA7GNfp8019420 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Nov 2018 16:23:41 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id wA7GNfBP011367; Wed, 7 Nov 2018 16:23:41 GMT Received: from dhcp-10-152-34-187.usdhcp.oraclecorp.com.com (/10.152.34.187) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Nov 2018 08:23:40 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=from : to : subject : date : message-id; s=corp-2018-07-02; bh=lz81Rm5VQzHq8aZYrOAroGYumhmJUW1Zy1FgdpICbrQ=; b=0+t0SOI3TgO41+36kvq3ZYiLgPaQiHVeMH6Z/NGWc56R3GnZWArUj7pVv72wX4C6YSc4 KKAx0idXeDxRbA9mkNX4MlC+WbF6VaGfDmby03qnRRBczA7xlxyZNOtGP+eV1ODA5IKQ ktZhE79mvWP2aSakIJtt0Z+bXkSDFR43IDW4jwSgqxlu41xYi3wUGsbOokLLLi6RA49L xjcOC26lBpOVjKeKVrF9ecRdmC+/JtdW3t6LuN8F+Ndd7jyZr018GE9/dk5/U4D4GXrZ jvz2tyB2q6AHUH2lciwQ+MERMSDhSm5fbtfhGXwLj/uVh9bRshSVopPgCdrUB/xM7tqO Lw== From: George Kennedy To: pbonzini@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, boris.ostrovsky@oracle.com Date: Wed, 7 Nov 2018 11:19:45 -0500 Message-Id: <1541607585-15570-1-git-send-email-george.kennedy@oracle.com> X-Mailer: git-send-email 1.8.3.1 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9070 signatures=668683 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=11 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=817 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811070147 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH v5] lsi: Reselection needed to remove pending commands from queue 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: pass (identity @oracle.com) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Under heavy IO (e.g. fio) the queue is not checked frequently enough for pending commands. As a result some pending commands are timed out by the linux sym53c8xx driver, which sends SCSI Abort messages for the timed out commands. The SCSI Abort messages result in linux errors, which show up on the console and in /var/log/messages. e.g. sd 0:0:3:0: [sdd] tag#33 ABORT operation started scsi target0:0:3: control msgout: 80 20 47 d sd 0:0:3:0: ABORT operation complete. scsi target0:0:4: message d sent on bad reselection When the current command completes, check if there is a pending command on the queue and if a pending command exists, set a flag indicating that a WAIT RESELECT command is needed to handle a queued pending command. When a WAIT RESELECT is needed, intercept and save the current DMA Scripts Ptr (DSP) contents following a WAIT DISCONNECT Script instruction and load the DSP instead with the pointer to the Reselection Scripts. When Reselection has completed, restore the original DSP contents. Signed-off-by: George Kennedy --- Thanks Paolo, Sorry for missing your suggested fix. I believe the Script intercept is now being done as you had suggested. hw/scsi/lsi53c895a.c | 52 +++++++++++++++++++++++++++++++++++++++++-------= ---- 1 file changed, 41 insertions(+), 11 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index d1e6534..7fb8ddc 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -219,6 +219,8 @@ typedef struct { int command_complete; QTAILQ_HEAD(, lsi_request) queue; lsi_request *current; + bool want_resel; /* need resel to handle queued completed cmds */ + uint32_t resel_dsp; /* DMA Scripts Ptr (DSP) of reselection scsi scrip= ts */ =20 uint32_t dsa; uint32_t temp; @@ -298,6 +300,18 @@ static inline int lsi_irq_on_rsl(LSIState *s) return (s->sien0 & LSI_SIST0_RSL) && (s->scid & LSI_SCID_RRE); } =20 +static lsi_request *get_pending_req(LSIState *s) +{ + lsi_request *p; + + QTAILQ_FOREACH(p, &s->queue, next) { + if (p->pending) { + return p; + } + } + return NULL; +} + static void lsi_soft_reset(LSIState *s) { trace_lsi_reset(); @@ -446,7 +460,6 @@ static void lsi_update_irq(LSIState *s) { int level; static int last_level; - lsi_request *p; =20 /* It's unclear whether the DIP/SIP bits should be cleared when the Interrupt Status Registers are cleared or when istat0 is read. @@ -477,12 +490,12 @@ static void lsi_update_irq(LSIState *s) lsi_set_irq(s, level); =20 if (!level && lsi_irq_on_rsl(s) && !(s->scntl1 & LSI_SCNTL1_CON)) { + lsi_request *p; + trace_lsi_update_irq_disconnected(); - QTAILQ_FOREACH(p, &s->queue, next) { - if (p->pending) { - lsi_reselect(s, p); - break; - } + p =3D get_pending_req(s); + if (p) { + lsi_reselect(s, p); } } } @@ -759,6 +772,8 @@ static void lsi_command_complete(SCSIRequest *req, uint= 32_t status, size_t resid lsi_request_free(s, s->current); scsi_req_unref(req); } + s->want_resel =3D get_pending_req(s) ? true : false; + lsi_resume_script(s); } =20 @@ -1064,11 +1079,13 @@ static void lsi_wait_reselect(LSIState *s) =20 trace_lsi_wait_reselect(); =20 - QTAILQ_FOREACH(p, &s->queue, next) { - if (p->pending) { - lsi_reselect(s, p); - break; - } + if (s->current) { + return; + } + + p =3D get_pending_req(s); + if (p) { + lsi_reselect(s, p); } if (s->current =3D=3D NULL) { s->waiting =3D 1; @@ -1082,6 +1099,7 @@ static void lsi_execute_script(LSIState *s) uint32_t addr, addr_high; int opcode; int insn_processed =3D 0; + uint32_t save_dsp =3D 0; =20 s->istat1 |=3D LSI_ISTAT1_SRUN; again: @@ -1258,9 +1276,21 @@ again: case 1: /* Disconnect */ trace_lsi_execute_script_io_disconnect(); s->scntl1 &=3D ~LSI_SCNTL1_CON; + if (s->want_resel && s->resel_dsp) { + save_dsp =3D s->dsp; + s->dsp =3D s->resel_dsp; + s->want_resel =3D false; + } break; case 2: /* Wait Reselect */ + if (!s->resel_dsp) { + s->resel_dsp =3D s->dsp - 8; + } if (!lsi_irq_on_rsl(s)) { + if (save_dsp) { + s->dsp =3D save_dsp; + save_dsp =3D 0; + } lsi_wait_reselect(s); } break; --=20 1.8.3.1