From nobody Fri Dec 03 14:53:39 2021 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 C324D18C12F7; Fri, 3 Dec 2021 14:53:39 +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 4J5G6W2r9Zz51hT; Fri, 3 Dec 2021 14:53:39 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 414EC12D37; Fri, 3 Dec 2021 14:53:39 +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 1B3Erdp1080993; Fri, 3 Dec 2021 14:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B3ErdAF080992; Fri, 3 Dec 2021 14:53:39 GMT (envelope-from git) Date: Fri, 3 Dec 2021 14:53:39 GMT Message-Id: <202112031453.1B3ErdAF080992@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: a6172e6353ee - stable/13 - amd64: provide PHYS_IN_DMAP() and VIRT_IN_DMAP() 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6172e6353ee88e331f2287901078f0d2edbb82c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638543219; 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=NGBs9VaNKmy3TJbt1cV250bgybdBN/DF6sEPWEZXqbo=; b=Wb6TbxnVVsslIYP6Y12WvEdMABOfZbRLAs69nzVUk1zxJhsT8vWFQ6TfPZeMovY6AJo+gJ kN/r37y246scYPEEJGeBeu+a7YCJhj2FvscDt7z7SpZyKzAcXuxUWlR99lqU7/u7m5iywz fCkKiDcDS459RhDBJ6C7xOarVJDvctuYBtm1NTtYcnGo/Z7CfbQ9wJsSjdfB3nThMqxs3a lhKlDqZoP8uYdsJUOLVhTL76x8DvODYs3iGlQbK2KxmDLgDPJlm8AZUTTjpk/jeuiKdVEv pQDNfMrDofGM2BseBoGH1+T8qbbhsBvUOvVnGX/i9LU1zwJ77KpuqSpJ9ya35w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638543219; a=rsa-sha256; cv=none; b=OHwwXVE8jnAvcPT2xMuQrusp8MH6MxaRxRcOY1OiXoDCTjwtSbtMdQOTS8/y27w+gjfgqu Vy//A3ln+d20xf+MTY1jYGRt7M8Lucp+/g1e53E7FvsJ54zDz2zBcB6r82fZa24mYpUMAc UHby3xIVOWBEKvjDAYLng+6vFVA/G2bQWe4V35n33jlYL4YHEvPwZ8Dc6S/fYUHlX3yxbl zZtTtSUSvQi1BP7mKu9h5A+WLlatMsfCrhCbr4prpFHLCCKlMe7xLW2ATIeCbYfn3cKDxR JiA+B49lcYdiH2YVrnkUzoxCFHsufdSuri7ePPAicKZUFKYU95gaVi+EjNOtyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=a6172e6353ee88e331f2287901078f0d2edbb82c commit a6172e6353ee88e331f2287901078f0d2edbb82c Author: Mitchell Horne AuthorDate: 2021-11-17 15:29:02 +0000 Commit: Mitchell Horne CommitDate: 2021-12-03 14:02:02 +0000 amd64: provide PHYS_IN_DMAP() and VIRT_IN_DMAP() It is useful for quickly checking an address against the DMAP region. These definitions exist already on arm64 and riscv. Reviewed by: kib, markj MFC after: 3 days Sponsored by: Juniper Networks, Inc. Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D32962 (cherry picked from commit 90d4da62259299a8d91fed1121be97ac5b7b6b3c) --- sys/amd64/include/vmparam.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h index 61d0dea54210..cddb360090ab 100644 --- a/sys/amd64/include/vmparam.h +++ b/sys/amd64/include/vmparam.h @@ -239,16 +239,19 @@ * because the result is not actually accessed until later, but the early * vt fb startup needs to be reworked. */ +#define PHYS_IN_DMAP(pa) (dmaplimit == 0 || (pa) < dmaplimit) +#define VIRT_IN_DMAP(va) ((va) >= DMAP_MIN_ADDRESS && \ + (va) < (DMAP_MIN_ADDRESS + dmaplimit)) + #define PMAP_HAS_DMAP 1 #define PHYS_TO_DMAP(x) ({ \ - KASSERT(dmaplimit == 0 || (x) < dmaplimit, \ + KASSERT(PHYS_IN_DMAP(x), \ ("physical address %#jx not covered by the DMAP", \ (uintmax_t)x)); \ (x) | DMAP_MIN_ADDRESS; }) #define DMAP_TO_PHYS(x) ({ \ - KASSERT((x) < (DMAP_MIN_ADDRESS + dmaplimit) && \ - (x) >= DMAP_MIN_ADDRESS, \ + KASSERT(VIRT_IN_DMAP(x), \ ("virtual address %#jx not covered by the DMAP", \ (uintmax_t)x)); \ (x) & ~DMAP_MIN_ADDRESS; })