From nobody Fri May 3 08:12:09 2024 Delivered-To: importer2@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+importer2=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1623479964; cv=none; d=zohomail.com; s=zohoarc; b=Lyw6Q9fKJB70ngW7G4mvrDQy3/1/kja9MCrDaR0tOKXXqM6tiTXRIuV/rI3D8yK3l9lzE0Muta1Adgrdt1mEoZZ0HiKWleHqQ49f+WQTxgSn5xMrlTXmO9VXoyM24r3cQS5UocNW9Ny6cB0/bv4wqmzHICTML4RNZDqmqPiE/Mo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1623479964; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=gAlr+CPeUFoaZex5yQVMUJrwDV7ksXMkHqnC+rl+/mI=; b=BULfz2KRr5UrW+XLP9XcbmXy20i8boI4UDX6XkiBg2UFz3LHLM+SV0a6qhYfUeHcdDOPrHPcOHkQ4+LeWW+jza4A/toG9BKkgpm73nhTY13bjKQmr3kgIZ3hObxJSURMnJDKN5DT9gyY1dS8TqClzfBqx5mYhk00iH7igMCfXYU= 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+importer2=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1623479964549155.04402337444105; Fri, 11 Jun 2021 23:39:24 -0700 (PDT) Received: from localhost ([::1]:37288 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lrxIh-00010g-4j for importer2@patchew.org; Sat, 12 Jun 2021 02:39:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42054) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lrx4f-00052K-JW for qemu-devel@nongnu.org; Sat, 12 Jun 2021 02:24:53 -0400 Received: from mail-ot1-x329.google.com ([2607:f8b0:4864:20::329]:42571) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lrx4d-0001uZ-EY for qemu-devel@nongnu.org; Sat, 12 Jun 2021 02:24:53 -0400 Received: by mail-ot1-x329.google.com with SMTP id w23-20020a9d5a970000b02903d0ef989477so5397505oth.9 for ; Fri, 11 Jun 2021 23:24:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=gAlr+CPeUFoaZex5yQVMUJrwDV7ksXMkHqnC+rl+/mI=; b=MAxnJApUKh7w1B9WlrZR74SbwxcoETUJURedE4PfJDz4abZ2Y0E5MhsWVsKzrOgm0U RJV0Omws+0LAqdYN6R90Uw3tWQ9+Lk6mB1Mnb+i9F/Z/Bu/WOZMYJFwbeuiJaqeerqas IrOf2V5riz/jPqU7HDXV5tNTwHDYRjiYVl6II4jHRZAXh4iCsmkVi3FAnNkC8RS2p76B PPv0g7SZNhCxUsMuRt7+3id7WCA1gzA+6Wjzits6pIv/eF8JBsY2MYhHuIL0TzN/5306 GbxX80EC8fxTzZBJxXCc6w+SCTEZx2TIo6FFx0/qabDP8SrrBY4rTsx+Iz0ZQ2YuBozN vCRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=gAlr+CPeUFoaZex5yQVMUJrwDV7ksXMkHqnC+rl+/mI=; b=bGm23EWnriw/xsXjsJENWnN8mjcfwvuK5gUNBXx3diDF8l5k/Cs2S3Ax6e2oOSfAYn RS6Oxa+VHHkylx1r3Ckk99TCCvjTbeurGnJdxEGSctoosLS15NRMbrLeaK6navSS+BLy 74S4PlP171w4W3k1xyjDb4T0WHpkushue4fd0br31LY7lRMQQtxDNiaOSZu+clBwda1+ FuSFzRvA4pMxkk3UtlCwPn7CjhuBTntl3ZPS7r7izd2mV4yukG9eTD10uK0SUBlURcgu zmN3TT3AWP/CsLmcJVrhSfeZGPxnN0FjY7XQ2uBwz76F7+OHXAMnVoaRwYnfvF5UJzdo jfhw== X-Gm-Message-State: AOAM530HbCmENwbboz/NowiXK7nuzOlePcVdl5lVywaT4IxZ72L9DW3E 309HPsScrECfk4NnA6VSGU5AcKd3TG+LkMXKhjuyfqrovrt+yA== X-Google-Smtp-Source: ABdhPJyKQZsQUJ8hujxGcLnGAMY0uPPOEK/UtMfHDCGOVJ1iTK6AXYi+1hO/9PqA2thU0oRNAoENg3oCPQ39WZrhWo8= X-Received: by 2002:a9d:3e5:: with SMTP id f92mr5844724otf.181.1623479089837; Fri, 11 Jun 2021 23:24:49 -0700 (PDT) MIME-Version: 1.0 From: Liu Cyrus Date: Sat, 12 Jun 2021 14:24:38 +0800 Message-ID: Subject: [PATCH] Fix assertion failure in lsi53c810 emulator To: qemu-devel@nongnu.org Content-Type: multipart/alternative; boundary="00000000000073387505c48baed6" 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+importer2=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::329; envelope-from=cyruscyliu@gmail.com; helo=mail-ot1-x329.google.com 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, HTML_MESSAGE=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-Mailman-Approved-At: Sat, 12 Jun 2021 02:38:24 -0400 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: , Errors-To: qemu-devel-bounces+importer2=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable --00000000000073387505c48baed6 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 RnJvbTogY3lydXNjeWxpdSA8Y3lydXNjeWxpdUBnbWFpbC5jb20+CgpBbiBhc3NlcnRpb24gZmFp bHVyZSBjYW4gYmUgdHJpZ2dlcmVkIGluIHRoZSBsc2k1M2M4MTAgZW11bGF0b3IgYnkgYSBndWVz dAp3aGVuICgocy0+c3N0YXQxICYgMHg3KSA9M0Q9M0QgUEhBU0VfRE8pIHx8IChzLT5zc3RhdDEg JiAweDcpID0zRD0zRCBQSEFTRV89CkRJKSkgJiYKKCFzLT5jdXJyZW50KSBob2xkcy4KQ2hlY2sg cy0+c3N0YXQxIGFuZCBzLT5jdXJyZW50IGluIGxzaV9yZWdfd3JpdGViIGJlZm9yZSBsc2lfZXhl Y3V0ZV9zY3JpcHQoKQp0byBkaXNjYXJkIHRoaXMgTU1JTyB3cml0ZS4KCkZpeGVzOiA3ZDg0MDZi ZTY5Y2UgKCJQQ0kgU0NTSSBIQkEgZW11bGF0aW9uLiIpClJlc29sdmVzOiBodHRwczovL2dpdGxh Yi5jb20vcWVtdS1wcm9qZWN0L3FlbXUvLS9pc3N1ZXMvMzA1CkJ1Z2xpbms6IGh0dHBzOi8vYnVn cy5sYXVuY2hwYWQubmV0L3FlbXUvK2J1Zy8xOTA4NTE1ClNpZ25lZC1vZmYtYnk6IGN5cnVzY3ls aXUgPGN5cnVzY3lsaXVAZ21haWwuY29tPgotLS0KIGh3L3Njc2kvbHNpNTNjODk1YS5jIHwgMTgg KysrKysrKysrKysrKysrKy0tCiAxIGZpbGUgY2hhbmdlZCwgMTYgaW5zZXJ0aW9ucygrKSwgMiBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9ody9zY3NpL2xzaTUzYzg5NWEuYyBiL2h3L3Njc2kv bHNpNTNjODk1YS5jCmluZGV4IGUyYzE5MTguLjVjMDhmN2YgMTAwNjQ0Ci0tLSBhL2h3L3Njc2kv bHNpNTNjODk1YS5jCisrKyBiL2h3L3Njc2kvbHNpNTNjODk1YS5jCkBAIC0xOTE5LDYgKzE5MTks MTAgQEAgc3RhdGljIHZvaWQgbHNpX3JlZ193cml0ZWIoTFNJU3RhdGUgKnMsIGludCBvZmZzZXQs CnVpbnQ4X3QgdmFsKQogICAgICAgICAgICAgbHNpX3VwZGF0ZV9pcnEocyk7CiAgICAgICAgIH0K ICAgICAgICAgaWYgKHMtPndhaXRpbmcgPTNEPTNEIExTSV9XQUlUX1JFU0VMRUNUICYmIHZhbCAm IExTSV9JU1RBVDBfU0lHUCkgeworICAgICAgICAgICAgaWYgKCEoKCgoKHMtPnNzdGF0MSAmIDB4 NykgPTNEPTNEIFBIQVNFX0RPKQorICAgICAgICAgICAgICAgICAgICB8fCAocy0+c3N0YXQxICYg MHg3KSA9M0Q9M0QgUEhBU0VfREkpKQorICAgICAgICAgICAgICAgICAgICAmJiBzLT5jdXJyZW50 KSkKKyAgICAgICAgICAgICAgICBicmVhazsKICAgICAgICAgICAgIHRyYWNlX2xzaV9hd29rZW4o KTsKICAgICAgICAgICAgIHMtPndhaXRpbmcgPTNEIExTSV9OT1dBSVQ7CiAgICAgICAgICAgICBz LT5kc3AgPTNEIHMtPmRuYWQ7CkBAIC0xOTgwLDggKzE5ODQsMTMgQEAgc3RhdGljIHZvaWQgbHNp X3JlZ193cml0ZWIoTFNJU3RhdGUgKnMsIGludCBvZmZzZXQsCnVpbnQ4X3QgdmFsKQogICAgICAg ICAgKiBpbnN0cnVjdGlvbi4gIElzIHRoaXMgY29ycmVjdD8KICAgICAgICAgICovCiAgICAgICAg IGlmICgocy0+ZG1vZGUgJiBMU0lfRE1PREVfTUFOKSA9M0Q9M0QgMAotICAgICAgICAgICAgJiYg KHMtPmlzdGF0MSAmIExTSV9JU1RBVDFfU1JVTikgPTNEPTNEIDApCisgICAgICAgICAgICAgICAg JiYgKHMtPmlzdGF0MSAmIExTSV9JU1RBVDFfU1JVTikgPTNEPTNEIDApIHsKKyAgICAgICAgICAg IGlmICghKCgoKChzLT5zc3RhdDEgJiAweDcpID0zRD0zRCBQSEFTRV9ETykKKyAgICAgICAgICAg ICAgICAgICAgfHwgKHMtPnNzdGF0MSAmIDB4NykgPTNEPTNEIFBIQVNFX0RJKSkKKyAgICAgICAg ICAgICAgICAgICAgJiYgcy0+Y3VycmVudCkpCisgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAg ICAgICAgICBsc2lfZXhlY3V0ZV9zY3JpcHQocyk7CisgICAgICAgIH0KICAgICAgICAgYnJlYWs7 CiAgICAgQ0FTRV9TRVRfUkVHMzIoZHNwcywgMHgzMCkKICAgICBDQVNFX1NFVF9SRUczMihzY3Jh dGNoWzBdLCAweDM0KQpAQCAtMjAwMSw4ICsyMDEwLDEzIEBAIHN0YXRpYyB2b2lkIGxzaV9yZWdf d3JpdGViKExTSVN0YXRlICpzLCBpbnQgb2Zmc2V0LAp1aW50OF90IHZhbCkKICAgICAgICAgICog RklYTUU6IGlmIHMtPndhaXRpbmcgIT0zRCBMU0lfTk9XQUlULCB0aGlzIHdpbGwgb25seSBleGVj dXRlIG9uZQogICAgICAgICAgKiBpbnN0cnVjdGlvbi4gIElzIHRoaXMgY29ycmVjdD8KICAgICAg ICAgICovCi0gICAgICAgIGlmICgodmFsICYgTFNJX0RDTlRMX1NURCkgJiYgKHMtPmlzdGF0MSAm IExTSV9JU1RBVDFfU1JVTikgPTNEPTNEID0KMCkKKyAgICAgICAgaWYgKCh2YWwgJiBMU0lfRENO VExfU1REKSAmJiAocy0+aXN0YXQxICYgTFNJX0lTVEFUMV9TUlVOKSA9M0Q9M0QgPQowKSB7Cisg ICAgICAgICAgICBpZiAoISgoKCgocy0+c3N0YXQxICYgMHg3KSA9M0Q9M0QgUEhBU0VfRE8pCisg ICAgICAgICAgICAgICAgICAgIHx8IChzLT5zc3RhdDEgJiAweDcpID0zRD0zRCBQSEFTRV9ESSkp CisgICAgICAgICAgICAgICAgICAgICYmIHMtPmN1cnJlbnQpKQorICAgICAgICAgICAgICAgIGJy ZWFrOwogICAgICAgICAgICAgbHNpX2V4ZWN1dGVfc2NyaXB0KHMpOworICAgICAgICB9CiAgICAg ICAgIGJyZWFrOwogICAgIGNhc2UgMHg0MDogLyogU0lFTjAgKi8KICAgICAgICAgcy0+c2llbjAg PTNEIHZhbDsKLS0KMi43LjQKCkhpIGZvbGtzLCB0aGlzIGlzIGEgc3VnZ2VzdGlvbiBmb3IgZml4 aW5nIHRoaXMgYnVnLgpJJ20gd2lsbGluZyB0byBkaXNjdXNzIHRoaXMgd2l0aCB5b3UgYmVjYXVz ZSBJJ20gbmV3IHRvIGNvbnRyaWJ1dGUgdG8gUUVNVS4KCkJlc3QsClFpYW5nIExpdQ== --00000000000073387505c48baed6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
From: cyruscyliu <cyruscyliu@gmail.com>

An assertion failure can= be triggered in the lsi53c810 emulator by a guest
when ((s->s= stat1 & 0x7) =3D=3D PHASE_DO) || (s->sstat1 & 0x7) =3D=3D PHASE_= DI)) && (!s->current) holds.
Check s->sstat1 and s-= >current in lsi_reg_writeb before=20 lsi_execute_script()
to discard this MMIO write.

Fi= xes:=C2=A07d8406be69ce ("PCI SCSI HBA emulation.")
Resolves:= =C2=A0https:/= /gitlab.com/qemu-project/qemu/-/issues/305
Buglink:=C2=A0https://bugs.launchpad.net/q= emu/+bug/1908515
Signed-off-by: cyruscyliu <cyruscyliu@gmail.com>
---
=C2=A0hw/scsi/lsi= 53c895a.c | 18 ++++++++++++++++--
=C2=A01 file changed, 16 insertions(+)= , 2 deletions(-)

diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c8= 95a.c
index e2c1918..5c08f7f 100644
--- a/hw/scsi/lsi53c895a.c
+++= b/hw/scsi/lsi53c895a.c
@@ -1919,6 +1919,10 @@ static void lsi_reg_write= b(LSIState *s, int offset, uint8_t val)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0lsi_update_irq(s);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}<= br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (s->waiting =3D=3D LSI_WAIT_RESE= LECT && val & LSI_ISTAT0_SIGP) {
+ =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0if (!(((((s->sstat1 & 0x7) =3D=3D PHASE_DO)
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|| (s-= >sstat1 & 0x7) =3D=3D PHASE_DI))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&& s->current))
+ = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
=C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0trace_lsi_awoken();
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0s->waiting =3D LSI_NOWAIT;
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0s->dsp =3D s->dnad;
@@ -1= 980,8 +1984,13 @@ static void lsi_reg_writeb(LSIState *s, int offset, uint8= _t val)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * instruction.=C2=A0 Is this = correct?
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0if ((s->dmode & LSI_DMODE_MAN) =3D=3D 0
- =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&& (s->istat1 & LSI_ISTAT1_SR= UN) =3D=3D 0)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&= amp;& (s->istat1 & LSI_ISTAT1_SRUN) =3D=3D 0) {
+ =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (!(((((s->sstat1 & 0x7) =3D=3D PHA= SE_DO)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0|| (s->sstat1 & 0x7) =3D=3D PHASE_DI))
+ =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&& s->curren= t))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0lsi_execute_script(s);
+= =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;=C2=A0 =C2=A0 =C2=A0CASE_SET_REG32(dsps, 0x30)
=C2=A0 =C2=A0 =C2=A0CAS= E_SET_REG32(scratch[0], 0x34)
@@ -2001,8 +2010,13 @@ static void lsi_reg= _writeb(LSIState *s, int offset, uint8_t val)
=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 * FIXME: if s->waiting !=3D LSI_NOWAIT, this will only execut= e one
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 * instruction.=C2=A0 Is this co= rrect?
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 */
- =C2=A0 =C2=A0 =C2=A0 = =C2=A0if ((val & LSI_DCNTL_STD) && (s->istat1 & LSI_ISTA= T1_SRUN) =3D=3D 0)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0if ((val & LSI_DCNTL= _STD) && (s->istat1 & LSI_ISTAT1_SRUN) =3D=3D 0) {
+ =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (!(((((s->sstat1 & 0x7) =3D= =3D PHASE_DO)
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0|| (s->sstat1 & 0x7) =3D=3D PHASE_DI))
+ =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0&& s->= ;current))
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0brea= k;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0lsi_execute_script(s)= ;
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0br= eak;
=C2=A0 =C2=A0 =C2=A0case 0x40: /* SIEN0 */
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0s->sien0 =3D val;
--
2.7.4

Hi folks, this is a= suggestion for fixing this bug.=C2=A0
I'm willing to discuss this with you= because I'm new to contribute to QEMU.

Best,
Qiang Liu
--00000000000073387505c48baed6--