Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87319/?format=api
{ "id": 87319, "url": "https://patches.dpdk.org/api/patches/87319/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-32-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": "<20210126101639.250481-32-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-32-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:26", "name": "[v4,31/44] net/virtio: add Virtio-user vring file ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c7a7a5820057189d1ec3c2555c00b297e805aeb6", "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/20210126101639.250481-32-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14950, "url": "https://patches.dpdk.org/api/series/14950/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14950", "date": "2021-01-26T10:15:55", "name": "net/virtio: Virtio PMD rework", "version": 4, "mbox": "https://patches.dpdk.org/series/14950/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/87319/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/87319/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 47081A052A;\n\tTue, 26 Jan 2021 11:22:05 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EEB1B1413F8;\n\tTue, 26 Jan 2021 11:18:24 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by mails.dpdk.org (Postfix) with ESMTP id 1631F1413DD\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:16 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-235-AZV7nt70N7uDfez4fxPyWA-1; Tue, 26 Jan 2021 05:18:14 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com\n [10.5.11.11])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 74085107ACE6;\n Tue, 26 Jan 2021 10:18:13 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 07D516F45C;\n Tue, 26 Jan 2021 10:18:11 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656296;\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=uonuyXHbc7UQxHyzBSYreOgACn1icAwi/vQasLylCpM=;\n b=Dn+VJwlSYogoylFLMYWoT5enGBOkGZcaHXoXhHMkOEop37KxLXzwLMIaLUBpACNFKy/r/H\n L0IM+wo6Q5/WqFawRjJtseTzqdDC29arsf6PfNPFzKN8UqUcw1aDeF6z30YkhDKyhyyFE6\n W43N+jDJdgxq3W13XPsGqSf/X5+UwMk=", "X-MC-Unique": "AZV7nt70N7uDfez4fxPyWA-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,\n amorenoz@redhat.com, david.marchand@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Tue, 26 Jan 2021 11:16:26 +0100", "Message-Id": "<20210126101639.250481-32-maxime.coquelin@redhat.com>", "In-Reply-To": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "References": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH v4 31/44] net/virtio: add Virtio-user vring file\n ops", "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", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "This patch introduces new callbacks for setting\nvring files (kick and call).\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\nReviewed-by: Chenbo Xia <chenbo.xia@intel.com>\n---\n drivers/net/virtio/virtio_user/vhost.h | 2 +\n drivers/net/virtio/virtio_user/vhost_kernel.c | 41 +++++++++++++++--\n drivers/net/virtio/virtio_user/vhost_user.c | 46 +++++++++++++++++--\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 18 ++++++--\n .../net/virtio/virtio_user/virtio_user_dev.c | 4 +-\n 5 files changed, 97 insertions(+), 14 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 2d433d5966..94c524547e 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -118,6 +118,8 @@ struct virtio_user_backend_ops {\n \tint (*set_vring_num)(struct virtio_user_dev *dev, struct vhost_vring_state *state);\n \tint (*set_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state);\n \tint (*get_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state);\n+\tint (*set_vring_call)(struct virtio_user_dev *dev, struct vhost_vring_file *file);\n+\tint (*set_vring_kick)(struct virtio_user_dev *dev, struct vhost_vring_file *file);\n \tint (*send_request)(struct virtio_user_dev *dev,\n \t\t\t enum vhost_user_request req,\n \t\t\t void *arg);\ndiff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c\nindex f6e7cf4717..bdef436595 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -259,11 +259,44 @@ vhost_kernel_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_stat\n \treturn vhost_kernel_set_vring(dev, VHOST_GET_VRING_BASE, state);\n }\n \n+static int\n+vhost_kernel_set_vring_file(struct virtio_user_dev *dev, uint64_t req,\n+\t\tstruct vhost_vring_file *file)\n+{\n+\tint ret, fd;\n+\tunsigned int index = file->index;\n+\n+\t/* Convert from queue index to queue-pair & offset */\n+\tfd = dev->vhostfds[file->index / 2];\n+\tfile->index %= 2;\n+\n+\tret = vhost_kernel_ioctl(fd, req, file);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set vring file (request %\" PRIu64 \")\", req);\n+\t\treturn -1;\n+\t}\n+\n+\t/* restore index back to queue index */\n+\tfile->index = index;\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_kernel_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file)\n+{\n+\treturn vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_KICK, file);\n+}\n+\n+static int\n+vhost_kernel_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file)\n+{\n+\treturn vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_CALL, file);\n+}\n+\n static uint64_t vhost_req_user_to_kernel[] = {\n \t[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,\n-\t[VHOST_USER_SET_VRING_CALL] = VHOST_SET_VRING_CALL,\n \t[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,\n-\t[VHOST_USER_SET_VRING_KICK] = VHOST_SET_VRING_KICK,\n };\n \n static int\n@@ -283,8 +316,6 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,\n \n \tswitch (req_kernel) {\n \tcase VHOST_SET_VRING_ADDR:\n-\tcase VHOST_SET_VRING_KICK:\n-\tcase VHOST_SET_VRING_CALL:\n \t\tqueue_sel = *(unsigned int *)arg;\n \t\tvhostfd = dev->vhostfds[queue_sel / 2];\n \t\t*(unsigned int *)arg = queue_sel % 2;\n@@ -440,6 +471,8 @@ struct virtio_user_backend_ops virtio_ops_kernel = {\n \t.set_vring_num = vhost_kernel_set_vring_num,\n \t.set_vring_base = vhost_kernel_set_vring_base,\n \t.get_vring_base = vhost_kernel_get_vring_base,\n+\t.set_vring_call = vhost_kernel_set_vring_call,\n+\t.set_vring_kick = vhost_kernel_set_vring_kick,\n \t.send_request = vhost_kernel_send_request,\n \t.enable_qp = vhost_kernel_enable_queue_pair\n };\ndiff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c\nindex 8d4c5cce77..ccb40484f4 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -498,13 +498,51 @@ vhost_user_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state\n \treturn -1;\n }\n \n+static int\n+vhost_user_set_vring_file(struct virtio_user_dev *dev, enum vhost_user_request req,\n+\t\tstruct vhost_vring_file *file)\n+{\n+\tint ret;\n+\tint fd = file->fd;\n+\tint num_fd = 0;\n+\tstruct vhost_user_msg msg = {\n+\t\t.request = req,\n+\t\t.flags = VHOST_USER_VERSION,\n+\t\t.size = sizeof(msg.payload.u64),\n+\t\t.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK,\n+\t};\n+\n+\tif (fd >= 0)\n+\t\tnum_fd++;\n+\telse\n+\t\tmsg.payload.u64 |= VHOST_USER_VRING_NOFD_MASK;\n+\n+\tret = vhost_user_write(dev->vhostfd, &msg, &fd, num_fd);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set vring file (request %d)\", req);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_user_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file)\n+{\n+\treturn vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_CALL, file);\n+}\n+\n+static int\n+vhost_user_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file)\n+{\n+\treturn vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file);\n+}\n+\n static struct vhost_user_msg m;\n \n const char * const vhost_msg_strings[] = {\n \t[VHOST_USER_RESET_OWNER] = \"VHOST_RESET_OWNER\",\n-\t[VHOST_USER_SET_VRING_CALL] = \"VHOST_SET_VRING_CALL\",\n \t[VHOST_USER_SET_VRING_ADDR] = \"VHOST_SET_VRING_ADDR\",\n-\t[VHOST_USER_SET_VRING_KICK] = \"VHOST_SET_VRING_KICK\",\n \t[VHOST_USER_SET_STATUS] = \"VHOST_SET_STATUS\",\n \t[VHOST_USER_GET_STATUS] = \"VHOST_GET_STATUS\",\n };\n@@ -577,8 +615,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\tmsg.size = sizeof(m.payload.addr);\n \t\tbreak;\n \n-\tcase VHOST_USER_SET_VRING_KICK:\n-\tcase VHOST_USER_SET_VRING_CALL:\n \tcase VHOST_USER_SET_VRING_ERR:\n \t\tfile = arg;\n \t\tmsg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK;\n@@ -749,6 +785,8 @@ struct virtio_user_backend_ops virtio_ops_user = {\n \t.set_vring_num = vhost_user_set_vring_num,\n \t.set_vring_base = vhost_user_set_vring_base,\n \t.get_vring_base = vhost_user_get_vring_base,\n+\t.set_vring_call = vhost_user_set_vring_call,\n+\t.set_vring_kick = vhost_user_set_vring_kick,\n \t.send_request = vhost_user_sock,\n \t.enable_qp = vhost_user_enable_queue_pair\n };\ndiff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c\nindex 323751093a..304a808b55 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -38,9 +38,7 @@\n \n static uint64_t vhost_req_user_to_vdpa[] = {\n \t[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,\n-\t[VHOST_USER_SET_VRING_CALL] = VHOST_SET_VRING_CALL,\n \t[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,\n-\t[VHOST_USER_SET_VRING_KICK] = VHOST_SET_VRING_KICK,\n \t[VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS,\n \t[VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS,\n };\n@@ -364,6 +362,18 @@ vhost_vdpa_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state\n \treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_VRING_BASE, state);\n }\n \n+static int\n+vhost_vdpa_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_CALL, file);\n+}\n+\n+static int\n+vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file);\n+}\n+\n /* with below features, vhost vdpa does not need to do the checksum and TSO,\n * these info will be passed to virtio_user through virtio net header.\n */\n@@ -393,8 +403,6 @@ vhost_vdpa_send_request(struct virtio_user_dev *dev,\n \n \tswitch (req_vdpa) {\n \tcase VHOST_SET_VRING_ADDR:\n-\tcase VHOST_SET_VRING_KICK:\n-\tcase VHOST_SET_VRING_CALL:\n \t\tPMD_DRV_LOG(DEBUG, \"vhostfd=%d, index=%u\",\n \t\t\t dev->vhostfd, *(unsigned int *)arg);\n \t\tbreak;\n@@ -474,6 +482,8 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {\n \t.set_vring_num = vhost_vdpa_set_vring_num,\n \t.set_vring_base = vhost_vdpa_set_vring_base,\n \t.get_vring_base = vhost_vdpa_get_vring_base,\n+\t.set_vring_call = vhost_vdpa_set_vring_call,\n+\t.set_vring_kick = vhost_vdpa_set_vring_kick,\n \t.send_request = vhost_vdpa_send_request,\n \t.enable_qp = vhost_vdpa_enable_queue_pair,\n \t.dma_map = vhost_vdpa_dma_map_batch,\ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex 0b30c10016..4383e403da 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -40,7 +40,7 @@ virtio_user_create_queue(struct virtio_user_dev *dev, uint32_t queue_sel)\n \n \tfile.index = queue_sel;\n \tfile.fd = dev->callfds[queue_sel];\n-\tdev->ops->send_request(dev, VHOST_USER_SET_VRING_CALL, &file);\n+\tdev->ops->set_vring_call(dev, &file);\n \n \treturn 0;\n }\n@@ -89,7 +89,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)\n \t */\n \tfile.index = queue_sel;\n \tfile.fd = dev->kickfds[queue_sel];\n-\tdev->ops->send_request(dev, VHOST_USER_SET_VRING_KICK, &file);\n+\tdev->ops->set_vring_kick(dev, &file);\n \n \treturn 0;\n }\n", "prefixes": [ "v4", "31/44" ] }