Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87320/?format=api
{ "id": 87320, "url": "https://patches.dpdk.org/api/patches/87320/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-33-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-33-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-33-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:27", "name": "[v4,32/44] net/virtio: add Virtio-user vring address ops", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "385c8f33c758dbb0dc1ebeb196ded1ce3b956202", "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-33-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/87320/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87320/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 3BB29A052A;\n\tTue, 26 Jan 2021 11:22:14 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 688751413FD;\n\tTue, 26 Jan 2021 11:18:27 +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 B5AD51413CF\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:18:20 +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-347-4pBRzq4kOJWeKDlj__n3Tw-1; Tue, 26 Jan 2021 05:18:16 -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 49308B8104;\n Tue, 26 Jan 2021 10:18:15 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id BFBC672163;\n Tue, 26 Jan 2021 10:18:13 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656300;\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=Ot+DSv6P5GI7j1PkCsAe0tL9gMGZdoukPzOOhXaYbLY=;\n b=YBMhM5lqaT1ily1xcaGs/7s1yhiyK6r0V3NT0iLNZC4nFtTsuwzIToxB/xtcM33+X8cT73\n JW2yNlKMCusD9LH+DP/0hHU4vBPOGlb8xjiSW2SYdSTz2IUqQbEpHQr+P+F+4j3kS3KOi7\n ZpbAyvaOQhxjQU/gfjED4dRoTkPagoE=", "X-MC-Unique": "4pBRzq4kOJWeKDlj__n3Tw-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:27 +0100", "Message-Id": "<20210126101639.250481-33-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 32/44] net/virtio: add Virtio-user vring\n address 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 a new callback for setting\nvrings addresses.\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 | 1 +\n drivers/net/virtio/virtio_user/vhost_kernel.c | 32 +++++++++++++------\n drivers/net/virtio/virtio_user/vhost_user.c | 29 +++++++++++++----\n drivers/net/virtio/virtio_user/vhost_vdpa.c | 8 ++++-\n .../net/virtio/virtio_user/virtio_user_dev.c | 2 +-\n 5 files changed, 55 insertions(+), 17 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h\nindex 94c524547e..19040dfdc2 100644\n--- a/drivers/net/virtio/virtio_user/vhost.h\n+++ b/drivers/net/virtio/virtio_user/vhost.h\n@@ -120,6 +120,7 @@ struct virtio_user_backend_ops {\n \tint (*get_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state);\n \tint (*set_vring_call)(struct virtio_user_dev *dev, struct vhost_vring_file *file);\n \tint (*set_vring_kick)(struct virtio_user_dev *dev, struct vhost_vring_file *file);\n+\tint (*set_vring_addr)(struct virtio_user_dev *dev, struct vhost_vring_addr *addr);\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 bdef436595..48eeb77aec 100644\n--- a/drivers/net/virtio/virtio_user/vhost_kernel.c\n+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c\n@@ -294,9 +294,30 @@ vhost_kernel_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file\n \treturn vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_CALL, file);\n }\n \n+static int\n+vhost_kernel_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)\n+{\n+\tint ret, fd;\n+\tunsigned int index = addr->index;\n+\n+\t/* Convert from queue index to queue-pair & offset */\n+\tfd = dev->vhostfds[addr->index / 2];\n+\taddr->index %= 2;\n+\n+\tret = vhost_kernel_ioctl(fd, VHOST_SET_VRING_ADDR, addr);\n+\tif (ret < 0) {\n+\t\tPMD_DRV_LOG(ERR, \"Failed to set vring address\");\n+\t\treturn -1;\n+\t}\n+\n+\t/* restore index back to queue index */\n+\taddr->index = index;\n+\n+\treturn 0;\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_ADDR] = VHOST_SET_VRING_ADDR,\n };\n \n static int\n@@ -308,20 +329,12 @@ vhost_kernel_send_request(struct virtio_user_dev *dev,\n \tunsigned int i;\n \tuint64_t req_kernel;\n \tint vhostfd;\n-\tunsigned int queue_sel;\n \n \tPMD_DRV_LOG(INFO, \"%s\", vhost_msg_strings[req]);\n \n \treq_kernel = vhost_req_user_to_kernel[req];\n \n \tswitch (req_kernel) {\n-\tcase VHOST_SET_VRING_ADDR:\n-\t\tqueue_sel = *(unsigned int *)arg;\n-\t\tvhostfd = dev->vhostfds[queue_sel / 2];\n-\t\t*(unsigned int *)arg = queue_sel % 2;\n-\t\tPMD_DRV_LOG(DEBUG, \"vhostfd=%d, index=%u\",\n-\t\t\t vhostfd, *(unsigned int *)arg);\n-\t\tbreak;\n \tdefault:\n \t\tvhostfd = -1;\n \t}\n@@ -473,6 +486,7 @@ struct virtio_user_backend_ops virtio_ops_kernel = {\n \t.get_vring_base = vhost_kernel_get_vring_base,\n \t.set_vring_call = vhost_kernel_set_vring_call,\n \t.set_vring_kick = vhost_kernel_set_vring_kick,\n+\t.set_vring_addr = vhost_kernel_set_vring_addr,\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 ccb40484f4..9ff49d2b1d 100644\n--- a/drivers/net/virtio/virtio_user/vhost_user.c\n+++ b/drivers/net/virtio/virtio_user/vhost_user.c\n@@ -538,11 +538,32 @@ vhost_user_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *\n \treturn vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file);\n }\n \n+\n+static int\n+vhost_user_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)\n+{\n+\tint ret;\n+\tstruct vhost_user_msg msg = {\n+\t\t.request = VHOST_USER_SET_VRING_ADDR,\n+\t\t.flags = VHOST_USER_VERSION,\n+\t\t.size = sizeof(*addr),\n+\t\t.payload.addr = *addr,\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 send vring addresses\");\n+\t\treturn -1;\n+\t}\n+\n+\treturn 0;\n+}\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_ADDR] = \"VHOST_SET_VRING_ADDR\",\n \t[VHOST_USER_SET_STATUS] = \"VHOST_SET_STATUS\",\n \t[VHOST_USER_GET_STATUS] = \"VHOST_GET_STATUS\",\n };\n@@ -610,11 +631,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_ADDR:\n-\t\tmemcpy(&msg.payload.addr, arg, sizeof(msg.payload.addr));\n-\t\tmsg.size = sizeof(m.payload.addr);\n-\t\tbreak;\n-\n \tcase VHOST_USER_SET_VRING_ERR:\n \t\tfile = arg;\n \t\tmsg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK;\n@@ -787,6 +803,7 @@ struct virtio_user_backend_ops virtio_ops_user = {\n \t.get_vring_base = vhost_user_get_vring_base,\n \t.set_vring_call = vhost_user_set_vring_call,\n \t.set_vring_kick = vhost_user_set_vring_kick,\n+\t.set_vring_addr = vhost_user_set_vring_addr,\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 304a808b55..1ec6bb26f2 100644\n--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c\n+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c\n@@ -38,7 +38,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_VRING_ADDR] = VHOST_SET_VRING_ADDR,\n \t[VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS,\n \t[VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS,\n };\n@@ -374,6 +373,12 @@ vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *\n \treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file);\n }\n \n+static int\n+vhost_vdpa_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr)\n+{\n+\treturn vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_ADDR, addr);\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@@ -484,6 +489,7 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {\n \t.get_vring_base = vhost_vdpa_get_vring_base,\n \t.set_vring_call = vhost_vdpa_set_vring_call,\n \t.set_vring_kick = vhost_vdpa_set_vring_kick,\n+\t.set_vring_addr = vhost_vdpa_set_vring_addr,\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 4383e403da..7e365d0570 100644\n--- a/drivers/net/virtio/virtio_user/virtio_user_dev.c\n+++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c\n@@ -81,7 +81,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel)\n \t\tstate.num |= (1 << 15);\n \tdev->ops->set_vring_base(dev, &state);\n \n-\tdev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr);\n+\tdev->ops->set_vring_addr(dev, &addr);\n \n \t/* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes\n \t * lastly because vhost depends on this msg to judge if\n", "prefixes": [ "v4", "32/44" ] }