Skip to contentSkip to conversation

vhost-vdpa: improve parameters error management

PATCH In review Laurent Vivier 4 participants 9 messages Sep 3, 2020 – Sep 9, 2020 Networking

lore
Share & tools
lore
#0 lore raw

cover vhost-vdpa: improve parameters error management

If vhostdev is not provided QEMU crashes, and more generally vhost-vdpa doesn't explain why parameters are wrong.

This series fixes that.

Laurent Vivier (2):
vhost-vdpa: define and use default value for vhostdev
vhost-vdpa: improve error reporting

 net/vhost-vdpa.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/2 vhost-vdpa: define and use default value for vhostdev

vhostdev is defined as optional in net.json, and if not set /dev/vhost-vdpa-0 should be used.

The default value is not set and if vhostdev is not provided QEMU crashes with a SIGSEGV exception.

Fixes 1e0a84ea49b6 ("vhost-vdpa: introduce vhost-vdpa net client")
---
 net/vhost-vdpa.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
net/vhost-vdpa.c +6 -1
index bc0e0d2d35b7..24103ef241e4 100644
@@ -24,6 +24,9 @@
 #include "monitor/monitor.h"
 #include "hw/virtio/vhost.h"
 
+/* default vhostdev as defined in qapi/net.json */
+#define VHOST_VDPA_DEFAULT_VHOSTDEV "/dev/vhost-vdpa-0"
+
 /* Todo:need to add the multiqueue support here */
 typedef struct VhostVDPAState {
     NetClientState nc;
@@ -224,5 +227,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
                           (char *)name, errp)) {
         return -1;
     }
-    return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev);
+    return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
+                               opts->has_vhostdev ?
+                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV);
 }
Signature · 1 line
2.26.2
#2 lore raw

Re: [PATCH 1/2] vhost-vdpa: define and use default value for vhostdev

Quoted 28 lines · Laurent Vivier

vhostdev is defined as optional in net.json, and if not set /dev/vhost-vdpa-0 should be used.

The default value is not set and if vhostdev is not provided QEMU crashes with a SIGSEGV exception.

Fixes 1e0a84ea49b6 ("vhost-vdpa: introduce vhost-vdpa net client")
---
  net/vhost-vdpa.c | 7 ++++++-
  1 file changed, 6 insertions(+), 1 deletion(-)
net/vhost-vdpa.c +3 -0
index bc0e0d2d35b7..24103ef241e4 100644
@@ -24,6 +24,9 @@
  #include "monitor/monitor.h"
  #include "hw/virtio/vhost.h"
 
+/* default vhostdev as defined in qapi/net.json */
+#define VHOST_VDPA_DEFAULT_VHOSTDEV "/dev/vhost-vdpa-0"
+
  /* Todo:need to add the multiqueue support here */
  typedef struct VhostVDPAState {
      NetClientState nc;

net/vhost-vdpa.c int net_init_vhost_vdpa(const Netdev *netdev, const char *name, · line 233

Quoted 8 lines
net/vhost-vdpa.c +3 -1
@@ -224,5 +227,7 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
                            (char *)name, errp)) {
          return -1;
      }
-    return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name, opts->vhostdev);
+    return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
+                               opts->has_vhostdev ?
+                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV);
  }

Hi Laurent:

I think having a default path could introduce more confusion here.

So I post a patch to remove the default [1].

Thanks

[1] https://lore.kernel.org/qemu-devel/[email protected]/

#3 lore raw

PATCH 2/2 vhost-vdpa: improve error reporting

In reply to Laurent Vivier

Use Error framework to report the id of the device and the details of the error (vhostdev name and errno).

For instance:

qemu-system-x86_64 ... -netdev vhost-vdpa,id=hostnet1 ...
hostnet1: Cannot open '/dev/vhost-vdpa-0': No such file or directory

---
 net/vhost-vdpa.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
net/vhost-vdpa.c +10 -4
index 24103ef241e4..8260902334ae 100644
@@ -176,7 +176,8 @@ static NetClientInfo net_vhost_vdpa_info = {
 };
 
 static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
-                               const char *name, const char *vhostdev)
+                               const char *name, const char *vhostdev,
+                               Error **errp)
 {
     NetClientState *nc = NULL;
     VhostVDPAState *s;
@@ -189,11 +190,15 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
     s = DO_UPCAST(VhostVDPAState, nc, nc);
     vdpa_device_fd = qemu_open(vhostdev, O_RDWR);
     if (vdpa_device_fd == -1) {
-        return -errno;
+        error_setg_errno(errp, errno, "%s: Cannot open '%s'", name, vhostdev);
+        return -1;
     }
     s->vhost_vdpa.device_fd = vdpa_device_fd;
     ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
-    assert(s->vhost_net);
+    if (ret == -1) {
+        error_setg(errp, "%s: Cannot add vhost-vdpa '%s'", name, vhostdev);
+        return -1;
+    }
     return ret;
 }
 
@@ -229,5 +234,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
     }
     return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
                                opts->has_vhostdev ?
-                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV);
+                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV,
+                               errp);
 }
Signature · 1 line
2.26.2
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] vhost-vdpa: improve error reporting

Quoted 9 lines · Laurent Vivier

Use Error framework to report the id of the device and the details of the error (vhostdev name and errno).

For instance:

qemu-system-x86_64 ... -netdev vhost-vdpa,id=hostnet1 ...
hostnet1: Cannot open '/dev/vhost-vdpa-0': No such file or directory

Quoted 45 lines
---
 net/vhost-vdpa.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)
net/vhost-vdpa.c +10 -4
index 24103ef241e4..8260902334ae 100644
@@ -176,7 +176,8 @@ static NetClientInfo net_vhost_vdpa_info = {
 };
 
 static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
-                               const char *name, const char *vhostdev)
+                               const char *name, const char *vhostdev,
+                               Error **errp)
 {
     NetClientState *nc = NULL;
     VhostVDPAState *s;
@@ -189,11 +190,15 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
     s = DO_UPCAST(VhostVDPAState, nc, nc);
     vdpa_device_fd = qemu_open(vhostdev, O_RDWR);
     if (vdpa_device_fd == -1) {
-        return -errno;
+        error_setg_errno(errp, errno, "%s: Cannot open '%s'", name, vhostdev);
+        return -1;
     }
     s->vhost_vdpa.device_fd = vdpa_device_fd;
     ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
-    assert(s->vhost_net);
+    if (ret == -1) {
+        error_setg(errp, "%s: Cannot add vhost-vdpa '%s'", name, vhostdev);
+        return -1;
+    }
     return ret;
 }
 
@@ -229,5 +234,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
     }
     return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
                                opts->has_vhostdev ?
-                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV);
+                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV,
+                               errp);
 }
#5 lore raw

Re: [PATCH 2/2] vhost-vdpa: improve error reporting

In reply to Laurent Vivier
Quoted 5 lines · Laurent Vivier

Use Error framework to report the id of the device and the details of the error (vhostdev name and errno).

For instance:

Quoted 7 lines

qemu-system-x86_64 ... -netdev vhost-vdpa,id=hostnet1 ...
hostnet1: Cannot open '/dev/vhost-vdpa-0': No such file or directory

---
  net/vhost-vdpa.c | 14 ++++++++++----
  1 file changed, 10 insertions(+), 4 deletions(-)

Hi Laurent:

If you don't mind I will add this patch to v2 of my series[1]

Thanks

[1] https://lore.kernel.org/qemu-devel/[email protected]/

Quoted 40 lines
net/vhost-vdpa.c +10 -4
index 24103ef241e4..8260902334ae 100644
@@ -176,7 +176,8 @@ static NetClientInfo net_vhost_vdpa_info = {
  };
 
  static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
-                               const char *name, const char *vhostdev)
+                               const char *name, const char *vhostdev,
+                               Error **errp)
  {
      NetClientState *nc = NULL;
      VhostVDPAState *s;
@@ -189,11 +190,15 @@ static int net_vhost_vdpa_init(NetClientState *peer, const char *device,
      s = DO_UPCAST(VhostVDPAState, nc, nc);
      vdpa_device_fd = qemu_open(vhostdev, O_RDWR);
      if (vdpa_device_fd == -1) {
-        return -errno;
+        error_setg_errno(errp, errno, "%s: Cannot open '%s'", name, vhostdev);
+        return -1;
      }
      s->vhost_vdpa.device_fd = vdpa_device_fd;
      ret = vhost_vdpa_add(nc, (void *)&s->vhost_vdpa);
-    assert(s->vhost_net);
+    if (ret == -1) {
+        error_setg(errp, "%s: Cannot add vhost-vdpa '%s'", name, vhostdev);
+        return -1;
+    }
      return ret;
  }
 
@@ -229,5 +234,6 @@ int net_init_vhost_vdpa(const Netdev *netdev, const char *name,
      }
      return net_vhost_vdpa_init(peer, TYPE_VHOST_VDPA, name,
                                 opts->has_vhostdev ?
-                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV);
+                               opts->vhostdev : VHOST_VDPA_DEFAULT_VHOSTDEV,
+                               errp);
  }
#6 lore raw

Re: [PATCH 2/2] vhost-vdpa: improve error reporting

Quoted 16 lines · Jason Wang
Quoted 5 lines · Laurent Vivier

Use Error framework to report the id of the device and the details of the error (vhostdev name and errno).

For instance:

Quoted 7 lines

  qemu-system-x86_64 ... -netdev vhost-vdpa,id=hostnet1 ...
  hostnet1: Cannot open '/dev/vhost-vdpa-0': No such file or directory

---
  net/vhost-vdpa.c | 14 ++++++++++----

  1 file changed, 10 insertions(+), 4 deletions(-)
Quoted 3 lines

Hi Laurent:

If you don't mind I will add this patch to v2 of my series[1]

Yes, please. I think it could replace the PATCH 3 of your series.

Thanks,
Laurent

#7 lore raw
In reply to Laurent Vivier
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series seems to have some coding style problems. See output below for more information:

N/A. Internal error while reading log file

The full log is available at
http://patchew.org/logs/[email protected]/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]

#8 lore raw
In reply to Laurent Vivier
Patchew URL: https://patchew.org/QEMU/[email protected]/

Patchew URL: https://patchew.org/QEMU/[email protected]/

Hi,

This series failed the docker-mingw@fedora build test. Please find the testing commands and their output below. If you have Docker installed, you can probably reproduce it locally.

The full log is available at
http://patchew.org/logs/[email protected]/testing.docker-mingw@fedora/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to [email protected]