From patchwork Tue Jan 3 07:29:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Xu X-Patchwork-Id: 710409 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tt5Yt2DcFz9sf9 for ; Tue, 3 Jan 2017 18:44:34 +1100 (AEDT) Received: from localhost ([::1]:60658 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOJlo-0006u7-7I for incoming@patchwork.ozlabs.org; Tue, 03 Jan 2017 02:44:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cOJYN-0003Gw-Pc for qemu-devel@nongnu.org; Tue, 03 Jan 2017 02:30:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cOJYM-0008Qz-Bq for qemu-devel@nongnu.org; Tue, 03 Jan 2017 02:30:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53948) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cOJYL-0008Qp-UZ for qemu-devel@nongnu.org; Tue, 03 Jan 2017 02:30:38 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 13C70C057FA5; Tue, 3 Jan 2017 07:30:38 +0000 (UTC) Received: from pxdev.xzpeter.org (vpn1-4-159.pek2.redhat.com [10.72.4.159]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v037TtOJ005764; Tue, 3 Jan 2017 02:30:34 -0500 From: Peter Xu To: qemu-devel@nongnu.org Date: Tue, 3 Jan 2017 15:29:47 +0800 Message-Id: <1483428594-28880-11-git-send-email-peterx@redhat.com> In-Reply-To: <1483428594-28880-1-git-send-email-peterx@redhat.com> References: <1483428594-28880-1-git-send-email-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Tue, 03 Jan 2017 07:30:38 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH RFC v2 10/17] memory: add section range info for IOMMU notifier X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: tianyu.lan@intel.com, kevin.tian@intel.com, mst@redhat.com, jan.kiszka@siemens.com, jasowang@redhat.com, peterx@redhat.com, alex.williamson@redhat.com, bd.aviv@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In this patch, IOMMUNotifier.{start|end} are introduced to store section information for a specific notifier. When notification occurs, we not only check the notification type (MAP|UNMAP), but also check whether the notified iova is in the range of specific IOMMU notifier, and skip those notifiers if not in the listened range. When removing an region, we need to make sure we removed the correct VFIOGuestIOMMU by checking the IOMMUNotifier.start address as well. Suggested-by: David Gibson Reviewed-by: David Gibson Signed-off-by: Peter Xu --- hw/vfio/common.c | 7 ++++++- include/exec/memory.h | 3 +++ memory.c | 4 +++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/hw/vfio/common.c b/hw/vfio/common.c index 801578b..6f648da 100644 --- a/hw/vfio/common.c +++ b/hw/vfio/common.c @@ -455,6 +455,10 @@ static void vfio_listener_region_add(MemoryListener *listener, giommu->container = container; giommu->n.notify = vfio_iommu_map_notify; giommu->n.notifier_flags = IOMMU_NOTIFIER_ALL; + giommu->n.start = section->offset_within_region; + llend = int128_add(int128_make64(giommu->n.start), section->size); + llend = int128_sub(llend, int128_one()); + giommu->n.end = int128_get64(llend); QLIST_INSERT_HEAD(&container->giommu_list, giommu, giommu_next); memory_region_register_iommu_notifier(giommu->iommu, &giommu->n); @@ -525,7 +529,8 @@ static void vfio_listener_region_del(MemoryListener *listener, VFIOGuestIOMMU *giommu; QLIST_FOREACH(giommu, &container->giommu_list, giommu_next) { - if (giommu->iommu == section->mr) { + if (giommu->iommu == section->mr && + giommu->n.start == section->offset_within_region) { memory_region_unregister_iommu_notifier(giommu->iommu, &giommu->n); QLIST_REMOVE(giommu, giommu_next); diff --git a/include/exec/memory.h b/include/exec/memory.h index 958f4b2..cecfed1 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -84,6 +84,9 @@ typedef enum { struct IOMMUNotifier { void (*notify)(struct IOMMUNotifier *notifier, IOMMUTLBEntry *data); IOMMUNotifierFlag notifier_flags; + /* Notify for address space range start <= addr <= end */ + hwaddr start; + hwaddr end; QLIST_ENTRY(IOMMUNotifier) node; }; typedef struct IOMMUNotifier IOMMUNotifier; diff --git a/memory.c b/memory.c index 2bfc37f..e88bb54 100644 --- a/memory.c +++ b/memory.c @@ -1671,7 +1671,9 @@ void memory_region_notify_iommu(MemoryRegion *mr, } QLIST_FOREACH(iommu_notifier, &mr->iommu_notify, node) { - if (iommu_notifier->notifier_flags & request_flags) { + if (iommu_notifier->notifier_flags & request_flags && + iommu_notifier->start <= entry.iova && + iommu_notifier->end >= entry.iova) { iommu_notifier->notify(iommu_notifier, &entry); } }