Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87327/?format=api
{ "id": 87327, "url": "https://patches.dpdk.org/api/patches/87327/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-39-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-39-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-39-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:33", "name": "[v4,38/44] net/virtio: move protocol features to Vhost-user", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c75222e3426621a25f4f7f21a6d91198b7bc49fc", "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-39-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/87327/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87327/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 55AB8A052A;\n\tTue, 26 Jan 2021 11:23:19 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id AD41214142F;\n\tTue, 26 Jan 2021 11:18:42 +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 4196C14140D\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:38 +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-459-d7ym15P_PVuFFzbRbCNQJA-1; Tue, 26 Jan 2021 05:18:33 -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 83B66B8100;\n Tue, 26 Jan 2021 10:18:32 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 5F9236F45C;\n Tue, 26 Jan 2021 10:18:30 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656317;\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=At2KU65P701R7y9vd7KV4cgase2NOpx1O43yQ3QrXUM=;\n b=D+kiYbEFZu+5qQhIYzzj0a2nsaVWHdmREUl96BJJYnT7MY9y551CDEceBr1w0w9QRBZmYh\n rgQJcP5/tLW0+34CDoFzQYhV/AeUrbBQ0tjve8VWqSSiapefUXGWACN9SSZrmum2qixrbh\n DVONfMiR68j9fXStXxXXANAsFMmRazs=", "X-MC-Unique": "d7ym15P_PVuFFzbRbCNQJA-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:33 +0100", "Message-Id": "<20210126101639.250481-39-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 38/44] net/virtio: move protocol features to\n Vhost-user", "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": "Since only protocol features are specific to Vhost-user\nbackend, this patch moves all related code to Vhost-user\nfile.\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 | 20 +----\n drivers/net/virtio/virtio_user/vhost_kernel.c | 9 ++\n drivers/net/virtio/virtio_user/vhost_user.c | 83 +++++++++++++++----\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 34 +++++++-\n .../net/virtio/virtio_user/virtio_user_dev.c | 47 ++---------\n drivers/net/virtio/virtio_user_ethdev.c | 17 ----\n 6 files changed, 113 insertions(+), 97 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 2aa6b2cb70..dfa2735a20 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -46,23 +46,6 @@ struct vhost_vring_addr {\n \tuint64_t log_guest_addr;\n };\n \n-#ifndef VHOST_USER_F_PROTOCOL_FEATURES\n-#define VHOST_USER_F_PROTOCOL_FEATURES 30\n-#endif\n-\n-/** Protocol features. */\n-#ifndef VHOST_USER_PROTOCOL_F_MQ\n-#define VHOST_USER_PROTOCOL_F_MQ 0\n-#endif\n-\n-#ifndef VHOST_USER_PROTOCOL_F_REPLY_ACK\n-#define VHOST_USER_PROTOCOL_F_REPLY_ACK 3\n-#endif\n-\n-#ifndef VHOST_USER_PROTOCOL_F_STATUS\n-#define VHOST_USER_PROTOCOL_F_STATUS 16\n-#endif\n-\n #ifndef VHOST_BACKEND_F_IOTLB_MSG_V2\n #define VHOST_BACKEND_F_IOTLB_MSG_V2 1\n #endif\n@@ -82,11 +65,10 @@ struct virtio_user_dev;\n \n struct virtio_user_backend_ops {\n \tint (*setup)(struct virtio_user_dev *dev);\n+\tint (*get_backend_features)(uint64_t *features);\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 (*set_memory_table)(struct virtio_user_dev *dev);\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);\ndiff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c\nindex 16065c8d11..2047d41a50 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -445,8 +445,17 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev *dev,\n \treturn 0;\n }\n \n+static int\n+vhost_kernel_get_backend_features(uint64_t *features)\n+{\n+\t*features = 0;\n+\n+\treturn 0;\n+}\n+\n struct virtio_user_backend_ops virtio_ops_kernel = {\n \t.setup = vhost_kernel_setup,\n+\t.get_backend_features = vhost_kernel_get_backend_features,\n \t.set_owner = vhost_kernel_set_owner,\n \t.get_features = vhost_kernel_get_features,\n \t.set_features = vhost_kernel_set_features,\ndiff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c\nindex 90fed6fe97..e3bc5a9b03 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -17,6 +17,29 @@\n #include \"vhost.h\"\n #include \"virtio_user_dev.h\"\n \n+\n+#ifndef VHOST_USER_F_PROTOCOL_FEATURES\n+#define VHOST_USER_F_PROTOCOL_FEATURES 30\n+#endif\n+\n+/** Protocol features. */\n+#ifndef VHOST_USER_PROTOCOL_F_MQ\n+#define VHOST_USER_PROTOCOL_F_MQ 0\n+#endif\n+\n+#ifndef VHOST_USER_PROTOCOL_F_REPLY_ACK\n+#define VHOST_USER_PROTOCOL_F_REPLY_ACK 3\n+#endif\n+\n+#ifndef VHOST_USER_PROTOCOL_F_STATUS\n+#define VHOST_USER_PROTOCOL_F_STATUS 16\n+#endif\n+\n+#define VHOST_USER_SUPPORTED_PROTOCOL_FEATURES\t\t\\\n+\t(1ULL << VHOST_USER_PROTOCOL_F_MQ |\t\t\\\n+\t 1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK |\t\\\n+\t 1ULL << VHOST_USER_PROTOCOL_F_STATUS)\n+\n /* The version of the protocol we support */\n #define VHOST_USER_VERSION 0x1\n \n@@ -205,11 +228,11 @@ vhost_user_set_owner(struct virtio_user_dev *dev)\n }\n \n static int\n-vhost_user_get_features(struct virtio_user_dev *dev, uint64_t *features)\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_FEATURES,\n+\t\t.request = VHOST_USER_GET_PROTOCOL_FEATURES,\n \t\t.flags = VHOST_USER_VERSION,\n \t};\n \n@@ -221,7 +244,7 @@ vhost_user_get_features(struct virtio_user_dev *dev, uint64_t *features)\n \tif (ret < 0)\n \t\tgoto err;\n \n-\tif (msg.request != VHOST_USER_GET_FEATURES) {\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@@ -235,27 +258,25 @@ vhost_user_get_features(struct virtio_user_dev *dev, uint64_t *features)\n \n \treturn 0;\n err:\n-\tPMD_DRV_LOG(ERR, \"Failed to get backend features\");\n+\tPMD_DRV_LOG(ERR, \"Failed to get backend protocol features\");\n \n \treturn -1;\n }\n \n static int\n-vhost_user_set_features(struct virtio_user_dev *dev, uint64_t features)\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_FEATURES,\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-\tmsg.payload.u64 |= dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES);\n-\n \tret = vhost_user_write(dev->vhostfd, &msg, NULL, 0);\n \tif (ret < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"Failed to set features\");\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set protocol features\");\n \t\treturn -1;\n \t}\n \n@@ -263,11 +284,11 @@ vhost_user_set_features(struct virtio_user_dev *dev, uint64_t features)\n }\n \n static int\n-vhost_user_get_protocol_features(struct virtio_user_dev *dev, uint64_t *features)\n+vhost_user_get_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.request = VHOST_USER_GET_FEATURES,\n \t\t.flags = VHOST_USER_VERSION,\n \t};\n \n@@ -279,7 +300,7 @@ vhost_user_get_protocol_features(struct virtio_user_dev *dev, uint64_t *features\n \tif (ret < 0)\n \t\tgoto err;\n \n-\tif (msg.request != VHOST_USER_GET_PROTOCOL_FEATURES) {\n+\tif (msg.request != VHOST_USER_GET_FEATURES) {\n \t\tPMD_DRV_LOG(ERR, \"Unexpected request type (%d)\", msg.request);\n \t\tgoto err;\n \t}\n@@ -291,27 +312,46 @@ vhost_user_get_protocol_features(struct virtio_user_dev *dev, uint64_t *features\n \n \t*features = msg.payload.u64;\n \n+\tif (!(*features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)))\n+\t\treturn 0;\n+\n+\t/* Negotiate protocol features */\n+\tret = vhost_user_get_protocol_features(dev, &dev->protocol_features);\n+\tif (ret < 0)\n+\t\tgoto err;\n+\n+\tdev->protocol_features &= VHOST_USER_SUPPORTED_PROTOCOL_FEATURES;\n+\n+\tret = vhost_user_set_protocol_features(dev, dev->protocol_features);\n+\tif (ret < 0)\n+\t\tgoto err;\n+\n+\tif (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ)))\n+\t\tdev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ);\n+\n \treturn 0;\n err:\n-\tPMD_DRV_LOG(ERR, \"Failed to get backend protocol features\");\n+\tPMD_DRV_LOG(ERR, \"Failed to get backend 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+vhost_user_set_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.request = VHOST_USER_SET_FEATURES,\n \t\t.flags = VHOST_USER_VERSION,\n \t\t.size = sizeof(features),\n \t\t.payload.u64 = features,\n \t};\n \n+\tmsg.payload.u64 |= dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES);\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\tPMD_DRV_LOG(ERR, \"Failed to set features\");\n \t\treturn -1;\n \t}\n \n@@ -780,13 +820,20 @@ vhost_user_enable_queue_pair(struct virtio_user_dev *dev,\n \treturn 0;\n }\n \n+static int\n+vhost_user_get_backend_features(uint64_t *features)\n+{\n+\t*features = 1ULL << VHOST_USER_F_PROTOCOL_FEATURES;\n+\n+\treturn 0;\n+}\n+\n struct virtio_user_backend_ops virtio_ops_user = {\n \t.setup = vhost_user_setup,\n+\t.get_backend_features = vhost_user_get_backend_features,\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.set_memory_table = vhost_user_set_memory_table,\n \t.set_vring_num = vhost_user_set_vring_num,\n \t.set_vring_base = vhost_user_set_vring_base,\ndiff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c\nindex 7fb1249569..8d354b298e 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -13,6 +13,10 @@\n #include \"vhost.h\"\n #include \"virtio_user_dev.h\"\n \n+#define VHOST_VDPA_SUPPORTED_BACKEND_FEATURES\t\t\\\n+\t(1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2\t|\t\\\n+\t1ULL << VHOST_BACKEND_F_IOTLB_BATCH)\n+\n /* vhost kernel & vdpa ioctls */\n #define VHOST_VIRTIO 0xAF\n #define VHOST_GET_FEATURES _IOR(VHOST_VIRTIO, 0x00, __u64)\n@@ -88,13 +92,13 @@ vhost_vdpa_set_owner(struct virtio_user_dev *dev)\n }\n \n static int\n-vhost_vdpa_get_backend_features(struct virtio_user_dev *dev, uint64_t *features)\n+vhost_vdpa_get_protocol_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+vhost_vdpa_set_protocol_features(struct virtio_user_dev *dev, uint64_t features)\n {\n \treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_BACKEND_FEATURES, &features);\n }\n@@ -113,6 +117,21 @@ vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features)\n \t/* Multiqueue not supported for now */\n \t*features &= ~(1ULL << VIRTIO_NET_F_MQ);\n \n+\t/* Negotiated vDPA backend features */\n+\tret = vhost_vdpa_get_protocol_features(dev, &dev->protocol_features);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get backend features\");\n+\t\treturn -1;\n+\t}\n+\n+\tdev->protocol_features &= VHOST_VDPA_SUPPORTED_BACKEND_FEATURES;\n+\n+\tret = vhost_vdpa_set_protocol_features(dev, dev->protocol_features);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set backend features\");\n+\t\treturn -1;\n+\t}\n+\n \treturn 0;\n }\n \n@@ -438,13 +457,20 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,\n \treturn 0;\n }\n \n+static int\n+vhost_vdpa_get_backend_features(uint64_t *features)\n+{\n+\t*features = 0;\n+\n+\treturn 0;\n+}\n+\n struct virtio_user_backend_ops virtio_ops_vdpa = {\n \t.setup = vhost_vdpa_setup,\n+\t.get_backend_features = vhost_vdpa_get_backend_features,\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.set_memory_table = vhost_vdpa_set_memory_table,\n \t.set_vring_num = vhost_vdpa_set_vring_num,\n \t.set_vring_base = vhost_vdpa_set_vring_base,\ndiff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c\nindex c2a41fe3a0..2614bcb349 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -480,24 +480,15 @@ virtio_user_dev_setup(struct virtio_user_dev *dev)\n \t 1ULL << VIRTIO_NET_F_GUEST_TSO6\t|\t\\\n \t 1ULL << VIRTIO_F_IN_ORDER\t\t|\t\\\n \t 1ULL << VIRTIO_F_VERSION_1\t\t|\t\\\n-\t 1ULL << VIRTIO_F_RING_PACKED\t\t|\t\\\n-\t 1ULL << VHOST_USER_F_PROTOCOL_FEATURES)\n+\t 1ULL << VIRTIO_F_RING_PACKED)\n \n-#define VHOST_USER_SUPPORTED_PROTOCOL_FEATURES\t\t\\\n-\t(1ULL << VHOST_USER_PROTOCOL_F_MQ |\t\t\\\n-\t 1ULL << VHOST_USER_PROTOCOL_F_REPLY_ACK |\t\\\n-\t 1ULL << VHOST_USER_PROTOCOL_F_STATUS)\n-\n-#define VHOST_VDPA_SUPPORTED_PROTOCOL_FEATURES\t\t\\\n-\t(1ULL << VHOST_BACKEND_F_IOTLB_MSG_V2\t|\t\\\n-\t1ULL << VHOST_BACKEND_F_IOTLB_BATCH)\n int\n virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \t\t int cq, int queue_size, const char *mac, char **ifname,\n \t\t int server, int mrg_rxbuf, int in_order, int packed_vq,\n \t\t enum virtio_user_backend_type backend_type)\n {\n-\tuint64_t protocol_features = 0;\n+\tuint64_t backend_features;\n \n \tpthread_mutex_init(&dev->mutex, NULL);\n \tstrlcpy(dev->path, path, PATH_MAX);\n@@ -508,14 +499,9 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \tdev->is_server = server;\n \tdev->mac_specified = 0;\n \tdev->frontend_features = 0;\n-\tdev->unsupported_features = ~VIRTIO_USER_SUPPORTED_FEATURES;\n+\tdev->unsupported_features = 0;\n \tdev->backend_type = backend_type;\n \n-\tif (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_USER)\n-\t\tdev->protocol_features = VHOST_USER_SUPPORTED_PROTOCOL_FEATURES;\n-\telse if (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA)\n-\t\tdev->protocol_features = VHOST_VDPA_SUPPORTED_PROTOCOL_FEATURES;\n-\n \tparse_mac(dev, mac);\n \n \tif (*ifname) {\n@@ -528,38 +514,21 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \t\treturn -1;\n \t}\n \n-\tif (dev->backend_type != VIRTIO_USER_BACKEND_VHOST_USER)\n-\t\tdev->unsupported_features |=\n-\t\t\t(1ULL << VHOST_USER_F_PROTOCOL_FEATURES);\n-\n \tif (dev->ops->set_owner(dev) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"(%s) Failed to set backend owner\", dev->path);\n \t\treturn -1;\n \t}\n \n-\tif (dev->ops->get_features(dev, &dev->device_features) < 0) {\n+\tif (dev->ops->get_backend_features(&backend_features) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"(%s) Failed to get backend features\", dev->path);\n \t\treturn -1;\n \t}\n \n-\tif ((dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) ||\n-\t\t\tdev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA) {\n-\t\tif (dev->ops->get_protocol_features(dev, &protocol_features)) {\n-\t\t\tPMD_INIT_LOG(ERR, \"(%s) Failed to get backend protocol features\",\n-\t\t\t\t\tdev->path);\n-\t\t\treturn -1;\n-\t\t}\n-\n-\t\tdev->protocol_features &= protocol_features;\n-\n-\t\tif (dev->ops->set_protocol_features(dev, dev->protocol_features)) {\n-\t\t\tPMD_INIT_LOG(ERR, \"(%s) Failed to set backend protocol features\",\n-\t\t\t\t\tdev->path);\n-\t\t\treturn -1;\n-\t\t}\n+\tdev->unsupported_features = ~(VIRTIO_USER_SUPPORTED_FEATURES | backend_features);\n \n-\t\tif (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ)))\n-\t\t\tdev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ);\n+\tif (dev->ops->get_features(dev, &dev->device_features) < 0) {\n+\t\tPMD_INIT_LOG(ERR, \"(%s) Failed to get device features\", dev->path);\n+\t\treturn -1;\n \t}\n \n \tif (!mrg_rxbuf)\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex e822d93690..e2c606a838 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -70,7 +70,6 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)\n \tint ret, connectfd, old_status;\n \tstruct rte_eth_dev *eth_dev = &rte_eth_devices[dev->port_id];\n \tstruct virtio_hw *hw = &dev->hw;\n-\tuint64_t protocol_features;\n \n \tconnectfd = accept(dev->listenfd, NULL, NULL);\n \tif (connectfd < 0)\n@@ -91,22 +90,6 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)\n \t\treturn -1;\n \t}\n \n-\tif (dev->device_features &\n-\t\t\t(1ULL << VHOST_USER_F_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 |= (1ULL << VHOST_USER_PROTOCOL_F_STATUS);\n-\t\tdev->protocol_features &= protocol_features;\n-\n-\t\tif (dev->ops->set_protocol_features(dev, dev->protocol_features))\n-\t\t\treturn -1;\n-\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 \tdev->device_features |= dev->frontend_features;\n \n \t/* umask vhost-user unsupported features */\n", "prefixes": [ "v4", "38/44" ] }