From nobody Tue Jan 02 00:41:56 2024 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 4T3vF0530Dz560JM; Tue, 2 Jan 2024 00:41:56 +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 4T3vF039Dkz3PtL; Tue, 2 Jan 2024 00:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704156116; 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=4Ct13Gxl8YQBc519JzPZnqJnVnBbOOpnQtJJV+ZNjbU=; b=E/uphzgb50iR4TtgxcqRwGAuYoDfNFxcp2ertneKtK6N34xWsRLNFCQdWbAzw+0OIwoFYF pOt1b9XztyihdYo7uIFHEsVnBY7/toOcViF5O6QYLUhash/rj0cH3/wUhoPnPknI5qvh4S j3E8h3RabfTcO7QUhD+44mrzRsdHC6vx7IefAZRnG8bCVZjnsLLV31S3hRwhjuiUCaVmLo KVEG1b/S05hk8Mi6HYfFM+Kp6ED4pzNOoZtqsbb1da6U7bzMFrikLKFsybesPhzfhnpHm5 P/XS5gFv0H5geDpCf5E/0YrwnD+mubdsFAtIwZaEqiGy4WrqEWksLvZ7BhzZOw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704156116; a=rsa-sha256; cv=none; b=wkrYTkw6nG007N/BeoW52owuhnYRKHKlQSHfjBUVB/GT756mFoMhPhN21szAFtNhd4wz0m c0TjHj6rYOQBKQBrNklStOXoqugDr9LUdVZAnLFqOYi6+wANNRGEhpVWDANapEADUT36D+ JicGgpODPeSRV0C9Fmtef8tq9tKcJJohQ2maLF9UXjmdWluRVUGa6ERkVBfwRIwfa8lWfV JpzRr3td3bKqxg0mIbNprjwfna2iOSgoCzqJmn6l0Jsmv21JjwdVeTlnCUEF5waLnENhCK nrZ3xEvGjjOrOfPIvLicchFD8srka816AE6JGYOqiVFGI4Dut0vdk6pvMWkZgA== 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=1704156116; 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=4Ct13Gxl8YQBc519JzPZnqJnVnBbOOpnQtJJV+ZNjbU=; b=mnHoepagAGZlzSTR1r27vXE83LCk04n+rViiB7c7vJnWLdvGnsGhN98CC6nonnZMj1OLTk Yy81bvrZrr+WtnOjPqXqyAaoX379iK6eXGic4VcJ5U5PgEXTHJN6IKAjO9mtyel7Dfh/cR P5UrtM/JqiYm9gKAXiKeuiyHO/CIz8qZcOYSILVaHvaBO4/igcnTR/BasDrnr25JEjPK6X CQMKyI3qe1xszyus07ETLaaV/z8IkXWUE/wljkBKSAYDRbyHHRMPCRqTxHqnOatcVFw1C9 0o+St15RpsDYBkTr2iSUPt2rtzpCvPpOj5Y3Eq3yv9Hv/CjCkynfUW4DTARpuw== 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 4T3vF028lSzfQk; Tue, 2 Jan 2024 00:41:56 +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 4020fugh096831; Tue, 2 Jan 2024 00:41:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4020fu17096828; Tue, 2 Jan 2024 00:41:56 GMT (envelope-from git) Date: Tue, 2 Jan 2024 00:41:56 GMT Message-Id: <202401020041.4020fu17096828@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b86d839af9c8 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: b86d839af9c869abee58b0dbb309cefc4d8695e1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b86d839af9c869abee58b0dbb309cefc4d8695e1 commit b86d839af9c869abee58b0dbb309cefc4d8695e1 Author: Konstantin Belousov AuthorDate: 2023-12-23 23:34:16 +0000 Commit: Konstantin Belousov CommitDate: 2024-01-02 00:41:38 +0000 iommu_gas: print entries flags and domains if an overlap detected (cherry picked from commit 733da1eb947688210bc152656357ecafbd172bb7) --- 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);