OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Revert "tap: setting error appropriately when calling net_init_tap_one()"

Browse Source 
This reverts commit 46d4d36d0b.

The reverted commit changed to emit warnings instead of errors when
vhost is requested but vhost initialization fails if vhostforce option
is not set.

However, vhostforce is not meant to ignore vhost errors. It was once
introduced as an option to commit 5430a28fe4 ("vhost: force vhost off
for non-MSI guests") to force enabling vhost for non-MSI guests, which
will have worse performance with vhost. The option was deprecated with
commit 1e7398a140 ("vhost: enable vhost without without MSI-X") and
changed to behave identical with the vhost option for compatibility.

Worse, commit bf769f742c ("virtio: del net client if net_init_tap_one
failed") changed to delete the client when vhost fails even when the
failure only results in a warning. The leads to an assertion failure
for the -netdev command line option.

The reverted commit was intended to avoid that the vhost initialization
failure won't result in a corrupted netdev. This problem should have
been fixed by deleting netdev when the initialization fails instead of
ignoring the failure with an arbitrary option. Fortunately, commit
bf769f742c ("virtio: del net client if net_init_tap_one failed"),
mentioned earlier, implements this behavior.

Restore the correct semantics and fix the assertion failure for the
-netdev command line option by reverting the problematic commit.

Signed-off-by: Akihiko Odaki <akihiko.odaki@daynix.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Akihiko Odaki 2023-09-21 18:37:59 +09:00 committed by Jason Wang
parent decfde6b0e
commit d9b33018a0
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/vhost_net.h
View File

@ -4,9 +4,6 @@
#include "net/net.h" #include "net/net.h"
#include "hw/virtio/vhost-backend.h" #include "hw/virtio/vhost-backend.h"
#define VHOST_NET_INIT_FAILED \
"vhost-net requested but could not be initialized"
struct vhost_net; struct vhost_net;
typedef struct vhost_net VHostNetState; typedef struct vhost_net VHostNetState;

16
net/tap.c
View File

@ -743,11 +743,7 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
if (vhostfdname) { if (vhostfdname) {
vhostfd = monitor_fd_param(monitor_cur(), vhostfdname, &err); vhostfd = monitor_fd_param(monitor_cur(), vhostfdname, &err);
if (vhostfd == -1) { if (vhostfd == -1) {
if (tap->has_vhostforce && tap->vhostforce) {
error_propagate(errp, err); error_propagate(errp, err);
} else {
warn_report_err(err);
}
goto failed; goto failed;
} }
if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) { if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
@ -758,13 +754,8 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
} else { } else {
vhostfd = open("/dev/vhost-net", O_RDWR); vhostfd = open("/dev/vhost-net", O_RDWR);
if (vhostfd < 0) { if (vhostfd < 0) {
if (tap->has_vhostforce && tap->vhostforce) {
error_setg_errno(errp, errno, error_setg_errno(errp, errno,
"tap: open vhost char device failed"); "tap: open vhost char device failed");
} else {
warn_report("tap: open vhost char device failed: %s",
strerror(errno));
}
goto failed; goto failed;
} }
if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) { if (!g_unix_set_fd_nonblocking(vhostfd, true, NULL)) {
@ -777,11 +768,8 @@ static void net_init_tap_one(const NetdevTapOptions *tap, NetClientState *peer,
s->vhost_net = vhost_net_init(&options); s->vhost_net = vhost_net_init(&options);
if (!s->vhost_net) { if (!s->vhost_net) {
if (tap->has_vhostforce && tap->vhostforce) { error_setg(errp,
error_setg(errp, VHOST_NET_INIT_FAILED); "vhost-net requested but could not be initialized");
} else {
warn_report(VHOST_NET_INIT_FAILED);
}
goto failed; goto failed;
} }
} else if (vhostfdname) { } else if (vhostfdname) {