From nobody Sun Jun 26 21:32:33 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 4E9928A19D6; Sun, 26 Jun 2022 21:32:33 +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 4LWPG91mlZz3lCf; Sun, 26 Jun 2022 21:32:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656279153; 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=+6iqYjnqyInuPUb5QaTjeOOHbOwYLtwHhlMlmj/tk1U=; b=rbhhh02mclgeKonZiT1t92ezosMX9JDpAiFPHX2EjITrgDPdXUQKeLMqBL9LrWHfrjj8/p P4GwLJyy3OPkyYPj9juKraL3kXpKmSWU+VbPQaoeKBcG2iBRkUZN4YNUWNOmd6yE89uDCB 4dGLawVVSQQZ7/8BDSDn1H6OZZ1eUzxiP6JNbXhutmuEDP9BAWEr4GezYg3KS9MF1PLCDf fK6TZDAcj7q+8ylp7CoPW6P22hhWmvp6o8Q6Sr/nmgDoeFI39/Qk+2aHcYyuNYvQnUfpfa qtDDrNjNtHQ6WzjvEulnt4CDczSpS8qb1M6zNZTchLbyhCEnrkBW5y1cEAu88A== 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 1D5781BD9A; Sun, 26 Jun 2022 21:32:33 +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 25QLWXtv020159; Sun, 26 Jun 2022 21:32:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25QLWX4M020158; Sun, 26 Jun 2022 21:32:33 GMT (envelope-from git) Date: Sun, 26 Jun 2022 21:32:33 GMT Message-Id: <202206262132.25QLWX4M020158@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: 7b39a9bc1df3 - main - iommu_gas: Fix a recent regression with IOMMU_MF_CANSPLIT 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: 7b39a9bc1df37502e8186593f3427b7ff0e4cc71 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656279153; 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=+6iqYjnqyInuPUb5QaTjeOOHbOwYLtwHhlMlmj/tk1U=; b=WXGzeBKLnE5MSXOA59EEGU7+g88sYBTNneV4E3L2Gfx4YboLiG9oUFYXWQOWPLbnFFOaI0 ojTaekpXd3PTwkkOR1tkoHEvLydD0W694mZuooRRhHstF83MQvM4WYj2EoTDJYOiH64Hj9 UfAi+funW1h5cqK95/49SyvFB1GeEsML0pT407DCZFqpU/HyLqlwY4Ig81Tkl5Q1tSmxFn Xfia/WeOM6L65ZrkOkezUPsH/YUSTOqFR54QtgCv1VM782qZEpFUUtH0znWiPH4WpXS2Lh 1bcnCFlUg4nDZMNfwTh2/eY3FEMqoDAA+8dgyh4ZY43BUJDESSUiPaJ+CxaTeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656279153; a=rsa-sha256; cv=none; b=oLhX33FWRgZiXCCG/TSoHKH8PFZI5Y4AEmmXajrpox9MsTOC6cmEpftlCnEc/CrB+5Wy0/ yBQovhpZhXgOfAcVqkRS8oVPFfcf6ThoSReC0PZhUqC4+MUGdnqv0gQJvojVTjI8JRYiQ4 uO7G/xJcbr2WlxWUgG0sCMeHs8KfyeZjsvfVimXOOvYspJ+stWy5beMueWwTPLnjHby4kh 78/nkbdB7z8QJLmgKMS+dWMmDYeai+UauHGanzCeRbZigKyR5WV9XFEXdlCu4NjF2uwW4y NNjyEuOGTKM/sbpfRpmsXqlNVnp1SkogIDNLJidydVEal4Fs9Cc7fhT0Vxyiyg== 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=7b39a9bc1df37502e8186593f3427b7ff0e4cc71 commit 7b39a9bc1df37502e8186593f3427b7ff0e4cc71 Author: Alan Cox AuthorDate: 2022-06-26 16:48:12 +0000 Commit: Alan Cox CommitDate: 2022-06-26 21:31:54 +0000 iommu_gas: Fix a recent regression with IOMMU_MF_CANSPLIT As of 19bb5a7244ff, the IOMMU_MF_CANSPLIT case in iommu_gas_match_one() must take into account the specified offset. Otherwise, the recently changed end calculation in iommu_gas_match_insert() could produce an end address that crosses the specified boundary by one page. Reviewed by: dougm MFC with: 19bb5a7244ff --- 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 2647c2ce6612..bb6cde2721a6 100644 --- a/sys/dev/iommu/iommu_gas.c +++ b/sys/dev/iommu/iommu_gas.c @@ -350,7 +350,7 @@ iommu_gas_match_one(struct iommu_gas_match_args *a, iommu_gaddr_t beg, * the next entry, then we do not have gap. Ignore for now. */ if ((a->gas_flags & IOMMU_MF_CANSPLIT) != 0) { - a->size = bs - a->entry->start; + a->size = bs - a->entry->start - a->offset; return (true); }