{"id":815317,"url":"http://patchwork.ozlabs.org/api/patches/815317/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505807208-9063-5-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-5-git-send-email-eric.auger@redhat.com>","list_archive_url":null,"date":"2017-09-19T07:46:36","name":"[RFC,v4,04/16] virtio-iommu: Decode the command payload","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ce1efcc6049b7840547cf480781832cbebd27768","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-5-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/815317/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815317/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-mx05.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx05.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 3xxFPc3gWxz9s82\n\tfor ;\n\tTue, 19 Sep 2017 17:49:08 +1000 (AEST)","from localhost ([::1]:40591 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duDHF-0008Q5-PY\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 03:49:05 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:47333)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duDG9-00085K-UO\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:48:02 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duDG8-0000k7-PF\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 03:47:58 -0400","from mx1.redhat.com ([209.132.183.28]:46316)\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 1duDG5-0000hX-Mo; Tue, 19 Sep 2017 03:47:53 -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 8E4FF2C975D;\n\tTue, 19 Sep 2017 07:47:52 +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 CF81D61342;\n\tTue, 19 Sep 2017 07:47:40 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 8E4FF2C975D","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:36 +0200","Message-Id":"<1505807208-9063-5-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.29]);\n\tTue, 19 Sep 2017 07:47:52 +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 04/16] virtio-iommu: Decode the command payload","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 adds the command payload decoding and\nintroduces the functions that will do the actual\ncommand handling. Those functions are not yet implemented.\n\nSigned-off-by: Eric Auger \n\n---\nv3 -> v4:\n- no flags field anymore in struct virtio_iommu_req_unmap\n- test reserved on attach/detach, change trace proto\n\nv3 -> v4:\n- rebase on v2.10.0.\n---\n hw/virtio/trace-events | 4 ++\n hw/virtio/virtio-iommu.c | 104 +++++++++++++++++++++++++++++++++++++++++++++--\n 2 files changed, 104 insertions(+), 4 deletions(-)","diff":"diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events\nindex 98cf9a1..a35dc62 100644\n--- a/hw/virtio/trace-events\n+++ b/hw/virtio/trace-events\n@@ -32,3 +32,7 @@ virtio_iommu_set_features(uint64_t features) \"features accepted by the driver =0\n virtio_iommu_device_reset(void) \"reset!\"\n virtio_iommu_device_status(uint8_t status) \"driver status = %d\"\n virtio_iommu_get_config(uint64_t page_size_mask, uint64_t start, uint64_t end, uint8_t ioasid_bits, uint32_t probe_size) \"page_size_mask=0x%\"PRIx64\" start=0x%\"PRIx64\" end=0x%\"PRIx64\" ioasid_bits=%d probe_size=0x%x\"\n+virtio_iommu_attach(uint32_t as, uint32_t dev) \"as=%d dev=%d\"\n+virtio_iommu_detach(uint32_t dev) \"dev=%d\"\n+virtio_iommu_map(uint32_t as, uint64_t phys_addr, uint64_t virt_addr, uint64_t size, uint32_t flags) \"as= %d phys_addr=0x%\"PRIx64\" virt_addr=0x%\"PRIx64\" size=0x%\"PRIx64\" flags=%d\"\n+virtio_iommu_unmap(uint32_t as, uint64_t virt_addr, uint64_t size) \"as= %d virt_addr=0x%\"PRIx64\" size=0x%\"PRIx64\ndiff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c\nindex 36e5b5f..51f9003 100644\n--- a/hw/virtio/virtio-iommu.c\n+++ b/hw/virtio/virtio-iommu.c\n@@ -35,29 +35,125 @@\n /* Max size */\n #define VIOMMU_DEFAULT_QUEUE_SIZE 256\n \n+static int virtio_iommu_attach(VirtIOIOMMU *s,\n+ struct virtio_iommu_req_attach *req)\n+{\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+\n+ trace_virtio_iommu_attach(asid, devid);\n+\n+ if (reserved) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+\n+ return VIRTIO_IOMMU_S_UNSUPP;\n+}\n+\n+static int virtio_iommu_detach(VirtIOIOMMU *s,\n+ struct virtio_iommu_req_detach *req)\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+\n+ if (reserved) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+\n+ return VIRTIO_IOMMU_S_UNSUPP;\n+}\n+\n+static int virtio_iommu_map(VirtIOIOMMU *s,\n+ struct virtio_iommu_req_map *req)\n+{\n+ uint32_t asid = le32_to_cpu(req->address_space);\n+ uint64_t phys_addr = le64_to_cpu(req->phys_addr);\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+\n+ trace_virtio_iommu_map(asid, phys_addr, virt_addr, size, flags);\n+\n+ return VIRTIO_IOMMU_S_UNSUPP;\n+}\n+\n+static int virtio_iommu_unmap(VirtIOIOMMU *s,\n+ struct virtio_iommu_req_unmap *req)\n+{\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+\n+ trace_virtio_iommu_unmap(asid, virt_addr, size);\n+\n+ return VIRTIO_IOMMU_S_UNSUPP;\n+}\n+\n+#define get_payload_size(req) (\\\n+sizeof((req)) - sizeof(struct virtio_iommu_req_tail))\n+\n static int virtio_iommu_handle_attach(VirtIOIOMMU *s,\n struct iovec *iov,\n unsigned int iov_cnt)\n {\n- return -ENOENT;\n+ struct virtio_iommu_req_attach req;\n+ size_t sz, payload_sz;\n+\n+ payload_sz = get_payload_size(req);\n+\n+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);\n+ if (sz != payload_sz) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+ return virtio_iommu_attach(s, &req);\n }\n static int virtio_iommu_handle_detach(VirtIOIOMMU *s,\n struct iovec *iov,\n unsigned int iov_cnt)\n {\n- return -ENOENT;\n+ struct virtio_iommu_req_detach req;\n+ size_t sz, payload_sz;\n+\n+ payload_sz = get_payload_size(req);\n+\n+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);\n+ if (sz != payload_sz) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+ return virtio_iommu_detach(s, &req);\n }\n static int virtio_iommu_handle_map(VirtIOIOMMU *s,\n struct iovec *iov,\n unsigned int iov_cnt)\n {\n- return -ENOENT;\n+ struct virtio_iommu_req_map req;\n+ size_t sz, payload_sz;\n+\n+ payload_sz = get_payload_size(req);\n+\n+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);\n+ if (sz != payload_sz) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+ return virtio_iommu_map(s, &req);\n }\n static int virtio_iommu_handle_unmap(VirtIOIOMMU *s,\n struct iovec *iov,\n unsigned int iov_cnt)\n {\n- return -ENOENT;\n+ struct virtio_iommu_req_unmap req;\n+ size_t sz, payload_sz;\n+\n+ payload_sz = get_payload_size(req);\n+\n+ sz = iov_to_buf(iov, iov_cnt, 0, &req, payload_sz);\n+ if (sz != payload_sz) {\n+ return VIRTIO_IOMMU_S_INVAL;\n+ }\n+ return virtio_iommu_unmap(s, &req);\n }\n \n static void virtio_iommu_handle_command(VirtIODevice *vdev, VirtQueue *vq)\n","prefixes":["RFC","v4","04/16"]}