[1/2] vhost: fix vduse features negotiation
Checks
Commit Message
The series introducing VDUSE support missed the
application capability to disable supported features.
This results in TSO being negotiated while not supported by
the application.
Fixes: 0adb8eccc6a6 ("vhost: add VDUSE device creation and destruction")
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
lib/vhost/socket.c | 19 +++++++++++++------
lib/vhost/vduse.c | 28 +++++++---------------------
lib/vhost/vduse.h | 20 ++++++++++++++++++++
3 files changed, 40 insertions(+), 27 deletions(-)
Comments
On Wed, Jul 5, 2023 at 3:22 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
> @@ -950,9 +954,14 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
> * two values.
> */
> vsocket->use_builtin_virtio_net = true;
> - vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
> - vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
> - vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> + if (vsocket->is_vduse) {
> + vsocket->supported_features = VDUSE_NET_SUPPORTED_FEATURES;
> + vsocket->features = VDUSE_NET_SUPPORTED_FEATURES;
> + } else {
> + vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
> + vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
> + vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> + }
>
Would it make sense to split those features in a set of features
shared by vhost-user and vduse, and one dedicated set for each of
them?
For example, the VIRTIO_NET_F_GUEST/HOST_* features are not bound to
vhost-user / vduse, are they?
Hi David,
On 7/5/23 15:36, David Marchand wrote:
> On Wed, Jul 5, 2023 at 3:22 PM Maxime Coquelin
> <maxime.coquelin@redhat.com> wrote:
>> @@ -950,9 +954,14 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
>> * two values.
>> */
>> vsocket->use_builtin_virtio_net = true;
>> - vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
>> - vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
>> - vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
>> + if (vsocket->is_vduse) {
>> + vsocket->supported_features = VDUSE_NET_SUPPORTED_FEATURES;
>> + vsocket->features = VDUSE_NET_SUPPORTED_FEATURES;
>> + } else {
>> + vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
>> + vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
>> + vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
>> + }
>>
>
> Would it make sense to split those features in a set of features
> shared by vhost-user and vduse, and one dedicated set for each of
> them?
> For example, the VIRTIO_NET_F_GUEST/HOST_* features are not bound to
> vhost-user / vduse, are they?
Most of the features are the same, but there are a few differences:
- VIRTIO_F_RING_PACKED: this is not really Vhost or VDUSE specific. The
issue is we just lack packed ring support in the control queue
implementation, only used by VDUSE for now. I expect to add it in
v23.11.
- VHOST_USER_F_PROTOCOL_FEATURES: This feature is Vhost-user specific
- VHOST_F_LOG_ALL: This is for live-migration, maybe it will be
advertised by VDUSE in the future, but we miss live-migration support in
Kernel VDUSE at the moment.
- VIRTIO_NET_F_CTRL_RX: This is advertised by Vhost-user, but it does
not do anything specific. While if we do it in VDUSE, we need to
implement its support in CVQ.
To summarize, we have some features specific to Vhost-user, but for the
other differences, this is just some features are not yet
implemented/tested with VDUSE.
Maybe we could have something like this, which has the advantage to
highlight the gaps we have in VDUSE (not compiled/tested):
------------------------------------------------------------
diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c
index a65d301406..f55fb299fd 100644
--- a/lib/vhost/socket.c
+++ b/lib/vhost/socket.c
@@ -958,8 +958,8 @@ rte_vhost_driver_register(const char *path, uint64_t
flags)
vsocket->supported_features = VDUSE_NET_SUPPORTED_FEATURES;
vsocket->features = VDUSE_NET_SUPPORTED_FEATURES;
} else {
- vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
- vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
+ vsocket->supported_features =
VHOST_USER_NET_SUPPORTED_FEATURES;
+ vsocket->features =
VHOST_USER_NET_SUPPORTED_FEATURES;
vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
}
diff --git a/lib/vhost/vduse.h b/lib/vhost/vduse.h
index 46753fec73..5a8b37ec67 100644
--- a/lib/vhost/vduse.h
+++ b/lib/vhost/vduse.h
@@ -7,28 +7,7 @@
#include "vhost.h"
-#define VDUSE_NET_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \
- (1ULL << VIRTIO_F_ANY_LAYOUT) | \
- (1ULL << VIRTIO_F_VERSION_1) | \
- (1ULL << VIRTIO_NET_F_GSO) | \
- (1ULL << VIRTIO_NET_F_HOST_TSO4) | \
- (1ULL << VIRTIO_NET_F_HOST_TSO6) | \
- (1ULL << VIRTIO_NET_F_HOST_UFO) | \
- (1ULL << VIRTIO_NET_F_HOST_ECN) | \
- (1ULL << VIRTIO_NET_F_CSUM) | \
- (1ULL << VIRTIO_NET_F_GUEST_CSUM) | \
- (1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
- (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
- (1ULL << VIRTIO_NET_F_GUEST_UFO) | \
- (1ULL << VIRTIO_NET_F_GUEST_ECN) | \
- (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
- (1ULL << VIRTIO_RING_F_EVENT_IDX) | \
- (1ULL << VIRTIO_F_IN_ORDER) | \
- (1ULL << VIRTIO_F_IOMMU_PLATFORM) | \
- (1ULL << VIRTIO_NET_F_CTRL_VQ) | \
- (1ULL << VIRTIO_NET_F_MQ))
-
-#ifdef VHOST_HAS_VDUSE
+#define VDUSE_NET_SUPPORTED_FEATURES VIRTIO_NET_SUPPORTED_FEATURES
int vduse_device_create(const char *path);
int vduse_device_destroy(const char *path);
diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h
index 9ecede0f30..f49ce943b0 100644
--- a/lib/vhost/vhost.h
+++ b/lib/vhost/vhost.h
@@ -438,12 +438,8 @@ struct vring_packed_desc_event {
#define VIRTIO_NET_SUPPORTED_FEATURES ((1ULL <<
VIRTIO_NET_F_MRG_RXBUF) | \
(1ULL << VIRTIO_F_ANY_LAYOUT) | \
(1ULL << VIRTIO_NET_F_CTRL_VQ) | \
- (1ULL << VIRTIO_NET_F_CTRL_RX) | \
- (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE) | \
(1ULL << VIRTIO_NET_F_MQ) | \
(1ULL << VIRTIO_F_VERSION_1) | \
- (1ULL << VHOST_F_LOG_ALL) | \
- (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
(1ULL << VIRTIO_NET_F_GSO) | \
(1ULL << VIRTIO_NET_F_HOST_TSO4) | \
(1ULL << VIRTIO_NET_F_HOST_TSO6) | \
@@ -457,10 +453,8 @@ struct vring_packed_desc_event {
(1ULL << VIRTIO_NET_F_GUEST_ECN) | \
(1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
(1ULL << VIRTIO_RING_F_EVENT_IDX) | \
- (1ULL << VIRTIO_NET_F_MTU) | \
(1ULL << VIRTIO_F_IN_ORDER) | \
- (1ULL << VIRTIO_F_IOMMU_PLATFORM) | \
- (1ULL << VIRTIO_F_RING_PACKED))
+ (1ULL << VIRTIO_F_IOMMU_PLATFORM))
struct guest_page {
diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h
index 1ffeca92f3..edf7adb3c0 100644
--- a/lib/vhost/vhost_user.h
+++ b/lib/vhost/vhost_user.h
@@ -13,6 +13,15 @@
#define VHOST_MEMORY_MAX_NREGIONS 8
+#define VHOST_USER_NET_SUPPORTED_FEATURES \
+ (VIRTIO_NET_SUPPORTED_FEATURES | \
+ (1ULL << VIRTIO_F_RING_PACKED) | \
+ (1ULL << VIRTIO_NET_F_MTU) | \
+ (1ULL << VHOST_F_LOG_ALL) | \
+ (1ULL << VHOST_USER_F_PROTOCOL_FEATURES) | \
+ (1ULL << VIRTIO_NET_F_CTRL_RX) | \
+ (1ULL << VIRTIO_NET_F_GUEST_ANNOUNCE))
+
#define VHOST_USER_PROTOCOL_FEATURES ((1ULL <<
VHOST_USER_PROTOCOL_F_MQ) | \
(1ULL <<
VHOST_USER_PROTOCOL_F_LOG_SHMFD) |\
(1ULL <<
VHOST_USER_PROTOCOL_F_RARP) | \
------------------------------------------------------------
WDYT?
Thanks,
Maxime
>
>
On Wed, Jul 5, 2023 at 7:02 PM Maxime Coquelin
<maxime.coquelin@redhat.com> wrote:
>
> On 7/5/23 15:36, David Marchand wrote:
> > On Wed, Jul 5, 2023 at 3:22 PM Maxime Coquelin
> > <maxime.coquelin@redhat.com> wrote:
> >> @@ -950,9 +954,14 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
> >> * two values.
> >> */
> >> vsocket->use_builtin_virtio_net = true;
> >> - vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
> >> - vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
> >> - vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> >> + if (vsocket->is_vduse) {
> >> + vsocket->supported_features = VDUSE_NET_SUPPORTED_FEATURES;
> >> + vsocket->features = VDUSE_NET_SUPPORTED_FEATURES;
> >> + } else {
> >> + vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
> >> + vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
> >> + vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
> >> + }
> >>
> >
> > Would it make sense to split those features in a set of features
> > shared by vhost-user and vduse, and one dedicated set for each of
> > them?
> > For example, the VIRTIO_NET_F_GUEST/HOST_* features are not bound to
> > vhost-user / vduse, are they?
>
> Most of the features are the same, but there are a few differences:
> - VIRTIO_F_RING_PACKED: this is not really Vhost or VDUSE specific. The
> issue is we just lack packed ring support in the control queue
> implementation, only used by VDUSE for now. I expect to add it in
> v23.11.
>
> - VHOST_USER_F_PROTOCOL_FEATURES: This feature is Vhost-user specific
>
> - VHOST_F_LOG_ALL: This is for live-migration, maybe it will be
> advertised by VDUSE in the future, but we miss live-migration support in
> Kernel VDUSE at the moment.
>
> - VIRTIO_NET_F_CTRL_RX: This is advertised by Vhost-user, but it does
> not do anything specific. While if we do it in VDUSE, we need to
> implement its support in CVQ.
>
> To summarize, we have some features specific to Vhost-user, but for the
> other differences, this is just some features are not yet
> implemented/tested with VDUSE.
>
> Maybe we could have something like this, which has the advantage to
> highlight the gaps we have in VDUSE (not compiled/tested):
LGTM on the principle.
Thanks Maxime.
@@ -921,6 +921,10 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
VHOST_LOG_CONFIG(path, ERR, "failed to init connection mutex\n");
goto out_free;
}
+
+ if (!strncmp("/dev/vduse/", path, strlen("/dev/vduse/")))
+ vsocket->is_vduse = true;
+
vsocket->vdpa_dev = NULL;
vsocket->max_queue_pairs = VHOST_MAX_QUEUE_PAIRS;
vsocket->extbuf = flags & RTE_VHOST_USER_EXTBUF_SUPPORT;
@@ -950,9 +954,14 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
* two values.
*/
vsocket->use_builtin_virtio_net = true;
- vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
- vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
- vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
+ if (vsocket->is_vduse) {
+ vsocket->supported_features = VDUSE_NET_SUPPORTED_FEATURES;
+ vsocket->features = VDUSE_NET_SUPPORTED_FEATURES;
+ } else {
+ vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES;
+ vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES;
+ vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES;
+ }
if (vsocket->async_copy) {
vsocket->supported_features &= ~(1ULL << VHOST_F_LOG_ALL);
@@ -993,9 +1002,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags)
#endif
}
- if (!strncmp("/dev/vduse/", path, strlen("/dev/vduse/"))) {
- vsocket->is_vduse = true;
- } else {
+ if (!vsocket->is_vduse) {
if ((flags & RTE_VHOST_USER_CLIENT) != 0) {
vsocket->reconnect = !(flags & RTE_VHOST_USER_NO_RECONNECT);
if (vsocket->reconnect && reconn_tid == 0) {
@@ -26,26 +26,6 @@
#define VHOST_VDUSE_API_VERSION 0
#define VDUSE_CTRL_PATH "/dev/vduse/control"
-#define VDUSE_NET_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \
- (1ULL << VIRTIO_F_ANY_LAYOUT) | \
- (1ULL << VIRTIO_F_VERSION_1) | \
- (1ULL << VIRTIO_NET_F_GSO) | \
- (1ULL << VIRTIO_NET_F_HOST_TSO4) | \
- (1ULL << VIRTIO_NET_F_HOST_TSO6) | \
- (1ULL << VIRTIO_NET_F_HOST_UFO) | \
- (1ULL << VIRTIO_NET_F_HOST_ECN) | \
- (1ULL << VIRTIO_NET_F_CSUM) | \
- (1ULL << VIRTIO_NET_F_GUEST_CSUM) | \
- (1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
- (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
- (1ULL << VIRTIO_NET_F_GUEST_UFO) | \
- (1ULL << VIRTIO_NET_F_GUEST_ECN) | \
- (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
- (1ULL << VIRTIO_F_IN_ORDER) | \
- (1ULL << VIRTIO_F_IOMMU_PLATFORM) | \
- (1ULL << VIRTIO_NET_F_CTRL_VQ) | \
- (1ULL << VIRTIO_NET_F_MQ))
-
struct vduse {
struct fdset fdset;
};
@@ -440,7 +420,7 @@ vduse_device_create(const char *path)
struct virtio_net *dev;
struct virtio_net_config vnet_config = { 0 };
uint64_t ver = VHOST_VDUSE_API_VERSION;
- uint64_t features = VDUSE_NET_SUPPORTED_FEATURES;
+ uint64_t features;
struct vduse_dev_config *dev_config = NULL;
const char *name = path + strlen("/dev/vduse/");
@@ -488,6 +468,12 @@ vduse_device_create(const char *path)
goto out_ctrl_close;
}
+ ret = rte_vhost_driver_get_features(path, &features);
+ if (ret < 0) {
+ VHOST_LOG_CONFIG(name, ERR, "Failed to get backend features\n");
+ goto out_free;
+ }
+
ret = rte_vhost_driver_get_queue_num(path, &max_queue_pairs);
if (ret < 0) {
VHOST_LOG_CONFIG(name, ERR, "Failed to get max queue pairs\n");
@@ -7,6 +7,26 @@
#include "vhost.h"
+#define VDUSE_NET_SUPPORTED_FEATURES ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | \
+ (1ULL << VIRTIO_F_ANY_LAYOUT) | \
+ (1ULL << VIRTIO_F_VERSION_1) | \
+ (1ULL << VIRTIO_NET_F_GSO) | \
+ (1ULL << VIRTIO_NET_F_HOST_TSO4) | \
+ (1ULL << VIRTIO_NET_F_HOST_TSO6) | \
+ (1ULL << VIRTIO_NET_F_HOST_UFO) | \
+ (1ULL << VIRTIO_NET_F_HOST_ECN) | \
+ (1ULL << VIRTIO_NET_F_CSUM) | \
+ (1ULL << VIRTIO_NET_F_GUEST_CSUM) | \
+ (1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
+ (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
+ (1ULL << VIRTIO_NET_F_GUEST_UFO) | \
+ (1ULL << VIRTIO_NET_F_GUEST_ECN) | \
+ (1ULL << VIRTIO_RING_F_INDIRECT_DESC) | \
+ (1ULL << VIRTIO_F_IN_ORDER) | \
+ (1ULL << VIRTIO_F_IOMMU_PLATFORM) | \
+ (1ULL << VIRTIO_NET_F_CTRL_VQ) | \
+ (1ULL << VIRTIO_NET_F_MQ))
+
#ifdef VHOST_HAS_VDUSE
int vduse_device_create(const char *path);