From nobody Fri Jun 17 18:06:01 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 35E9485EE27; Fri, 17 Jun 2022 18:06:02 +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 4LPn620mX0z4mYr; Fri, 17 Jun 2022 18:06:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655489162; 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=0vCueDrWyA7kol90R48eycSEQzfbdDGdN7PR/1tb1eM=; b=Ys8ayz5pssDPiNL4ELgDxFdsdHBLkIgxFfcvujzF6j4tkT54+5PUrsjvl4IYK7RlwYGFJ+ aKir3tynXF8XtwDv+3ONlvKXEz3DoVOyxgBZDqimdPdwRjQJ2UFUds5IFgbs0PPka7FFma ZgvCUxKQvjLJ/5IFz+30OugB70vgEtXfzLiHj3UJhPd2FFj2XLZQsNLOy7hAdW+ZeuOAHF T3NBM/7kDMGbKXX7Z0GmKeimaqzRZWSKEWdUryUbZWd4mtv7u17ZB2KouaWuR2UJQZ0Zso sE3DvPSxTGUgZ4Fqw7ryzX6uMVLevLuUm1Po1BSUrkY9kxQp3sqYctSrXbimBg== 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 EAFC1247D8; Fri, 17 Jun 2022 18:06:01 +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 25HI61RS088535; Fri, 17 Jun 2022 18:06:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HI61Si088534; Fri, 17 Jun 2022 18:06:01 GMT (envelope-from git) Date: Fri, 17 Jun 2022 18:06:01 GMT Message-Id: <202206171806.25HI61Si088534@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: e6775534aee1 - main - iommu_gas: Correct a broken KASSERT 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e6775534aee1963a39e5ee762b8eab1d7dfb1b6b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655489162; 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=0vCueDrWyA7kol90R48eycSEQzfbdDGdN7PR/1tb1eM=; b=Rcl7kXQKsMwOvzngqwAEeswUDFwqslTgLRV/LAWNxQX1mT3l8ezZZvUzIF/NnAQU7mRn3o i3GFC0hLcV932oYrFtu3FPM6Bj34do+XzNulAwkAzvWySxRrNkej1nMX6rDA61bjI10E07 LTTBNUYGiT+Dr11ELDsTrIvnxfCH1tsIApIpu5cYrC4OealeEpZKn/QGa6+ojx6YDVB9z9 GBA4UATkuoj3aqYa6JTRdOmvnGkojrr6bQbdYNxRsvhhG9MK77mIq2fXZJj7HBxPem8LBP YJzjyOVUsfdCPA1j3F1ZAlg6ivp2Sqn0j9aJ1P2+3yAoxy4PWkkHvDtgwqWVYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655489162; a=rsa-sha256; cv=none; b=SY57aMo47g6iaAdcrLbL5Okbf5cVIcmbH3kWaQH1pmiCQz0oPiK3OEFGSzVFesHiLvvruS hUYQ3LF3HhRPLEWxdqwyy9Vd8B5K/detC8aSqMPqdmcWtL2F4koAJh7HbmtXxW3QJ26e+B IzWzSPketowGNYvhMmzYMByoX1nk76v8yL/opSEpGO/W19X0qXNbbpvWoyu5R9nH3ghGPu CYxPtLlaHmReSM4bBActzKhwJyGai/yDmE72GVYLoJq0VJRa41erFksC2b+hwd0wLLXTYk CXDtSM9zzd5+SppuV0ENPdCuMSzVMDwTw2H6tIvJi9LBAM+6Eu95vMysfOR1sg== 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=e6775534aee1963a39e5ee762b8eab1d7dfb1b6b commit e6775534aee1963a39e5ee762b8eab1d7dfb1b6b Author: Alan Cox AuthorDate: 2022-06-17 17:03:06 +0000 Commit: Alan Cox CommitDate: 2022-06-17 18:05:20 +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 --- 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 a65bb23e87c5..073b5626edf6 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); }