From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4E0EA42C72 for ; Sat, 10 Jun 2023 00:32:07 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4E84840A84; Sat, 10 Jun 2023 00:32:07 +0200 (CEST) Received: from mail-io1-f100.google.com (mail-io1-f100.google.com [209.85.166.100]) by mails.dpdk.org (Postfix) with ESMTP id F378240A84 for ; Sat, 10 Jun 2023 00:31:52 +0200 (CEST) Received: by mail-io1-f100.google.com with SMTP id ca18e2360f4ac-77a103c5ebbso97096239f.3 for ; Fri, 09 Jun 2023 15:31:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=iol.unh.edu; s=unh-iol; t=1686349912; x=1688941912; h=cc:to:from:subject:message-id:date:from:to:cc:subject:date :message-id:reply-to; bh=Bg6R36kMPJxLDrsoEvSoQfGbe6nBEInL0BA6AxSY5QA=; b=SIy/s/p/LpM8zs+3yzkXS/4jWvfv+IuikQDd/WSHUfC4CmLZDgPY8chrjjXd9J4LAl Aaow5sdZs4X9Foh0OjHffdC57+aK9ybysweBmVKT5rsLC8hbOAJJyHt7b/oC4KC8VivH RKEHPn6mMnw04T9SMZlQa84sWJh+xRtQw4M/M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686349912; x=1688941912; h=cc:to:from:subject:message-id:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Bg6R36kMPJxLDrsoEvSoQfGbe6nBEInL0BA6AxSY5QA=; b=SbZuOays5BuIVrLoMBBXVx/YL4Li6jNiP39EHI8ScB4/B9UCJL8xb77UAP5rf/YwF6 RZ2jGUtY8bADhDjFOba8DL88373QzGJeilZRNRYxP3q+sUDDdqsvbpF+4jAPYsyAKWZ3 nehS2+DiTZ9uDUTWLMTYcxzwKmt+vvFB8Dm8kvPt7l+eYzFBIE5E3I96dYYsF0jSqxg8 IAs6+sTyqtqKETM/UZfUVjGSRo4pMNKE01wGmAXzsQpI3YALRSwCD4ryRK4ck5hW2Pis 0JUSZqYDW2rl1IO1xQe1Wb+lkUzh7JCsVjZDlO8z6QyfEWJeehqn5ejRzbKwj2iXEWdi Z7+g== X-Gm-Message-State: AC+VfDy7RNCL7pQlsHefcLVWN568tXxC2sVUL2PrBoMaIx/twEuVzMz+ 5Rp7FVaGjMYYli5cXieHZTPj2YjPSW2e+4U5ZFqC7d6gpmZ2OTMJh+Y3kQ== X-Google-Smtp-Source: ACHHUZ71hCM+3FOFXQElNGKqZsOhXxLTyh+Xu2L94WaNh/dXwd+0c344Ra08QL7TT/YObW4FLR8f24FnTuFP X-Received: by 2002:a6b:f30c:0:b0:77a:e728:f087 with SMTP id m12-20020a6bf30c000000b0077ae728f087mr1434008ioh.21.1686349912374; Fri, 09 Jun 2023 15:31:52 -0700 (PDT) Received: from postal.iol.unh.edu (postal.iol.unh.edu. [132.177.123.84]) by smtp-relay.gmail.com with ESMTPS id f12-20020a5d814c000000b00777b805da6bsm17085ioo.35.2023.06.09.15.31.52 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Jun 2023 15:31:52 -0700 (PDT) X-Relaying-Domain: iol.unh.edu Date: Fri, 09 Jun 2023 15:31:52 -0700 (PDT) Message-ID: <6483a858.5d0a0220.24d87.08d6SMTPIN_ADDED_MISSING@mx.google.com> Received: from [172.17.0.3] (unknown [172.18.0.214]) by postal.iol.unh.edu (Postfix) with ESMTP id E14C2605246B; Fri, 9 Jun 2023 18:31:51 -0400 (EDT) Subject: |WARNING| pw127909-127932 [PATCH] [v4, 26/26] vhost: add VDUSE device stop From: dpdklab@iol.unh.edu To: test-report@dpdk.org Cc: dpdk-test-reports@iol.unh.edu Content-Type: text/plain X-BeenThere: test-report@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: automatic DPDK test reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: test-report-bounces@dpdk.org Test-Label: iol-testing Test-Status: WARNING http://dpdk.org/patch/127909 _apply patch failure_ Submitter: Maxime Coquelin Date: Thursday, June 01 2023 20:08:12 Applied on: CommitID:c9df59bcc9bec67783de98486879594e52bdc418 Apply patch set 127909-127932 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,12 @@ 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. + Removed Items ------------- https://lab.dpdk.org/results/dashboard/patchsets/26495/ UNH-IOL DPDK Community Lab