From nobody Wed Nov 15 18:12:18 2023 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 4SVrq66KPxz50ZLJ; Wed, 15 Nov 2023 18:12:18 +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 4SVrq65SpLz4MbG; Wed, 15 Nov 2023 18:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700071938; 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=eqa0v0YwgN07RLgViKu/4O0Q+qzXBo8XUGqVMpwatSE=; b=cD+W1jDH42JLmEnbNP1jqjojNL5gBTmqW422bb6Gc8ir4z8P1zzeyhKJoixgQxoqXcdvVu 4a1odkWer6vTclzQ/LlychemJ3Xh3pFzNKquspncJIkV6mtef8RgqJMA51VxDGAyjuzcdd +gcHrlVDCkHjZdccRxSmK9nuworvbRMtsABV9JbbpFNbW1qSbc0nlBjVX0KQCgQaUS4oyZ WBeURJP1VQd3RkRJLnivsZjs/f2wzDMAAbrcKtDdHdf+Q+hYtJ2fjRrEDe8tJKFNo46x/M E2muAsDHHAd1Phg9W8YxCxlsF1C5Mw1PMc76sr72d7XoaopaZfHvl4/yk+IGcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700071938; 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=eqa0v0YwgN07RLgViKu/4O0Q+qzXBo8XUGqVMpwatSE=; b=wJYHaEg/efooyjwegsfBgkGmiVKdbulpJ8Ds5mDAhpNojq3GVAXnDR0I3OUx8kuHgIfpki 8eM89NUIJcxnW+XQUFFqkd1h9YyTfax5XTW+cMNXKxf0m6CdJSLrJPKctW4vbzrx6RMyDh Qp8i2jN7ewEGn/ZgCj8Y0jZIr65AWz01E2C/KovJQ6lpsIVzcRsUSJOimnvHWe7xdPwdlg G6dp/Rc4qVqzRrQyB5qglEKCRo2NK/CbUxUrB/JBX4rDdhV6XCW26+7fexyefBiHLgv6UQ /dXMV80LQ/dMbqUMEfcRM6w32c63E6R9sRAr1SRe4BkLOE2cRle18lIfdWyjiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700071938; a=rsa-sha256; cv=none; b=aIKrQhp2/+fCthyD/Kd7XgxTESKssYNxtJHPTDtPY6s5K8UeEwbpt3CSdtBGekmOqkHPb4 Rv6PsbkmQM9C/MV3jhhKL4ml/E+CACX4QHXqj2TqdgxDQ00oOcsNxkB4s2oPhV4Mb9QLfA pm1A79KHUcABxIlkg8Nt4NEWN2Y/76SVx9STdkf9jsMv0YAyKkr7AjckYWMEoSRQLZUawF r4nV85xwv7k98iIEmCnz3/gbktjsGDxtuVPuzD1vWIuhNKjXSqMXhK79kFATkqBsD9zsxZ CFn++W/X3SeE1icWLysiNRI7eS2tlLkYoC9LTV8xR+6IkcbHVARRqEneE7DmKQ== 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 4SVrq64XnGzCDk; Wed, 15 Nov 2023 18:12:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AFICIIa077420; Wed, 15 Nov 2023 18:12:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AFICIqp077417; Wed, 15 Nov 2023 18:12:18 GMT (envelope-from git) Date: Wed, 15 Nov 2023 18:12:18 GMT Message-Id: <202311151812.3AFICIqp077417@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5fae53589eac - main - arm64: Use pmap_early_vtophys in pmap_bootstrap_san 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fae53589eacbf65855419922c881b3a25a68e03 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5fae53589eacbf65855419922c881b3a25a68e03 commit 5fae53589eacbf65855419922c881b3a25a68e03 Author: Andrew Turner AuthorDate: 2023-11-13 16:34:56 +0000 Commit: Andrew Turner CommitDate: 2023-11-15 18:05:08 +0000 arm64: Use pmap_early_vtophys in pmap_bootstrap_san Use pmap_early_vtophys to find the physical address of the kernel base rather than using the calculated offset as it will be removed in a latter commit. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42566 --- sys/arm64/arm64/machdep.c | 2 +- sys/arm64/arm64/pmap.c | 5 ++++- sys/arm64/include/pmap.h | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index bb7689c19101..7aa20357acf4 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -973,7 +973,7 @@ initarm(struct arm64_bootparams *abp) * segments also get excluded from phys_avail. */ #if defined(KASAN) - pmap_bootstrap_san(KERNBASE - abp->kern_delta); + pmap_bootstrap_san(); #endif physmem_init_kernel_globals(); diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 8c2c6f9d7b81..3dc74626f01b 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1365,11 +1365,14 @@ pmap_bootstrap(vm_paddr_t kernstart, vm_size_t kernlen) * - Map that entire range using L2 superpages. */ void -pmap_bootstrap_san(vm_paddr_t kernstart) +pmap_bootstrap_san(void) { vm_offset_t va; + vm_paddr_t kernstart; int i, shadow_npages, nkasan_l2; + kernstart = pmap_early_vtophys(KERNBASE); + /* * Rebuild physmap one more time, we may have excluded more regions from * allocation since pmap_bootstrap(). diff --git a/sys/arm64/include/pmap.h b/sys/arm64/include/pmap.h index 1789588210c3..ad9aa409815a 100644 --- a/sys/arm64/include/pmap.h +++ b/sys/arm64/include/pmap.h @@ -192,7 +192,7 @@ pmap_vmspace_copy(pmap_t dst_pmap __unused, pmap_t src_pmap __unused) #if defined(KASAN) || defined(KMSAN) struct arm64_bootparams; -void pmap_bootstrap_san(vm_paddr_t); +void pmap_bootstrap_san(void); void pmap_san_enter(vm_offset_t); void pmap_san_bootstrap(struct arm64_bootparams *); #endif