{"id":815320,"url":"http://patchwork.ozlabs.org/api/patches/815320/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505807208-9063-8-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-8-git-send-email-eric.auger@redhat.com>","list_archive_url":null,"date":"2017-09-19T07:46:39","name":"[RFC,v4,07/16] virtio-iommu: Implement attach/detach command","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"95ae5733bb96ec078fd38d6424e955ae6f9b032d","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-8-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/815320/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815320/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-mx06.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx06.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 3xxFSx55Jbz9s7M\n\tfor ;\n\tTue, 19 Sep 2017 17:52:01 +1000 (AEST)","from localhost ([::1]:40609 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duDK3-0002PN-Pu\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 03:51:59 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47528)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duDGX-0008QF-Uw\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:48:26 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duDGX-0000xr-12\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:48:22 -0400","from mx1.redhat.com ([209.132.183.28]:52470)\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 1duDGU-0000uT-Go; Tue, 19 Sep 2017 03:48:18 -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 80D491F56A;\n\tTue, 19 Sep 2017 07:48:17 +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 6F7DA61346;\n\tTue, 19 Sep 2017 07:48:11 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 80D491F56A","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:39 +0200","Message-Id":"<1505807208-9063-8-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.30]);\n\tTue, 19 Sep 2017 07:48:17 +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 07/16] virtio-iommu: Implement attach/detach\n\tcommand","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 the device attach/detach to an\naddress space.\n\nSigned-off-by: Eric Auger \n---\n hw/virtio/virtio-iommu.c | 38 ++++++++++++++++++++++++++++++++------\n 1 file changed, 32 insertions(+), 6 deletions(-)","diff":"diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c\nindex 41a4bbc..bd859fb 100644\n--- a/hw/virtio/virtio-iommu.c\n+++ b/hw/virtio/virtio-iommu.c\n@@ -110,8 +110,7 @@ static void virtio_iommu_put_dev(gpointer data)\n g_free(dev);\n }\n \n-viommu_as *virtio_iommu_get_as(VirtIOIOMMU *s, uint32_t asid);\n-viommu_as *virtio_iommu_get_as(VirtIOIOMMU *s, uint32_t asid)\n+static viommu_as *virtio_iommu_get_as(VirtIOIOMMU *s, uint32_t asid)\n {\n viommu_as *as;\n \n@@ -205,6 +204,8 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,\n uint32_t asid = le32_to_cpu(req->address_space);\n uint32_t devid = le32_to_cpu(req->device);\n uint32_t reserved = le32_to_cpu(req->reserved);\n+ viommu_as *as;\n+ viommu_dev *dev;\n \n trace_virtio_iommu_attach(asid, devid);\n \n@@ -212,7 +213,22 @@ static int virtio_iommu_attach(VirtIOIOMMU *s,\n return VIRTIO_IOMMU_S_INVAL;\n }\n \n- return VIRTIO_IOMMU_S_UNSUPP;\n+ dev = virtio_iommu_get_dev(s, devid);\n+ if (dev->as) {\n+ /*\n+ * the device is already attached to an address space,\n+ * detach it first\n+ */\n+ virtio_iommu_detach_dev_from_as(dev);\n+ }\n+\n+ as = virtio_iommu_get_as(s, asid);\n+ QLIST_INSERT_HEAD(&as->device_list, dev, next);\n+\n+ dev->as = as;\n+ g_tree_ref(as->mappings);\n+\n+ return VIRTIO_IOMMU_S_OK;\n }\n \n static int virtio_iommu_detach(VirtIOIOMMU *s,\n@@ -220,14 +236,24 @@ static int virtio_iommu_detach(VirtIOIOMMU *s,\n {\n uint32_t devid = le32_to_cpu(req->device);\n uint32_t reserved = le32_to_cpu(req->reserved);\n-\n- trace_virtio_iommu_detach(devid);\n+ viommu_dev *dev;\n \n if (reserved) {\n return VIRTIO_IOMMU_S_INVAL;\n }\n \n- return VIRTIO_IOMMU_S_UNSUPP;\n+ dev = g_tree_lookup(s->devices, GUINT_TO_POINTER(devid));\n+ if (!dev) {\n+ return VIRTIO_IOMMU_S_NOENT;\n+ }\n+\n+ if (!dev->as) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+\n+ virtio_iommu_detach_dev_from_as(dev);\n+ trace_virtio_iommu_detach(devid);\n+ return VIRTIO_IOMMU_S_OK;\n }\n \n static int virtio_iommu_map(VirtIOIOMMU *s,\n","prefixes":["RFC","v4","07/16"]}