From nobody Wed Jul 06 17:05:04 2022 X-Original-To: dev-commits-src-branches@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 0E71D1D0CB87; Wed, 6 Jul 2022 17:05:06 +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 4LdQrx2MdFz3CPj; Wed, 6 Jul 2022 17:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127105; 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=E2gg+gkwcDa5NnrfFVwK7cG7MDFoPo5GcaJASxnYcLE=; b=HALP243x2BWasgSsa40usqKdr3X87gfTtKax87nKUtPR3K+nF1SJbMEPquYYMlXalx61r3 wFMe78fm6WdUChzBHCKAmnpl9mHlgET46z3ldfp9q+Xu/CyV0pcCSLSyXrcvdgsrnitNXO JVWo7xR6d2yBmr/309h+kodkJEuKJCpYLNWxWtPDu6IeNEiLmZlkGDRKwgIQGlWkGKL+Rm /XpeIcWLR/YbEnJXXnTqjcTUUII78pi02uARL6w5z9orENVlT3e2uMj6gFvk/5gVR6AIi6 v0uJ7u82kVctxhWOExIajnXwRgT6SpNn0cEE78v57Y+u6uBP5cfmIzhFpG9uqA== 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 08F581E628; Wed, 6 Jul 2022 17:05:05 +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 266H54fW083741; Wed, 6 Jul 2022 17:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266H54dB083740; Wed, 6 Jul 2022 17:05:04 GMT (envelope-from git) Date: Wed, 6 Jul 2022 17:05:04 GMT Message-Id: <202207061705.266H54dB083740@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: 8c1edfe309a5 - stable/13 - iommu_gas: Correct a broken KASSERT List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 8c1edfe309a50744e46aa086257279a322374273 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127105; 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=E2gg+gkwcDa5NnrfFVwK7cG7MDFoPo5GcaJASxnYcLE=; b=uAvOmwnQpy0yruLtNyL3RYCjJ5FeD+htQ5ijvg2P6F/QqH+FStMKDmQilMJsJVmNpjbaEr 7oCAe38f8HVYOxggavXrr5khiGY4hok58CR0hdVPUc83xJSU4eUQoqTYT99nnHp4mVlG2K r83TLkyIiXQVnT4bnrw/yVk3sz33LChiU5O1niM9td5Y0LTUs4f3ZBTgW9gRJ45tzRk9PC J6BT0AAKW8JZU5K4PTnX4rtRjtz6aR3ymMmTk8Dzi2Fa8wWydBM7SqIYxfwFBI6peDDJql 59n+hfTKO0D1gLOT3cFLAEktQvpoatxmbVsYqKk54ySvOFzrNirrvhy2nE14AQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657127105; a=rsa-sha256; cv=none; b=lq2nuR922HP3cwTXIlvmZhlUrADowiLP63geSGXlrM9J7ubAeRrAIE40kqZWPWl2O6jmsE AW+DDm1q8ifFcHSHQzykL+g9wXkkz2uPECT/eI2usTu8cPVFXlaVOGTeLRjt+NsPmT1aRB W7bfVegq4eFmomZo79iv7ZIvzDDdauufY/p/EQnYLmC1kqLArOuy/a6B+3JcMDw1gjOy4I doGjJhD2So6NcSgmS0AuKhfRfoyuS5LpGwTRz71wbWtA6cYl+jI7MKCU4d3ne4fe4Js1eS iChzoiNNGpvVXeqg8Th2Jm+ZGF9qcgzNU5d82Nu5w536Jz/ITlm/ZUnmkevN7A== 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=8c1edfe309a50744e46aa086257279a322374273 commit 8c1edfe309a50744e46aa086257279a322374273 Author: Alan Cox AuthorDate: 2022-06-17 17:03:06 +0000 Commit: Doug Moore CommitDate: 2022-07-06 16:51:05 +0000 iommu_gas: Correct a broken KASSERT If iommu_gas_find_space() ever called iommu_gas_uppermatch(), and it succeeded in allocating space, then the subsequent KASSERT would be triggered. Change that KASSERT to accept either success or ENOMEM. MFC after: 1 week (cherry picked from commit e6775534aee1963a39e5ee762b8eab1d7dfb1b6b) --- sys/dev/iommu/iommu_gas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/iommu/iommu_gas.c b/sys/dev/iommu/iommu_gas.c index 7ff44a7b0027..d0ed0bde54c0 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -504,7 +504,7 @@ iommu_gas_find_space(struct iommu_domain *domain, if (common->highaddr >= domain->end) return (ENOMEM); error = iommu_gas_uppermatch(&a, RB_ROOT(&domain->rb_root)); - KASSERT(error == ENOMEM, + KASSERT(error == 0 || error == ENOMEM, ("error %d from iommu_gas_uppermatch", error)); return (error); }