From nobody Thu May 2 14:09:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1629931390; cv=none; d=zohomail.com; s=zohoarc; b=LZpNqvPln+5EzUksjrH6iSMml8eXhQVaJrFojkKKZOJYwAGHb8fUXSySZTQC3zZ5xJChJxHFPkQ7nMKI7MQhhE2aS0voGjEXfKtkKr2jeY03jLZF0zyq0DYtSQpKnPWx80Rxh/0WaFUQkMntLTZiMfkCucqVvmL9ayqoz856z5A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629931390; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=aNSpVfcKDwenCE4DzkUSIS6d8NXopGvNy2bA28mLtL4=; b=O6a/RkESQUcR30sAP+3/KJGQa9AX1eQrTcgTQZfOly6Jykr2RadXQQyIf4CKsNSLgk5GbEgnjmp8tanftk0OG/0W6JSnBrLkqLbZjKTOowwa83451Ebzj5J64l/haQUNvHNtFur9390fewtBrdon0u+6h1/kdro4Zx2UyZXOREA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1629931390701283.70649046732774; Wed, 25 Aug 2021 15:43:10 -0700 (PDT) Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-471-x_1PRJ2sMmOAYfBrt-HWzQ-1; Wed, 25 Aug 2021 18:43:06 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5-20020a1c00050000b02902e67111d9f0so197856wma.4 for ; Wed, 25 Aug 2021 15:43:06 -0700 (PDT) Return-Path: Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id d124sm807278wmd.2.2021.08.25.15.43.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 15:43:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629931389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aNSpVfcKDwenCE4DzkUSIS6d8NXopGvNy2bA28mLtL4=; b=iWBYljSUPtKfEl3yvpmz1jWQjkjbn/UQ437+iVgzMbJIL39z6xOOv7nntZd92Vt+j2ci+0 OASEjDmk9O+MQ3AKctg7SkI94dgUbSKLfC03ncUECLkH/SsolyjB1myNtW+MLNCE0KyKa/ RY0SBIP8jbHlYKPmK1IIWOlHAtSfIKA= X-MC-Unique: x_1PRJ2sMmOAYfBrt-HWzQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aNSpVfcKDwenCE4DzkUSIS6d8NXopGvNy2bA28mLtL4=; b=U0nT6cncEdAC90a5wpSnyJ2gLKo3Sr4PaR7u+ULGZ+2Axakuveo1WiVvvjrb48nwwj V6RXIPkYZ+FihBuY6ojcGgEG0sKZGOCxhpTBivZglGFcWZYHxL5sLaUmhoOVTyWZlaMz r57B0GIcp6h1Uw7mMRnThRwiuHRJpnqY99IkhCB3+oSMvu0bGi1Rg+h2QYJ/WNx1jP6m 9tDK1or5q6Kf4p1kIKRvommkP7PTWlzpQne4HTI7BpS3+UkRsfTSv4Nwi99LM8doWFWw laJhsuOuL/uo8Boc2vnyoTZwV+oi0aY73rhs4M1hj/bsSQV7ygOJ9f5ArErZvlqVovk4 zukA== X-Gm-Message-State: AOAM530TY+7mujCDtTyCgAKe3w4G33+PIZf6x3VZ1rM1Q5YjqohxSA13 gPKvU4btTOoNlekgP+qtno49N9HkYgynYndMQhtzGhp447Tw4ziA/WSpsopCe6/yU7iisGlp2t2 XL3CFVLiARjQ89A== X-Received: by 2002:a7b:c318:: with SMTP id k24mr673225wmj.144.1629931383851; Wed, 25 Aug 2021 15:43:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwgWzMwKrUBRd0Rf4tAxLWqGufF9NdoXi9Ce9RdkwK/QIAOc1yOYPie3CdZLHGSDLi8m2V8Rw== X-Received: by 2002:a7b:c318:: with SMTP id k24mr673212wmj.144.1629931383627; Wed, 25 Aug 2021 15:43:03 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jason Wang , Li Qiang , Stefan Hajnoczi , Paolo Bonzini , Qiuhao Li , Cornelia Huck , "Michael S. Tsirkin" , Alexander Bulekov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH] hw/virtio: Update vring after modifying its queue size Date: Thu, 26 Aug 2021 00:42:56 +0200 Message-Id: <20210825224256.1750286-1-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1629931391823100001 When a ring queue size is modified, we need to call virtio_queue_update_rings() to re-init the memory region caches. Otherwise the region might have outdated memory size, and later load/store access might trigger an assertion, such: qemu-system-i386: include/exec/memory_ldst_cached.h.inc:30: uint16_t addr= ess_space_lduw_le_cached(MemoryRegionCache *, hwaddr, MemTxAttrs, MemTxResu= lt *): Assertion `addr < cache->len && 2 <=3D cache->len - addr' failed. Thread 1 "qemu-system-i38" received signal SIGABRT, Aborted. 0x00007ffff4d312a2 in raise () from /lib64/libc.so.6 (gdb) bt #1 0x00007ffff4d1a8a4 in abort () at /lib64/libc.so.6 #4 0x0000555558f2b8ec in address_space_lduw_le_cached (cache=3D0x6130001= 0a7c0, addr=3D134, attrs=3D..., result=3D0x0) at include/exec/memory_ldst_c= ached.h.inc:30 #5 0x0000555558f2ac6b in lduw_le_phys_cached (cache=3D0x61300010a7c0, ad= dr=3D134) at include/exec/memory_ldst_phys.h.inc:67 #6 0x0000555558f2a3cd in virtio_lduw_phys_cached (vdev=3D0x62d00003a680,= cache=3D0x61300010a7c0, pa=3D134) at include/hw/virtio/virtio-access.h:166 #7 0x0000555558f300ea in vring_avail_ring (vq=3D0x7fffdd55d8a0, i=3D65) = at hw/virtio/virtio.c:326 #8 0x0000555558f33b10 in vring_get_used_event (vq=3D0x7fffdd55d8a0) at h= w/virtio/virtio.c:332 #9 0x0000555558f33677 in virtio_split_should_notify (vdev=3D0x62d00003a6= 80, vq=3D0x7fffdd55d8a0) at hw/virtio/virtio.c:2471 #10 0x0000555558f1859f in virtio_should_notify (vdev=3D0x62d00003a680, vq= =3D0x7fffdd55d8a0) at hw/virtio/virtio.c:2523 #11 0x0000555558f188cc in virtio_notify (vdev=3D0x62d00003a680, vq=3D0x7f= ffdd55d8a0) at hw/virtio/virtio.c:2565 #12 0x0000555557c2bd52 in virtio_input_handle_sts (vdev=3D0x62d00003a680,= vq=3D0x7fffdd55d8a0) at hw/input/virtio-input.c:100 #13 0x0000555558f16df7 in virtio_queue_notify (vdev=3D0x62d00003a680, n= =3D1) at hw/virtio/virtio.c:2363 #14 0x00005555583f45c0 in virtio_pci_notify_write (opaque=3D0x62d00003240= 0, addr=3D7, val=3D0, size=3D1) at hw/virtio/virtio-pci.c:1369 #15 0x0000555558b80b04 in memory_region_write_accessor (mr=3D0x62d0000331= 90, addr=3D7, value=3D0x7fffffff8eb0, size=3D1, shift=3D0, mask=3D255, attr= s=3D...) at softmmu/memory.c:492 Reported-by: Qiuhao Li Fixes: ab223c9518e ("virtio: allow virtio-1 queue layout") Resolves: https://gitlab.com/qemu-project/qemu/-/issues/302 BugLink: https://bugs.launchpad.net/qemu/+bug/1913510 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/virtio/virtio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 874377f37a7..04ffe5f420e 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -2255,6 +2255,7 @@ void virtio_queue_set_num(VirtIODevice *vdev, int n, = int num) return; } vdev->vq[n].vring.num =3D num; + virtio_queue_update_rings(vdev, n); } =20 VirtQueue *virtio_vector_first_queue(VirtIODevice *vdev, uint16_t vector) --=20 2.31.1