From nobody Tue Dec 26 01:28:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SzccN6DVnz55Gvm; Tue, 26 Dec 2023 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SzccN4PhQz3gBT; Tue, 26 Dec 2023 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554132; 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; bh=8VNQv7nknM/avuHBeXwPclLd/aoqfJgemJ3NTIkk5YM=; b=GG3wAie507zgADMOzG3YU3Baxu8VSIOFfbYPD/l3BmdwshNhW609HAWpGB3hgUYPMMM3VB lPr/0VYQqB4F505daXpTCfHE0n3dGj+zBk7GSsDJRUWKfpR5QIVSRprUxbOI39sFb7T2i4 P/XVXTH2yaS6tPyS2BlddUZNlig96rdzpSJLa/Jgzen1Re/208aFYuBL8kYm0B43LyvRCE 4nP+eHfY7wGQQwom0I8FAvQxgyokM39/9TptPLoc6a0WPQ1leHzzGdhvByo5/w/efutlUQ 05hhTiV7ZQNRwOJ5lsDj7WmGLVM6og/b5PmILNo316nQKlTNC6r6w+7ZAmY17g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703554132; a=rsa-sha256; cv=none; b=dQ033gWExqj6uvI7EgshHVvQDj2e1DGkSCWWt0ofDYGborIublt8HAuU7jTk/5sH8nj8gD 53zm/nbk/fvahSbQisNgeruErxAQJW7EKE2ghFhYEtfKrDwwoo7+NrDXnFli7ucd6PqHL3 T844CG6ynJYJZtmpMSJ+nsXGvY55zkDqOupgII37XO9We8nm0yVEUAKCoD1FUEYJrJbZRK XTpcvano6FFAPFq22OT6Burwt0RyDSJZ8fuRnjt8/7kLcfctniUY0xg2HY0AXENEK4h83X aBkmmSkiu8PTRZnBTHs1QMvlJn5VcE6RsX1gfkSd73dUbF4InUe8xG/iyGQb0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703554132; 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; bh=8VNQv7nknM/avuHBeXwPclLd/aoqfJgemJ3NTIkk5YM=; b=srMULQr2Zb1APy0oSkLv0rgyc06QYB6FhqT2q8b6xQuLydk9A3Zjf6EQ7yC0yt2Qr92ApC l0RFLELe9WF/5VX9NxMTF9xCxPH+2/wyRpdA8ZyxPQ1hO8oD4BtLdE0sUuFga6P/JcSJQT Q9kXGURPq3RxPFnAlkuoCEWR6zsSdQtLDPLh9NY8/CLj6qLL0zDJeHyMeIJl75q4M0PbZk DnURAOffXl69Gq7YF5PKmkaQi5fmkLxfi3/K75/uf2vV+f0/S1SBKrg1dpYvC9ez7VVVJg wNRGJHZpkHNAKQTDyP6wIY2nWIbTgpw3Fsf9MQGagF/Rmfv5Jtcae0kqb+QlFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SzccN3NNRzZcF; Tue, 26 Dec 2023 01:28:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BQ1Sq3Y035559; Tue, 26 Dec 2023 01:28:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BQ1Sqqh035556; Tue, 26 Dec 2023 01:28:52 GMT (envelope-from git) Date: Tue, 26 Dec 2023 01:28:52 GMT Message-Id: <202312260128.3BQ1Sqqh035556@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 733da1eb9476 - main - iommu_gas: print entries flags and domains if an overlap detected List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 733da1eb947688210bc152656357ecafbd172bb7 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=733da1eb947688210bc152656357ecafbd172bb7 commit 733da1eb947688210bc152656357ecafbd172bb7 Author: Konstantin Belousov AuthorDate: 2023-12-23 23:34:16 +0000 Commit: Konstantin Belousov CommitDate: 2023-12-26 01:28:22 +0000 iommu_gas: print entries flags and domains if an overlap detected Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/dev/iommu/iommu_gas.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 72db5ca871ec..25e13aad2291 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -125,9 +125,11 @@ iommu_gas_cmp_entries(struct iommu_map_entry *a, struct iommu_map_entry *b) b, (uintmax_t)b->start, (uintmax_t)b->end)); KASSERT(a->end <= b->start || b->end <= a->start || a->end == a->start || b->end == b->start, - ("overlapping entries %p (%jx, %jx) %p (%jx, %jx)", - a, (uintmax_t)a->start, (uintmax_t)a->end, - b, (uintmax_t)b->start, (uintmax_t)b->end)); + ("overlapping entries %p (%jx, %jx) f %#x %p (%jx, %jx) f %#x" + " domain %p %p", + a, (uintmax_t)a->start, (uintmax_t)a->end, a->flags, + b, (uintmax_t)b->start, (uintmax_t)b->end, b->flags, + a->domain, b->domain)); if (a->end < b->end) return (-1);