* |WARNING| pw128166-128191 [PATCH] [v5, 26/26] vhost: add VDUSE device stop
@ 2023-06-09 21:46 dpdklab
0 siblings, 0 replies; 3+ messages in thread
From: dpdklab @ 2023-06-09 21:46 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/128166
_apply patch failure_
Submitter: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Tuesday, June 06 2023 08:18:52
Applied on: CommitID:38689022f609a290645c7027084aee720c1fcf91
Apply patch set 128166-128191 failed:
Checking patch lib/vhost/iotlb.c...
Checking patch lib/vhost/iotlb.h...
Checking patch lib/vhost/vhost.c...
Hunk #1 succeeded at 63 (offset -4 lines).
Hunk #2 succeeded at 75 (offset -4 lines).
Hunk #3 succeeded at 85 (offset -4 lines).
error: while searching for:
vhost_free_async_mem(vq);
rte_rwlock_write_unlock(&vq->access_lock);
rte_free(vq->batch_copy_elems);
vhost_user_iotlb_destroy(vq);
rte_free(vq->log_cache);
rte_free(vq);
}
error: patch failed: lib/vhost/vhost.c:401
Hunk #5 succeeded at 575 (offset -3 lines).
Hunk #6 succeeded at 595 (offset -3 lines).
error: while searching for:
dev->virtqueue[i] = vq;
init_vring_queue(dev, vq, i);
rte_rwlock_init(&vq->access_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;
vq->signalled_used_valid = false;
error: patch failed: lib/vhost/vhost.c:635
Hunk #8 succeeded at 793 (offset -4 lines).
Checking patch lib/vhost/vhost.h...
Hunk #1 succeeded at 302 (offset -3 lines).
Hunk #2 succeeded at 476 (offset -3 lines).
Checking patch lib/vhost/vhost_user.c...
error: while searching for:
if (!vva)
return RTE_VHOST_MSG_RESULT_ERR;
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
len, imsg->perm);
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
translate_ring_addresses(&dev, &vq);
error: patch failed: lib/vhost/vhost_user.c:2639
error: while searching for:
}
break;
case VHOST_IOTLB_INVALIDATE:
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
vhost_user_iotlb_cache_remove(dev, vq, imsg->iova,
imsg->size);
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
error: patch failed: lib/vhost/vhost_user.c:2657
Hunk #8 succeeded at 2676 (offset 2 lines).
Applied patch lib/vhost/iotlb.c cleanly.
Applied patch lib/vhost/iotlb.h cleanly.
Applying patch lib/vhost/vhost.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
Hunk #8 applied cleanly.
Applied patch lib/vhost/vhost.h cleanly.
Applying patch lib/vhost/vhost_user.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Rejected hunk #7.
Hunk #8 applied cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/lib/vhost/vhost.c b/lib/vhost/vhost.c (rejected hunks)
@@ -401,7 +401,6 @@ free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq)
vhost_free_async_mem(vq);
rte_rwlock_write_unlock(&vq->access_lock);
rte_free(vq->batch_copy_elems);
- vhost_user_iotlb_destroy(vq);
rte_free(vq->log_cache);
rte_free(vq);
}
@@ -635,6 +632,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
dev->virtqueue[i] = vq;
init_vring_queue(dev, vq, i);
rte_rwlock_init(&vq->access_lock);
+ rte_rwlock_init(&vq->iotlb_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;
vq->signalled_used_valid = false;
diff a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c (rejected hunks)
@@ -2639,15 +2641,14 @@ vhost_user_iotlb_msg(struct virtio_net **pdev,
if (!vva)
return RTE_VHOST_MSG_RESULT_ERR;
+ vhost_user_iotlb_cache_insert(dev, imsg->iova, vva, len, imsg->perm);
+
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
- vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
- len, imsg->perm);
-
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
translate_ring_addresses(&dev, &vq);
@@ -2657,15 +2658,14 @@ vhost_user_iotlb_msg(struct virtio_net **pdev,
}
break;
case VHOST_IOTLB_INVALIDATE:
+ vhost_user_iotlb_cache_remove(dev, imsg->iova, imsg->size);
+
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
- vhost_user_iotlb_cache_remove(dev, vq, imsg->iova,
- imsg->size);
-
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/iotlb.h...
error: lib/vhost/iotlb.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/iotlb.h...
error: lib/vhost/iotlb.h: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/socket.c...
Hunk #1 succeeded at 221 (offset -2 lines).
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
Checking patch lib/vhost/vhost_user.h...
Applied patch lib/vhost/socket.c cleanly.
Applied patch lib/vhost/vhost_user.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
Checking patch lib/vhost/vhost_user.h...
error: lib/vhost/vhost_user.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch doc/guides/prog_guide/vhost_lib.rst...
error: while searching for:
Inject the offloaded interrupt received by the 'guest_notify' callback,
into the vhost device's queue.
Vhost-user Implementations
--------------------------
error: patch failed: doc/guides/prog_guide/vhost_lib.rst:339
Checking patch doc/guides/rel_notes/release_23_07.rst...
error: while searching for:
rte_vhost_notify_guest(), is added to raise the interrupt outside of the
fast path.
Removed Items
-------------
error: patch failed: doc/guides/rel_notes/release_23_07.rst:62
Checking patch lib/vhost/rte_vhost.h...
Hunk #1 succeeded at 588 (offset -21 lines).
Checking patch lib/vhost/socket.c...
error: lib/vhost/socket.c: does not match index
Checking patch lib/vhost/version.map...
error: while searching for:
# added in 23.07
rte_vhost_notify_guest;
};
INTERNAL {
error: patch failed: lib/vhost/version.map:107
Applying patch doc/guides/prog_guide/vhost_lib.rst with 1 reject...
Rejected hunk #1.
Applying patch doc/guides/rel_notes/release_23_07.rst with 1 reject...
Rejected hunk #1.
Applied patch lib/vhost/rte_vhost.h cleanly.
Applying patch lib/vhost/version.map with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst (rejected hunks)
@@ -339,6 +339,10 @@ The following is an overview of some key Vhost API functions:
Inject the offloaded interrupt received by the 'guest_notify' callback,
into the vhost device's queue.
+* ``rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs)``
+
+ Set the maximum number of queue pairs supported by the device.
+
Vhost-user Implementations
--------------------------
diff a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst (rejected hunks)
@@ -62,6 +62,11 @@ New Features
rte_vhost_notify_guest(), is added to raise the interrupt outside of the
fast path.
+* **Added Vhost API to set maximum queue pairs supported.**
+
+ Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
+ maximum number of supported queue pairs, required for VDUSE support.
+
Removed Items
-------------
diff a/lib/vhost/version.map b/lib/vhost/version.map (rejected hunks)
@@ -107,6 +107,7 @@ EXPERIMENTAL {
# added in 23.07
rte_vhost_notify_guest;
+ rte_vhost_driver_set_max_queue_num;
};
INTERNAL {
Checking patch lib/vhost/meson.build...
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/virtio_net_ctrl.c...
Checking patch lib/vhost/virtio_net_ctrl.h...
Applied patch lib/vhost/meson.build cleanly.
Applied patch lib/vhost/virtio_net_ctrl.c cleanly.
Applied patch lib/vhost/virtio_net_ctrl.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/meson.build...
error: lib/vhost/meson.build: does not match index
Checking patch lib/vhost/socket.c...
error: lib/vhost/socket.c: does not match index
Checking patch lib/vhost/vduse.c...
Checking patch lib/vhost/vduse.h...
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Applied patch lib/vhost/vduse.c cleanly.
Applied patch lib/vhost/vduse.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch doc/guides/rel_notes/release_23_07.rst...
error: while searching for:
Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
maximum number of supported queue pairs, required for VDUSE support.
Removed Items
-------------
error: patch failed: doc/guides/rel_notes/release_23_07.rst:67
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
Applying patch doc/guides/rel_notes/release_23_07.rst with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst (rejected hunks)
@@ -67,6 +67,13 @@ New Features
Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
maximum number of supported queue pairs, required for VDUSE support.
+* **Added VDUSE support into Vhost library.**
+
+ VDUSE aims at implementing vDPA devices in userspace. It can be used as an
+ alternative to Vhost-user when using Vhost-vDPA, but also enable providing a
+ virtio-net netdev to the host when using Virtio-vDPA driver. A limitation in
+ this release is the lack of reconnection support.
+
Removed Items
-------------
https://lab.dpdk.org/results/dashboard/patchsets/26546/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] 3+ messages in thread
* |WARNING| pw128166-128191 [PATCH] [v5, 26/26] vhost: add VDUSE device stop
@ 2023-06-08 21:35 dpdklab
0 siblings, 0 replies; 3+ messages in thread
From: dpdklab @ 2023-06-08 21:35 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/128166
_apply patch failure_
Submitter: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Tuesday, June 06 2023 08:18:52
Applied on: CommitID:38689022f609a290645c7027084aee720c1fcf91
Apply patch set 128166-128191 failed:
Checking patch lib/vhost/iotlb.c...
Checking patch lib/vhost/iotlb.h...
Checking patch lib/vhost/vhost.c...
Hunk #1 succeeded at 63 (offset -4 lines).
Hunk #2 succeeded at 75 (offset -4 lines).
Hunk #3 succeeded at 85 (offset -4 lines).
error: while searching for:
vhost_free_async_mem(vq);
rte_rwlock_write_unlock(&vq->access_lock);
rte_free(vq->batch_copy_elems);
vhost_user_iotlb_destroy(vq);
rte_free(vq->log_cache);
rte_free(vq);
}
error: patch failed: lib/vhost/vhost.c:401
Hunk #5 succeeded at 575 (offset -3 lines).
Hunk #6 succeeded at 595 (offset -3 lines).
error: while searching for:
dev->virtqueue[i] = vq;
init_vring_queue(dev, vq, i);
rte_rwlock_init(&vq->access_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;
vq->signalled_used_valid = false;
error: patch failed: lib/vhost/vhost.c:635
Hunk #8 succeeded at 793 (offset -4 lines).
Checking patch lib/vhost/vhost.h...
Hunk #1 succeeded at 302 (offset -3 lines).
Hunk #2 succeeded at 476 (offset -3 lines).
Checking patch lib/vhost/vhost_user.c...
error: while searching for:
if (!vva)
return RTE_VHOST_MSG_RESULT_ERR;
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
len, imsg->perm);
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
translate_ring_addresses(&dev, &vq);
error: patch failed: lib/vhost/vhost_user.c:2639
error: while searching for:
}
break;
case VHOST_IOTLB_INVALIDATE:
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
vhost_user_iotlb_cache_remove(dev, vq, imsg->iova,
imsg->size);
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
error: patch failed: lib/vhost/vhost_user.c:2657
Hunk #8 succeeded at 2676 (offset 2 lines).
Applied patch lib/vhost/iotlb.c cleanly.
Applied patch lib/vhost/iotlb.h cleanly.
Applying patch lib/vhost/vhost.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
Hunk #8 applied cleanly.
Applied patch lib/vhost/vhost.h cleanly.
Applying patch lib/vhost/vhost_user.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Rejected hunk #7.
Hunk #8 applied cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/lib/vhost/vhost.c b/lib/vhost/vhost.c (rejected hunks)
@@ -401,7 +401,6 @@ free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq)
vhost_free_async_mem(vq);
rte_rwlock_write_unlock(&vq->access_lock);
rte_free(vq->batch_copy_elems);
- vhost_user_iotlb_destroy(vq);
rte_free(vq->log_cache);
rte_free(vq);
}
@@ -635,6 +632,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
dev->virtqueue[i] = vq;
init_vring_queue(dev, vq, i);
rte_rwlock_init(&vq->access_lock);
+ rte_rwlock_init(&vq->iotlb_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;
vq->signalled_used_valid = false;
diff a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c (rejected hunks)
@@ -2639,15 +2641,14 @@ vhost_user_iotlb_msg(struct virtio_net **pdev,
if (!vva)
return RTE_VHOST_MSG_RESULT_ERR;
+ vhost_user_iotlb_cache_insert(dev, imsg->iova, vva, len, imsg->perm);
+
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
- vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
- len, imsg->perm);
-
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
translate_ring_addresses(&dev, &vq);
@@ -2657,15 +2658,14 @@ vhost_user_iotlb_msg(struct virtio_net **pdev,
}
break;
case VHOST_IOTLB_INVALIDATE:
+ vhost_user_iotlb_cache_remove(dev, imsg->iova, imsg->size);
+
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
- vhost_user_iotlb_cache_remove(dev, vq, imsg->iova,
- imsg->size);
-
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/iotlb.h...
error: lib/vhost/iotlb.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/iotlb.h...
error: lib/vhost/iotlb.h: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/socket.c...
Hunk #1 succeeded at 221 (offset -2 lines).
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
Checking patch lib/vhost/vhost_user.h...
Applied patch lib/vhost/socket.c cleanly.
Applied patch lib/vhost/vhost_user.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
Checking patch lib/vhost/vhost_user.h...
error: lib/vhost/vhost_user.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch doc/guides/prog_guide/vhost_lib.rst...
error: while searching for:
Inject the offloaded interrupt received by the 'guest_notify' callback,
into the vhost device's queue.
Vhost-user Implementations
--------------------------
error: patch failed: doc/guides/prog_guide/vhost_lib.rst:339
Checking patch doc/guides/rel_notes/release_23_07.rst...
error: while searching for:
rte_vhost_notify_guest(), is added to raise the interrupt outside of the
fast path.
Removed Items
-------------
error: patch failed: doc/guides/rel_notes/release_23_07.rst:62
Checking patch lib/vhost/rte_vhost.h...
Hunk #1 succeeded at 588 (offset -21 lines).
Checking patch lib/vhost/socket.c...
error: lib/vhost/socket.c: does not match index
Checking patch lib/vhost/version.map...
error: while searching for:
# added in 23.07
rte_vhost_notify_guest;
};
INTERNAL {
error: patch failed: lib/vhost/version.map:107
Applying patch doc/guides/prog_guide/vhost_lib.rst with 1 reject...
Rejected hunk #1.
Applying patch doc/guides/rel_notes/release_23_07.rst with 1 reject...
Rejected hunk #1.
Applied patch lib/vhost/rte_vhost.h cleanly.
Applying patch lib/vhost/version.map with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst (rejected hunks)
@@ -339,6 +339,10 @@ The following is an overview of some key Vhost API functions:
Inject the offloaded interrupt received by the 'guest_notify' callback,
into the vhost device's queue.
+* ``rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs)``
+
+ Set the maximum number of queue pairs supported by the device.
+
Vhost-user Implementations
--------------------------
diff a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst (rejected hunks)
@@ -62,6 +62,11 @@ New Features
rte_vhost_notify_guest(), is added to raise the interrupt outside of the
fast path.
+* **Added Vhost API to set maximum queue pairs supported.**
+
+ Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
+ maximum number of supported queue pairs, required for VDUSE support.
+
Removed Items
-------------
diff a/lib/vhost/version.map b/lib/vhost/version.map (rejected hunks)
@@ -107,6 +107,7 @@ EXPERIMENTAL {
# added in 23.07
rte_vhost_notify_guest;
+ rte_vhost_driver_set_max_queue_num;
};
INTERNAL {
Checking patch lib/vhost/meson.build...
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/virtio_net_ctrl.c...
Checking patch lib/vhost/virtio_net_ctrl.h...
Applied patch lib/vhost/meson.build cleanly.
Applied patch lib/vhost/virtio_net_ctrl.c cleanly.
Applied patch lib/vhost/virtio_net_ctrl.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/meson.build...
error: lib/vhost/meson.build: does not match index
Checking patch lib/vhost/socket.c...
error: lib/vhost/socket.c: does not match index
Checking patch lib/vhost/vduse.c...
Checking patch lib/vhost/vduse.h...
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Applied patch lib/vhost/vduse.c cleanly.
Applied patch lib/vhost/vduse.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch doc/guides/rel_notes/release_23_07.rst...
error: while searching for:
Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
maximum number of supported queue pairs, required for VDUSE support.
Removed Items
-------------
error: patch failed: doc/guides/rel_notes/release_23_07.rst:67
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
Applying patch doc/guides/rel_notes/release_23_07.rst with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst (rejected hunks)
@@ -67,6 +67,13 @@ New Features
Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
maximum number of supported queue pairs, required for VDUSE support.
+* **Added VDUSE support into Vhost library.**
+
+ VDUSE aims at implementing vDPA devices in userspace. It can be used as an
+ alternative to Vhost-user when using Vhost-vDPA, but also enable providing a
+ virtio-net netdev to the host when using Virtio-vDPA driver. A limitation in
+ this release is the lack of reconnection support.
+
Removed Items
-------------
https://lab.dpdk.org/results/dashboard/patchsets/26546/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] 3+ messages in thread
* |WARNING| pw128166-128191 [PATCH] [v5, 26/26] vhost: add VDUSE device stop
@ 2023-06-06 13:13 dpdklab
0 siblings, 0 replies; 3+ messages in thread
From: dpdklab @ 2023-06-06 13:13 UTC (permalink / raw)
To: test-report; +Cc: dpdk-test-reports
Test-Label: iol-testing
Test-Status: WARNING
http://dpdk.org/patch/128166
_apply patch failure_
Submitter: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Tuesday, June 06 2023 08:18:52
Applied on: CommitID:38689022f609a290645c7027084aee720c1fcf91
Apply patch set 128166-128191 failed:
Checking patch lib/vhost/iotlb.c...
Checking patch lib/vhost/iotlb.h...
Checking patch lib/vhost/vhost.c...
Hunk #1 succeeded at 63 (offset -4 lines).
Hunk #2 succeeded at 75 (offset -4 lines).
Hunk #3 succeeded at 85 (offset -4 lines).
error: while searching for:
vhost_free_async_mem(vq);
rte_rwlock_write_unlock(&vq->access_lock);
rte_free(vq->batch_copy_elems);
vhost_user_iotlb_destroy(vq);
rte_free(vq->log_cache);
rte_free(vq);
}
error: patch failed: lib/vhost/vhost.c:401
Hunk #5 succeeded at 575 (offset -3 lines).
Hunk #6 succeeded at 595 (offset -3 lines).
error: while searching for:
dev->virtqueue[i] = vq;
init_vring_queue(dev, vq, i);
rte_rwlock_init(&vq->access_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;
vq->signalled_used_valid = false;
error: patch failed: lib/vhost/vhost.c:635
Hunk #8 succeeded at 793 (offset -4 lines).
Checking patch lib/vhost/vhost.h...
Hunk #1 succeeded at 302 (offset -3 lines).
Hunk #2 succeeded at 476 (offset -3 lines).
Checking patch lib/vhost/vhost_user.c...
error: while searching for:
if (!vva)
return RTE_VHOST_MSG_RESULT_ERR;
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
len, imsg->perm);
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
translate_ring_addresses(&dev, &vq);
error: patch failed: lib/vhost/vhost_user.c:2639
error: while searching for:
}
break;
case VHOST_IOTLB_INVALIDATE:
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
vhost_user_iotlb_cache_remove(dev, vq, imsg->iova,
imsg->size);
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
error: patch failed: lib/vhost/vhost_user.c:2657
Hunk #8 succeeded at 2676 (offset 2 lines).
Applied patch lib/vhost/iotlb.c cleanly.
Applied patch lib/vhost/iotlb.h cleanly.
Applying patch lib/vhost/vhost.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Rejected hunk #4.
Hunk #5 applied cleanly.
Hunk #6 applied cleanly.
Rejected hunk #7.
Hunk #8 applied cleanly.
Applied patch lib/vhost/vhost.h cleanly.
Applying patch lib/vhost/vhost_user.c with 2 rejects...
Hunk #1 applied cleanly.
Hunk #2 applied cleanly.
Hunk #3 applied cleanly.
Hunk #4 applied cleanly.
Hunk #5 applied cleanly.
Rejected hunk #6.
Rejected hunk #7.
Hunk #8 applied cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/lib/vhost/vhost.c b/lib/vhost/vhost.c (rejected hunks)
@@ -401,7 +401,6 @@ free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq)
vhost_free_async_mem(vq);
rte_rwlock_write_unlock(&vq->access_lock);
rte_free(vq->batch_copy_elems);
- vhost_user_iotlb_destroy(vq);
rte_free(vq->log_cache);
rte_free(vq);
}
@@ -635,6 +632,7 @@ alloc_vring_queue(struct virtio_net *dev, uint32_t vring_idx)
dev->virtqueue[i] = vq;
init_vring_queue(dev, vq, i);
rte_rwlock_init(&vq->access_lock);
+ rte_rwlock_init(&vq->iotlb_lock);
vq->avail_wrap_counter = 1;
vq->used_wrap_counter = 1;
vq->signalled_used_valid = false;
diff a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c (rejected hunks)
@@ -2639,15 +2641,14 @@ vhost_user_iotlb_msg(struct virtio_net **pdev,
if (!vva)
return RTE_VHOST_MSG_RESULT_ERR;
+ vhost_user_iotlb_cache_insert(dev, imsg->iova, vva, len, imsg->perm);
+
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
- vhost_user_iotlb_cache_insert(dev, vq, imsg->iova, vva,
- len, imsg->perm);
-
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
translate_ring_addresses(&dev, &vq);
@@ -2657,15 +2658,14 @@ vhost_user_iotlb_msg(struct virtio_net **pdev,
}
break;
case VHOST_IOTLB_INVALIDATE:
+ vhost_user_iotlb_cache_remove(dev, imsg->iova, imsg->size);
+
for (i = 0; i < dev->nr_vring; i++) {
struct vhost_virtqueue *vq = dev->virtqueue[i];
if (!vq)
continue;
- vhost_user_iotlb_cache_remove(dev, vq, imsg->iova,
- imsg->size);
-
if (is_vring_iotlb(dev, vq, imsg)) {
rte_rwlock_write_lock(&vq->access_lock);
vring_invalidate(dev, vq);
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/iotlb.h...
error: lib/vhost/iotlb.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/iotlb.h...
error: lib/vhost/iotlb.h: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/socket.c...
Hunk #1 succeeded at 221 (offset -2 lines).
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
Checking patch lib/vhost/vhost_user.h...
Applied patch lib/vhost/socket.c cleanly.
Applied patch lib/vhost/vhost_user.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/iotlb.c...
error: lib/vhost/iotlb.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
Checking patch lib/vhost/vhost_user.h...
error: lib/vhost/vhost_user.h: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vhost.c...
error: lib/vhost/vhost.c: does not match index
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/vhost_user.c...
error: lib/vhost/vhost_user.c: does not match index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch doc/guides/prog_guide/vhost_lib.rst...
error: while searching for:
Inject the offloaded interrupt received by the 'guest_notify' callback,
into the vhost device's queue.
Vhost-user Implementations
--------------------------
error: patch failed: doc/guides/prog_guide/vhost_lib.rst:339
Checking patch doc/guides/rel_notes/release_23_07.rst...
error: while searching for:
rte_vhost_notify_guest(), is added to raise the interrupt outside of the
fast path.
Removed Items
-------------
error: patch failed: doc/guides/rel_notes/release_23_07.rst:62
Checking patch lib/vhost/rte_vhost.h...
Hunk #1 succeeded at 588 (offset -21 lines).
Checking patch lib/vhost/socket.c...
error: lib/vhost/socket.c: does not match index
Checking patch lib/vhost/version.map...
error: while searching for:
# added in 23.07
rte_vhost_notify_guest;
};
INTERNAL {
error: patch failed: lib/vhost/version.map:107
Applying patch doc/guides/prog_guide/vhost_lib.rst with 1 reject...
Rejected hunk #1.
Applying patch doc/guides/rel_notes/release_23_07.rst with 1 reject...
Rejected hunk #1.
Applied patch lib/vhost/rte_vhost.h cleanly.
Applying patch lib/vhost/version.map with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst (rejected hunks)
@@ -339,6 +339,10 @@ The following is an overview of some key Vhost API functions:
Inject the offloaded interrupt received by the 'guest_notify' callback,
into the vhost device's queue.
+* ``rte_vhost_driver_set_max_queue_num(const char *path, uint32_t max_queue_pairs)``
+
+ Set the maximum number of queue pairs supported by the device.
+
Vhost-user Implementations
--------------------------
diff a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst (rejected hunks)
@@ -62,6 +62,11 @@ New Features
rte_vhost_notify_guest(), is added to raise the interrupt outside of the
fast path.
+* **Added Vhost API to set maximum queue pairs supported.**
+
+ Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
+ maximum number of supported queue pairs, required for VDUSE support.
+
Removed Items
-------------
diff a/lib/vhost/version.map b/lib/vhost/version.map (rejected hunks)
@@ -107,6 +107,7 @@ EXPERIMENTAL {
# added in 23.07
rte_vhost_notify_guest;
+ rte_vhost_driver_set_max_queue_num;
};
INTERNAL {
Checking patch lib/vhost/meson.build...
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Checking patch lib/vhost/virtio_net_ctrl.c...
Checking patch lib/vhost/virtio_net_ctrl.h...
Applied patch lib/vhost/meson.build cleanly.
Applied patch lib/vhost/virtio_net_ctrl.c cleanly.
Applied patch lib/vhost/virtio_net_ctrl.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/meson.build...
error: lib/vhost/meson.build: does not match index
Checking patch lib/vhost/socket.c...
error: lib/vhost/socket.c: does not match index
Checking patch lib/vhost/vduse.c...
Checking patch lib/vhost/vduse.h...
Checking patch lib/vhost/vhost.h...
error: lib/vhost/vhost.h: does not match index
Applied patch lib/vhost/vduse.c cleanly.
Applied patch lib/vhost/vduse.h cleanly.
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
hint: Use 'git am --show-current-patch' to see the failed patch
Checking patch doc/guides/rel_notes/release_23_07.rst...
error: while searching for:
Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
maximum number of supported queue pairs, required for VDUSE support.
Removed Items
-------------
error: patch failed: doc/guides/rel_notes/release_23_07.rst:67
Checking patch lib/vhost/vduse.c...
error: lib/vhost/vduse.c: does not exist in index
Applying patch doc/guides/rel_notes/release_23_07.rst with 1 reject...
Rejected hunk #1.
hint: Use 'git am --show-current-patch' to see the failed patch
diff a/doc/guides/rel_notes/release_23_07.rst b/doc/guides/rel_notes/release_23_07.rst (rejected hunks)
@@ -67,6 +67,13 @@ New Features
Introduced ``rte_vhost_driver_set_max_queue_num()`` to be able to limit the
maximum number of supported queue pairs, required for VDUSE support.
+* **Added VDUSE support into Vhost library.**
+
+ VDUSE aims at implementing vDPA devices in userspace. It can be used as an
+ alternative to Vhost-user when using Vhost-vDPA, but also enable providing a
+ virtio-net netdev to the host when using Virtio-vDPA driver. A limitation in
+ this release is the lack of reconnection support.
+
Removed Items
-------------
https://lab.dpdk.org/results/dashboard/patchsets/26546/
UNH-IOL DPDK Community Lab
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-06-09 21:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-09 21:46 |WARNING| pw128166-128191 [PATCH] [v5, 26/26] vhost: add VDUSE device stop dpdklab
-- strict thread matches above, loose matches on Subject: below --
2023-06-08 21:35 dpdklab
2023-06-06 13:13 dpdklab
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).