From nobody Sat May 4 19:05:29 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.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 170.10.133.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=1629922201; cv=none; d=zohomail.com; s=zohoarc; b=ILIzizUcpDkimH8fE7wQbQse9JPV8agBpoOPacL9DOfmOQvhkJi7Okh8fEZXT7F8Ce7Q7p+2pYRLRQJcnFENHYCGqH4wH88Y1r7lwzhoo5zHNNR+2Gn7dgVcBT2KrmMeqsavJjXpvD/K5KisU6l+E/VFQp8gMzwYNKStWeC4uzc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1629922201; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=gswhgCUxLGQhQMBl1TrHPNJGF6IsmlnjsfrD38KQdnI=; b=HLjpcI35cxhQi/lPhhYQD7wnmgjPfZRp8dLAYMQACoI+QBGenDeFzIagCkrfocaDpqsJRiO7jAJxPCUynYzxaS8SpDSsqHBVrsMJJCJve9s0JxJp1PWB14Z/+0asHIyH2F4ugvUL3OIKsh6lal/kByoCsLFNgI+eF0RpX/lt+ZM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 170.10.133.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 [170.10.133.124]) by mx.zohomail.com with SMTPS id 1629922201444182.20344570640805; Wed, 25 Aug 2021 13:10:01 -0700 (PDT) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-204--4Mur3eeO_m4AJ8FUZtYZw-1; Wed, 25 Aug 2021 16:09:57 -0400 Received: by mail-wm1-f71.google.com with SMTP id m33-20020a05600c3b2100b002e87a0542efso188592wms.2 for ; Wed, 25 Aug 2021 13:09:57 -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 a77sm6484516wmd.31.2021.08.25.13.09.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Aug 2021 13:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629922200; 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=gswhgCUxLGQhQMBl1TrHPNJGF6IsmlnjsfrD38KQdnI=; b=IfHQ4nnlYGH0ZPje4RyuAIp7RnYD1bw68jJL5zB/+pZhnhP/UxA/CNRxGuvIqJ63m8AKzp KDep/Ihe+AxJKtUyX/50eefatKOCTddTeLZNniAhQd6G6O8zKs7ihTVIC7QNgleT8S0UeY RKKeHGZQxmyFQs4JlIeAJrnyW8htBpI= X-MC-Unique: -4Mur3eeO_m4AJ8FUZtYZw-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=gswhgCUxLGQhQMBl1TrHPNJGF6IsmlnjsfrD38KQdnI=; b=FqmNSmxk4mTz9nRipLhX2Nfx79Z8Qs30fVdVLAMvvXF6DGtGfReU3IZyUPfhXPCfeW E4QvBLQ6UgozIcay2l56tAfoNobLqwRFr3cdN8uo3NDfXpr+BnKaeP1acrTkDbOptFWK 2Bzpunm3fNEkElO8lpJSBWpU+KMaOx0FIfojftK/LjmxpP5tiF+WocjOvLvF9tFYht7/ QFsn4KOU4azlp7N3rg32v1eNnPTooL2jVloS7CbAQ+JuiaVJyY0FZEmrMIINq5fR06mH g8nqry1fS5l+/dObagBCdBmk0op34eo1KVPlJ4zCE+lelCtIldt/+lhT0Rm7B1Pa/0Yl zuAw== X-Gm-Message-State: AOAM531GUJeTUWIxwM66pNntiWp+HHB/wXp6Gq5CfFK9HmXLhvnZGq1d 4fanR7duk/pdsWKzKCNeTnI5ChbyOSXnClhg/yNpAxUPDgIAJT/4Lx4SMEBHXGxaalhv+HZ+Arb RJ+9fsb5U03zdGQ== X-Received: by 2002:a5d:4ccc:: with SMTP id c12mr20233252wrt.59.1629922195607; Wed, 25 Aug 2021 13:09:55 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxN1xvYlYCDwVV0CguAgfS04dwhD6EQaIB8In0HBKnRo9UNgcmjc0pNk1xs3S4/aQ9Z5azhMw== X-Received: by 2002:a5d:4ccc:: with SMTP id c12mr20233236wrt.59.1629922195400; Wed, 25 Aug 2021 13:09:55 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Jason Wang , Alexander Bulekov , Li Qiang , Qiuhao Li , Stefan Hajnoczi , "Michael S. Tsirkin" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Cheolwoo Myung Subject: [RFC PATCH] hw/virtio: Do not access vring cache if queue is not ready Date: Wed, 25 Aug 2021 22:09:53 +0200 Message-Id: <20210825200953.1684541-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: 1629922203781100001 Do not intent to access the vring MemoryRegion cache if the queue is not ready (no vring available). This fixes issue #301: qemu-system-i386: include/exec/memory_ldst_cached.h.inc:77: void address_= space_stw_le_cached(MemoryRegionCache *, hwaddr, uint16_t, MemTxAttrs, MemT= xResult *): Assertion `addr < cache->len && 2 <=3D cache->len - addr' failed. Thread 1 "qemu-system-i38" received signal SIGABRT, Aborted. (gdb) bt #1 0x00007ffff4d1a8a4 in abort () at /lib64/libc.so.6 #4 0x0000555558f2a122 in address_space_stw_le_cached (cache=3D0x61300010= bb70, addr=3D516, val=3D0, attrs=3D..., result=3D0x0) at include/exec/memor= y_ldst_cached.h.inc:77 #5 0x0000555558f2964c in stw_le_phys_cached (cache=3D0x61300010bb70, add= r=3D516, val=3D0) at include/exec/memory_ldst_phys.h.inc:109 #6 0x0000555558f28da8 in virtio_stw_phys_cached (vdev=3D0x62d00004e680, = cache=3D0x61300010bb70, pa=3D516, value=3D0) at include/hw/virtio/virtio-ac= cess.h:196 #7 0x0000555558f287dc in vring_set_avail_event (vq=3D0x7fff5d23e800, val= =3D0) at hw/virtio/virtio.c:428 #8 0x0000555558efabb7 in virtio_queue_split_set_notification (vq=3D0x7ff= f5d23e800, enable=3D1) at hw/virtio/virtio.c:437 #9 0x0000555558ef9f3c in virtio_queue_set_notification (vq=3D0x7fff5d23e= 800, enable=3D1) at hw/virtio/virtio.c:498 #10 0x0000555558c94786 in virtio_blk_handle_vq (s=3D0x62d00004e680, vq=3D= 0x7fff5d23e800) at hw/block/virtio-blk.c:795 #11 0x0000555558cb96c2 in virtio_blk_data_plane_handle_output (vdev=3D0x6= 2d00004e680, vq=3D0x7fff5d23e800) at hw/block/dataplane/virtio-blk.c:165 #12 0x0000555558f35937 in virtio_queue_notify_aio_vq (vq=3D0x7fff5d23e800= ) at hw/virtio/virtio.c:2323 #13 0x0000555558f264b3 in virtio_queue_host_notifier_aio_read (n=3D0x7fff= 5d23e87c) at hw/virtio/virtio.c:3532 #14 0x0000555559a9cd3e in aio_dispatch_handler (ctx=3D0x613000063000, nod= e=3D0x60d000008f40) at util/aio-posix.c:329 #15 0x0000555559a963ae in aio_dispatch_handlers (ctx=3D0x613000063000) at= util/aio-posix.c:372 #16 0x0000555559a95f82 in aio_dispatch (ctx=3D0x613000063000) at util/aio= -posix.c:382 and #302: 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: Cheolwoo Myung Reported-by: Qiuhao Li Resolves: https://gitlab.com/qemu-project/qemu/-/issues/301 BugLink: https://bugs.launchpad.net/qemu/+bug/1910941 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 --- Could be more readable to use virtio_queue_ready() RFC because I have no clue about this hot path code, I simply looked at the backtraces. --- hw/virtio/virtio.c | 82 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 66 insertions(+), 16 deletions(-) diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c index 874377f37a7..be1ec9e05ef 100644 --- a/hw/virtio/virtio.c +++ b/hw/virtio/virtio.c @@ -289,26 +289,38 @@ static VRingMemoryRegionCaches *vring_get_region_cach= es(struct VirtQueue *vq) /* Called within rcu_read_lock(). */ static inline uint16_t vring_avail_flags(VirtQueue *vq) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - hwaddr pa =3D offsetof(VRingAvail, flags); + VRingMemoryRegionCaches *caches; + hwaddr pa; =20 + if (unlikely(!vq->vring.avail)) { + return 0; + } + + caches =3D vring_get_region_caches(vq); if (!caches) { return 0; } =20 + pa =3D offsetof(VRingAvail, flags); return virtio_lduw_phys_cached(vq->vdev, &caches->avail, pa); } =20 /* Called within rcu_read_lock(). */ static inline uint16_t vring_avail_idx(VirtQueue *vq) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - hwaddr pa =3D offsetof(VRingAvail, idx); + VRingMemoryRegionCaches *caches; + hwaddr pa; =20 + if (unlikely(!vq->vring.avail)) { + return 0; + } + + caches =3D vring_get_region_caches(vq); if (!caches) { return 0; } =20 + pa =3D offsetof(VRingAvail, idx); vq->shadow_avail_idx =3D virtio_lduw_phys_cached(vq->vdev, &caches->av= ail, pa); return vq->shadow_avail_idx; } @@ -316,13 +328,19 @@ static inline uint16_t vring_avail_idx(VirtQueue *vq) /* Called within rcu_read_lock(). */ static inline uint16_t vring_avail_ring(VirtQueue *vq, int i) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - hwaddr pa =3D offsetof(VRingAvail, ring[i]); + VRingMemoryRegionCaches *caches; + hwaddr pa; =20 + if (unlikely(!vq->vring.avail)) { + return 0; + } + + caches =3D vring_get_region_caches(vq); if (!caches) { return 0; } =20 + pa =3D offsetof(VRingAvail, ring[i]); return virtio_lduw_phys_cached(vq->vdev, &caches->avail, pa); } =20 @@ -336,13 +354,19 @@ static inline uint16_t vring_get_used_event(VirtQueue= *vq) static inline void vring_used_write(VirtQueue *vq, VRingUsedElem *uelem, int i) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - hwaddr pa =3D offsetof(VRingUsed, ring[i]); + VRingMemoryRegionCaches *caches; + hwaddr pa; =20 + if (unlikely(!vq->vring.avail)) { + return; + } + + caches =3D vring_get_region_caches(vq); if (!caches) { return; } =20 + pa =3D offsetof(VRingUsed, ring[i]); virtio_tswap32s(vq->vdev, &uelem->id); virtio_tswap32s(vq->vdev, &uelem->len); address_space_write_cached(&caches->used, pa, uelem, sizeof(VRingUsedE= lem)); @@ -352,23 +376,35 @@ static inline void vring_used_write(VirtQueue *vq, VR= ingUsedElem *uelem, /* Called within rcu_read_lock(). */ static uint16_t vring_used_idx(VirtQueue *vq) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - hwaddr pa =3D offsetof(VRingUsed, idx); + VRingMemoryRegionCaches *caches; + hwaddr pa; =20 + if (unlikely(!vq->vring.avail)) { + return 0; + } + + caches =3D vring_get_region_caches(vq); if (!caches) { return 0; } =20 + pa =3D offsetof(VRingUsed, idx); return virtio_lduw_phys_cached(vq->vdev, &caches->used, pa); } =20 /* Called within rcu_read_lock(). */ static inline void vring_used_idx_set(VirtQueue *vq, uint16_t val) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - hwaddr pa =3D offsetof(VRingUsed, idx); + VRingMemoryRegionCaches *caches; =20 + if (unlikely(!vq->vring.avail)) { + return; + } + + caches =3D vring_get_region_caches(vq); if (caches) { + hwaddr pa =3D offsetof(VRingUsed, idx); + virtio_stw_phys_cached(vq->vdev, &caches->used, pa, val); address_space_cache_invalidate(&caches->used, pa, sizeof(val)); } @@ -379,17 +415,22 @@ static inline void vring_used_idx_set(VirtQueue *vq, = uint16_t val) /* Called within rcu_read_lock(). */ static inline void vring_used_flags_set_bit(VirtQueue *vq, int mask) { - VRingMemoryRegionCaches *caches =3D vring_get_region_caches(vq); - VirtIODevice *vdev =3D vq->vdev; - hwaddr pa =3D offsetof(VRingUsed, flags); + VRingMemoryRegionCaches *caches; + hwaddr pa; uint16_t flags; =20 + if (unlikely(!vq->vring.avail)) { + return; + } + + caches =3D vring_get_region_caches(vq); if (!caches) { return; } =20 + pa =3D offsetof(VRingUsed, flags); flags =3D virtio_lduw_phys_cached(vq->vdev, &caches->used, pa); - virtio_stw_phys_cached(vdev, &caches->used, pa, flags | mask); + virtio_stw_phys_cached(vq->vdev, &caches->used, pa, flags | mask); address_space_cache_invalidate(&caches->used, pa, sizeof(flags)); } =20 @@ -401,6 +442,10 @@ static inline void vring_used_flags_unset_bit(VirtQueu= e *vq, int mask) hwaddr pa =3D offsetof(VRingUsed, flags); uint16_t flags; =20 + if (unlikely(!vq->vring.avail)) { + return; + } + if (!caches) { return; } @@ -415,10 +460,15 @@ static inline void vring_set_avail_event(VirtQueue *v= q, uint16_t val) { VRingMemoryRegionCaches *caches; hwaddr pa; + if (!vq->notification) { return; } =20 + if (unlikely(!vq->vring.avail)) { + return; + } + caches =3D vring_get_region_caches(vq); if (!caches) { return; --=20 2.31.1