From nobody Fri Jun 09 19:58:23 2023 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 4QdBhv5r44z4cKfF; Fri, 9 Jun 2023 19:58:23 +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 4QdBhv5KVRz4KZt; Fri, 9 Jun 2023 19:58:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340703; 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=DHFy3Z29pjqSfixu7tHwhumRMQhxENv6Q2i5+KMRDoM=; b=MTPcwZgRCIsq7rPO/bS9xGRpWpeNcvasfVn4InFt7n9iUcfgbDExVEjeURgvq+Di2saZeV je4rr3NTVV8EF8jM0TUExz+n/zjvZWuA5Xm8Z/3ij/RVFEYAJ4IvCcwnoZgtrMxQ1AbBdH 2jpUEZGbEcv7bCOiFshzFA8CwoAKbsRBavaQR4vY515dKnkmz8B5wj85/Y4aTXh3rC9uSZ PAsxbmJ0wLO89yUyjNhOMPmLJ0Belz+2sit5UM4ku9zYG0AaVXuEUWUKoMbXaQT8kj64/c FzFMvVzXakMh87YMKVtRGgi7Yz7NjBRb3wuaBHtOGz2gb4iEegzXGCgCIUwE/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340703; 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=DHFy3Z29pjqSfixu7tHwhumRMQhxENv6Q2i5+KMRDoM=; b=AMhxPWvdbZDdiI5vHfV5ez7qFCJp/8LClt237+7+S0ga7yVt1GBl9RjTGTuURe4XAV/rr6 HF2ZtJYikDswtbhzr7tv1lPNYqsY4Or38IU2/UNdKMtTM4RlvyrbEP+CN3Z3wjy4VJYL6b dLH3ZWCuaHq1ds2C0+Br4ha+dvoogKIGMLG8jqI2e+j4J70LfbcDD1B6DKIyHe20X6tOye jSam+uhjfOEmI+FvPs3jum+BlOde9/vZtq1jSEixSUJanA7WfRW/TY5OucqwHJE5BxQEoG doNJNHpz36RRYfFoaBUGcgLxTlhgaNfvO/4WyxuOHAUJ3797EeTfifj1epRssg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686340703; a=rsa-sha256; cv=none; b=YUapNk0PcBPzIOO92mlC/zozDGBzYcgZ0d5Z/AnM+PE58B0D5AhhkJAw0SynWDvjTU0Jg/ am4S+BR0voYEq3Mjj/R+WXMPtcFWvZCL3qR2RUYcjWqu3+8FRnyrPpaNC6RfBDmiI67C40 NxzjhU8TVS25CW9rJWMiBg5Xbss8yh9K+dCJRfOprSL65fORnwAZFTd3Cc72LAraQD/ASP aNXAjliaoCcj/DfUlJceCmq91VEY9V3KWxTegh0a2Npk5yDuTpX5GB49iUHEFjAa25dIk3 UWnal+waCxoR+3Gkgy/kZ13FXp5PtQHCibJCNwfogmvc++DRuO3F/pPe8VizHA== 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 4QdBhv4NX3znbJ; Fri, 9 Jun 2023 19:58:23 +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 359JwN8c072447; Fri, 9 Jun 2023 19:58:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359JwNvk072446; Fri, 9 Jun 2023 19:58:23 GMT (envelope-from git) Date: Fri, 9 Jun 2023 19:58:23 GMT Message-Id: <202306091958.359JwNvk072446@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: d3af72040679 - stable/13 - riscv: Use PMAP_MAPDEV_EARLY_SIZE in locore and pmap_bootstrap 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: d3af72040679a1cd75889a69898e53bb699f4212 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=d3af72040679a1cd75889a69898e53bb699f4212 commit d3af72040679a1cd75889a69898e53bb699f4212 Author: Alfredo Mazzinghi AuthorDate: 2023-05-25 15:33:12 +0000 Commit: Mitchell Horne CommitDate: 2023-06-09 19:48:06 +0000 riscv: Use PMAP_MAPDEV_EARLY_SIZE in locore and pmap_bootstrap Use PMAP_MAPDEV_EARLY_SIZE instead of assuming that its value is always L2_SIZE. Add compile-time assertions to check that the size matches the expectations in locore. Reviewed by: mhorne MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40110 (cherry picked from commit ef0a711fd5d0d389205c18c869c78b9a4d639ddb) --- sys/riscv/include/vmparam.h | 2 +- sys/riscv/riscv/genassym.c | 1 + sys/riscv/riscv/locore.S | 6 ++++-- sys/riscv/riscv/pmap.c | 13 +++++++++++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/sys/riscv/include/vmparam.h b/sys/riscv/include/vmparam.h index 6e1c9e11a3cc..5f76b312c7fd 100644 --- a/sys/riscv/include/vmparam.h +++ b/sys/riscv/include/vmparam.h @@ -250,7 +250,7 @@ extern vm_offset_t init_pt_va; #define ZERO_REGION_SIZE (64 * 1024) /* 64KB */ #define DEVMAP_MAX_VADDR VM_MAX_KERNEL_ADDRESS -#define PMAP_MAPDEV_EARLY_SIZE (L2_SIZE * 2) +#define PMAP_MAPDEV_EARLY_SIZE L2_SIZE /* * No non-transparent large page support in the pmap. diff --git a/sys/riscv/riscv/genassym.c b/sys/riscv/riscv/genassym.c index ff5e8fa01ddf..22b8cf3b8dbc 100644 --- a/sys/riscv/riscv/genassym.c +++ b/sys/riscv/riscv/genassym.c @@ -62,6 +62,7 @@ ASSYM(KERNBASE, KERNBASE); ASSYM(VM_MAXUSER_ADDRESS, VM_MAXUSER_ADDRESS); ASSYM(VM_MAX_KERNEL_ADDRESS, VM_MAX_KERNEL_ADDRESS); ASSYM(VM_EARLY_DTB_ADDRESS, VM_EARLY_DTB_ADDRESS); +ASSYM(PMAP_MAPDEV_EARLY_SIZE, PMAP_MAPDEV_EARLY_SIZE); ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); diff --git a/sys/riscv/riscv/locore.S b/sys/riscv/riscv/locore.S index bf0ac8e122be..32d1b6198de8 100644 --- a/sys/riscv/riscv/locore.S +++ b/sys/riscv/riscv/locore.S @@ -162,7 +162,7 @@ pagetables: lla s2, pagetable_l2_devmap /* Link to next level PN */ srli s2, s2, PAGE_SHIFT - li a5, (VM_MAX_KERNEL_ADDRESS - L2_SIZE) + li a5, (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE) srli a5, a5, L1_SHIFT /* >> L1_SHIFT */ andi a5, a5, Ln_ADDR_MASK /* & Ln_ADDR_MASK */ li t4, PTE_V @@ -191,7 +191,9 @@ pagetables: /* Store the L2 table entry for the DTB */ li a6, PTE_SIZE - li a5, 510 + li a5, VM_EARLY_DTB_ADDRESS + srli a5, a5, L2_SHIFT /* >> L2_SHIFT */ + andi a5, a5, Ln_ADDR_MASK /* & Ln_ADDR_MASK */ mulw a5, a5, a6 add t1, s1, a5 sd t0, (t1) diff --git a/sys/riscv/riscv/pmap.c b/sys/riscv/riscv/pmap.c index df473acef0e7..a6029f5d642d 100644 --- a/sys/riscv/riscv/pmap.c +++ b/sys/riscv/riscv/pmap.c @@ -254,6 +254,15 @@ vm_offset_t dmap_max_addr; /* The virtual address limit of the dmap */ CTASSERT((DMAP_MIN_ADDRESS & ~L1_OFFSET) == DMAP_MIN_ADDRESS); CTASSERT((DMAP_MAX_ADDRESS & ~L1_OFFSET) == DMAP_MAX_ADDRESS); +/* + * This code assumes that the early DEVMAP is L2_SIZE aligned and is fully + * contained within a single L2 entry. The early DTB is mapped immediately + * before the devmap L2 entry. + */ +CTASSERT((PMAP_MAPDEV_EARLY_SIZE & L2_OFFSET) == 0); +CTASSERT((VM_EARLY_DTB_ADDRESS & L2_OFFSET) == 0); +CTASSERT(VM_EARLY_DTB_ADDRESS < (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE)); + static struct rwlock_padalign pvh_global_lock; static struct mtx_padalign allpmaps_lock; @@ -684,7 +693,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) /* Create the l3 tables for the early devmap */ freemempos = pmap_bootstrap_l3(l1pt, - VM_MAX_KERNEL_ADDRESS - L2_SIZE, freemempos); + VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE, freemempos); /* * Invalidate the mapping we created for the DTB. At this point a copy @@ -738,7 +747,7 @@ pmap_bootstrap(vm_offset_t l1pt, vm_paddr_t kernstart, vm_size_t kernlen) msgbufp = (void *)msgbufpv; virtual_avail = roundup2(freemempos, L2_SIZE); - virtual_end = VM_MAX_KERNEL_ADDRESS - L2_SIZE; + virtual_end = VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE; kernel_vm_end = virtual_avail; pa = pmap_early_vtophys(l1pt, freemempos);