{"id":815325,"url":"http://patchwork.ozlabs.org/api/patches/815325/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505807208-9063-9-git-send-email-eric.auger@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505807208-9063-9-git-send-email-eric.auger@redhat.com>","list_archive_url":null,"date":"2017-09-19T07:46:40","name":"[RFC,v4,08/16] virtio-iommu: Implement map/unmap","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"2fbd022c4441ced8c1baf55f784141311ffdbd03","submitter":{"id":69187,"url":"http://patchwork.ozlabs.org/api/people/69187/?format=json","name":"Eric Auger","email":"eric.auger@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505807208-9063-9-git-send-email-eric.auger@redhat.com/mbox/","series":[{"id":3796,"url":"http://patchwork.ozlabs.org/api/series/3796/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3796","date":"2017-09-19T07:46:32","name":"VIRTIO-IOMMU device","version":4,"mbox":"http://patchwork.ozlabs.org/series/3796/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815325/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815325/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx02.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=eric.auger@redhat.com"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxFXM6B4qz9s7M\n\tfor ;\n\tTue, 19 Sep 2017 17:54:59 +1000 (AEST)","from localhost ([::1]:40621 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duDMw-0004pw-0I\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 03:54:58 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47677)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duDGp-0000CD-T3\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:48:41 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duDGo-00015L-S0\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:48:39 -0400","from mx1.redhat.com ([209.132.183.28]:53204)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1duDGi-00012e-O1; Tue, 19 Sep 2017 03:48:32 -0400","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 90537883DA;\n\tTue, 19 Sep 2017 07:48:31 +0000 (UTC)","from localhost.localdomain.com (ovpn-116-197.ams2.redhat.com\n\t[10.36.116.197])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id D8F7B60466;\n\tTue, 19 Sep 2017 07:48:17 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 90537883DA","From":"Eric Auger ","To":"eric.auger.pro@gmail.com, eric.auger@redhat.com, peter.maydell@linaro.org,\n\talex.williamson@redhat.com, mst@redhat.com, qemu-arm@nongnu.org,\n\tqemu-devel@nongnu.org, jean-philippe.brucker@arm.com","Date":"Tue, 19 Sep 2017 09:46:40 +0200","Message-Id":"<1505807208-9063-9-git-send-email-eric.auger@redhat.com>","In-Reply-To":"<1505807208-9063-1-git-send-email-eric.auger@redhat.com>","References":"<1505807208-9063-1-git-send-email-eric.auger@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.26]);\n\tTue, 19 Sep 2017 07:48:31 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [RFC v4 08/16] virtio-iommu: Implement map/unmap","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"wei@redhat.com, kevin.tian@intel.com, marc.zyngier@arm.com,\n\ttn@semihalf.com, \n\twill.deacon@arm.com, drjones@redhat.com, peterx@redhat.com,\n\tlinuc.decode@gmail.com, bharat.bhushan@nxp.com,\n\tchristoffer.dall@linaro.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"This patch implements virtio_iommu_map/unmap.\n\nSigned-off-by: Eric Auger \n\n---\n\nv3 -> v4:\n- implement unmap semantics as specified in v0.4\n---\n hw/virtio/trace-events | 3 ++\n hw/virtio/virtio-iommu.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++--\n 2 files changed, 92 insertions(+), 2 deletions(-)","diff":"diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events\nindex 74b92d3..da298c1 100644\n--- a/hw/virtio/trace-events\n+++ b/hw/virtio/trace-events\n@@ -42,3 +42,6 @@ virtio_iommu_get_dev(uint32_t devid) \"Alloc devid=%d\"\n virtio_iommu_put_dev(uint32_t devid) \"Free devid=%d\"\n virtio_iommu_get_as(uint32_t asid) \"Alloc asid=%d\"\n virtio_iommu_put_as(uint32_t asid) \"Free asid=%d\"\n+virtio_iommu_unmap_left_interval(uint64_t low, uint64_t high, uint64_t next_low, uint64_t next_high) \"Unmap left [0x%\"PRIx64\",0x%\"PRIx64\"], new interval=[0x%\"PRIx64\",0x%\"PRIx64\"]\"\n+virtio_iommu_unmap_right_interval(uint64_t low, uint64_t high, uint64_t next_low, uint64_t next_high) \"Unmap right [0x%\"PRIx64\",0x%\"PRIx64\"], new interval=[0x%\"PRIx64\",0x%\"PRIx64\"]\"\n+virtio_iommu_unmap_inc_interval(uint64_t low, uint64_t high) \"Unmap inc [0x%\"PRIx64\",0x%\"PRIx64\"]\"\ndiff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c\nindex bd859fb..6f1a7d1 100644\n--- a/hw/virtio/virtio-iommu.c\n+++ b/hw/virtio/virtio-iommu.c\n@@ -56,6 +56,13 @@ typedef struct viommu_interval {\n uint64_t high;\n } viommu_interval;\n \n+typedef struct viommu_mapping {\n+ uint64_t virt_addr;\n+ uint64_t phys_addr;\n+ uint64_t size;\n+ uint32_t flags;\n+} viommu_mapping;\n+\n static inline uint16_t virtio_iommu_get_sid(IOMMUDevice *dev)\n {\n return PCI_BUILD_BDF(pci_bus_num(dev->bus), dev->devfn);\n@@ -264,10 +271,37 @@ static int virtio_iommu_map(VirtIOIOMMU *s,\n uint64_t virt_addr = le64_to_cpu(req->virt_addr);\n uint64_t size = le64_to_cpu(req->size);\n uint32_t flags = le32_to_cpu(req->flags);\n+ viommu_as *as;\n+ viommu_interval *interval;\n+ viommu_mapping *mapping;\n+\n+ interval = g_malloc0(sizeof(*interval));\n+\n+ interval->low = virt_addr;\n+ interval->high = virt_addr + size - 1;\n+\n+ as = g_tree_lookup(s->address_spaces, GUINT_TO_POINTER(asid));\n+ if (!as) {\n+ return VIRTIO_IOMMU_S_NOENT;\n+ }\n+\n+ mapping = g_tree_lookup(as->mappings, (gpointer)interval);\n+ if (mapping) {\n+ g_free(interval);\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n \n trace_virtio_iommu_map(asid, phys_addr, virt_addr, size, flags);\n \n- return VIRTIO_IOMMU_S_UNSUPP;\n+ mapping = g_malloc0(sizeof(*mapping));\n+ mapping->virt_addr = virt_addr;\n+ mapping->phys_addr = phys_addr;\n+ mapping->size = size;\n+ mapping->flags = flags;\n+\n+ g_tree_insert(as->mappings, interval, mapping);\n+\n+ return VIRTIO_IOMMU_S_OK;\n }\n \n static int virtio_iommu_unmap(VirtIOIOMMU *s,\n@@ -276,10 +310,63 @@ static int virtio_iommu_unmap(VirtIOIOMMU *s,\n uint32_t asid = le32_to_cpu(req->address_space);\n uint64_t virt_addr = le64_to_cpu(req->virt_addr);\n uint64_t size = le64_to_cpu(req->size);\n+ viommu_mapping *mapping;\n+ viommu_interval interval;\n+ viommu_as *as;\n \n trace_virtio_iommu_unmap(asid, virt_addr, size);\n \n- return VIRTIO_IOMMU_S_UNSUPP;\n+ as = g_tree_lookup(s->address_spaces, GUINT_TO_POINTER(asid));\n+ if (!as) {\n+ error_report(\"%s: no as\", __func__);\n+ return VIRTIO_IOMMU_S_NOENT;\n+ }\n+ interval.low = virt_addr;\n+ interval.high = virt_addr + size - 1;\n+\n+ mapping = g_tree_lookup(as->mappings, (gpointer)(&interval));\n+\n+ while (mapping) {\n+ viommu_interval current;\n+ uint64_t low = mapping->virt_addr;\n+ uint64_t high = mapping->virt_addr + mapping->size - 1;\n+\n+ current.low = low;\n+ current.high = high;\n+\n+ if (low == interval.low && size >= mapping->size) {\n+ g_tree_remove(as->mappings, (gpointer)(¤t));\n+ interval.low = high + 1;\n+ trace_virtio_iommu_unmap_left_interval(current.low, current.high,\n+ interval.low, interval.high);\n+ } else if (high == interval.high && size >= mapping->size) {\n+ trace_virtio_iommu_unmap_right_interval(current.low, current.high,\n+ interval.low, interval.high);\n+ g_tree_remove(as->mappings, (gpointer)(¤t));\n+ interval.high = low - 1;\n+ } else if (low > interval.low && high < interval.high) {\n+ trace_virtio_iommu_unmap_inc_interval(current.low, current.high);\n+ g_tree_remove(as->mappings, (gpointer)(¤t));\n+ } else {\n+ break;\n+ }\n+ if (interval.low >= interval.high) {\n+ return VIRTIO_IOMMU_S_OK;\n+ } else {\n+ mapping = g_tree_lookup(as->mappings, (gpointer)(&interval));\n+ }\n+ }\n+\n+ if (mapping) {\n+ error_report(\"****** %s: Unmap 0x%\"PRIx64\" size=0x%\"PRIx64\n+ \" from 0x%\"PRIx64\" size=0x%\"PRIx64\" is not supported\",\n+ __func__, interval.low, size,\n+ mapping->virt_addr, mapping->size);\n+ } else {\n+ return VIRTIO_IOMMU_S_OK;\n+ }\n+\n+ return VIRTIO_IOMMU_S_INVAL;\n }\n \n #define get_payload_size(req) (\\\n","prefixes":["RFC","v4","08/16"]}