Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/125689/?format=api
{ "id": 125689, "url": "http://patches.dpdk.org/api/patches/125689/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230331154259.1447831-15-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20230331154259.1447831-15-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230331154259.1447831-15-maxime.coquelin@redhat.com", "date": "2023-03-31T15:42:46", "name": "[RFC,14/27] vhost: add helper for interrupt injection", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "f4c495fb9cfd1a2f42bf61793cdf4cb76109c4fc", "submitter": { "id": 512, "url": "http://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230331154259.1447831-15-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 27594, "url": "http://patches.dpdk.org/api/series/27594/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=27594", "date": "2023-03-31T15:42:32", "name": "Add VDUSE support to Vhost library", "version": 1, "mbox": "http://patches.dpdk.org/series/27594/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/125689/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/125689/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id BFAC942887;\n\tFri, 31 Mar 2023 17:44:52 +0200 (CEST)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8AF9F42D3A;\n\tFri, 31 Mar 2023 17:43:48 +0200 (CEST)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.129.124])\n by mails.dpdk.org (Postfix) with ESMTP id B2CC142D33\n for <dev@dpdk.org>; Fri, 31 Mar 2023 17:43:47 +0200 (CEST)", "from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com\n [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-467-4kIAusRWOkGtXVKvqpEmXA-1; Fri, 31 Mar 2023 11:43:44 -0400", "from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B370D3C10693;\n Fri, 31 Mar 2023 15:43:43 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.39.208.6])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 7142D2027040;\n Fri, 31 Mar 2023 15:43:40 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1680277427;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=aOBLjEobRVaJIQA0lIk4GLINRlU5Goj1AlU+vw9Oxwo=;\n b=UgRFr4FAiJKUVCmtwgCoqDx3N77miD3n+6K7vIFqTnb2ew9HF8olwzyGnV0o+EAnVHeH8G\n vZs/RYP9cCVolC/0+R1bZaigIrCUXk0moBYHgG8eME4byQW8lblIgM6AMDjyEo97KuNfa6\n VOjhRIdB5FCD+e8XzzFKu7QetbrFvOA=", "X-MC-Unique": "4kIAusRWOkGtXVKvqpEmXA-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, david.marchand@redhat.com, chenbo.xia@intel.com,\n mkp@redhat.com, fbl@redhat.com, jasowang@redhat.com,\n cunming.liang@intel.com, xieyongji@bytedance.com, echaudro@redhat.com,\n eperezma@redhat.com, amorenoz@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[RFC 14/27] vhost: add helper for interrupt injection", "Date": "Fri, 31 Mar 2023 17:42:46 +0200", "Message-Id": "<20230331154259.1447831-15-maxime.coquelin@redhat.com>", "In-Reply-To": "<20230331154259.1447831-1-maxime.coquelin@redhat.com>", "References": "<20230331154259.1447831-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.4", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "Vhost-user uses eventfd to inject IRQs, but VDUSE uses\nan ioctl.\n\nThis patch prepares vhost_vring_call_split() and\nvhost_vring_call_packed() to support VDUSE by introducing\na new helper.\n\nIt also adds a new counter to for guest notification\nfailures, which could happen in case of uninitialized call\nfile descriptor for example.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n lib/vhost/vhost.c | 6 +++++\n lib/vhost/vhost.h | 54 +++++++++++++++++++++++-------------------\n lib/vhost/vhost_user.c | 10 ++++++++\n 3 files changed, 46 insertions(+), 24 deletions(-)", "diff": "diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c\nindex 790eb06b28..c07028f2b3 100644\n--- a/lib/vhost/vhost.c\n+++ b/lib/vhost/vhost.c\n@@ -44,6 +44,7 @@ static const struct vhost_vq_stats_name_off vhost_vq_stat_strings[] = {\n \t{\"size_1024_1518_packets\", offsetof(struct vhost_virtqueue, stats.size_bins[6])},\n \t{\"size_1519_max_packets\", offsetof(struct vhost_virtqueue, stats.size_bins[7])},\n \t{\"guest_notifications\", offsetof(struct vhost_virtqueue, stats.guest_notifications)},\n+\t{\"guest_notifications_error\", offsetof(struct vhost_virtqueue, stats.guest_notifications_error)},\n \t{\"iotlb_hits\", offsetof(struct vhost_virtqueue, stats.iotlb_hits)},\n \t{\"iotlb_misses\", offsetof(struct vhost_virtqueue, stats.iotlb_misses)},\n \t{\"inflight_submitted\", offsetof(struct vhost_virtqueue, stats.inflight_submitted)},\n@@ -697,6 +698,11 @@ vhost_new_device(struct vhost_backend_ops *ops)\n \t\treturn -1;\n \t}\n \n+\tif (ops->inject_irq == NULL) {\n+\t\tVHOST_LOG_CONFIG(\"device\", ERR, \"missing IRQ injection backend op.\\n\");\n+\t\treturn -1;\n+\t}\n+\n \tpthread_mutex_lock(&vhost_dev_lock);\n \tfor (i = 0; i < RTE_MAX_VHOST_DEVICE; i++) {\n \t\tif (vhost_devices[i] == NULL)\ndiff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h\nindex ee7640e901..8f0875b4e2 100644\n--- a/lib/vhost/vhost.h\n+++ b/lib/vhost/vhost.h\n@@ -90,16 +90,20 @@\n #endif\n \n struct virtio_net;\n+struct vhost_virtqueue;\n+\n typedef void (*vhost_iotlb_remove_notify)(uint64_t addr, uint64_t off, uint64_t size);\n \n typedef int (*vhost_iotlb_miss_cb)(struct virtio_net *dev, uint64_t iova, uint8_t perm);\n \n+typedef int (*vhost_vring_inject_irq_cb)(struct virtio_net *dev, struct vhost_virtqueue *vq);\n /**\n * Structure that contains backend-specific ops.\n */\n struct vhost_backend_ops {\n \tvhost_iotlb_remove_notify iotlb_remove_notify;\n \tvhost_iotlb_miss_cb iotlb_miss;\n+\tvhost_vring_inject_irq_cb inject_irq;\n };\n \n /**\n@@ -149,6 +153,7 @@ struct virtqueue_stats {\n \t/* Size bins in array as RFC 2819, undersized [0], 64 [1], etc */\n \tuint64_t size_bins[8];\n \tuint64_t guest_notifications;\n+\tuint64_t guest_notifications_error;\n \tuint64_t iotlb_hits;\n \tuint64_t iotlb_misses;\n \tuint64_t inflight_submitted;\n@@ -900,6 +905,24 @@ vhost_need_event(uint16_t event_idx, uint16_t new_idx, uint16_t old)\n \treturn (uint16_t)(new_idx - event_idx - 1) < (uint16_t)(new_idx - old);\n }\n \n+static __rte_always_inline void\n+vhost_vring_inject_irq(struct virtio_net *dev, struct vhost_virtqueue *vq)\n+{\n+\tint ret;\n+\n+\tret = dev->backend_ops->inject_irq(dev, vq);\n+\tif (ret) {\n+\t\tif (dev->flags & VIRTIO_DEV_STATS_ENABLED)\n+\t\t\tvq->stats.guest_notifications_error++;\n+\t\treturn;\n+\t}\n+\n+\tif (dev->flags & VIRTIO_DEV_STATS_ENABLED)\n+\t\tvq->stats.guest_notifications++;\n+\tif (dev->notify_ops->guest_notified)\n+\t\tdev->notify_ops->guest_notified(dev->vid);\n+}\n+\n static __rte_always_inline void\n vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq)\n {\n@@ -919,25 +942,13 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq)\n \t\t\t\"%s: used_event_idx=%d, old=%d, new=%d\\n\",\n \t\t\t__func__, vhost_used_event(vq), old, new);\n \n-\t\tif ((vhost_need_event(vhost_used_event(vq), new, old) ||\n-\t\t\t\t\tunlikely(!signalled_used_valid)) &&\n-\t\t\t\tvq->callfd >= 0) {\n-\t\t\teventfd_write(vq->callfd, (eventfd_t) 1);\n-\t\t\tif (dev->flags & VIRTIO_DEV_STATS_ENABLED)\n-\t\t\t\tvq->stats.guest_notifications++;\n-\t\t\tif (dev->notify_ops->guest_notified)\n-\t\t\t\tdev->notify_ops->guest_notified(dev->vid);\n-\t\t}\n+\t\tif (vhost_need_event(vhost_used_event(vq), new, old) ||\n+\t\t\t\t\tunlikely(!signalled_used_valid))\n+\t\t\tvhost_vring_inject_irq(dev, vq);\n \t} else {\n \t\t/* Kick the guest if necessary. */\n-\t\tif (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT)\n-\t\t\t\t&& (vq->callfd >= 0)) {\n-\t\t\teventfd_write(vq->callfd, (eventfd_t)1);\n-\t\t\tif (dev->flags & VIRTIO_DEV_STATS_ENABLED)\n-\t\t\t\tvq->stats.guest_notifications++;\n-\t\t\tif (dev->notify_ops->guest_notified)\n-\t\t\t\tdev->notify_ops->guest_notified(dev->vid);\n-\t\t}\n+\t\tif (!(vq->avail->flags & VRING_AVAIL_F_NO_INTERRUPT))\n+\t\t\tvhost_vring_inject_irq(dev, vq);\n \t}\n }\n \n@@ -988,13 +999,8 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq)\n \tif (vhost_need_event(off, new, old))\n \t\tkick = true;\n kick:\n-\tif (kick && vq->callfd >= 0) {\n-\t\teventfd_write(vq->callfd, (eventfd_t)1);\n-\t\tif (dev->flags & VIRTIO_DEV_STATS_ENABLED)\n-\t\t\tvq->stats.guest_notifications++;\n-\t\tif (dev->notify_ops->guest_notified)\n-\t\t\tdev->notify_ops->guest_notified(dev->vid);\n-\t}\n+\tif (kick)\n+\t\tvhost_vring_inject_irq(dev, vq);\n }\n \n static __rte_always_inline void\ndiff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c\nindex 6a9f32972a..2e4a9fdea4 100644\n--- a/lib/vhost/vhost_user.c\n+++ b/lib/vhost/vhost_user.c\n@@ -3465,8 +3465,18 @@ int rte_vhost_host_notifier_ctrl(int vid, uint16_t qid, bool enable)\n \treturn ret;\n }\n \n+static int\n+vhost_user_inject_irq(struct virtio_net *dev __rte_unused, struct vhost_virtqueue *vq)\n+{\n+\tif (vq->callfd < 0)\n+\t\treturn -1;\n+\n+\treturn eventfd_write(vq->callfd, (eventfd_t)1);\n+}\n+\n static struct vhost_backend_ops vhost_user_backend_ops = {\n \t.iotlb_miss = vhost_user_iotlb_miss,\n+\t.inject_irq = vhost_user_inject_irq,\n };\n \n int\n", "prefixes": [ "RFC", "14/27" ] }