Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87318/?format=api
{ "id": 87318, "url": "https://patches.dpdk.org/api/patches/87318/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-31-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-31-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-31-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:25", "name": "[v4,30/44] net/virtio: add Virtio-user vring setting ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a4beecbab3b2898adbc8c9374d9a680f3d678337", "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-31-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/87318/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/87318/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 1A669A052A;\n\tTue, 26 Jan 2021 11:21:52 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 68E4B1413EB;\n\tTue, 26 Jan 2021 11:18:20 +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 463091413C4\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:15 +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-147-4RAd7H1cPQOeytBglYf_-A-1; Tue, 26 Jan 2021 05:18:12 -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 B08111005513;\n Tue, 26 Jan 2021 10:18:11 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 3D3DA7216C;\n Tue, 26 Jan 2021 10:18:10 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656294;\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=N8pKv94xmECMOoAX1o5GfYrS28u0wpovXJbwqOXoHeI=;\n b=JX6WCcKki7EOryECWFeJb4PiVmlIS6Fr92gQyWXy44TFOFHCGF0RIPTrSmv3TJAS0G/rn9\n 0w6okDEKGikCzHSMwOXznlCmMMDk4885YI6qomTO9uN0pA9G0/bTmWcDnEVaYhYeUOPwkh\n ccvrO4MLtGgWRrVo66w2kDX6nQIvnGE=", "X-MC-Unique": "4RAd7H1cPQOeytBglYf_-A-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:25 +0100", "Message-Id": "<20210126101639.250481-31-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 30/44] net/virtio: add Virtio-user vring\n setting 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\nand getting vring state.\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 | 3 +\n drivers/net/virtio/virtio_user/vhost_kernel.c | 49 +++++++-\n drivers/net/virtio/virtio_user/vhost_user.c | 113 +++++++++++++-----\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 41 +++++--\n .../net/virtio/virtio_user/virtio_user_dev.c | 9 +-\n 5 files changed, 165 insertions(+), 50 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 463801f563..2d433d5966 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -115,6 +115,9 @@ struct virtio_user_backend_ops {\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);\n+\tint (*get_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state);\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 69f932bede..f6e7cf4717 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -219,12 +219,49 @@ vhost_kernel_set_memory_table(struct virtio_user_dev *dev)\n \treturn -1;\n }\n \n+static int\n+vhost_kernel_set_vring(struct virtio_user_dev *dev, uint64_t req, struct vhost_vring_state *state)\n+{\n+\tint ret, fd;\n+\tunsigned int index = state->index;\n+\n+\t/* Convert from queue index to queue-pair & offset */\n+\tfd = dev->vhostfds[state->index / 2];\n+\tstate->index %= 2;\n+\n+\tret = vhost_kernel_ioctl(fd, req, state);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set vring (request %\" PRIu64 \")\", req);\n+\t\treturn -1;\n+\t}\n+\n+\t/* restore index back to queue index */\n+\tstate->index = index;\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_kernel_set_vring_num(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_kernel_set_vring(dev, VHOST_SET_VRING_NUM, state);\n+}\n+\n+static int\n+vhost_kernel_set_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_kernel_set_vring(dev, VHOST_SET_VRING_BASE, state);\n+}\n+\n+static int\n+vhost_kernel_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_kernel_set_vring(dev, VHOST_GET_VRING_BASE, state);\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_NUM] = VHOST_SET_VRING_NUM,\n-\t[VHOST_USER_SET_VRING_BASE] = VHOST_SET_VRING_BASE,\n-\t[VHOST_USER_GET_VRING_BASE] = VHOST_GET_VRING_BASE,\n \t[VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR,\n \t[VHOST_USER_SET_VRING_KICK] = VHOST_SET_VRING_KICK,\n };\n@@ -245,10 +282,7 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,\n \treq_kernel = vhost_req_user_to_kernel[req];\n \n \tswitch (req_kernel) {\n-\tcase VHOST_SET_VRING_NUM:\n \tcase VHOST_SET_VRING_ADDR:\n-\tcase VHOST_SET_VRING_BASE:\n-\tcase VHOST_GET_VRING_BASE:\n \tcase VHOST_SET_VRING_KICK:\n \tcase VHOST_SET_VRING_CALL:\n \t\tqueue_sel = *(unsigned int *)arg;\n@@ -403,6 +437,9 @@ struct virtio_user_backend_ops virtio_ops_kernel = {\n \t.get_features = vhost_kernel_get_features,\n \t.set_features = vhost_kernel_set_features,\n \t.set_memory_table = vhost_kernel_set_memory_table,\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.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 84765d5fdf..8d4c5cce77 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -417,17 +417,94 @@ vhost_user_set_memory_table(struct virtio_user_dev *dev)\n \treturn -1;\n }\n \n+static int\n+vhost_user_set_vring(struct virtio_user_dev *dev, enum vhost_user_request req,\n+\t\tstruct vhost_vring_state *state)\n+{\n+\tint ret;\n+\tstruct vhost_user_msg msg = {\n+\t\t.request = req,\n+\t\t.flags = VHOST_USER_VERSION,\n+\t\t.size = sizeof(*state),\n+\t\t.payload.state = *state,\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 vring state (request %d)\", req);\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\n+\n+static int\n+vhost_user_set_vring_enable(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_user_set_vring(dev, VHOST_USER_SET_VRING_ENABLE, state);\n+}\n+\n+static int\n+vhost_user_set_vring_num(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_user_set_vring(dev, VHOST_USER_SET_VRING_NUM, state);\n+}\n+\n+static int\n+vhost_user_set_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_user_set_vring(dev, VHOST_USER_SET_VRING_BASE, state);\n+}\n+\n+static int\n+vhost_user_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\tint ret;\n+\tstruct vhost_user_msg msg;\n+\tunsigned int index = state->index;\n+\n+\tret = vhost_user_set_vring(dev, VHOST_USER_GET_VRING_BASE, state);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to send request\");\n+\t\tgoto err;\n+\t}\n+\n+\tret = vhost_user_read(dev->vhostfd, &msg);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to read reply\");\n+\t\tgoto err;\n+\t}\n+\n+\tif (msg.request != VHOST_USER_GET_VRING_BASE) {\n+\t\tPMD_DRV_LOG(ERR, \"Unexpected request type (%d)\", msg.request);\n+\t\tgoto err;\n+\t}\n+\n+\tif (msg.size != sizeof(*state)) {\n+\t\tPMD_DRV_LOG(ERR, \"Unexpected payload size (%u)\", msg.size);\n+\t\tgoto err;\n+\t}\n+\n+\tif (msg.payload.state.index != index) {\n+\t\tPMD_DRV_LOG(ERR, \"Unexpected ring index (%u)\", state->index);\n+\t\tgoto err;\n+\t}\n+\n+\t*state = msg.payload.state;\n+\n+\treturn 0;\n+err:\n+\tPMD_DRV_LOG(ERR, \"Failed to get vring base\");\n+\treturn -1;\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_NUM] = \"VHOST_SET_VRING_NUM\",\n-\t[VHOST_USER_SET_VRING_BASE] = \"VHOST_SET_VRING_BASE\",\n-\t[VHOST_USER_GET_VRING_BASE] = \"VHOST_GET_VRING_BASE\",\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_VRING_ENABLE] = \"VHOST_SET_VRING_ENABLE\",\n \t[VHOST_USER_SET_STATUS] = \"VHOST_SET_STATUS\",\n \t[VHOST_USER_GET_STATUS] = \"VHOST_GET_STATUS\",\n };\n@@ -495,19 +572,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\tfds[fd_num++] = *((int *)arg);\n \t\tbreak;\n \n-\tcase VHOST_USER_SET_VRING_NUM:\n-\tcase VHOST_USER_SET_VRING_BASE:\n-\tcase VHOST_USER_SET_VRING_ENABLE:\n-\t\tmemcpy(&msg.payload.state, arg, sizeof(msg.payload.state));\n-\t\tmsg.size = sizeof(m.payload.state);\n-\t\tbreak;\n-\n-\tcase VHOST_USER_GET_VRING_BASE:\n-\t\tmemcpy(&msg.payload.state, arg, sizeof(msg.payload.state));\n-\t\tmsg.size = sizeof(m.payload.state);\n-\t\tneed_reply = 1;\n-\t\tbreak;\n-\n \tcase VHOST_USER_SET_VRING_ADDR:\n \t\tmemcpy(&msg.payload.addr, arg, sizeof(msg.payload.addr));\n \t\tmsg.size = sizeof(m.payload.addr);\n@@ -556,14 +620,6 @@ vhost_user_sock(struct virtio_user_dev *dev,\n \t\t\t}\n \t\t\t*((__u64 *)arg) = msg.payload.u64;\n \t\t\tbreak;\n-\t\tcase VHOST_USER_GET_VRING_BASE:\n-\t\t\tif (msg.size != sizeof(m.payload.state)) {\n-\t\t\t\tPMD_DRV_LOG(ERR, \"Received bad msg size\");\n-\t\t\t\treturn -1;\n-\t\t\t}\n-\t\t\tmemcpy(arg, &msg.payload.state,\n-\t\t\t sizeof(struct vhost_vring_state));\n-\t\t\tbreak;\n \t\tdefault:\n \t\t\t/* Reply-ack handling */\n \t\t\tif (msg.size != sizeof(m.payload.u64)) {\n@@ -671,10 +727,10 @@ vhost_user_enable_queue_pair(struct virtio_user_dev *dev,\n \tfor (i = 0; i < 2; ++i) {\n \t\tstruct vhost_vring_state state = {\n \t\t\t.index = pair_idx * 2 + i,\n-\t\t\t.num = enable,\n+\t\t\t.num = enable,\n \t\t};\n \n-\t\tif (vhost_user_sock(dev, VHOST_USER_SET_VRING_ENABLE, &state))\n+\t\tif (vhost_user_set_vring_enable(dev, &state))\n \t\t\treturn -1;\n \t}\n \n@@ -690,6 +746,9 @@ struct virtio_user_backend_ops virtio_ops_user = {\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,\n+\t.get_vring_base = vhost_user_get_vring_base,\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 bd7daebf0c..323751093a 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -32,24 +32,17 @@\n #define VHOST_VDPA_GET_DEVICE_ID _IOR(VHOST_VIRTIO, 0x70, __u32)\n #define VHOST_VDPA_GET_STATUS _IOR(VHOST_VIRTIO, 0x71, __u8)\n #define VHOST_VDPA_SET_STATUS _IOW(VHOST_VIRTIO, 0x72, __u8)\n-#define VHOST_VDPA_SET_VRING_ENABLE\t_IOW(VHOST_VIRTIO, 0x75, \\\n-\t\t\t\t\t struct vhost_vring_state)\n+#define VHOST_VDPA_SET_VRING_ENABLE _IOW(VHOST_VIRTIO, 0x75, struct vhost_vring_state)\n #define VHOST_SET_BACKEND_FEATURES _IOW(VHOST_VIRTIO, 0x25, __u64)\n #define VHOST_GET_BACKEND_FEATURES _IOR(VHOST_VIRTIO, 0x26, __u64)\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_NUM] = VHOST_SET_VRING_NUM,\n-\t[VHOST_USER_SET_VRING_BASE] = VHOST_SET_VRING_BASE,\n-\t[VHOST_USER_GET_VRING_BASE] = VHOST_GET_VRING_BASE,\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-\t[VHOST_USER_SET_VRING_ENABLE] = VHOST_VDPA_SET_VRING_ENABLE,\n-\t[VHOST_USER_GET_PROTOCOL_FEATURES] = VHOST_GET_BACKEND_FEATURES,\n-\t[VHOST_USER_SET_PROTOCOL_FEATURES] = VHOST_SET_BACKEND_FEATURES,\n };\n \n /* no alignment requirement */\n@@ -347,6 +340,30 @@ vhost_vdpa_set_memory_table(struct virtio_user_dev *dev)\n \treturn ret;\n }\n \n+static int\n+vhost_vdpa_set_vring_enable(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_SET_VRING_ENABLE, state);\n+}\n+\n+static int\n+vhost_vdpa_set_vring_num(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_NUM, state);\n+}\n+\n+static int\n+vhost_vdpa_set_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_BASE, state);\n+}\n+\n+static int\n+vhost_vdpa_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_VRING_BASE, state);\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@@ -375,10 +392,7 @@ vhost_vdpa_send_request(struct virtio_user_dev *dev,\n \treq_vdpa = vhost_req_user_to_vdpa[req];\n \n \tswitch (req_vdpa) {\n-\tcase VHOST_SET_VRING_NUM:\n \tcase VHOST_SET_VRING_ADDR:\n-\tcase VHOST_SET_VRING_BASE:\n-\tcase VHOST_GET_VRING_BASE:\n \tcase VHOST_SET_VRING_KICK:\n \tcase VHOST_SET_VRING_CALL:\n \t\tPMD_DRV_LOG(DEBUG, \"vhostfd=%d, index=%u\",\n@@ -440,7 +454,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_send_request(dev, VHOST_USER_SET_VRING_ENABLE, &state))\n+\t\tif (vhost_vdpa_set_vring_enable(dev, &state))\n \t\t\treturn -1;\n \t}\n \n@@ -457,6 +471,9 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {\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,\n+\t.get_vring_base = vhost_vdpa_get_vring_base,\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 cb8f8a872c..0b30c10016 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -73,13 +73,13 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)\n \n \tstate.index = queue_sel;\n \tstate.num = vring->num;\n-\tdev->ops->send_request(dev, VHOST_USER_SET_VRING_NUM, &state);\n+\tdev->ops->set_vring_num(dev, &state);\n \n \tstate.index = queue_sel;\n \tstate.num = 0; /* no reservation */\n \tif (dev->features & (1ULL << VIRTIO_F_RING_PACKED))\n \t\tstate.num |= (1 << 15);\n-\tdev->ops->send_request(dev, VHOST_USER_SET_VRING_BASE, &state);\n+\tdev->ops->set_vring_base(dev, &state);\n \n \tdev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr);\n \n@@ -218,9 +218,8 @@ int virtio_user_stop_device(struct virtio_user_dev *dev)\n \t/* Stop the backend. */\n \tfor (i = 0; i < dev->max_queue_pairs * 2; ++i) {\n \t\tstate.index = i;\n-\t\tif (dev->ops->send_request(dev, VHOST_USER_GET_VRING_BASE,\n-\t\t\t\t\t &state) < 0) {\n-\t\t\tPMD_DRV_LOG(ERR, \"get_vring_base failed, index=%u\\n\",\n+\t\tif (dev->ops->get_vring_base(dev, &state) < 0) {\n+\t\t\tPMD_DRV_LOG(ERR, \"get_vring_base failed, index=%u\",\n \t\t\t\t i);\n \t\t\terror = -1;\n \t\t\tgoto out;\n", "prefixes": [ "v4", "30/44" ] }