From nobody Wed Jul 6 17:05:10 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 4D2EC1D0CD9E; Wed, 6 Jul 2022 17:05:11 +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 4LdQs26WNSz3CXq; Wed, 6 Jul 2022 17:05:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127111; 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=MnCYm4jc5sjIumwec4hV/U4Qc2STUV5FzJnbOGxcz18=; b=yX8wqnqy10oAtL/PN/pgFfPiNuqYCa9MzNi1GgGyyNL8oyg3jwCE9QHYD/jWGKPWbVEAAI 1ArqpFcsSIfVwIs0eIKM4fOpuw7baKrTcxENC6WBiVM5ofqJbfU5K5MFf5OR779tK2VMgG aj9YDa2OTeB3LKzSUON+xHoFr2Bhdm43fId4fpOV9XdhQlglUhvHYDzTSm3mdgJiUy0s32 Nyv1xucuGvi304XwWYcafwrgOe0CsgYIg0X0t6IZk0P1XMzPNYHU2vC+ZtFeYZ/HCA8qip ZjIHYqSTOoC6h/X9GNaN5aimBxlhT8r12nhRiLK0/DmTdGTwTFjP54Fh0QDKhg== 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 B90401E4CE; Wed, 6 Jul 2022 17:05:10 +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 266H5ARu083867; Wed, 6 Jul 2022 17:05:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266H5App083866; Wed, 6 Jul 2022 17:05:10 GMT (envelope-from git) Date: Wed, 6 Jul 2022 17:05:10 GMT Message-Id: <202207061705.266H5App083866@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: 01ebb5b8cf8f - stable/13 - 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 01ebb5b8cf8f55f1cf5a994d3927411c50aac7ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657127111; 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=MnCYm4jc5sjIumwec4hV/U4Qc2STUV5FzJnbOGxcz18=; b=YI3T91PPfPTGyAoMU9G9YlwbSjfXMjOR3uL33w9c/I2pSQpkC/rHV6393AcOqIp3GfmKng bh9lUTNlOES1ALI+yhDdOzE+VFTzrq4d8THZxjKDXcAKbZEE8fqAbMCY8J+LDqYbHjfHvN ipTE+hNY0SaDKy+5NFW8yJo5OIIdEYtGps6+gN0HfbjWrzUstzQp0I551Ewwzq3Pb4VbHX t0/q3cNjMbSbER2qeJxevRfLv5mxMuFGy6lmQyedAtguhz/vLaP84sKMSQVoOcMIQAMnql 1Ww8v8Dq6w8i3DnYdu/qgS9C7qgTEjLQLfbR3xFlSaR1oUgSGZ7dxxbf7oG52w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657127111; a=rsa-sha256; cv=none; b=E5zcs/MiQW6sxfmu/SFc0yVe/kXsL8zY5OqG2760hdpaQ9OdCDs5t7xY974Zh+gBroqAMA 4f9xkqTZjkRBqLgSX2Md32QVWU0EqTUy3RFQce2TrnHeuFM7zienSvGoBBsxgSqfYOasd4 dayt8uhYlSPaTatxFed215dGW9wHjG/gPXZy5RCAZ4soj+QQRHthS1eeE3WGg65Wwy2o+/ yVLVZ1cBusLMT0M8d2go1RmB31JZidNaXk6UZKoNTE90sBcu1kth8Hu5QXsTQ8v7CjksT3 7yh+g0eYlOqVahQOK9h3kne9Lgb4XXAbUShincdLMOUMl/Bi3acxo1Vais1MZw== 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=01ebb5b8cf8f55f1cf5a994d3927411c50aac7ca commit 01ebb5b8cf8f55f1cf5a994d3927411c50aac7ca Author: Alan Cox AuthorDate: 2022-06-26 16:48:12 +0000 Commit: Doug Moore CommitDate: 2022-07-06 17:01:41 +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 (cherry picked from commit 7b39a9bc1df37502e8186593f3427b7ff0e4cc71) --- 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 23e603ef18dc..b6594af80cb9 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); }