From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3C54C2BB1D for ; Fri, 13 Mar 2020 14:26:39 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C2189206FA for ; Fri, 13 Mar 2020 14:26:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="deI+rMBe" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C2189206FA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:59710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jClGo-0007MJ-Tg for qemu-devel@archiver.kernel.org; Fri, 13 Mar 2020 10:26:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48225) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jClFs-0006QU-Br for qemu-devel@nongnu.org; Fri, 13 Mar 2020 10:25:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jClFq-0005bN-Nj for qemu-devel@nongnu.org; Fri, 13 Mar 2020 10:25:40 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:49067 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jClFm-0005Q9-GQ for qemu-devel@nongnu.org; Fri, 13 Mar 2020 10:25:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584109531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AMwHb4K8T3L+BBa95qgJaRfxhYeRkcOh+68pFgugpk8=; b=deI+rMBejAyTWAXfakA7rq37TBHe6RryPbLsWuxtFKDV0vwtFiwwWomf3F7txv48rv0nQJ eGRiaJgoB2E7GOAJRy53zQMC7kLNVtImUqycFTR3lGH9dOKmZLWeKfxJEq6jyoeQFNLjzd Cr5FRFkaELzpywSfM/5Fiqreyfy9tgI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-344-INS1YWi_Mviw3BX1uOfbCA-1; Fri, 13 Mar 2020 10:25:27 -0400 X-MC-Unique: INS1YWi_Mviw3BX1uOfbCA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 121E0801E74; Fri, 13 Mar 2020 14:25:26 +0000 (UTC) Received: from [10.36.118.12] (unknown [10.36.118.12]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9CDE43AA; Fri, 13 Mar 2020 14:25:12 +0000 (UTC) Subject: Re: [PATCH v7 2/5] virtio-iommu: Add iommu notifier for map/unmap To: Bharat Bhushan , peter.maydell@linaro.org, peterx@redhat.com, eric.auger.pro@gmail.com, alex.williamson@redhat.com, kevin.tian@intel.com, mst@redhat.com, tnowicki@marvell.com, drjones@redhat.com, linuc.decode@gmail.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, bharatb.linux@gmail.com References: <20200313074811.27175-1-bbhushan2@marvell.com> <20200313074811.27175-3-bbhushan2@marvell.com> From: Auger Eric Message-ID: <369b162f-3a0c-6861-0737-96aa8914b915@redhat.com> Date: Fri, 13 Mar 2020 15:25:09 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 In-Reply-To: <20200313074811.27175-3-bbhushan2@marvell.com> Content-Language: en-US X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Hi Bharat, On 3/13/20 8:48 AM, Bharat Bhushan wrote: > This patch extends VIRTIO_IOMMU_T_MAP/UNMAP request to > notify registered iommu-notifier. Which will call vfio s/iommu-notifier/iommu-notifiers > notifier to map/unmap region in iommu. can be any notifier (vhost/vfio). > > Signed-off-by: Bharat Bhushan > Signed-off-by: Eric Auger > --- > hw/virtio/trace-events | 2 + > hw/virtio/virtio-iommu.c | 66 +++++++++++++++++++++++++++++++- > include/hw/virtio/virtio-iommu.h | 6 +++ > 3 files changed, 73 insertions(+), 1 deletion(-) > > diff --git a/hw/virtio/trace-events b/hw/virtio/trace-events > index e83500bee9..d94a1cd8a3 100644 > --- a/hw/virtio/trace-events > +++ b/hw/virtio/trace-events > @@ -73,3 +73,5 @@ virtio_iommu_get_domain(uint32_t domain_id) "Alloc domain=%d" > virtio_iommu_put_domain(uint32_t domain_id) "Free domain=%d" > virtio_iommu_translate_out(uint64_t virt_addr, uint64_t phys_addr, uint32_t sid) "0x%"PRIx64" -> 0x%"PRIx64 " for sid=%d" > virtio_iommu_report_fault(uint8_t reason, uint32_t flags, uint32_t endpoint, uint64_t addr) "FAULT reason=%d flags=%d endpoint=%d address =0x%"PRIx64 > +virtio_iommu_notify_map(const char *name, uint64_t iova, uint64_t paddr, uint64_t map_size) "mr=%s iova=0x%"PRIx64" pa=0x%" PRIx64" size=0x%"PRIx64 > +virtio_iommu_notify_unmap(const char *name, uint64_t iova, uint64_t map_size) "mr=%s iova=0x%"PRIx64" size=0x%"PRIx64 > diff --git a/hw/virtio/virtio-iommu.c b/hw/virtio/virtio-iommu.c > index 4cee8083bc..e51344a53e 100644 > --- a/hw/virtio/virtio-iommu.c > +++ b/hw/virtio/virtio-iommu.c > @@ -123,6 +123,38 @@ static gint interval_cmp(gconstpointer a, gconstpointer b, gpointer user_data) > } > } > > +static void virtio_iommu_notify_map(IOMMUMemoryRegion *mr, hwaddr iova, > + hwaddr paddr, hwaddr size) > +{ > + IOMMUTLBEntry entry; > + > + entry.target_as = &address_space_memory; > + entry.addr_mask = size - 1; > + > + entry.iova = iova; > + trace_virtio_iommu_notify_map(mr->parent_obj.name, iova, paddr, size); > + entry.perm = IOMMU_RW; > + entry.translated_addr = paddr; > + > + memory_region_notify_iommu(mr, 0, entry); > +} > + > +static void virtio_iommu_notify_unmap(IOMMUMemoryRegion *mr, hwaddr iova, > + hwaddr size) > +{ > + IOMMUTLBEntry entry; > + > + entry.target_as = &address_space_memory; > + entry.addr_mask = size - 1; > + > + entry.iova = iova; > + trace_virtio_iommu_notify_unmap(mr->parent_obj.name, iova, size); > + entry.perm = IOMMU_NONE; > + entry.translated_addr = 0; > + > + memory_region_notify_iommu(mr, 0, entry); > +} > + > static void virtio_iommu_detach_endpoint_from_domain(VirtIOIOMMUEndpoint *ep) > { > if (!ep->domain) { > @@ -307,9 +339,12 @@ static int virtio_iommu_map(VirtIOIOMMU *s, > uint64_t virt_start = le64_to_cpu(req->virt_start); > uint64_t virt_end = le64_to_cpu(req->virt_end); > uint32_t flags = le32_to_cpu(req->flags); > + hwaddr size = virt_end - virt_start + 1; > + VirtioIOMMUNotifierNode *node; > VirtIOIOMMUDomain *domain; > VirtIOIOMMUInterval *interval; > VirtIOIOMMUMapping *mapping; > + VirtIOIOMMUEndpoint *ep; > > if (flags & ~VIRTIO_IOMMU_MAP_F_MASK) { > return VIRTIO_IOMMU_S_INVAL; > @@ -339,9 +374,37 @@ static int virtio_iommu_map(VirtIOIOMMU *s, > > g_tree_insert(domain->mappings, interval, mapping); > > + /* All devices in an address-space share mapping */ > + QLIST_FOREACH(node, &s->notifiers_list, next) { > + QLIST_FOREACH(ep, &domain->endpoint_list, next) { > + if (ep->id == node->iommu_dev->devfn) { > + virtio_iommu_notify_map(&node->iommu_dev->iommu_mr, > + virt_start, phys_start, size); > + } > + } > + } > + > return VIRTIO_IOMMU_S_OK; > } > > +static void virtio_iommu_remove_mapping(VirtIOIOMMU *s, VirtIOIOMMUDomain *domain, > + VirtIOIOMMUInterval *interval) > +{ > + VirtioIOMMUNotifierNode *node; > + VirtIOIOMMUEndpoint *ep; > + > + QLIST_FOREACH(node, &s->notifiers_list, next) { > + QLIST_FOREACH(ep, &domain->endpoint_list, next) { > + if (ep->id == node->iommu_dev->devfn) { > + virtio_iommu_notify_unmap(&node->iommu_dev->iommu_mr, > + interval->low, > + interval->high - interval->low + 1); > + } > + } > + } > + g_tree_remove(domain->mappings, (gpointer)(interval)); > +} What about virtio_iommu_put_domain() where you destroy the mapping gtree. I guess you also need to send invalidations there? > + > static int virtio_iommu_unmap(VirtIOIOMMU *s, > struct virtio_iommu_req_unmap *req) > { > @@ -368,7 +431,7 @@ static int virtio_iommu_unmap(VirtIOIOMMU *s, > uint64_t current_high = iter_key->high; > > if (interval.low <= current_low && interval.high >= current_high) { > - g_tree_remove(domain->mappings, iter_key); > + virtio_iommu_remove_mapping(s, domain, iter_key); > trace_virtio_iommu_unmap_done(domain_id, current_low, current_high); > } else { > ret = VIRTIO_IOMMU_S_RANGE; > @@ -655,6 +718,7 @@ static void virtio_iommu_device_realize(DeviceState *dev, Error **errp) > VirtIODevice *vdev = VIRTIO_DEVICE(dev); > VirtIOIOMMU *s = VIRTIO_IOMMU(dev); > > + QLIST_INIT(&s->notifiers_list); > virtio_init(vdev, "virtio-iommu", VIRTIO_ID_IOMMU, > sizeof(struct virtio_iommu_config)); > > diff --git a/include/hw/virtio/virtio-iommu.h b/include/hw/virtio/virtio-iommu.h > index 6f67f1020a..4539c8ae72 100644 > --- a/include/hw/virtio/virtio-iommu.h > +++ b/include/hw/virtio/virtio-iommu.h > @@ -44,6 +44,11 @@ typedef struct IOMMUPciBus { > IOMMUDevice *pbdev[0]; /* Parent array is sparse, so dynamically alloc */ > } IOMMUPciBus; > > +typedef struct VirtioIOMMUNotifierNode { > + IOMMUDevice *iommu_dev; > + QLIST_ENTRY(VirtioIOMMUNotifierNode) next; > +} VirtioIOMMUNotifierNode; You may use scripts/git.orderfile for a better diff ordering. > + > typedef struct VirtIOIOMMU { > VirtIODevice parent_obj; > VirtQueue *req_vq; > @@ -56,6 +61,7 @@ typedef struct VirtIOIOMMU { > GTree *domains; > QemuMutex mutex; > GTree *endpoints; > + QLIST_HEAD(, VirtioIOMMUNotifierNode) notifiers_list; See what was done in smmuv3 and intel. We now directly use a list of IOMMUDevice directly. VirtioIOMMUNotifierNode does not bring anything extra. > } VirtIOIOMMU; > > #endif > Thanks Eric