63a3520e29
The QEMU CI fails in virtio-scmi test occasionally. As reported by Thomas Huth, this happens most likely when the system is loaded and it fails with the following error: qemu-system-aarch64: ../../devel/qemu/hw/pci/msix.c:659: msix_unset_vector_notifiers: Assertion `dev->msix_vector_use_notifier && dev->msix_vector_release_notifier' failed. ../../devel/qemu/tests/qtest/libqtest.c:200: kill_qemu() detected QEMU death from signal 6 (Aborted) (core dumped) As discovered by Fabiano Rosas, the cause is a duplicate invocation of msix_unset_vector_notifiers via duplicate vu_scmi_stop calls: msix_unset_vector_notifiers virtio_pci_set_guest_notifiers vu_scmi_stop vu_scmi_disconnect ... qemu_chr_write_buffer msix_unset_vector_notifiers virtio_pci_set_guest_notifiers vu_scmi_stop vu_scmi_set_status ... qemu_cleanup While vu_scmi_stop calls are protected by vhost_dev_is_started() check, it's apparently not enough. vhost-user-blk and vhost-user-gpio use an extra protection, seef5b22d06fb(vhost: recheck dev state in the vhost_migration_log routine) for the motivation. Let's use the same in vhost-user-scmi, which fixes the failure above. Fixes:a5dab090e1("hw/virtio: Add boilerplate for vhost-user-scmi device") Signed-off-by: Milan Zamazal <mzamazal@redhat.com> Message-Id: <20230720101037.2161450-1-mzamazal@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Tested-by: Thomas Huth <thuth@redhat.com> Reviewed-by: Fabiano Rosas <farosas@suse.de>
32 lines
700 B
C
32 lines
700 B
C
/*
|
|
* Vhost-user SCMI virtio device
|
|
*
|
|
* Copyright (c) 2023 Red Hat, Inc.
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0-or-later
|
|
*/
|
|
|
|
#ifndef _QEMU_VHOST_USER_SCMI_H
|
|
#define _QEMU_VHOST_USER_SCMI_H
|
|
|
|
#include "hw/virtio/virtio.h"
|
|
#include "hw/virtio/vhost.h"
|
|
#include "hw/virtio/vhost-user.h"
|
|
|
|
#define TYPE_VHOST_USER_SCMI "vhost-user-scmi"
|
|
OBJECT_DECLARE_SIMPLE_TYPE(VHostUserSCMI, VHOST_USER_SCMI);
|
|
|
|
struct VHostUserSCMI {
|
|
VirtIODevice parent;
|
|
CharBackend chardev;
|
|
struct vhost_virtqueue *vhost_vqs;
|
|
struct vhost_dev vhost_dev;
|
|
VhostUserState vhost_user;
|
|
VirtQueue *cmd_vq;
|
|
VirtQueue *event_vq;
|
|
bool connected;
|
|
bool started_vu;
|
|
};
|
|
|
|
#endif /* _QEMU_VHOST_USER_SCMI_H */
|