From nobody Tue Apr 30 13:32:26 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 1541628590562344.45126696833745; Wed, 7 Nov 2018 14:09:50 -0800 (PST) Received: from localhost ([::1]:51665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKW12-0005CA-Q5 for importer@patchew.org; Wed, 07 Nov 2018 17:09:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gKW00-0004ov-6x for qemu-devel@nongnu.org; Wed, 07 Nov 2018 17:08:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gKVzt-0006sB-B5 for qemu-devel@nongnu.org; Wed, 07 Nov 2018 17:08:29 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:50240) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gKVzs-0006dd-MN for qemu-devel@nongnu.org; Wed, 07 Nov 2018 17:08:25 -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 wA7M3qBD060762; Wed, 7 Nov 2018 22:08:20 GMT Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by userp2120.oracle.com with ESMTP id 2nh4aqx4xe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 07 Nov 2018 22:08:20 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id wA7M8Eaa032471 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 7 Nov 2018 22:08:14 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id wA7M8Erv016673; Wed, 7 Nov 2018 22:08:14 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 14:08:13 -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=2D6JeD4uKjOP3nqreQxoEqEs443q2T6mcn48CrtlG4c=; b=3R/tIGD/4RtKCiJGi4R6x3nPtIDULfF8Wq2rq4zjk5D9wAg5Ro6GCydWKdlQdKeJmd0J 1v90aX5PpYxa+65rdOHD7/EO279nWeTosmqkqEO3pSlLluMl4aeHvWiu0EdPFbRWE2ss J3BBB2zPR2aD+I1LvriglSjyEeC+YHi3dSmQaK4prNIvj2th1udngOXaS0LEd2+JUH48 zUwC8qHKrbCdQGjvRL0e0tXZ+QMgIa2dJcm7eRCcXDrU5k9uXfGxLABGBmC9ESPcXwbN EcTiicy5+yOs0i9DntAjtuKA+up4xfq3M9CLhp7ErtujR2YLB2ZDOVBD8UYZ3nTanW1n 4A== From: George Kennedy To: pbonzini@redhat.com, famz@redhat.com, qemu-devel@nongnu.org, boris.ostrovsky@oracle.com Date: Wed, 7 Nov 2018 17:04:47 -0500 Message-Id: <1541628287-11627-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=930 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1807170000 definitions=main-1811070195 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] X-Received-From: 156.151.31.85 Subject: [Qemu-devel] [PATCH v6] 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 call to lsi_wait_reselect() is needed to handle a queued pending command. The flag is checked following a WAIT DISCONNECT Script instruction and if set, lsi_wait_reselect() is called to handle a queued pending command. Signed-off-by: George Kennedy --- Thanks Paolo, Your latest suggestion was the "missing link". Calling lsi_wait_reselect() after a WAIT DISCONNECT Script instruction when there are commands on=20 the pending queue is all the is needed. The patch has been greatly reduced in size and complexity. hw/scsi/lsi53c895a.c | 43 ++++++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 11 deletions(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index d1e6534..7f9ed2f 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -219,6 +219,7 @@ typedef struct { int command_complete; QTAILQ_HEAD(, lsi_request) queue; lsi_request *current; + bool handle_pending; /* handle queued pending commands */ =20 uint32_t dsa; uint32_t temp; @@ -298,6 +299,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 +459,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 +489,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 +771,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->handle_pending =3D get_pending_req(s) ? true : false; + lsi_resume_script(s); } =20 @@ -1064,11 +1078,15 @@ 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; - } + s->handle_pending =3D false; + + 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; @@ -1258,6 +1276,9 @@ again: case 1: /* Disconnect */ trace_lsi_execute_script_io_disconnect(); s->scntl1 &=3D ~LSI_SCNTL1_CON; + if (s->handle_pending) { + lsi_wait_reselect(s); + } break; case 2: /* Wait Reselect */ if (!lsi_irq_on_rsl(s)) { --=20 1.8.3.1