Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/60058/?format=api
{ "id": 60058, "url": "https://patches.dpdk.org/api/patches/60058/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20190927183759.18816-3-amorenoz@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": "<20190927183759.18816-3-amorenoz@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20190927183759.18816-3-amorenoz@redhat.com", "date": "2019-09-27T18:37:58", "name": "[v3,2/3] vhost: convert buffer addresses to GPA for logging", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "00b2366e79482ac96bc90f7e111f91d48b04bbb1", "submitter": { "id": 1397, "url": "https://patches.dpdk.org/api/people/1397/?format=api", "name": "Adrian Moreno", "email": "amorenoz@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/20190927183759.18816-3-amorenoz@redhat.com/mbox/", "series": [ { "id": 6593, "url": "https://patches.dpdk.org/api/series/6593/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=6593", "date": "2019-09-27T18:37:56", "name": "vhost: add support for IOVA_VA mode", "version": 3, "mbox": "https://patches.dpdk.org/series/6593/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/60058/comments/", "check": "fail", "checks": "https://patches.dpdk.org/api/patches/60058/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 164451BEEF;\n\tFri, 27 Sep 2019 20:38:26 +0200 (CEST)", "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id 89E691BEDA;\n\tFri, 27 Sep 2019 20:38:21 +0200 (CEST)", "from smtp.corp.redhat.com\n\t(int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 02BC0308219E;\n\tFri, 27 Sep 2019 18:38:21 +0000 (UTC)", "from amorenoz.users.ipa.redhat.com (ovpn-116-96.ams2.redhat.com\n\t[10.36.116.96])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 7A2A75C21A;\n\tFri, 27 Sep 2019 18:38:19 +0000 (UTC)" ], "From": "Adrian Moreno <amorenoz@redhat.com>", "To": "dev@dpdk.org", "Cc": "tiwei.bie@intel.com, zhihong.wang@intel.com, maxime.coquelin@redhat.com, \n\tAdrian Moreno <amorenoz@redhat.com>, stable@dpdk.org", "Date": "Fri, 27 Sep 2019 20:37:58 +0200", "Message-Id": "<20190927183759.18816-3-amorenoz@redhat.com>", "In-Reply-To": "<20190927183759.18816-1-amorenoz@redhat.com>", "References": "<20190927183759.18816-1-amorenoz@redhat.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.16", "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.47]); Fri, 27 Sep 2019 18:38:21 +0000 (UTC)", "Subject": "[dpdk-dev] [PATCH v3 2/3] vhost: convert buffer addresses to GPA\n\tfor logging", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Note that the API facing rte_vhost_log_write is not modified.\nSo, make explicit that it expects the address in GPA space.\n\nFixes: 69c90e98f483 (\"vhost: enable IOMMU support\")\nCc: maxime.coquelin@redhat.com\nCc: stable@dpdk.org\n\nSigned-off-by: Adrian Moreno <amorenoz@redhat.com>\n---\n lib/librte_vhost/rte_vhost.h | 2 +-\n lib/librte_vhost/vdpa.c | 4 +++-\n lib/librte_vhost/vhost.c | 21 +++++++++++++++++++++\n lib/librte_vhost/vhost.h | 16 ++++++++++++++++\n lib/librte_vhost/virtio_net.c | 12 +++++++-----\n 5 files changed, 48 insertions(+), 7 deletions(-)", "diff": "diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h\nindex 7fb172912..16c7e4243 100644\n--- a/lib/librte_vhost/rte_vhost.h\n+++ b/lib/librte_vhost/rte_vhost.h\n@@ -265,7 +265,7 @@ rte_vhost_va_from_guest_pa(struct rte_vhost_memory *mem,\n * @param vid\n * vhost device ID\n * @param addr\n- * the starting address for write\n+ * the starting address for write (in guest physical address space)\n * @param len\n * the length to write\n */\ndiff --git a/lib/librte_vhost/vdpa.c b/lib/librte_vhost/vdpa.c\nindex 8e45ce9f8..11fd5aede 100644\n--- a/lib/librte_vhost/vdpa.c\n+++ b/lib/librte_vhost/vdpa.c\n@@ -201,7 +201,9 @@ rte_vdpa_relay_vring_used(int vid, uint16_t qid, void *vring_m)\n \t\t\t\tgoto fail;\n \t\t\tdesc = desc_ring[desc_id];\n \t\t\tif (desc.flags & VRING_DESC_F_WRITE)\n-\t\t\t\tvhost_log_write(dev, desc.addr, desc.len);\n+\t\t\t\tvhost_log_cache_write_iova(dev, vq,\n+\t\t\t\t\t\t\t desc.addr,\n+\t\t\t\t\t\t\t desc.len);\n \t\t\tdesc_id = desc.next;\n \t\t} while (desc.flags & VRING_DESC_F_NEXT);\n \ndiff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c\nindex e57dda22f..78457a77c 100644\n--- a/lib/librte_vhost/vhost.c\n+++ b/lib/librte_vhost/vhost.c\n@@ -200,6 +200,27 @@ __vhost_log_cache_write(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t}\n }\n \n+void\n+__vhost_log_cache_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq,\n+\t\t\t uint64_t iova, uint64_t len)\n+{\n+\tuint64_t hva, gpa, map_len;\n+\tmap_len = len;\n+\n+\thva = __vhost_iova_to_vva(dev, vq, iova, &map_len, VHOST_ACCESS_RW);\n+\tif (map_len != len) {\n+\t\tRTE_LOG(ERR, VHOST_CONFIG,\n+\t\t\t\"Failed to write log for IOVA 0x%0lx.\"\n+\t\t\t\"No IOTLB entry found\\n\",\n+\t\t\tiova);\n+\t\treturn;\n+\t}\n+\n+\tgpa = hva_to_gpa(dev, hva, len);\n+\tif (gpa)\n+\t\t__vhost_log_cache_write(dev, vq, gpa, len);\n+}\n+\n void *\n vhost_alloc_copy_ind_table(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t\tuint64_t desc_addr, uint64_t desc_len)\ndiff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h\nindex 9d3883385..9fa70bc3c 100644\n--- a/lib/librte_vhost/vhost.h\n+++ b/lib/librte_vhost/vhost.h\n@@ -353,6 +353,9 @@ desc_is_avail(struct vring_packed_desc *desc, bool wrap_counter)\n void __vhost_log_cache_write(struct virtio_net *dev,\n \t\tstruct vhost_virtqueue *vq,\n \t\tuint64_t addr, uint64_t len);\n+void __vhost_log_cache_write_iova(struct virtio_net *dev,\n+\t\tstruct vhost_virtqueue *vq,\n+\t\tuint64_t iova, uint64_t len);\n void __vhost_log_cache_sync(struct virtio_net *dev,\n \t\tstruct vhost_virtqueue *vq);\n void __vhost_log_write(struct virtio_net *dev, uint64_t addr, uint64_t len);\n@@ -393,6 +396,19 @@ vhost_log_used_vring(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \tvhost_log_write(dev, vq->log_guest_addr + offset, len);\n }\n \n+static __rte_always_inline void\n+vhost_log_cache_write_iova(struct virtio_net *dev, struct vhost_virtqueue *vq,\n+\t\t\t uint64_t iova, uint64_t len)\n+{\n+\tif (likely(!(dev->features & (1ULL << VHOST_F_LOG_ALL))))\n+\t\treturn;\n+\n+\tif (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM))\n+\t\t__vhost_log_cache_write_iova(dev, vq, iova, len);\n+\telse\n+\t\t__vhost_log_cache_write(dev, vq, iova, len);\n+}\n+\n /* Macros for printing using RTE_LOG */\n #define RTE_LOGTYPE_VHOST_CONFIG RTE_LOGTYPE_USER1\n #define RTE_LOGTYPE_VHOST_DATA RTE_LOGTYPE_USER1\ndiff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c\nindex 5b85b832d..22961cafe 100644\n--- a/lib/librte_vhost/virtio_net.c\n+++ b/lib/librte_vhost/virtio_net.c\n@@ -178,7 +178,8 @@ do_data_copy_enqueue(struct virtio_net *dev, struct vhost_virtqueue *vq)\n \n \tfor (i = 0; i < count; i++) {\n \t\trte_memcpy(elem[i].dst, elem[i].src, elem[i].len);\n-\t\tvhost_log_cache_write(dev, vq, elem[i].log_addr, elem[i].len);\n+\t\tvhost_log_cache_write_iova(dev, vq, elem[i].log_addr,\n+\t\t\t\t\t elem[i].len);\n \t\tPRINT_PACKET(dev, (uintptr_t)elem[i].dst, elem[i].len, 0);\n \t}\n \n@@ -633,7 +634,7 @@ copy_vnet_hdr_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \n \t\tPRINT_PACKET(dev, (uintptr_t)dst,\n \t\t\t\t(uint32_t)len, 0);\n-\t\tvhost_log_cache_write(dev, vq,\n+\t\tvhost_log_cache_write_iova(dev, vq,\n \t\t\t\tiova, len);\n \n \t\tremain -= len;\n@@ -733,7 +734,7 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t\t\t} else {\n \t\t\t\tPRINT_PACKET(dev, (uintptr_t)hdr_addr,\n \t\t\t\t\t\tdev->vhost_hlen, 0);\n-\t\t\t\tvhost_log_cache_write(dev, vq,\n+\t\t\t\tvhost_log_cache_write_iova(dev, vq,\n \t\t\t\t\t\tbuf_vec[0].buf_iova,\n \t\t\t\t\t\tdev->vhost_hlen);\n \t\t\t}\n@@ -748,8 +749,9 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,\n \t\t\trte_memcpy((void *)((uintptr_t)(buf_addr + buf_offset)),\n \t\t\t\trte_pktmbuf_mtod_offset(m, void *, mbuf_offset),\n \t\t\t\tcpy_len);\n-\t\t\tvhost_log_cache_write(dev, vq, buf_iova + buf_offset,\n-\t\t\t\t\tcpy_len);\n+\t\t\tvhost_log_cache_write_iova(dev, vq,\n+\t\t\t\t\t\t buf_iova + buf_offset,\n+\t\t\t\t\t\t cpy_len);\n \t\t\tPRINT_PACKET(dev, (uintptr_t)(buf_addr + buf_offset),\n \t\t\t\tcpy_len, 0);\n \t\t} else {\n", "prefixes": [ "v3", "2/3" ] }