From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
qemu-block@nongnu.org,
Raphael Norwitz <raphael.norwitz@nutanix.com>,
Roman Kagan <rvkagan@yandex-team.ru>,
Hanna Reitz <hreitz@redhat.com>
Subject: [PULL 14/52] vhost-user-blk: reconnect on any error during realize
Date: Thu, 6 Jan 2022 08:16:53 -0500 [thread overview]
Message-ID: <20220106131534.423671-15-mst@redhat.com> (raw)
In-Reply-To: <20220106131534.423671-1-mst@redhat.com>
From: Roman Kagan <rvkagan@yandex-team.ru>
vhost-user-blk realize only attempts to reconnect if the previous
connection attempt failed on "a problem with the connection and not an
error related to the content (which would fail again the same way in the
next attempt)".
However this distinction is very subtle, and may be inadvertently broken
if the code changes somewhere deep down the stack and a new error gets
propagated up to here.
OTOH now that the number of reconnection attempts is limited it seems
harmless to try reconnecting on any error.
So relax the condition of whether to retry connecting to check for any
error.
This patch amends a527e312b5 "vhost-user-blk: Implement reconnection
during realize".
Signed-off-by: Roman Kagan <rvkagan@yandex-team.ru>
Message-Id: <20211111153354.18807-2-rvkagan@yandex-team.ru>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Reviewed-by: Raphael Norwitz <raphael.norwitz@nutanix.com>
---
hw/block/vhost-user-blk.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c
index ba13cb87e5..f9b17f6813 100644
--- a/hw/block/vhost-user-blk.c
+++ b/hw/block/vhost-user-blk.c
@@ -511,7 +511,7 @@ static void vhost_user_blk_device_realize(DeviceState *dev, Error **errp)
*errp = NULL;
}
ret = vhost_user_blk_realize_connect(s, errp);
- } while (ret == -EPROTO && retries--);
+ } while (ret < 0 && retries--);
if (ret < 0) {
goto virtio_err;
--
MST
next prev parent reply other threads:[~2022-01-06 13:39 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-06 13:16 [PULL 00/52] virtio,pci,pc: features,fixes,cleanups Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 01/52] virtio-mem: Don't skip alignment checks when warning about block size Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 02/52] acpi: validate hotplug selector on access Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 03/52] virtio: introduce macro IRTIO_CONFIG_IRQ_IDX Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 05/52] virtio-pci: decouple the single vector from the interrupt process Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 06/52] vhost: introduce new VhostOps vhost_set_config_call Michael S. Tsirkin
2022-01-06 13:22 ` Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 07/52] vhost-vdpa: add support for config interrupt Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 08/52] virtio: add support for configure interrupt Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 09/52] vhost: " Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 10/52] virtio-net: " Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 11/52] virtio-mmio: " Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 12/52] virtio-pci: " Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 13/52] trace-events,pci: unify trace events format Michael S. Tsirkin
2022-01-06 13:16 ` Michael S. Tsirkin [this message]
2022-01-06 13:16 ` [PULL 15/52] chardev/char-socket: tcp_chr_recv: don't clobber errno Michael S. Tsirkin
2022-01-06 13:16 ` [PULL 16/52] chardev/char-socket: tcp_chr_sync_read: " Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 17/52] vhost-backend: avoid overflow on memslots_limit Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 18/52] vhost-backend: stick to -errno error return convention Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 19/52] vhost-vdpa: " Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 20/52] vhost-user: " Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 21/52] vhost: " Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 22/52] vhost-user-blk: propagate error return from generic vhost Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 23/52] pci: Export the pci_intx() function Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 24/52] pcie_aer: Don't trigger a LSI if none are defined Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 25/52] smbios: Rename SMBIOS_ENTRY_POINT_* enums Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 26/52] hw/smbios: Use qapi for SmbiosEntryPointType Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 27/52] hw/i386: expose a "smbios-entry-point-type" PC machine property Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 28/52] hw/vhost-user-blk: turn on VIRTIO_BLK_F_SIZE_MAX feature for virtio blk device Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 29/52] util/oslib-posix: Let touch_all_pages() return an error Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 30/52] util/oslib-posix: Support MADV_POPULATE_WRITE for os_mem_prealloc() Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 31/52] util/oslib-posix: Introduce and use MemsetContext for touch_all_pages() Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 32/52] util/oslib-posix: Don't create too many threads with small memory or little pages Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 33/52] util/oslib-posix: Avoid creating a single thread with MADV_POPULATE_WRITE Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 34/52] util/oslib-posix: Support concurrent os_mem_prealloc() invocation Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 35/52] util/oslib-posix: Forward SIGBUS to MCE handler under Linux Michael S. Tsirkin
2022-01-06 13:17 ` [PULL 36/52] virtio-mem: Support "prealloc=on" option Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 37/52] virtio: signal after wrapping packed used_idx Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 38/52] MAINTAINERS: Add a separate entry for acpi/VIOT tables Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 39/52] linux-headers: sync VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 40/52] virtio-mem: Support VIRTIO_MEM_F_UNPLUGGED_INACCESSIBLE Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 41/52] virtio-mem: Set "unplugged-inaccessible=auto" for the 7.0 machine on x86 Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 42/52] intel-iommu: correctly check passthrough during translation Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 43/52] acpi: fix QEMU crash when started with SLIC table Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 46/52] tests: acpi: SLIC: update expected blobs Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 47/52] acpihp: simplify acpi_pcihp_disable_root_bus Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 48/52] hw/i386/pc: Add missing property descriptions Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 49/52] docs: reSTify virtio-balloon-stats documentation and move to docs/interop Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 50/52] hw/scsi/vhost-scsi: don't leak vqs on error Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 51/52] hw/scsi/vhost-scsi: don't double close vhostfd " Michael S. Tsirkin
2022-01-06 13:18 ` [PULL 52/52] virtio/vhost-vsock: don't double close vhostfd, remove redundant cleanup Michael S. Tsirkin
2022-01-06 13:21 ` [PULL 45/52] tests: acpi: add SLIC table test Michael S. Tsirkin
2022-01-06 13:18 ` Michael S. Tsirkin
2022-01-06 13:21 ` [PULL 44/52] tests: acpi: whitelist expected blobs before changing them Michael S. Tsirkin
2022-01-06 13:22 ` [PULL 04/52] virtio-pci: decouple notifier from interrupt process Michael S. Tsirkin
2022-01-06 23:06 ` [PULL 00/52] virtio,pci,pc: features,fixes,cleanups Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220106131534.423671-15-mst@redhat.com \
--to=mst@redhat.com \
--cc=hreitz@redhat.com \
--cc=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=raphael.norwitz@nutanix.com \
--cc=rvkagan@yandex-team.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).