Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87316/?format=api
{ "id": 87316, "url": "https://patches.dpdk.org/api/patches/87316/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-29-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-29-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-29-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:23", "name": "[v4,28/44] net/virtio: add Virtio-user protocol features ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "3451c32fca520bd975a1b2befca71b55c6a8686f", "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-29-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/87316/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87316/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 B014FA052A;\n\tTue, 26 Jan 2021 11:21:35 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id C480B1413E7;\n\tTue, 26 Jan 2021 11:18:17 +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 CDEB51413B7\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:08 +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-317-DIah2O1vMJmJLfm2ne9Hkw-1; Tue, 26 Jan 2021 05:18:06 -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 38EEE107ACE3;\n Tue, 26 Jan 2021 10:18:05 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id AAECE72163;\n Tue, 26 Jan 2021 10:18:00 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656288;\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=6Z3mNZIZYY5QR/Em/nib3/UIEB4iIcQd4DK2LB9QZQQ=;\n b=dNUK6IZFBHuK2DtDp/+lFayZkyn2tymB1cAIQ1G6yAAT0/SzgeVoa6eHWNvzIqqkOt/5OL\n PHLmfHjMW6ivzwdht5o8mu9g/v1QrgINBCfdCa8hQTMBs2UXKDsi4ap7koSfXjp5yMrR45\n Rv4xamPWNMB5t/QalwLorthIcwL0Rq8=", "X-MC-Unique": "DIah2O1vMJmJLfm2ne9Hkw-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:23 +0100", "Message-Id": "<20210126101639.250481-29-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 28/44] net/virtio: add Virtio-user protocol\n features 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 getting\nand setting Vhost-user protocol features.\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_user.c | 64 +++++++++++++++++--\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 14 ++++\n .../net/virtio/virtio_user/virtio_user_dev.c | 14 ++--\n drivers/net/virtio/virtio_user_ethdev.c | 14 ++--\n 5 files changed, 82 insertions(+), 26 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 13a88c7671..d805526130 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -112,6 +112,8 @@ struct virtio_user_backend_ops {\n \tint (*set_owner)(struct virtio_user_dev *dev);\n \tint (*get_features)(struct virtio_user_dev *dev, uint64_t *features);\n \tint (*set_features)(struct virtio_user_dev *dev, uint64_t features);\n+\tint (*get_protocol_features)(struct virtio_user_dev *dev, uint64_t *features);\n+\tint (*set_protocol_features)(struct virtio_user_dev *dev, uint64_t features);\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_user.c b/drivers/net/virtio/virtio_user/vhost_user.c\nindex 8e5bf332d6..4877574f72 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -201,6 +201,62 @@ vhost_user_set_features(struct virtio_user_dev *dev, uint64_t features)\n \treturn 0;\n }\n \n+static int\n+vhost_user_get_protocol_features(struct virtio_user_dev *dev, uint64_t *features)\n+{\n+\tint ret;\n+\tstruct vhost_user_msg msg = {\n+\t\t.request = VHOST_USER_GET_PROTOCOL_FEATURES,\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\tgoto err;\n+\n+\tret = vhost_user_read(dev->vhostfd, &msg);\n+\tif (ret < 0)\n+\t\tgoto err;\n+\n+\tif (msg.request != VHOST_USER_GET_PROTOCOL_FEATURES) {\n+\t\tPMD_DRV_LOG(ERR, \"Unexpected request type (%d)\", msg.request);\n+\t\tgoto err;\n+\t}\n+\n+\tif (msg.size != sizeof(*features)) {\n+\t\tPMD_DRV_LOG(ERR, \"Unexpected payload size (%u)\", msg.size);\n+\t\tgoto err;\n+\t}\n+\n+\t*features = msg.payload.u64;\n+\n+\treturn 0;\n+err:\n+\tPMD_DRV_LOG(ERR, \"Failed to get backend protocol features\");\n+\n+\treturn -1;\n+}\n+\n+static int\n+vhost_user_set_protocol_features(struct virtio_user_dev *dev, uint64_t features)\n+{\n+\tint ret;\n+\tstruct vhost_user_msg msg = {\n+\t\t.request = VHOST_USER_SET_PROTOCOL_FEATURES,\n+\t\t.flags = VHOST_USER_VERSION,\n+\t\t.size = sizeof(features),\n+\t\t.payload.u64 = features,\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 protocol features\");\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@@ -315,8 +371,6 @@ const char * const vhost_msg_strings[] = {\n \t[VHOST_USER_SET_VRING_KICK] = \"VHOST_SET_VRING_KICK\",\n \t[VHOST_USER_SET_MEM_TABLE] = \"VHOST_SET_MEM_TABLE\",\n \t[VHOST_USER_SET_VRING_ENABLE] = \"VHOST_SET_VRING_ENABLE\",\n-\t[VHOST_USER_GET_PROTOCOL_FEATURES] = \"VHOST_USER_GET_PROTOCOL_FEATURES\",\n-\t[VHOST_USER_SET_PROTOCOL_FEATURES] = \"VHOST_USER_SET_PROTOCOL_FEATURES\",\n \t[VHOST_USER_SET_STATUS] = \"VHOST_SET_STATUS\",\n \t[VHOST_USER_GET_STATUS] = \"VHOST_GET_STATUS\",\n };\n@@ -354,8 +408,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\t (!(dev->protocol_features &\n \t\t\t\t(1ULL << VHOST_USER_PROTOCOL_F_STATUS))))\n \t\t\treturn -ENOTSUP;\n-\t\t/* Fallthrough */\n-\tcase VHOST_USER_GET_PROTOCOL_FEATURES:\n \t\tneed_reply = 1;\n \t\tbreak;\n \n@@ -368,7 +420,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\tif (has_reply_ack)\n \t\t\tmsg.flags |= VHOST_USER_NEED_REPLY_MASK;\n \t\t/* Fallthrough */\n-\tcase VHOST_USER_SET_PROTOCOL_FEATURES:\n \tcase VHOST_USER_SET_LOG_BASE:\n \t\tmsg.payload.u64 = *((__u64 *)arg);\n \t\tmsg.size = sizeof(m.payload.u64);\n@@ -454,7 +505,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \n \t\tswitch (req) {\n \t\tcase VHOST_USER_GET_STATUS:\n-\t\tcase VHOST_USER_GET_PROTOCOL_FEATURES:\n \t\t\tif (msg.size != sizeof(m.payload.u64)) {\n \t\t\t\tPMD_DRV_LOG(ERR, \"Received bad msg size\");\n \t\t\t\treturn -1;\n@@ -592,6 +642,8 @@ struct virtio_user_backend_ops virtio_ops_user = {\n \t.set_owner = vhost_user_set_owner,\n \t.get_features = vhost_user_get_features,\n \t.set_features = vhost_user_set_features,\n+\t.get_protocol_features = vhost_user_get_protocol_features,\n+\t.set_protocol_features = vhost_user_set_protocol_features,\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 22a329526a..f627afbcfc 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -105,6 +105,18 @@ vhost_vdpa_set_owner(struct virtio_user_dev *dev)\n \treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_OWNER, NULL);\n }\n \n+static int\n+vhost_vdpa_get_backend_features(struct virtio_user_dev *dev, uint64_t *features)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_BACKEND_FEATURES, features);\n+}\n+\n+static int\n+vhost_vdpa_set_backend_features(struct virtio_user_dev *dev, uint64_t features)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_BACKEND_FEATURES, &features);\n+}\n+\n static int\n vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features)\n {\n@@ -447,6 +459,8 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {\n \t.set_owner = vhost_vdpa_set_owner,\n \t.get_features = vhost_vdpa_get_features,\n \t.set_features = vhost_vdpa_set_features,\n+\t.get_protocol_features = vhost_vdpa_get_backend_features,\n+\t.set_protocol_features = vhost_vdpa_set_backend_features,\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 1f3bbae663..45417bbc5d 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -505,22 +505,16 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \n \t\tif ((dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) ||\n \t\t\t\t(dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA)) {\n-\t\t\tif (dev->ops->send_request(dev,\n-\t\t\t\t\tVHOST_USER_GET_PROTOCOL_FEATURES,\n-\t\t\t\t\t&protocol_features))\n+\t\t\tif (dev->ops->get_protocol_features(dev, &protocol_features))\n \t\t\t\treturn -1;\n \n \t\t\tdev->protocol_features &= protocol_features;\n \n-\t\t\tif (dev->ops->send_request(dev,\n-\t\t\t\t\tVHOST_USER_SET_PROTOCOL_FEATURES,\n-\t\t\t\t\t&dev->protocol_features))\n+\t\t\tif (dev->ops->set_protocol_features(dev, dev->protocol_features))\n \t\t\t\treturn -1;\n \n-\t\t\tif (!(dev->protocol_features &\n-\t\t\t\t\t(1ULL << VHOST_USER_PROTOCOL_F_MQ)))\n-\t\t\t\tdev->unsupported_features |=\n-\t\t\t\t\t(1ull << VIRTIO_NET_F_MQ);\n+\t\t\tif (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ)))\n+\t\t\t\tdev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ);\n \t\t}\n \t} else {\n \t\t/* We just pretend vhost-user can support all these features.\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 56c379bc15..5e256f4e6d 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -93,23 +93,17 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)\n \n \tif (dev->device_features &\n \t\t\t(1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) {\n-\t\tif (dev->ops->send_request(dev,\n-\t\t\t\t\tVHOST_USER_GET_PROTOCOL_FEATURES,\n-\t\t\t\t\t&protocol_features))\n+\t\tif (dev->ops->get_protocol_features(dev, &protocol_features))\n \t\t\treturn -1;\n \n \t\t/* Offer VHOST_USER_PROTOCOL_F_STATUS */\n-\t\tdev->protocol_features |=\n-\t\t\t(1ULL << VHOST_USER_PROTOCOL_F_STATUS);\n+\t\tdev->protocol_features |= (1ULL << VHOST_USER_PROTOCOL_F_STATUS);\n \t\tdev->protocol_features &= protocol_features;\n \n-\t\tif (dev->ops->send_request(dev,\n-\t\t\t\t\tVHOST_USER_SET_PROTOCOL_FEATURES,\n-\t\t\t\t\t&dev->protocol_features))\n+\t\tif (dev->ops->set_protocol_features(dev, dev->protocol_features))\n \t\t\treturn -1;\n \n-\t\tif (!(dev->protocol_features &\n-\t\t\t\t(1ULL << VHOST_USER_PROTOCOL_F_MQ)))\n+\t\tif (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ)))\n \t\t\tdev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ);\n \t}\n \n", "prefixes": [ "v4", "28/44" ] }