From patchwork Fri Jun 28 22:19:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhao X-Patchwork-Id: 1124564 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=intel.com 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 ozlabs.org (Postfix) with ESMTPS id 45bB7J4v5Vz9s5c for ; Sat, 29 Jun 2019 08:21:11 +1000 (AEST) Received: from localhost ([::1]:36684 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgzEw-0004S6-7Q for incoming@patchwork.ozlabs.org; Fri, 28 Jun 2019 18:21:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40323) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgzE0-0004Lf-Cm for qemu-devel@nongnu.org; Fri, 28 Jun 2019 18:20:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgzDu-0006hP-Pb for qemu-devel@nongnu.org; Fri, 28 Jun 2019 18:20:06 -0400 Received: from mga11.intel.com ([192.55.52.93]:55164) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgzDs-0006bJ-KJ for qemu-devel@nongnu.org; Fri, 28 Jun 2019 18:20:02 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Jun 2019 15:19:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,429,1557212400"; d="scan'208";a="153498916" Received: from joy-desktop.sh.intel.com ([10.239.13.126]) by orsmga007.jf.intel.com with ESMTP; 28 Jun 2019 15:19:54 -0700 From: Yan Zhao To: pbonzini@redhat.com Date: Sat, 29 Jun 2019 06:19:49 +0800 Message-Id: <1561760389-31325-1-git-send-email-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.7.4 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.93 Subject: [Qemu-devel] [PATCH v5] memory: do not notify for non inclusive overlap entry 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: , Cc: Eric Auger , Yan Zhao , qemu-devel@nongnu.org, Peter Xu Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" if an entry has non inclusive overlap with the notifier, print warning message and do not do notification for it. Out of scope mapping/unmapping would cause problem, as in below case: 1. initially there are two notifiers with ranges 0-0xfedfffff, 0xfef00000-0xffffffffffffffff, IOVAs from 0x3c000000 - 0x3c1fffff is in shadow page table. 2. in vfio, memory_region_register_iommu_notifier() is followed by memory_region_iommu_replay(), which will first call address space unmap, and walk and add back all entries in vtd shadow page table. e.g. (1) for notifier 0-0xfedfffff, IOVAs from 0 - 0xffffffff get unmapped, and IOVAs from 0x3c000000 - 0x3c1fffff get mapped (2) for notifier 0xfef00000-0xffffffffffffffff IOVAs from 0 - 0x7fffffffff get unmapped, but IOVAs from 0x3c000000 - 0x3c1fffff cannot get mapped back. Cc: Eric Auger Cc: Peter Xu Signed-off-by: Yan Zhao Reviewed-by: Eric Auger --- v5: 1. still using warn_report instead of "assert" 2. returning at the end to refuse notification for entry which has non inclusive overlap with the notifier. 3. updated commit title and warning message. v4: 1. modified commit title 2. using "assert" instead of printing warning message v3: refined code style and message format v2: 1. added a local variable entry_end (Eric Auger) 2. using PRIx64 as format for address range in warning message (Eric Auger) --- memory.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/memory.c b/memory.c index 0a089a7..fe0d08d 100644 --- a/memory.c +++ b/memory.c @@ -1937,13 +1937,13 @@ void memory_region_notify_one(IOMMUNotifier *notifier, IOMMUTLBEntry *entry) { IOMMUNotifierFlag request_flags; + hwaddr entry_end = entry->iova + entry->addr_mask; /* * Skip the notification if the notification does not overlap * with registered range. */ - if (notifier->start > entry->iova + entry->addr_mask || - notifier->end < entry->iova) { + if (notifier->start > entry_end || notifier->end < entry->iova) { return; } @@ -1953,6 +1953,18 @@ void memory_region_notify_one(IOMMUNotifier *notifier, request_flags = IOMMU_NOTIFIER_UNMAP; } + if (entry->iova < notifier->start || entry_end > notifier->end) { + warn_report("IOMMUTLBEntry 0x%" PRIx64 " - 0x%" PRIx64 + " has non inclusive overlap with notifier 0x%" PRIx64 + " - 0x%" PRIx64 ". %s is not allowed." + " Try to divide it into smaller sections.", + entry->iova, entry_end, + notifier->start, notifier->end, + (request_flags == IOMMU_NOTIFIER_MAP) ? + "Mapping" : "Unmapping"); + return; + } + if (notifier->notifier_flags & request_flags) { notifier->notify(notifier, entry); }