Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/109696 _apply patch failure_ Submitter: Yuan Wang Date: Wednesday, April 13 2022 18:27:42 Applied on: CommitID:1e230b9be8866939ef7ce9f7f16b8c8369b7bc28 Apply patch set 109696-109697 failed: Checking patch doc/guides/prog_guide/vhost_lib.rst... error: while searching for: * ``rte_vhost_clear_queue_thread_unsafe(vid, queue_id, **pkts, count, dma_id, vchan_id)`` Clear inflight packets which are submitted to DMA engine in vhost async data path. Completed packets are returned to applications through ``pkts``. * ``rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id, error: patch failed: doc/guides/prog_guide/vhost_lib.rst:273 Checking patch doc/guides/rel_notes/release_22_07.rst... error: while searching for: Added vhost async dequeue API which can leverage DMA devices to accelerate receiving pkts from guest. Removed Items ------------- error: patch failed: doc/guides/rel_notes/release_22_07.rst:60 Checking patch lib/vhost/rte_vhost_async.h... Checking patch lib/vhost/version.map... error: while searching for: # added in 22.07 rte_vhost_async_try_dequeue_burst; }; INTERNAL { error: patch failed: lib/vhost/version.map:90 Checking patch lib/vhost/virtio_net.c... Hunk #2 succeeded at 2088 (offset -14 lines). Hunk #3 succeeded at 2109 (offset -14 lines). Applying patch doc/guides/prog_guide/vhost_lib.rst with 1 reject... Rejected hunk #1. Applying patch doc/guides/rel_notes/release_22_07.rst with 1 reject... Rejected hunk #1. Applied patch lib/vhost/rte_vhost_async.h cleanly. Applying patch lib/vhost/version.map with 1 reject... Rejected hunk #1. Applied patch lib/vhost/virtio_net.c cleanly. diff a/doc/guides/prog_guide/vhost_lib.rst b/doc/guides/prog_guide/vhost_lib.rst (rejected hunks) @@ -273,7 +273,13 @@ The following is an overview of some key Vhost API functions: * ``rte_vhost_clear_queue_thread_unsafe(vid, queue_id, **pkts, count, dma_id, vchan_id)`` - Clear inflight packets which are submitted to DMA engine in vhost async data + Clear in-flight packets which are submitted to async channel in vhost + async data path without performing any locking. Completed packets are + returned to applications through ``pkts``. + +* ``rte_vhost_clear_queue(vid, queue_id, **pkts, count, dma_id, vchan_id)`` + + Clear in-flight packets which are submitted to async channel in vhost async data path. Completed packets are returned to applications through ``pkts``. * ``rte_vhost_async_try_dequeue_burst(int vid, uint16_t queue_id, diff a/doc/guides/rel_notes/release_22_07.rst b/doc/guides/rel_notes/release_22_07.rst (rejected hunks) @@ -60,6 +60,10 @@ New Features Added vhost async dequeue API which can leverage DMA devices to accelerate receiving pkts from guest. +* **Added thread-safe version of inflight packet clear API in vhost library.** + Added an API which can clear the inflight packets submitted to + the async channel in a thread-safe manner in the vhost async data path. + Removed Items ------------- diff a/lib/vhost/version.map b/lib/vhost/version.map (rejected hunks) @@ -90,6 +90,7 @@ EXPERIMENTAL { # added in 22.07 rte_vhost_async_try_dequeue_burst; + rte_vhost_clear_queue; }; INTERNAL { Checking patch examples/vhost/main.c... error: while searching for: if (!vdev) return -1; if (queue_id != VIRTIO_RXQ) return 0; if (dma_bind[vid2socketid[vid]].dmas[queue_id].async_enabled) { if (!enable) vhost_clear_queue_thread_unsafe(vdev, queue_id); error: patch failed: examples/vhost/main.c:1767 Applying patch examples/vhost/main.c with 1 reject... Rejected hunk #1. diff a/examples/vhost/main.c b/examples/vhost/main.c (rejected hunks) @@ -1767,9 +1767,6 @@ vring_state_changed(int vid, uint16_t queue_id, int enable) if (!vdev) return -1; - if (queue_id != VIRTIO_RXQ) - return 0; - if (dma_bind[vid2socketid[vid]].dmas[queue_id].async_enabled) { if (!enable) vhost_clear_queue_thread_unsafe(vdev, queue_id); https://lab.dpdk.org/results/dashboard/patchsets/21794/ UNH-IOL DPDK Community Lab