From patchwork Fri Sep 25 11:35:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 522741 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6CDED140779 for ; Fri, 25 Sep 2015 21:41:31 +1000 (AEST) Received: from localhost ([::1]:60822 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfRNZ-0008Vy-AN for incoming@patchwork.ozlabs.org; Fri, 25 Sep 2015 07:41:29 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50274) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfRHA-0005DG-RM for qemu-devel@nongnu.org; Fri, 25 Sep 2015 07:34:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZfRH8-00027t-MH for qemu-devel@nongnu.org; Fri, 25 Sep 2015 07:34:52 -0400 Received: from ozlabs.org ([103.22.144.67]:45596) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZfRH8-00027M-CG; Fri, 25 Sep 2015 07:34:50 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 38CBD14090B; Fri, 25 Sep 2015 21:34:48 +1000 (AEST) From: David Gibson To: alex.williamson@redhat.com, pbonzini@redhat.com Date: Fri, 25 Sep 2015 21:35:06 +1000 Message-Id: <1443180908-19911-6-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443180908-19911-1-git-send-email-david@gibson.dropbear.id.au> References: <1443180908-19911-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Cc: lvivier@redhat.com, thuth@redhat.com, abologna@redhat.com, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, David Gibson Subject: [Qemu-devel] [PATCHv2 5/7] memory: Allow replay of IOMMU mapping notifications X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org When we have guest visible IOMMUs, we allow notifiers to be registered which will be informed of all changes to IOMMU mappings. This is used by vfio to keep the host IOMMU mappings in sync with guest IOMMU mappings. However, unlike with a memory region listener, an iommu notifier won't be told about any mappings which already exist in the (guest) IOMMU at the time it is registered. This can cause problems if hotplugging a VFIO device onto a guest bus which had existing guest IOMMU mappings, but didn't previously have an VFIO devices (and hence no host IOMMU mappings). This adds a memory_region_register_iommu_notifier_replay() function to handle this case. As well as registering the new notifier it replays existing mappings. Because the IOMMU memory region doesn't internally remember the granularity of the guest IOMMU it has a small hack where the caller must specify a granularity at which to replay mappings. If there are finer mappings in the guest IOMMU these will be reported in the iotlb structures passed to the notifier which it must handle (probably causing it to flag an error). This isn't new - the VFIO iommu notifier must already handle notifications about guest IOMMU mappings too short for it to represent in the host IOMMU. Signed-off-by: David Gibson --- include/exec/memory.h | 17 +++++++++++++++++ memory.c | 23 +++++++++++++++++++++++ 2 files changed, 40 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 5baaf48..304f985 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -583,6 +583,23 @@ void memory_region_notify_iommu(MemoryRegion *mr, void memory_region_register_iommu_notifier(MemoryRegion *mr, Notifier *n); /** + * memory_region_register_iommu_notifier_replay: register a notifier + * for changes to IOMMU translation entries, and replay existing IOMMU + * translations to the new notifier. + * + * @mr: the memory region to observe + * @n: the notifier to be added; the notifier receives a pointer to an + * #IOMMUTLBEntry as the opaque value; the pointer ceases to be + * valid on exit from the notifier. + * @granularity: Minimum page granularity to replay notifications for + * @is_write: Whether to treat the replay as a translate "write" + * through the iommu + */ +void memory_region_register_iommu_notifier_replay(MemoryRegion *mr, Notifier *n, + hwaddr granularity, + bool is_write); + +/** * memory_region_unregister_iommu_notifier: unregister a notifier for * changes to IOMMU translation entries. * diff --git a/memory.c b/memory.c index ef87363..5884136 100644 --- a/memory.c +++ b/memory.c @@ -1403,6 +1403,29 @@ void memory_region_register_iommu_notifier(MemoryRegion *mr, Notifier *n) notifier_list_add(&mr->iommu_notify, n); } +void memory_region_register_iommu_notifier_replay(MemoryRegion *mr, Notifier *n, + hwaddr granularity, + bool is_write) +{ + hwaddr addr; + IOMMUTLBEntry iotlb; + + memory_region_register_iommu_notifier(mr, n); + + for (addr = 0; addr < memory_region_size(mr); addr += granularity) { + iotlb = mr->iommu_ops->translate(mr, addr, is_write); + if (iotlb.perm != IOMMU_NONE) { + n->notify(n, &iotlb); + } + + /* if (2^64 - MR size) < granularity, it's possible to get an + * infinite loop here. This should catch such a wraparound */ + if ((addr + granularity) < addr) { + break; + } + } +} + void memory_region_unregister_iommu_notifier(Notifier *n) { notifier_remove(n);