Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/85548/?format=api
{ "id": 85548, "url": "http://patches.dpdk.org/api/patches/85548/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20201220211405.313012-25-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": "<20201220211405.313012-25-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201220211405.313012-25-maxime.coquelin@redhat.com", "date": "2020-12-20T21:13:49", "name": "[24/40] net/virtio: add Virtio-user ops to set owner", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "22e46025555e7c569556969777e9f483c75f978c", "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/20201220211405.313012-25-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14390, "url": "http://patches.dpdk.org/api/series/14390/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=14390", "date": "2020-12-20T21:13:25", "name": "net/virtio: Virtio PMD rework", "version": 1, "mbox": "http://patches.dpdk.org/series/14390/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/85548/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/85548/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 dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9CE8CA09FD;\n\tSun, 20 Dec 2020 22:22:07 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7B40ACDF8;\n\tSun, 20 Dec 2020 22:15:54 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by dpdk.org (Postfix) with ESMTP id F14C0CD7E\n for <dev@dpdk.org>; Sun, 20 Dec 2020 22:15:51 +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-321--8fKGpcdNZ-QM0kQ0B5JNg-1; Sun, 20 Dec 2020 16:15:48 -0500", "from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com\n [10.5.11.12])\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 B787F59;\n Sun, 20 Dec 2020 21:15:47 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.43])\n by smtp.corp.redhat.com (Postfix) with ESMTP id CDB5560C43;\n Sun, 20 Dec 2020 21:15:45 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1608498950;\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=qF2bSIh/D6GzoG+qlopRdkgcsh2MwjW7TP6fLv6OiBQ=;\n b=VhBZBlMGxU2BAcFCf9Z7yojQut1urChrIP1SgcdhO99OgwFHuYNpm9GbJz+MknbRO5NZal\n JjLu+gEEpHJW7Wd6Q8G2yjvJdq4GW7czmo9m3kanw9oXaSpkZ9rHG+Ojgy9c+kc8yV23z3\n DgOL/zfyxdEtLjS4tlMEDCpTxiSXYl8=", "X-MC-Unique": "-8fKGpcdNZ-QM0kQ0B5JNg-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": "Sun, 20 Dec 2020 22:13:49 +0100", "Message-Id": "<20201220211405.313012-25-maxime.coquelin@redhat.com>", "In-Reply-To": "<20201220211405.313012-1-maxime.coquelin@redhat.com>", "References": "<20201220211405.313012-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.12", "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 24/40] net/virtio: add Virtio-user ops to set\n\towner", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "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 implements a dedicated callabck for\nsending owner request. All the requests will be\nconverted that way so that backends other than\nVhost-user don't have to work around being it.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\n---\n drivers/net/virtio/virtio_user/vhost.h | 1 +\n drivers/net/virtio/virtio_user/vhost_kernel.c | 28 +++++++++++++++--\n drivers/net/virtio/virtio_user/vhost_user.c | 21 +++++++++++--\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 30 ++++++++++++++++---\n .../net/virtio/virtio_user/virtio_user_dev.c | 3 +-\n 5 files changed, 72 insertions(+), 11 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 9d2a8505b3..8e819ecfb8 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -101,6 +101,7 @@ struct virtio_user_dev;\n \n struct virtio_user_backend_ops {\n \tint (*setup)(struct virtio_user_dev *dev);\n+\tint (*set_owner)(struct virtio_user_dev *dev);\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 2c805077af..b79dcad179 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -6,6 +6,7 @@\n #include <sys/stat.h>\n #include <fcntl.h>\n #include <unistd.h>\n+#include <errno.h>\n \n #include <rte_memory.h>\n \n@@ -55,8 +56,28 @@ get_vhost_kernel_max_regions(void)\n \tclose(fd);\n }\n \n+static int\n+vhost_kernel_ioctl(int fd, uint64_t request, void *arg)\n+{\n+\tint ret;\n+\n+\tret = ioctl(fd, request, arg);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Vhost-kernel ioctl %\"PRIu64\" failed (%s)\",\n+\t\t\t\trequest, strerror(errno));\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_kernel_set_owner(struct virtio_user_dev *dev)\n+{\n+\treturn vhost_kernel_ioctl(dev->vhostfds[0], VHOST_SET_OWNER, NULL);\n+}\n+\n static uint64_t vhost_req_user_to_kernel[] = {\n-\t[VHOST_USER_SET_OWNER] = VHOST_SET_OWNER,\n \t[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,\n \t[VHOST_USER_SET_FEATURES] = VHOST_SET_FEATURES,\n \t[VHOST_USER_GET_FEATURES] = VHOST_GET_FEATURES,\n@@ -175,7 +196,7 @@ tap_support_features(void)\n }\n \n static int\n-vhost_kernel_ioctl(struct virtio_user_dev *dev,\n+vhost_kernel_send_request(struct virtio_user_dev *dev,\n \t\t enum vhost_user_request req,\n \t\t void *arg)\n {\n@@ -385,6 +406,7 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev *dev,\n \n struct virtio_user_backend_ops virtio_ops_kernel = {\n \t.setup = vhost_kernel_setup,\n-\t.send_request = vhost_kernel_ioctl,\n+\t.set_owner = vhost_kernel_set_owner,\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 e9053eea95..5ab15318ac 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -125,6 +125,24 @@ vhost_user_read(int fd, struct vhost_user_msg *msg)\n \treturn -1;\n }\n \n+static int\n+vhost_user_set_owner(struct virtio_user_dev *dev)\n+{\n+\tint ret;\n+\tstruct vhost_user_msg msg = {\n+\t\t.request = VHOST_USER_SET_OWNER,\n+\t\t.flags = VHOST_USER_VERSION,\n+\t};\n+\n+\tret = vhost_user_write(dev->vhostfd, &msg, NULL, 0);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set owner\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n struct walk_arg {\n \tstruct vhost_memory *vm;\n \tint *fds;\n@@ -230,7 +248,6 @@ prepare_vhost_memory_user(struct vhost_user_msg *msg, int fds[])\n static struct vhost_user_msg m;\n \n const char * const vhost_msg_strings[] = {\n-\t[VHOST_USER_SET_OWNER] = \"VHOST_SET_OWNER\",\n \t[VHOST_USER_RESET_OWNER] = \"VHOST_RESET_OWNER\",\n \t[VHOST_USER_SET_FEATURES] = \"VHOST_SET_FEATURES\",\n \t[VHOST_USER_GET_FEATURES] = \"VHOST_GET_FEATURES\",\n@@ -303,7 +320,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\tmsg.size = sizeof(m.payload.u64);\n \t\tbreak;\n \n-\tcase VHOST_USER_SET_OWNER:\n \tcase VHOST_USER_RESET_OWNER:\n \t\tbreak;\n \n@@ -514,6 +530,7 @@ vhost_user_enable_queue_pair(struct virtio_user_dev *dev,\n \n struct virtio_user_backend_ops virtio_ops_user = {\n \t.setup = vhost_user_setup,\n+\t.set_owner = vhost_user_set_owner,\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 c7b9349fc8..f405b6b86a 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -37,7 +37,6 @@\n \t\t\t\t\t struct vhost_vring_state)\n \n static uint64_t vhost_req_user_to_vdpa[] = {\n-\t[VHOST_USER_SET_OWNER] = VHOST_SET_OWNER,\n \t[VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,\n \t[VHOST_USER_SET_FEATURES] = VHOST_SET_FEATURES,\n \t[VHOST_USER_GET_FEATURES] = VHOST_GET_FEATURES,\n@@ -80,6 +79,28 @@ struct vhost_msg {\n \t};\n };\n \n+\n+static int\n+vhost_vdpa_ioctl(int fd, uint64_t request, void *arg)\n+{\n+\tint ret;\n+\n+\tret = ioctl(fd, request, arg);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Vhost-vDPA ioctl %\"PRIu64\" failed (%s)\",\n+\t\t\t\trequest, strerror(errno));\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_vdpa_set_owner(struct virtio_user_dev *dev)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_OWNER, NULL);\n+}\n+\n static int\n vhost_vdpa_dma_map(struct virtio_user_dev *dev, void *addr,\n \t\t\t\t uint64_t iova, size_t len)\n@@ -192,7 +213,7 @@ vhost_vdpa_dma_map_all(struct virtio_user_dev *dev)\n \t (1ULL << VIRTIO_NET_F_CSUM))\n \n static int\n-vhost_vdpa_ioctl(struct virtio_user_dev *dev,\n+vhost_vdpa_send_request(struct virtio_user_dev *dev,\n \t\t enum vhost_user_request req,\n \t\t void *arg)\n {\n@@ -280,7 +301,7 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,\n \t\t\t.num = enable,\n \t\t};\n \n-\t\tif (vhost_vdpa_ioctl(dev, VHOST_USER_SET_VRING_ENABLE, &state))\n+\t\tif (vhost_vdpa_send_request(dev, VHOST_USER_SET_VRING_ENABLE, &state))\n \t\t\treturn -1;\n \t}\n \n@@ -291,7 +312,8 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,\n \n struct virtio_user_backend_ops virtio_ops_vdpa = {\n \t.setup = vhost_vdpa_setup,\n-\t.send_request = vhost_vdpa_ioctl,\n+\t.set_owner = vhost_vdpa_set_owner,\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,\n \t.dma_unmap = vhost_vdpa_dma_unmap,\ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex 053f0267ca..f8e4581951 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -482,8 +482,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \t\t\t(1ULL << VHOST_USER_F_PROTOCOL_FEATURES);\n \n \tif (!dev->is_server) {\n-\t\tif (dev->ops->send_request(dev, VHOST_USER_SET_OWNER,\n-\t\t\t\t\t NULL) < 0) {\n+\t\tif (dev->ops->set_owner(dev) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"set_owner fails: %s\",\n \t\t\t\t strerror(errno));\n \t\t\treturn -1;\n", "prefixes": [ "24/40" ] }