From patchwork Mon Jun 24 08:39:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yan Zhao X-Patchwork-Id: 1121160 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 45XN7S17Nxz9s6w for ; Mon, 24 Jun 2019 18:41:40 +1000 (AEST) Received: from localhost ([::1]:48820 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfKXi-0007Fs-8U for incoming@patchwork.ozlabs.org; Mon, 24 Jun 2019 04:41:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43244) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hfKW1-0005Vz-Kd for qemu-devel@nongnu.org; Mon, 24 Jun 2019 04:39:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hfKVz-0000F9-FU for qemu-devel@nongnu.org; Mon, 24 Jun 2019 04:39:53 -0400 Received: from mga01.intel.com ([192.55.52.88]:30403) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hfKVy-0008Et-UE for qemu-devel@nongnu.org; Mon, 24 Jun 2019 04:39:51 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Jun 2019 01:39:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,411,1557212400"; d="scan'208";a="169398196" Received: from joy-desktop.sh.intel.com ([10.239.13.126]) by FMSMGA003.fm.intel.com with ESMTP; 24 Jun 2019 01:39:36 -0700 From: Yan Zhao To: pbonzini@redhat.com Date: Mon, 24 Jun 2019 16:39:19 +0800 Message-Id: <1561365559-10235-1-git-send-email-yan.y.zhao@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1561364781-6897-1-git-send-email-yan.y.zhao@intel.com> References: <1561364781-6897-1-git-send-email-yan.y.zhao@intel.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.88 Subject: [Qemu-devel] [PATCH v3] memory: warning on out of scope notification 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: Auger Eric , Yan Zhao , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" if an entry has parts out of scope of notifier's range, print warning message. 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: Auger Eric Signed-off-by: Yan Zhao --- v3: refined code style and message format v2: 1. added a local variable entry_end (Auger Eric) 2. using PRIx64 as format for address range in warning message (Auger Eric) --- memory.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/memory.c b/memory.c index 0a089a7..c7154ab 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,15 @@ void memory_region_notify_one(IOMMUNotifier *notifier, request_flags = IOMMU_NOTIFIER_UNMAP; } + if (entry->iova < notifier->start || entry_end > notifier->end) { + warn_report("%s IOMMUTLBEntry 0x%" PRIx64 " - 0x%" PRIx64 + " outside of notifier scope 0x%" PRIx64 " - 0x%" PRIx64, + (request_flags == IOMMU_NOTIFIER_MAP) ? + "Mapping" : "Unmapping", + entry->iova, entry->iova + entry->addr_mask, + notifier->start, notifier->end); + } + if (notifier->notifier_flags & request_flags) { notifier->notify(notifier, entry); }