From nobody Wed Sep 04 21:50:54 2024 X-Original-To: dev-commits-src-main@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 4Wzblg1Y2Kz5VRrw; Wed, 04 Sep 2024 21:50:55 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wzblf70p2z4hYB; Wed, 4 Sep 2024 21:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725486655; 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=jzYVvrZL3q01UIj6LbHw5f1eEDLqo0MkyGk2kliMS9w=; b=FSjSFHuSHCwEBv5+IhElscy4NK183yhldcUaHZ8UwAo+QX/ydkYs5+h3EXGzn2JBecfgdn wWXL1XPOdG7yMk74PnfI09dylIRxaEWuFSkxoWd0xX/3aacgrDa5RJEfk8YeNqDq/fz/VM Mnh9uysMey3iAvsiiQogqLqM3M4/iYIwcJ09j5Rynf6wdw/GInaDON15odqI/2iwXRlEhE IRsNe8m4kkJO/gp4rGQTtErZAJQ6dzfh1cDY5sxAi3m9bSy6A5/xQC11eEiFLxIHMrM86v 1+CQF9in8MfCUIiMjHCZTrsdlHBmwbVMHuNnO5kYsyXgcHH61ywGMgrv6v9V+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725486655; a=rsa-sha256; cv=none; b=jChl/gSKNHZ5avhYKOf7YBhLvQcdd6ILaACK568gk1kw94boVXrIm6D/bFm6y2Ghffg5GS bof21HwN2aVBZ3D8t++SqFhqSpkl/AuVSugl3QGY32M6oLt9ErH+JP+uN1feq3bDNtmDgR GOEfG8nvSSGXtzaM4fkd+SAl5P1NLVJi9pLm60pJRDzvgModQUxlFvT7PGi5oqVBoyEHQI PWZD+9I1vMzqNCqWKJ0hU30S6rpHRUfrYSTfiML1tbR2GKLL5BAjfT9jze8GkDhzrvCnhw y7nGYTCEQ/ob4pPI/gkDfP1vjnPwFTaASUgJ+UzX0w4O9sqwgGrZ5wQFDFf9sQ== 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=1725486655; 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=jzYVvrZL3q01UIj6LbHw5f1eEDLqo0MkyGk2kliMS9w=; b=SBre3MkXUMJiU2i0OjGwXsIRTVTaTXFQ7vjFuVptDdchi/8ZlTROzlD4AeuzcGylorP1Wg SeHA1N6ZjiXqBSypBLYYZcia7e1TQ5EFIkeJkVhoKpGjiYBsie+CkHPb79aFICgTT6uLF/ Ktxgp/v2Pow/7H67rMoKrOZucn9mc6INYHHMVuABWQFcVRK+/Wt5wMNH3O9alYfKJLh1Ml zx8jutED3jiPoCmy2Qlf6AzTzHi4evWy+BO4Rz0wfxSWpnVBZpPCIjLxVswyJEwUXtw2va 9Ibl8gKX4sRhdNuESvw9gKL2Yj1KR1Pjq1nXaA4RN3a6/u6K6h5WY/fBS5/+ww== 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 4Wzblf6cd7zhL9; Wed, 4 Sep 2024 21:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 484Lossg033107; Wed, 4 Sep 2024 21:50:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 484LosDN033104; Wed, 4 Sep 2024 21:50:54 GMT (envelope-from git) Date: Wed, 4 Sep 2024 21:50:54 GMT Message-Id: <202409042150.484LosDN033104@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: 09fc33d1d75f - main - dmar: avoid excessive indirection in KASSERT() in domain_map_buf() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: 09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0 commit 09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0 Author: Konstantin Belousov AuthorDate: 2024-07-20 00:15:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-04 21:50:19 +0000 dmar: avoid excessive indirection in KASSERT() in domain_map_buf() Sponsored by: Advanced Micro Devices (AMD) Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/x86/iommu/intel_idpgtbl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/iommu/intel_idpgtbl.c b/sys/x86/iommu/intel_idpgtbl.c index 53851622340b..fbc0e9e97b64 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -478,7 +478,7 @@ domain_map_buf(struct iommu_domain *iodom, iommu_gaddr_t base, domain = IODOM2DOM(iodom); unit = domain->dmar; - KASSERT((domain->iodom.flags & IOMMU_DOMAIN_IDMAP) == 0, + KASSERT((iodom->flags & IOMMU_DOMAIN_IDMAP) == 0, ("modifying idmap pagetable domain %p", domain)); KASSERT((base & IOMMU_PAGE_MASK) == 0, ("non-aligned base %p %jx %jx", domain, (uintmax_t)base,