diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-08-14 18:55:37 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-08-14 18:57:39 +0100 |
| commit | ae1479de3027a4a0f68d90bf65ac6ff2b862b837 (patch) | |
| tree | 5dbca675b6717b6b61abbe1a9583d5166fed942b /lib/librte_vhost/socket.c | |
| parent | 8cee230dd1f0f9f31f4b0339c671d0b1ee14e111 (diff) | |
| parent | b63264c8342e6a1b6971c79550d2af2024b6a4de (diff) | |
Merge branch 'upstream' into 18.08.x
Change-Id: Ifbda2d554199dd4d11e01f0090881b5f0103ae12
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_vhost/socket.c')
| -rw-r--r-- | lib/librte_vhost/socket.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c index 0399c37b..d6303174 100644 --- a/lib/librte_vhost/socket.c +++ b/lib/librte_vhost/socket.c @@ -853,6 +853,12 @@ rte_vhost_driver_register(const char *path, uint64_t flags) vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES; vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES; + /* Dequeue zero copy can't assure descriptors returned in order */ + if (vsocket->dequeue_zero_copy) { + vsocket->supported_features &= ~(1ULL << VIRTIO_F_IN_ORDER); + vsocket->features &= ~(1ULL << VIRTIO_F_IN_ORDER); + } + if (!(flags & RTE_VHOST_USER_IOMMU_SUPPORT)) { vsocket->supported_features &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM); vsocket->features &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM); |