Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/120376/?format=api
{ "id": 120376, "url": "https://patches.dpdk.org/api/patches/120376/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20221130155639.150553-20-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "https://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": "<20221130155639.150553-20-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20221130155639.150553-20-maxime.coquelin@redhat.com", "date": "2022-11-30T15:56:37", "name": "[v1,19/21] net/virtio-user: forward control messages to shadow queue", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "29cd78a2c704a9a5bd60a88773a7a20c06051fcd", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20221130155639.150553-20-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 25958, "url": "https://patches.dpdk.org/api/series/25958/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=25958", "date": "2022-11-30T15:56:18", "name": "Add control queue & MQ support to Virtio-user vDPA", "version": 1, "mbox": "https://patches.dpdk.org/series/25958/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/120376/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/120376/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 7007BA00C2;\n\tWed, 30 Nov 2022 16:58:51 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 8438542D76;\n\tWed, 30 Nov 2022 16:57:21 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id 1CC6C42D6D\n for <dev@dpdk.org>; Wed, 30 Nov 2022 16:57:19 +0100 (CET)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) 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-330-Qf-43n6GPP-yLqBuRvJMyA-1; Wed, 30 Nov 2022 10:57:16 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com\n [10.11.54.1])\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 30656185A792;\n Wed, 30 Nov 2022 15:57:16 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.39.208.22])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 07D0540C83D9;\n Wed, 30 Nov 2022 15:57:14 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1669823838;\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=UFbgNTF81Y13bSZ+40wXMV8pAf94LiiV59jBR+MG7ZI=;\n b=fjc+Nc/GcMu3jFhd+uuYQcTN9K8L669uucxwqh+Kkp1cabTzqLkypeg5pCjkqxZCgeys1V\n u9rKfP6rxXHQvGjETzta1BpXlrmfBk4dY5W3yBZkO34Fi535V8YMKQM21jhayhxPu0WreA\n q2TNt0AqJ8+vHRXbVIFcqbmblyKeaXs=", "X-MC-Unique": "Qf-43n6GPP-yLqBuRvJMyA-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com,\n eperezma@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[PATCH v1 19/21] net/virtio-user: forward control messages to shadow\n queue", "Date": "Wed, 30 Nov 2022 16:56:37 +0100", "Message-Id": "<20221130155639.150553-20-maxime.coquelin@redhat.com>", "In-Reply-To": "<20221130155639.150553-1-maxime.coquelin@redhat.com>", "References": "<20221130155639.150553-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.1", "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": "This patch implements control messages forwarding from the\nregular control queue to the shadow control queue.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n .../net/virtio/virtio_user/virtio_user_dev.c | 37 ++++++++++++++++---\n .../net/virtio/virtio_user/virtio_user_dev.h | 3 --\n drivers/net/virtio/virtio_user_ethdev.c | 6 +--\n 3 files changed, 33 insertions(+), 13 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex b0d603ee12..7c48c9bb29 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -750,7 +750,7 @@ virtio_user_dev_uninit(struct virtio_user_dev *dev)\n \tdev->ops->destroy(dev);\n }\n \n-uint8_t\n+static uint8_t\n virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs)\n {\n \tuint16_t i;\n@@ -775,14 +775,17 @@ virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs)\n \treturn ret;\n }\n \n+#define CVQ_MAX_DATA_DESCS 32\n+\n static uint32_t\n-virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,\n+virtio_user_handle_ctrl_msg_split(struct virtio_user_dev *dev, struct vring *vring,\n \t\t\t uint16_t idx_hdr)\n {\n \tstruct virtio_net_ctrl_hdr *hdr;\n \tvirtio_net_ctrl_ack status = ~0;\n \tuint16_t i, idx_data, idx_status;\n \tuint32_t n_descs = 0;\n+\tint dlen[CVQ_MAX_DATA_DESCS], nb_dlen = 0;\n \n \t/* locate desc for header, data, and status */\n \tidx_data = vring->desc[idx_hdr].next;\n@@ -790,6 +793,7 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,\n \n \ti = idx_data;\n \twhile (vring->desc[i].flags == VRING_DESC_F_NEXT) {\n+\t\tdlen[nb_dlen++] = vring->desc[i].len;\n \t\ti = vring->desc[i].next;\n \t\tn_descs++;\n \t}\n@@ -811,6 +815,11 @@ virtio_user_handle_ctrl_msg(struct virtio_user_dev *dev, struct vring *vring,\n \t\tstatus = 0;\n \t}\n \n+\tif (status != 0 || !dev->scvq)\n+\t\tgoto out;\n+\n+\tstatus = virtio_send_command(&dev->scvq->cq, (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen);\n+out:\n \t/* Update status */\n \t*(virtio_net_ctrl_ack *)(uintptr_t)vring->desc[idx_status].addr = status;\n \n@@ -836,6 +845,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,\n \tuint16_t idx_data, idx_status;\n \t/* initialize to one, header is first */\n \tuint32_t n_descs = 1;\n+\tint dlen[CVQ_MAX_DATA_DESCS], nb_dlen = 0;\n \n \t/* locate desc for header, data, and status */\n \tidx_data = idx_hdr + 1;\n@@ -846,6 +856,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,\n \n \tidx_status = idx_data;\n \twhile (vring->desc[idx_status].flags & VRING_DESC_F_NEXT) {\n+\t\tdlen[nb_dlen++] = vring->desc[idx_status].len;\n \t\tidx_status++;\n \t\tif (idx_status >= dev->queue_size)\n \t\t\tidx_status -= dev->queue_size;\n@@ -866,6 +877,11 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,\n \t\tstatus = 0;\n \t}\n \n+\tif (status != 0 || !dev->scvq)\n+\t\tgoto out;\n+\n+\tstatus = virtio_send_command(&dev->scvq->cq, (struct virtio_pmd_ctrl *)hdr, dlen, nb_dlen);\n+out:\n \t/* Update status */\n \t*(virtio_net_ctrl_ack *)(uintptr_t)\n \t\tvring->desc[idx_status].addr = status;\n@@ -877,7 +893,7 @@ virtio_user_handle_ctrl_msg_packed(struct virtio_user_dev *dev,\n \treturn n_descs;\n }\n \n-void\n+static void\n virtio_user_handle_cq_packed(struct virtio_user_dev *dev, uint16_t queue_idx)\n {\n \tstruct virtio_user_queue *vq = &dev->packed_queues[queue_idx];\n@@ -909,8 +925,8 @@ virtio_user_handle_cq_packed(struct virtio_user_dev *dev, uint16_t queue_idx)\n \t}\n }\n \n-void\n-virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)\n+static void\n+virtio_user_handle_cq_split(struct virtio_user_dev *dev, uint16_t queue_idx)\n {\n \tuint16_t avail_idx, desc_idx;\n \tstruct vring_used_elem *uep;\n@@ -924,7 +940,7 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)\n \t\t\t & (vring->num - 1);\n \t\tdesc_idx = vring->avail->ring[avail_idx];\n \n-\t\tn_descs = virtio_user_handle_ctrl_msg(dev, vring, desc_idx);\n+\t\tn_descs = virtio_user_handle_ctrl_msg_split(dev, vring, desc_idx);\n \n \t\t/* Update used ring */\n \t\tuep = &vring->used->ring[avail_idx];\n@@ -935,6 +951,15 @@ virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)\n \t}\n }\n \n+void\n+virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx)\n+{\n+\tif (virtio_with_packed_queue(&dev->hw))\n+\t\tvirtio_user_handle_cq_packed(dev, queue_idx);\n+\telse\n+\t\tvirtio_user_handle_cq_split(dev, queue_idx);\n+}\n+\n static void\n virtio_user_control_queue_notify(struct virtqueue *vq, void *cookie)\n {\ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h\nindex e0db4faf3f..e8753f6019 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.h\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h\n@@ -74,9 +74,6 @@ int virtio_user_dev_init(struct virtio_user_dev *dev, char *path, uint16_t queue\n \t\t\t enum virtio_user_backend_type backend_type);\n void virtio_user_dev_uninit(struct virtio_user_dev *dev);\n void virtio_user_handle_cq(struct virtio_user_dev *dev, uint16_t queue_idx);\n-void virtio_user_handle_cq_packed(struct virtio_user_dev *dev,\n-\t\t\t\t uint16_t queue_idx);\n-uint8_t virtio_user_handle_mq(struct virtio_user_dev *dev, uint16_t q_pairs);\n int virtio_user_dev_create_shadow_cvq(struct virtio_user_dev *dev, struct virtqueue *vq);\n void virtio_user_dev_destroy_shadow_cvq(struct virtio_user_dev *dev);\n int virtio_user_dev_set_status(struct virtio_user_dev *dev, uint8_t status);\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 626bd95b62..d23959e836 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -266,10 +266,8 @@ virtio_user_notify_queue(struct virtio_hw *hw, struct virtqueue *vq)\n \tstruct virtio_user_dev *dev = virtio_user_get_dev(hw);\n \n \tif (hw->cvq && (virtnet_cq_to_vq(hw->cvq) == vq)) {\n-\t\tif (virtio_with_packed_queue(vq->hw))\n-\t\t\tvirtio_user_handle_cq_packed(dev, vq->vq_queue_index);\n-\t\telse\n-\t\t\tvirtio_user_handle_cq(dev, vq->vq_queue_index);\n+\t\tvirtio_user_handle_cq(dev, vq->vq_queue_index);\n+\n \t\treturn;\n \t}\n \n", "prefixes": [ "v1", "19/21" ] }