From nobody Wed Sep 11 08:44:36 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 4X3Yz82B9Cz5W7gq; Wed, 11 Sep 2024 08:44:36 +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 4X3Yz81ck8z41R1; Wed, 11 Sep 2024 08:44:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726044276; 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=HgAgj0F9DVbb+A3kpz2FPg1iuP6MFSHCmZxamOBN4+c=; b=oWT/13Q5/GMNrQ6Ot4F9zowPTqdJij2Z6y1usL6MsZMm+s89lJ6ISX96Zc/D5hkAz/5R5x KqouADaGBV9d5Jtu3KU/5LhI6HQ25r6UIOrq0gcI/u7mFdmx0x4hAnG/UG5PXlSP0lRuoT fLKzdPMcDzeZ8XWjB6GfDAsFncIE8rBNYFNuTnchKY8G+kAvNAN5cNjW6Z3YWhv5t8QTty Eb3LG+u900/WAVS103uz83jAHTa1sYkd2L9eXeMNGo0y6yNL1pcXzUJjuGgM4Ag5MfNDxT Le4/IgVslBFDnOpgRYIqm49vGcu/oD2mPsLKxn4pjNajZgZfSX26/OsahHAJ9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726044276; a=rsa-sha256; cv=none; b=tgc/Lql+/67e+j6WyMZSfrW3bRhQ7e2ivXFJtlAhFstHePVqmwMCCRIibNG0AAbpH8F5al k3EanjrGN5nAGXb474kCna0ci5sIAqnlkoyjN9fTe4Djpx26dfmN5QpUahgmJ7TUtxg84D IPbEPZawWzjP655wLrlAyyon3S6TF3vhG+9HSWDE5izXWwTWqALfUswjUY5dm/yAKjCI3l Arq5MXVpNrMkk5OyaOmwq4T8OdPyY6oxKCE2riJkXu59lzvlBBazxSwZ+bQC/QSYZYVhge LrlHPGc8y/rkhctz7IjkxBWYhZAL8+Efl5uEevUE1ploZVo+412cV7uaaCE35A== 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=1726044276; 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=HgAgj0F9DVbb+A3kpz2FPg1iuP6MFSHCmZxamOBN4+c=; b=OnxblxSD7Kj+yQuo6WYyaMF1B6hBcLR1YG+/pD6MGoomuFLU2wvTUnF1alfMLg4ND1sD2P s1YPZO1KUbxi2oADMFBurPKhYInr9zkgYjyoMqXbEiJJcpanIIwLHYdEPWmxPMU5RLg86m uoB2al/943nT0uFVAbACYE5EzM2pMcTfl3tjPp5zTxw74EkZM9kZOr6Scsod1oFhTKsp8n 6vp5r6nwLbcDOiyrestt2x3Qo4ZcF5XFojqKB9f5fqzO2AcNl4wKBVvgg46OCrDLC0ij58 02QxcpzcVwxvlm1sS4dLiDLNa1ueW/w4VpZ+OOSyMBKoPRwAtUx/dXp5gLNvxQ== 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 4X3Yz81D0gzP9m; Wed, 11 Sep 2024 08:44:36 +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 48B8ianC008044; Wed, 11 Sep 2024 08:44:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48B8ianC008041; Wed, 11 Sep 2024 08:44:36 GMT (envelope-from git) Date: Wed, 11 Sep 2024 08:44:36 GMT Message-Id: <202409110844.48B8ianC008041@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: 1d85f40e7fe3 - stable/14 - dmar: avoid excessive indirection in KASSERT() in domain_map_buf() 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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: 1d85f40e7fe35f9e434f22cdc16a9f8c02b1dd16 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1d85f40e7fe35f9e434f22cdc16a9f8c02b1dd16 commit 1d85f40e7fe35f9e434f22cdc16a9f8c02b1dd16 Author: Konstantin Belousov AuthorDate: 2024-07-20 00:15:22 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-11 08:44:00 +0000 dmar: avoid excessive indirection in KASSERT() in domain_map_buf() (cherry picked from commit 09fc33d1d75f93ed04fc6b18e7fe2911b7e770e0) --- 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 850627a2defd..21b717f54f34 100644 --- a/sys/x86/iommu/intel_idpgtbl.c +++ b/sys/x86/iommu/intel_idpgtbl.c @@ -479,7 +479,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,