Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 58861,
    "url": "http://patchwork.dpdk.org/api/patches/58861/?format=api",
    "web_url": "http://patchwork.dpdk.org/project/dpdk/patch/20190906125020.23276-1-amorenoz@redhat.com/",
    "project": {
        "id": 1,
        "url": "http://patchwork.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": "<20190906125020.23276-1-amorenoz@redhat.com>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20190906125020.23276-1-amorenoz@redhat.com",
    "date": "2019-09-06T12:50:20",
    "name": "vhost: fix vring memory partially mapped",
    "commit_ref": null,
    "pull_url": null,
    "state": "accepted",
    "archived": true,
    "hash": "8b7246cb2b1356b4819fb5ddac1f454215383e59",
    "submitter": {
        "id": 1397,
        "url": "http://patchwork.dpdk.org/api/people/1397/?format=api",
        "name": "Adrian Moreno",
        "email": "amorenoz@redhat.com"
    },
    "delegate": {
        "id": 2642,
        "url": "http://patchwork.dpdk.org/api/users/2642/?format=api",
        "username": "mcoquelin",
        "first_name": "Maxime",
        "last_name": "Coquelin",
        "email": "maxime.coquelin@redhat.com"
    },
    "mbox": "http://patchwork.dpdk.org/project/dpdk/patch/20190906125020.23276-1-amorenoz@redhat.com/mbox/",
    "series": [
        {
            "id": 6302,
            "url": "http://patchwork.dpdk.org/api/series/6302/?format=api",
            "web_url": "http://patchwork.dpdk.org/project/dpdk/list/?series=6302",
            "date": "2019-09-06T12:50:20",
            "name": "vhost: fix vring memory partially mapped",
            "version": 1,
            "mbox": "http://patchwork.dpdk.org/series/6302/mbox/"
        }
    ],
    "comments": "http://patchwork.dpdk.org/api/patches/58861/comments/",
    "check": "success",
    "checks": "http://patchwork.dpdk.org/api/patches/58861/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 E1D541F35C;\n\tFri,  6 Sep 2019 14:50:43 +0200 (CEST)",
            "from mx1.redhat.com (mx1.redhat.com [209.132.183.28])\n\tby dpdk.org (Postfix) with ESMTP id AEECA1F311;\n\tFri,  6 Sep 2019 14:50:42 +0200 (CEST)",
            "from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\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 1B13318C4273;\n\tFri,  6 Sep 2019 12:50:42 +0000 (UTC)",
            "from amorenoz.users.ipa.redhat.com (unknown [10.36.118.65])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id E7574600C4;\n\tFri,  6 Sep 2019 12:50:40 +0000 (UTC)"
        ],
        "From": "Adrian Moreno <amorenoz@redhat.com>",
        "To": "dev@dpdk.org",
        "Cc": "Adrian Moreno <amorenoz@redhat.com>, maxime.coquelin@redhat.com,\n\tstable@dpdk.org",
        "Date": "Fri,  6 Sep 2019 14:50:20 +0200",
        "Message-Id": "<20190906125020.23276-1-amorenoz@redhat.com>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11",
        "X-Greylist": "Sender IP whitelisted, not delayed by milter-greylist-4.6.2\n\t(mx1.redhat.com [10.5.110.62]); Fri, 06 Sep 2019 12:50:42 +0000 (UTC)",
        "Subject": "[dpdk-dev] [PATCH] vhost: fix vring memory partially mapped",
        "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": "Only the mapping of the vring addresses is being ensured. This causes\nerrors when the vring size is larger than the IOTLB page size. E.g:\nqueue sizes > 256 for 4K IOTLB pages\n\nEnsure the entire vring memory range gets mapped. Refactor duplicated\ncode for for IOTLB UPDATE and IOTLB INVALIDATE and add packed virtqueue\nsupport.\n\nFixes: 09927b524969 (\"vhost: translate ring addresses when IOMMU enabled\")\nCc: maxime.coquelin@redhat.com\nCc: stable@dpdk.org\n\nSigned-off-by: Adrian Moreno <amorenoz@redhat.com>\n---\n lib/librte_vhost/vhost_user.c | 64 +++++++++++++++++++++--------------\n 1 file changed, 39 insertions(+), 25 deletions(-)",
    "diff": "diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c\nindex 0b72648a5..168ad9e0f 100644\n--- a/lib/librte_vhost/vhost_user.c\n+++ b/lib/librte_vhost/vhost_user.c\n@@ -558,11 +558,13 @@ ring_addr_to_vva(struct virtio_net *dev, struct vhost_virtqueue *vq,\n {\n \tif (dev->features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)) {\n \t\tuint64_t vva;\n+\t\tuint64_t req_size = *size;\n \n \t\tvva = vhost_user_iotlb_cache_find(vq, ra,\n \t\t\t\t\tsize, VHOST_ACCESS_RW);\n-\t\tif (!vva)\n-\t\t\tvhost_user_iotlb_miss(dev, ra, VHOST_ACCESS_RW);\n+\t\tif (req_size != *size)\n+\t\t\tvhost_user_iotlb_miss(dev, (ra + *size),\n+\t\t\t\t\t      VHOST_ACCESS_RW);\n \n \t\treturn vva;\n \t}\n@@ -1570,54 +1572,66 @@ vhost_user_set_req_fd(struct virtio_net **pdev, struct VhostUserMsg *msg,\n }\n \n static int\n-is_vring_iotlb_update(struct vhost_virtqueue *vq, struct vhost_iotlb_msg *imsg)\n+is_vring_iotlb_split(struct vhost_virtqueue *vq, struct vhost_iotlb_msg *imsg)\n {\n \tstruct vhost_vring_addr *ra;\n-\tuint64_t start, end;\n+\tuint64_t start, end, len;\n \n \tstart = imsg->iova;\n \tend = start + imsg->size;\n \n \tra = &vq->ring_addrs;\n-\tif (ra->desc_user_addr >= start && ra->desc_user_addr < end)\n+\tlen = sizeof(struct vring_desc) * vq->size;\n+\tif (ra->desc_user_addr < end && (ra->desc_user_addr + len) > start)\n \t\treturn 1;\n-\tif (ra->avail_user_addr >= start && ra->avail_user_addr < end)\n+\n+\tlen = sizeof(struct vring_avail) + sizeof(uint16_t) * vq->size;\n+\tif (ra->avail_user_addr < end && (ra->avail_user_addr + len) > start)\n \t\treturn 1;\n-\tif (ra->used_user_addr >= start && ra->used_user_addr < end)\n+\n+\tlen = sizeof(struct vring_used) +\n+\t       sizeof(struct vring_used_elem) * vq->size;\n+\tif (ra->used_user_addr < end && (ra->used_user_addr + len) > start)\n \t\treturn 1;\n \n \treturn 0;\n }\n \n static int\n-is_vring_iotlb_invalidate(struct vhost_virtqueue *vq,\n-\t\t\t\tstruct vhost_iotlb_msg *imsg)\n+is_vring_iotlb_packed(struct vhost_virtqueue *vq, struct vhost_iotlb_msg *imsg)\n {\n-\tuint64_t istart, iend, vstart, vend;\n+\tstruct vhost_vring_addr *ra;\n+\tuint64_t start, end, len;\n \n-\tistart = imsg->iova;\n-\tiend = istart + imsg->size - 1;\n+\tstart = imsg->iova;\n+\tend = start + imsg->size;\n \n-\tvstart = (uintptr_t)vq->desc;\n-\tvend = vstart + sizeof(struct vring_desc) * vq->size - 1;\n-\tif (vstart <= iend && istart <= vend)\n+\tra = &vq->ring_addrs;\n+\tlen = sizeof(struct vring_packed_desc) * vq->size;\n+\tif (ra->desc_user_addr < end && (ra->desc_user_addr + len) > start)\n \t\treturn 1;\n \n-\tvstart = (uintptr_t)vq->avail;\n-\tvend = vstart + sizeof(struct vring_avail);\n-\tvend += sizeof(uint16_t) * vq->size - 1;\n-\tif (vstart <= iend && istart <= vend)\n+\tlen = sizeof(struct vring_packed_desc_event);\n+\tif (ra->avail_user_addr < end && (ra->avail_user_addr + len) > start)\n \t\treturn 1;\n \n-\tvstart = (uintptr_t)vq->used;\n-\tvend = vstart + sizeof(struct vring_used);\n-\tvend += sizeof(struct vring_used_elem) * vq->size - 1;\n-\tif (vstart <= iend && istart <= vend)\n+\tlen = sizeof(struct vring_packed_desc_event);\n+\tif (ra->used_user_addr < end && (ra->used_user_addr + len) > start)\n \t\treturn 1;\n \n \treturn 0;\n }\n \n+static int is_vring_iotlb(struct virtio_net *dev,\n+\t\t\t  struct vhost_virtqueue *vq,\n+\t\t\t  struct vhost_iotlb_msg *imsg)\n+{\n+\tif (vq_is_packed(dev))\n+\t\treturn is_vring_iotlb_packed(vq, imsg);\n+\telse\n+\t\treturn is_vring_iotlb_split(vq, imsg);\n+}\n+\n static int\n vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,\n \t\t\tint main_fd __rte_unused)\n@@ -1640,7 +1654,7 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,\n \t\t\tvhost_user_iotlb_cache_insert(vq, imsg->iova, vva,\n \t\t\t\t\tlen, imsg->perm);\n \n-\t\t\tif (is_vring_iotlb_update(vq, imsg))\n+\t\t\tif (is_vring_iotlb(dev, vq, imsg))\n \t\t\t\t*pdev = dev = translate_ring_addresses(dev, i);\n \t\t}\n \t\tbreak;\n@@ -1651,7 +1665,7 @@ vhost_user_iotlb_msg(struct virtio_net **pdev, struct VhostUserMsg *msg,\n \t\t\tvhost_user_iotlb_cache_remove(vq, imsg->iova,\n \t\t\t\t\timsg->size);\n \n-\t\t\tif (is_vring_iotlb_invalidate(vq, imsg))\n+\t\t\tif (is_vring_iotlb(dev, vq, imsg))\n \t\t\t\tvring_invalidate(dev, vq);\n \t\t}\n \t\tbreak;\n",
    "prefixes": []
}