Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87315/?format=api
{ "id": 87315, "url": "https://patches.dpdk.org/api/patches/87315/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-28-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-28-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-28-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:22", "name": "[v4,27/44] net/virtio: add Virtio-user features ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "e8a6bc9f60107cbaeedd36cb8e095916465726dd", "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-28-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/87315/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/87315/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 2976AA052A;\n\tTue, 26 Jan 2021 11:21:28 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 32EAB1413C2;\n\tTue, 26 Jan 2021 11:18:15 +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 21DC61413B4\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:03 +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-543-O4xnzgYYNXKTRSD8w-xzfA-1; Tue, 26 Jan 2021 05:18:01 -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 5E6DAB8100;\n Tue, 26 Jan 2021 10:18:00 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id E7D476F45C;\n Tue, 26 Jan 2021 10:17:58 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656283;\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=Se58WjEchgMnodU0oy5kI7qP3M56FVEXmpupma9NnPM=;\n b=Mnk2RO71LULPlLLLHr2nLKtd4FcFxDbiGTISOXIwr3aXY4ZArDFhdnufhWa+M3ABKqiDS6\n 6nuqjE3bSVyzee99gQg9xK52cqPqUyYXGYDOeyKxFawDUs7e55l5k3asTVssf4RJPhj8KF\n k2EgQAsD4wCPnUu4BkSnuiyraErg3j4=", "X-MC-Unique": "O4xnzgYYNXKTRSD8w-xzfA-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:22 +0100", "Message-Id": "<20210126101639.250481-28-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 27/44] net/virtio: add Virtio-user 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 Virtio features, and implements them\nfor the different backend types.\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 | 150 +++++++++---------\n .../net/virtio/virtio_user/vhost_kernel_tap.c | 23 +++\n .../net/virtio/virtio_user/vhost_kernel_tap.h | 1 +\n drivers/net/virtio/virtio_user/vhost_user.c | 64 +++++++-\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 38 +++--\n .../net/virtio/virtio_user/virtio_user_dev.c | 5 +-\n drivers/net/virtio/virtio_user_ethdev.c | 3 +-\n 8 files changed, 190 insertions(+), 96 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 5413ec6778..13a88c7671 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -110,6 +110,8 @@ struct virtio_user_dev;\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 (*get_features)(struct virtio_user_dev *dev, uint64_t *features);\n+\tint (*set_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_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c\nindex b79dcad179..e46039e649 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -38,6 +38,28 @@ struct vhost_memory_kernel {\n #define VHOST_SET_VRING_ERR _IOW(VHOST_VIRTIO, 0x22, struct vhost_vring_file)\n #define VHOST_NET_SET_BACKEND _IOW(VHOST_VIRTIO, 0x30, struct vhost_vring_file)\n \n+/* with below features, vhost kernel does not need to do the checksum and TSO,\n+ * these info will be passed to virtio_user through virtio net header.\n+ */\n+#define VHOST_KERNEL_GUEST_OFFLOADS_MASK\t\\\n+\t((1ULL << VIRTIO_NET_F_GUEST_CSUM) |\t\\\n+\t (1ULL << VIRTIO_NET_F_GUEST_TSO4) |\t\\\n+\t (1ULL << VIRTIO_NET_F_GUEST_TSO6) |\t\\\n+\t (1ULL << VIRTIO_NET_F_GUEST_ECN) |\t\\\n+\t (1ULL << VIRTIO_NET_F_GUEST_UFO))\n+\n+/* with below features, when flows from virtio_user to vhost kernel\n+ * (1) if flows goes up through the kernel networking stack, it does not need\n+ * to verify checksum, which can save CPU cycles;\n+ * (2) if flows goes through a Linux bridge and outside from an interface\n+ * (kernel driver), checksum and TSO will be done by GSO in kernel or even\n+ * offloaded into real physical device.\n+ */\n+#define VHOST_KERNEL_HOST_OFFLOADS_MASK\t\t\\\n+\t((1ULL << VIRTIO_NET_F_HOST_TSO4) |\t\\\n+\t (1ULL << VIRTIO_NET_F_HOST_TSO6) |\t\\\n+\t (1ULL << VIRTIO_NET_F_CSUM))\n+\n static uint64_t max_regions = 64;\n \n static void\n@@ -77,10 +99,57 @@ vhost_kernel_set_owner(struct virtio_user_dev *dev)\n \treturn vhost_kernel_ioctl(dev->vhostfds[0], VHOST_SET_OWNER, NULL);\n }\n \n+static int\n+vhost_kernel_get_features(struct virtio_user_dev *dev, uint64_t *features)\n+{\n+\tint ret;\n+\tunsigned int tap_features;\n+\n+\tret = vhost_kernel_ioctl(dev->vhostfds[0], VHOST_GET_FEATURES, features);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get features\");\n+\t\treturn -1;\n+\t}\n+\n+\tret = tap_support_features(&tap_features);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get TAP features\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* with tap as the backend, all these features are supported\n+\t * but not claimed by vhost-net, so we add them back when\n+\t * reporting to upper layer.\n+\t */\n+\tif (tap_features & IFF_VNET_HDR) {\n+\t\t*features |= VHOST_KERNEL_GUEST_OFFLOADS_MASK;\n+\t\t*features |= VHOST_KERNEL_HOST_OFFLOADS_MASK;\n+\t}\n+\n+\t/* vhost_kernel will not declare this feature, but it does\n+\t * support multi-queue.\n+\t */\n+\tif (tap_features & IFF_MULTI_QUEUE)\n+\t\t*features |= (1ull << VIRTIO_NET_F_MQ);\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_kernel_set_features(struct virtio_user_dev *dev, uint64_t features)\n+{\n+\t/* We don't need memory protection here */\n+\tfeatures &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM);\n+\t/* VHOST kernel does not know about below flags */\n+\tfeatures &= ~VHOST_KERNEL_GUEST_OFFLOADS_MASK;\n+\tfeatures &= ~VHOST_KERNEL_HOST_OFFLOADS_MASK;\n+\tfeatures &= ~(1ULL << VIRTIO_NET_F_MQ);\n+\n+\treturn vhost_kernel_ioctl(dev->vhostfds[0], VHOST_SET_FEATURES, &features);\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_FEATURES] = VHOST_SET_FEATURES,\n-\t[VHOST_USER_GET_FEATURES] = VHOST_GET_FEATURES,\n \t[VHOST_USER_SET_VRING_CALL] = VHOST_SET_VRING_CALL,\n \t[VHOST_USER_SET_VRING_NUM] = VHOST_SET_VRING_NUM,\n \t[VHOST_USER_SET_VRING_BASE] = VHOST_SET_VRING_BASE,\n@@ -150,51 +219,6 @@ prepare_vhost_memory_kernel(void)\n \treturn vm;\n }\n \n-/* with below features, vhost kernel does not need to do the checksum and TSO,\n- * these info will be passed to virtio_user through virtio net header.\n- */\n-#define VHOST_KERNEL_GUEST_OFFLOADS_MASK\t\\\n-\t((1ULL << VIRTIO_NET_F_GUEST_CSUM) |\t\\\n-\t (1ULL << VIRTIO_NET_F_GUEST_TSO4) |\t\\\n-\t (1ULL << VIRTIO_NET_F_GUEST_TSO6) |\t\\\n-\t (1ULL << VIRTIO_NET_F_GUEST_ECN) |\t\\\n-\t (1ULL << VIRTIO_NET_F_GUEST_UFO))\n-\n-/* with below features, when flows from virtio_user to vhost kernel\n- * (1) if flows goes up through the kernel networking stack, it does not need\n- * to verify checksum, which can save CPU cycles;\n- * (2) if flows goes through a Linux bridge and outside from an interface\n- * (kernel driver), checksum and TSO will be done by GSO in kernel or even\n- * offloaded into real physical device.\n- */\n-#define VHOST_KERNEL_HOST_OFFLOADS_MASK\t\t\\\n-\t((1ULL << VIRTIO_NET_F_HOST_TSO4) |\t\\\n-\t (1ULL << VIRTIO_NET_F_HOST_TSO6) |\t\\\n-\t (1ULL << VIRTIO_NET_F_CSUM))\n-\n-static unsigned int\n-tap_support_features(void)\n-{\n-\tint tapfd;\n-\tunsigned int tap_features;\n-\n-\ttapfd = open(PATH_NET_TUN, O_RDWR);\n-\tif (tapfd < 0) {\n-\t\tPMD_DRV_LOG(ERR, \"fail to open %s: %s\",\n-\t\t\t PATH_NET_TUN, strerror(errno));\n-\t\treturn -1;\n-\t}\n-\n-\tif (ioctl(tapfd, TUNGETFEATURES, &tap_features) == -1) {\n-\t\tPMD_DRV_LOG(ERR, \"TUNGETFEATURES failed: %s\", strerror(errno));\n-\t\tclose(tapfd);\n-\t\treturn -1;\n-\t}\n-\n-\tclose(tapfd);\n-\treturn tap_features;\n-}\n-\n static int\n vhost_kernel_send_request(struct virtio_user_dev *dev,\n \t\t enum vhost_user_request req,\n@@ -206,7 +230,6 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,\n \tstruct vhost_memory_kernel *vm = NULL;\n \tint vhostfd;\n \tunsigned int queue_sel;\n-\tunsigned int features;\n \n \tPMD_DRV_LOG(INFO, \"%s\", vhost_msg_strings[req]);\n \n@@ -219,17 +242,6 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,\n \t\targ = (void *)vm;\n \t}\n \n-\tif (req_kernel == VHOST_SET_FEATURES) {\n-\t\t/* We don't need memory protection here */\n-\t\t*(uint64_t *)arg &= ~(1ULL << VIRTIO_F_IOMMU_PLATFORM);\n-\n-\t\t/* VHOST kernel does not know about below flags */\n-\t\t*(uint64_t *)arg &= ~VHOST_KERNEL_GUEST_OFFLOADS_MASK;\n-\t\t*(uint64_t *)arg &= ~VHOST_KERNEL_HOST_OFFLOADS_MASK;\n-\n-\t\t*(uint64_t *)arg &= ~(1ULL << VIRTIO_NET_F_MQ);\n-\t}\n-\n \tswitch (req_kernel) {\n \tcase VHOST_SET_VRING_NUM:\n \tcase VHOST_SET_VRING_ADDR:\n@@ -259,24 +271,6 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,\n \t\tret = ioctl(vhostfd, req_kernel, arg);\n \t}\n \n-\tif (!ret && req_kernel == VHOST_GET_FEATURES) {\n-\t\tfeatures = tap_support_features();\n-\t\t/* with tap as the backend, all these features are supported\n-\t\t * but not claimed by vhost-net, so we add them back when\n-\t\t * reporting to upper layer.\n-\t\t */\n-\t\tif (features & IFF_VNET_HDR) {\n-\t\t\t*((uint64_t *)arg) |= VHOST_KERNEL_GUEST_OFFLOADS_MASK;\n-\t\t\t*((uint64_t *)arg) |= VHOST_KERNEL_HOST_OFFLOADS_MASK;\n-\t\t}\n-\n-\t\t/* vhost_kernel will not declare this feature, but it does\n-\t\t * support multi-queue.\n-\t\t */\n-\t\tif (features & IFF_MULTI_QUEUE)\n-\t\t\t*(uint64_t *)arg |= (1ull << VIRTIO_NET_F_MQ);\n-\t}\n-\n \tif (vm)\n \t\tfree(vm);\n \n@@ -407,6 +401,8 @@ vhost_kernel_enable_queue_pair(struct virtio_user_dev *dev,\n struct virtio_user_backend_ops virtio_ops_kernel = {\n \t.setup = vhost_kernel_setup,\n \t.set_owner = vhost_kernel_set_owner,\n+\t.get_features = vhost_kernel_get_features,\n+\t.set_features = vhost_kernel_set_features,\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_kernel_tap.c b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c\nindex eade702c5c..99096bdf39 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.c\n@@ -18,6 +18,29 @@\n #include \"../virtio_logs.h\"\n #include \"../virtio.h\"\n \n+\n+int\n+tap_support_features(unsigned int *tap_features)\n+{\n+\tint tapfd;\n+\n+\ttapfd = open(PATH_NET_TUN, O_RDWR);\n+\tif (tapfd < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"fail to open %s: %s\",\n+\t\t\t PATH_NET_TUN, strerror(errno));\n+\t\treturn -1;\n+\t}\n+\n+\tif (ioctl(tapfd, TUNGETFEATURES, tap_features) == -1) {\n+\t\tPMD_DRV_LOG(ERR, \"TUNGETFEATURES failed: %s\", strerror(errno));\n+\t\tclose(tapfd);\n+\t\treturn -1;\n+\t}\n+\n+\tclose(tapfd);\n+\treturn 0;\n+}\n+\n int\n vhost_kernel_tap_set_offload(int fd, uint64_t features)\n {\ndiff --git a/drivers/net/virtio/virtio_user/vhost_kernel_tap.h b/drivers/net/virtio/virtio_user/vhost_kernel_tap.h\nindex 5c4447b296..ed03fce21e 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel_tap.h\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel_tap.h\n@@ -43,5 +43,6 @@ int vhost_kernel_open_tap(char **p_ifname, int hdr_size, int req_mq,\n \t\t\t const char *mac, uint64_t features);\n int vhost_kernel_tap_set_offload(int fd, uint64_t features);\n int vhost_kernel_tap_set_queue(int fd, bool attach);\n+int tap_support_features(unsigned int *tap_features);\n \n #endif\ndiff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c\nindex ea3bd4ca10..8e5bf332d6 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -143,6 +143,64 @@ vhost_user_set_owner(struct virtio_user_dev *dev)\n \treturn 0;\n }\n \n+static int\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_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_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 features\");\n+\n+\treturn -1;\n+}\n+\n+static int\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_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\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n struct walk_arg {\n \tstruct vhost_memory *vm;\n \tint *fds;\n@@ -249,8 +307,6 @@ 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_FEATURES] = \"VHOST_SET_FEATURES\",\n-\t[VHOST_USER_GET_FEATURES] = \"VHOST_GET_FEATURES\",\n \t[VHOST_USER_SET_VRING_CALL] = \"VHOST_SET_VRING_CALL\",\n \t[VHOST_USER_SET_VRING_NUM] = \"VHOST_SET_VRING_NUM\",\n \t[VHOST_USER_SET_VRING_BASE] = \"VHOST_SET_VRING_BASE\",\n@@ -299,7 +355,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\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_FEATURES:\n \tcase VHOST_USER_GET_PROTOCOL_FEATURES:\n \t\tneed_reply = 1;\n \t\tbreak;\n@@ -398,7 +453,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\t}\n \n \t\tswitch (req) {\n-\t\tcase VHOST_USER_GET_FEATURES:\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@@ -536,6 +590,8 @@ vhost_user_enable_queue_pair(struct virtio_user_dev *dev,\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.get_features = vhost_user_get_features,\n+\t.set_features = vhost_user_set_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 d9bc213e0d..22a329526a 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -40,8 +40,6 @@\n \n static uint64_t vhost_req_user_to_vdpa[] = {\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 \t[VHOST_USER_SET_VRING_CALL] = VHOST_SET_VRING_CALL,\n \t[VHOST_USER_SET_VRING_NUM] = VHOST_SET_VRING_NUM,\n \t[VHOST_USER_SET_VRING_BASE] = VHOST_SET_VRING_BASE,\n@@ -107,6 +105,32 @@ 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_features(struct virtio_user_dev *dev, uint64_t *features)\n+{\n+\tint ret;\n+\n+\tret = vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_FEATURES, features);\n+\tif (ret) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to get features\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* Multiqueue not supported for now */\n+\t*features &= ~(1ULL << VIRTIO_NET_F_MQ);\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_vdpa_set_features(struct virtio_user_dev *dev, uint64_t features)\n+{\n+\t/* WORKAROUND */\n+\tfeatures |= 1ULL << VIRTIO_F_IOMMU_PLATFORM;\n+\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_FEATURES, &features);\n+}\n+\n static int\n vhost_vdpa_iotlb_batch_begin(struct virtio_user_dev *dev)\n {\n@@ -343,14 +367,6 @@ vhost_vdpa_send_request(struct virtio_user_dev *dev,\n \tif (req_vdpa == VHOST_SET_MEM_TABLE)\n \t\treturn vhost_vdpa_dma_map_all(dev);\n \n-\tif (req_vdpa == VHOST_SET_FEATURES) {\n-\t\t/* WORKAROUND */\n-\t\t*(uint64_t *)arg |= 1ULL << VIRTIO_F_IOMMU_PLATFORM;\n-\n-\t\t/* Multiqueue not supported for now */\n-\t\t*(uint64_t *)arg &= ~(1ULL << VIRTIO_NET_F_MQ);\n-\t}\n-\n \tswitch (req_vdpa) {\n \tcase VHOST_SET_VRING_NUM:\n \tcase VHOST_SET_VRING_ADDR:\n@@ -429,6 +445,8 @@ vhost_vdpa_enable_queue_pair(struct virtio_user_dev *dev,\n struct virtio_user_backend_ops virtio_ops_vdpa = {\n \t.setup = vhost_vdpa_setup,\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.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 f4b97d8489..1f3bbae663 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -141,7 +141,7 @@ virtio_user_dev_set_features(struct virtio_user_dev *dev)\n \t/* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know */\n \tfeatures &= ~(1ull << VIRTIO_NET_F_CTRL_VQ);\n \tfeatures &= ~(1ull << VIRTIO_NET_F_STATUS);\n-\tret = dev->ops->send_request(dev, VHOST_USER_SET_FEATURES, &features);\n+\tret = dev->ops->set_features(dev, features);\n \tif (ret < 0)\n \t\tgoto error;\n \tPMD_DRV_LOG(INFO, \"set features: %\" PRIx64, features);\n@@ -496,8 +496,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues,\n \t\t\treturn -1;\n \t\t}\n \n-\t\tif (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES,\n-\t\t\t\t\t &dev->device_features) < 0) {\n+\t\tif (dev->ops->get_features(dev, &dev->device_features) < 0) {\n \t\t\tPMD_INIT_LOG(ERR, \"get_features failed: %s\",\n \t\t\t\t strerror(errno));\n \t\t\treturn -1;\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 91794b8645..56c379bc15 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -85,8 +85,7 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev)\n \n \tvirtio_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER);\n \n-\tif (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES,\n-\t\t\t\t &dev->device_features) < 0) {\n+\tif (dev->ops->get_features(dev, &dev->device_features) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"get_features failed: %s\",\n \t\t\t strerror(errno));\n \t\treturn -1;\n", "prefixes": [ "v4", "27/44" ] }