From nobody Wed Jul 6 17:05:09 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 7FBCA1D0CA53; Wed, 6 Jul 2022 17:05:10 +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 4LdQs166pZz3CF2; Wed, 6 Jul 2022 17:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127110; 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=6TBO6/25ajtV7o1kfI2j6lIlly7XGwSZHi+ldUbXUiQ=; b=vGpPNbA54Dq1qIk2B05FNkOycHxcKmKrD1paa/mS85zYYyGSxKlMF3PfdjmDrR5UvQTgg4 LO//jolvJlWbR+NDvlosd92RIl5lzUeeBlx0AoJdYBH7egHaPCUVk2l8qTbaCqWkmNkNZl HEhO9LNa7nHr7msycc+oKJWbhZwrHu3zaZf8JjAmmbBI/YFueJyOJihtsUw0snoVe3L7x0 oZP+2j1N4omgO6k29xoViGPBaTn2iabSzqPiZ2Br7Lwu9tzJFG0YPyeOZVd+lOeP2OWcUu w2GYWmaAYzbNAAQXl0s+YPOn3ZGh9nnlHqwYAaqhv085ALWGftdWEE7s90Edcw== 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 9DE531E4CD; Wed, 6 Jul 2022 17:05:09 +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 266H59xQ083843; Wed, 6 Jul 2022 17:05:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266H59Kj083842; Wed, 6 Jul 2022 17:05:09 GMT (envelope-from git) Date: Wed, 6 Jul 2022 17:05:09 GMT Message-Id: <202207061705.266H59Kj083842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Moore Subject: git: cf70aef40144 - stable/13 - 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cf70aef40144e721c40c4db9fc2dd4c6ec57c849 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127110; 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=6TBO6/25ajtV7o1kfI2j6lIlly7XGwSZHi+ldUbXUiQ=; b=nx8iWHAj/dg3Hy4DPH1llzHZ7QJDOCvCnmxsEPFK+zljftsbg4wGYWy4GD2fSVuM4BnbTq ftj3uzV7ILNpyUBG7+xajzf4BkT4gWWjUl0K2x/2ZvWYJDejTMx9T0sIFecMpbTdqeqb+G VVLOnzCG00leXAzlGYOj2SPEjV4vgoT+f5ZfGnRYBk4ChQRevZOhrANTyMxXZsilDXWnIg 253yrUrYEtcKOGmpVr8JlYn9zok4kehwp1bv7JrMvVdKqK0sluDKDF0x/ZscjdBhGKSHic eY9tES1UAnaiC0ppnMIMzVVAeebFPxIc0xAugkQkVeG/CWzIJpkgxsqol6ak3Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657127110; a=rsa-sha256; cv=none; b=l4fIPke1SyweqPbEGwHgwNvOF0eW2mmIL2SKPxAGtmkZzi6Mbpg9io8bjK6FHYTawlTDVt 8rBiXm+vbkYUtWlcMg3Y/qgnhT5SXsIMdBaySTecEJyA3F1XF5JCr68c0ufGX+NUVSuSj4 dFz8o4qJlQ409X7IYUSY0IMzGEvBKyOdpEf5ZaXSeixn7lVFnsTNa63/tS8yRsQB1hMGzC KoIPwHn4qEqxZ1fb2lnFd5Jij5UHROMuvrHA/Iz3UX+khlW8oLswv6qJDS1HTu7BXc+Uy4 hFrcrNWkvZsH/kA/WDDrtvIrrGel/U3Ih8Nqr3d9FMZiVzECAvSRom5jgTTqUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=cf70aef40144e721c40c4db9fc2dd4c6ec57c849 commit cf70aef40144e721c40c4db9fc2dd4c6ec57c849 Author: Alan Cox AuthorDate: 2022-06-26 05:44:47 +0000 Commit: Doug Moore CommitDate: 2022-07-06 17:00:59 +0000 iommu_gas: Tidy up Move a comment to the code that it describes. Improve the wording. Style fixes. MFC after: 2 weeks (cherry picked from commit da33f6d76b9d0c00649c692f6cb2b3b33bf5af30) --- 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 48b27d6e81dc..23e603ef18dc 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->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); @@ -492,8 +491,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, @@ -641,7 +639,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); @@ -665,7 +663,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);