From nobody Sun Jun 26 06:02:54 2022 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 1035487AE9D; Sun, 26 Jun 2022 06:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LW0dV72v6z3v55; Sun, 26 Jun 2022 06:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656223375; 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=HIIeL4Bydtio6zBptSOCkbPo+VyBBFx1YpyvtFIXs0s=; b=bb0Deaw8ZFnx/2Tb7XMPUDfd4Zf24cS3rPRFzu5d77XIBaZRepom2YqrvyJxXm9CRkzU9N gz4f1uiqFEWYXrRNptGtKibREohqzlzmHkuZk/7IpowfVssoS85sMTLVe5Fil5wV1p20En VqohYQpiytvFwKDIk7Nk+cnW4OEx2KmOStNx+QYhOBJavM8e9uYxNSs5q/Y2SZjfPRd7ux cua3PacQ5vi8rlu6hzRdRoZQdKHsW7YvdkCOja4G1s2h9MkSlbbEaNd2k0LeFoBA2jcHU0 1NNwx9EZWLSfnU1dnF2/+n0NcguGAFqIyVwDCmQoTZ/j1r3SzGjXm50schXsHw== 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 D26F41234A; Sun, 26 Jun 2022 06:02:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25Q62sBA092734; Sun, 26 Jun 2022 06:02:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25Q62sUn092733; Sun, 26 Jun 2022 06:02:54 GMT (envelope-from git) Date: Sun, 26 Jun 2022 06:02:54 GMT Message-Id: <202206260602.25Q62sUn092733@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: da33f6d76b9d - main - iommu_gas: Tidy up 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da33f6d76b9d0c00649c692f6cb2b3b33bf5af30 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656223375; 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=HIIeL4Bydtio6zBptSOCkbPo+VyBBFx1YpyvtFIXs0s=; b=rf4N2WeIxPJ5zIPJjgU9DlTwIWKDr6ShmkiesVJXQWodN1X+0TWV6wkVRcLXpta4ZouAsY WF76B4ifxA+AmHQFsbHKFlz3Nzg3JHdKTCNZPzbZhmJAydywH6RVUxTElmBthcAi9XD8M8 aembVGAn6MYIs3U6UkpuTtyi5hQ+eohVKN1mRLgLiXK8KpiZlzdGh/zpoqZq1j4v5/cod1 +rcXc/v7mbShTU4P3iave52GBcIWMC1KfwiQmzGfDEjVwlFKECWt+kbMsr7Di5D7FqPBiV q7QEEQV3Ys0agw04BVXXbIWJ9Y4N9FPNy4ZJrSzRd770O5TCqGhC/l9fxg3rIw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656223375; a=rsa-sha256; cv=none; b=uSZGlP8xnuNHEgi6KVpneRW+h4vGmUvu6ullY55DrxDOBIoaiKMzhhg3im5kHr2nK6XCbz sFVs1gunAav5ImbumI4FT133jNl3dqPx9kYFk9E6ckKFfVexS4d9d8XLaukszgn5piUixg KWiX9B5hOKuyhBvLqVKcNxq+xhFQuPgi/W7dxNHXOsoa+K0yOlhaCq15tHFUnSNqviQjbR Le9ehqSCX9Y0I+EEOfwTZARVD5eE0yrHTz/Rr9ztAUzsZx4TioIHoLtAifz9mKeEE4zFtL 6ZO5v/bd3i7Pz9S6JShL/+DTz9FJapWwfHyDMOECRQjMGNnJtVoC2SA3efoU/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=da33f6d76b9d0c00649c692f6cb2b3b33bf5af30 commit da33f6d76b9d0c00649c692f6cb2b3b33bf5af30 Author: Alan Cox AuthorDate: 2022-06-26 05:44:47 +0000 Commit: Alan Cox CommitDate: 2022-06-26 06:01:49 +0000 iommu_gas: Tidy up Move a comment to the code that it describes. Improve the wording. Style fixes. MFC after: 2 weeks --- sys/dev/iommu/iommu_gas.c | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index a9c4caa30dd8..2647c2ce6612 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -197,8 +197,7 @@ iommu_gas_rb_insert(struct iommu_domain *domain, struct iommu_map_entry *entry) { struct iommu_map_entry *found; - found = RB_INSERT(iommu_gas_entries_tree, - &domain->rb_root, entry); + found = RB_INSERT(iommu_gas_entries_tree, &domain->rb_root, entry); return (found == NULL); } @@ -303,6 +302,13 @@ iommu_gas_match_one(struct iommu_gas_match_args *a, iommu_gaddr_t beg, { iommu_gaddr_t bs, start; + /* + * The prev->end is always aligned on the page size, which + * causes page alignment for the entry->start too. + * + * A page sized gap is created between consecutive + * allocations to ensure that out-of-bounds accesses fault. + */ a->entry->start = roundup2(beg + IOMMU_PAGE_SIZE, a->common->alignment); if (a->entry->start + a->offset + a->size > maxaddr) @@ -356,13 +362,6 @@ iommu_gas_match_insert(struct iommu_gas_match_args *a) { bool found __diagused; - /* - * The prev->end is always aligned on the page size, which - * causes page alignment for the entry->start too. - * - * The page sized gap is created between consequent - * allocations to ensure that out-of-bounds accesses fault. - */ a->entry->end = a->entry->start + roundup2(a->size + a->offset, IOMMU_PAGE_SIZE); @@ -487,8 +486,7 @@ iommu_gas_find_space(struct iommu_domain *domain, /* Handle lower region. */ if (common->lowaddr > 0) { - error = iommu_gas_lowermatch(&a, - RB_ROOT(&domain->rb_root)); + error = iommu_gas_lowermatch(&a, RB_ROOT(&domain->rb_root)); if (error == 0) return (0); KASSERT(error == ENOMEM, @@ -636,7 +634,7 @@ iommu_gas_map(struct iommu_domain *domain, ("invalid flags 0x%x", flags)); entry = iommu_gas_alloc_entry(domain, - (flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0); + (flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0); if (entry == NULL) return (ENOMEM); IOMMU_DOMAIN_LOCK(domain); @@ -660,7 +658,7 @@ iommu_gas_map(struct iommu_domain *domain, error = domain->ops->map(domain, entry->start, entry->end - entry->start, ma, eflags, - ((flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0)); + ((flags & IOMMU_MF_CANWAIT) != 0 ? IOMMU_PGF_WAITOK : 0)); if (error == ENOMEM) { iommu_domain_unload_entry(entry, true); return (error);