From nobody Tue Jun 21 00:38:15 2022 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 8116286D877; Tue, 21 Jun 2022 00:38:15 +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 4LRngC2y9jz4t75; Tue, 21 Jun 2022 00:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655771895; 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=h6DlAozmTGmrmRkssjba2hsmAmPJS+bYoZ7fh78B25Y=; b=bVlELkq8LnPiC3kSEcRLyWUEOx1w6hucy0nl8Fj3AicjgolfOXY5XXowxB0ze4wRar9hWW cUE3ABGoIM0KBG3tY/5vXyE5QEdy+lRAM05gkNhqs7OCTqKiqU8jTrMi4G/EO3qd+EbdTe Jcp1ohLHABScsxfBa+LayuGNAz1I6juU0FDMIHlO8p8m9o2QeCyZHOjDLaupSbUvxInRct bghNQ4OitOfHkGNUtLX0XZLPvpXZWe97CGLjh7GOpdssKMB3SmBYuYQYGJvMTUy4HBx3mo tPItNn6PGpa+3aUpaEbQiw/aIXiGN6IIq52Rc098M/EqHD6iD9oWE+NdKSDcHw== 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 4139727802; Tue, 21 Jun 2022 00:38:15 +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 25L0cFfs061319; Tue, 21 Jun 2022 00:38:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25L0cFKk061318; Tue, 21 Jun 2022 00:38:15 GMT (envelope-from git) Date: Tue, 21 Jun 2022 00:38:15 GMT Message-Id: <202206210038.25L0cFKk061318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: 70b5d8fa0f94 - main - iommu_gas: Drop needless bound check in lowermatch 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 70b5d8fa0f9457833027e4a1c57b4e68a9351cac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655771895; 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=h6DlAozmTGmrmRkssjba2hsmAmPJS+bYoZ7fh78B25Y=; b=dR+5YZb/ypnBM6TSz3qO5gnNSbVH9fUvo3B6mmra3bpmS36oEFu/bJMMVob1HgpqKSPdAp 5aOg1Zvy03ZZl2bphvvPDeiSWkBB+VyM4evohIO//AA0C4/ITUI8Rgb9SzqoaPjApMI+M8 1LLXWu+Aiy87wq62s4HQnQ6hLdE5NBPEEcwlGiVSGUDmz+g4DA8B5O6SmHCwHuvkbB3fJE e8Zc9pktvgCV10YdbqyDzzedD8pxOSpy4FjZJmkR4X3CNYoFNp1liOEFgr1qmD9gYerYhA cSJAWfJCg8ywY3qzLkr1I9t5iCfi+3jqZRjRy1KOd1CwyIBdV6fH3NX+3Q6Qpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655771895; a=rsa-sha256; cv=none; b=KGCi2niBGaxny260pA+tg3LyQNvqBXydGEeEQ40a8eNNo4OSldu4ey/Ur/ObX3qqF9MYgk +x8rX42h+q7+SQff6AcGe9qyfkpgCJL3SShIeosMxx4SxaKQODrviytzQKMAFGQupakhvm rloB08olEpfJPg+o/5h551aEhlX1LC4bTDWEw3ZlV12gS+LeeT+LYKVJs2JSQijF+RF+Uc o5doFE/dBGMcsMV1OIGuTh9oj6YFEPZgqN7TeQKYVOXDqVADNdzwE77AsJjcT1XYODjOhx Q83CRfMKVpvj37Cqbr77jXoUOHAGUdkQtMAWDzYtrMjqZWQ09B21FvMt9vK9Rw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=70b5d8fa0f9457833027e4a1c57b4e68a9351cac commit 70b5d8fa0f9457833027e4a1c57b4e68a9351cac Author: Doug Moore AuthorDate: 2022-06-21 00:34:46 +0000 Commit: Doug Moore CommitDate: 2022-06-21 00:34:46 +0000 iommu_gas: Drop needless bound check in lowermatch The loop iteration in iommu_gas_lowermatch checks the bound a->common->lowaddr twice per loop iteration. Rewrite to test only once per iteration. Do not worry about passing to iommu_gas_match_one a range wholly beyond lowaddr. Since that function checks the upper end of the range against lowaddr, it'll get rejected there. Reviewed by: alc MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D35522 --- sys/dev/iommu/iommu_gas.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index f25519552d1c..70eef9a0a1f7 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -398,16 +398,11 @@ iommu_gas_lowermatch(struct iommu_gas_match_args *a, struct iommu_map_entry *ent */ entry = first; while (entry != NULL) { - if ((first = RB_LEFT(entry, rb_entry)) != NULL) { - if (first->last >= a->common->lowaddr) { - /* All remaining ranges >= lowaddr */ - break; - } - if (iommu_gas_match_one(a, first->last, entry->start, - a->common->lowaddr)) { - iommu_gas_match_insert(a); - return (0); - } + if ((first = RB_LEFT(entry, rb_entry)) != NULL && + iommu_gas_match_one(a, first->last, entry->start, + a->common->lowaddr)) { + iommu_gas_match_insert(a); + return (0); } if (entry->end >= a->common->lowaddr) { /* All remaining ranges >= lowaddr */