From nobody Tue Jul 22 14:03:07 2025 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 4bmf9m5JSFz5pRlF; Tue, 22 Jul 2025 14:03:08 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bmf9l67Frz416n; Tue, 22 Jul 2025 14:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753192987; 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=SY5EmQu1TYyueyq393ibfd7mu36WB158E2S0T2uVTgI=; b=EVB+pm+tib+OzoAMWKBMEoCf4uQlTls2xDUJZ9VI3zeLPIJK8fzETdd0NXLUbLW7q0ZrXX BvwX2kmEstpqkE5SAe3XnHlqPZZ+7On7rdhDs/pFHv3d1eUBKsLTakGZQPVmFTtAwJvozn KzbQ8olCM4Sp0G3veHfaLPDJPLZBY1PqbNdNG0xtwMziKfTKvRlJtLzG+15oCoeCDRpvp5 IjHn5GndAjyPzQ/EVDQ79Q9Ktk9l8erenc/Qz25qZbedF2ZiPWUDdEaNHHL3Tzd3M/DI8L imJMP3PIoRO+mnY5p8+KdDQKh2oOokS0TDIMqtQx4Q3iDSdYMjpLEnk0vjzj6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753192987; 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=SY5EmQu1TYyueyq393ibfd7mu36WB158E2S0T2uVTgI=; b=S3YQWU5BAnttjjBq4XUYV1UiZDPDwCVIuRseo/sWPLjnUIRKn+v3in0af5WGwPT11EFiSS te885CnOUVGFP6iaacANidxTXTXgvbIi3DDqeHb/3YG+wheNn6XjNbwTweHGh1m3jwTjnW IRYtyWNDbv4w37aQNoxNwEoJv28KIACyLCPqGd80TeNa2S4y/FAUycCkn29I41zZa7anC1 bsXwVpEv2eaj4Q516lEVDa45sDC2bOEOk2PxivR28xiGCP/25H4jlUwweVHiNF0X8WAst9 GScuZjvIBsMCMg2QXvFKw/KRlOVmUCce5OuCdiQppS2dJf7wEWQJxKLkLml41Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753192987; a=rsa-sha256; cv=none; b=dUQM0uvLWfJkWnGvT5pBsXCH+K/IPR6CgRHlGft1RfLPo6p3ZxanLGS/6uRAKfu6hTD4bN vW95bQxpibqBqamp5x/wPYI3LMwWTWb8tiwZZ4aPG2ZGdn8kTUaD7d6QIw7neJ+Eze1++G 56iqxvFXsByUR5AdMnCOcX1ft320TFOW9O7qAWt7pyOCmy4RcuFKPceBFVNzJQgGQo5mDI l0uIYTF9lj412eDLWCrdOOG6O3JEwvXQ1RXnHjWhhG6itHkpVj5J01Icd2QyX/l4ax6d9a LHSLo9u677R5TQHMtJVL5An9IzoZ1Xineaa1s11vgKnt7gms6Q6wH0I4P9qSwA== 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 4bmf9l5WXbzVbL; Tue, 22 Jul 2025 14:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56ME37WL071074; Tue, 22 Jul 2025 14:03:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ME37dO071071; Tue, 22 Jul 2025 14:03:07 GMT (envelope-from git) Date: Tue, 22 Jul 2025 14:03:07 GMT Message-Id: <202507221403.56ME37dO071071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 58832abd24f0 - main - amd64 sysctl_kmaps_check(): add pml5e arg 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 58832abd24f03eab62e06cbe3a74304b7bfd950a Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=58832abd24f03eab62e06cbe3a74304b7bfd950a commit 58832abd24f03eab62e06cbe3a74304b7bfd950a Author: Konstantin Belousov AuthorDate: 2025-07-20 13:23:10 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-22 13:59:00 +0000 amd64 sysctl_kmaps_check(): add pml5e arg For now all callers pass zero. Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51453 --- sys/amd64/amd64/pmap.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 13c6df01ccfe..9805184bd07e 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -11941,12 +11941,18 @@ sysctl_kmaps_reinit(struct pmap_kernel_map_range *range, vm_offset_t va, */ static void sysctl_kmaps_check(struct sbuf *sb, struct pmap_kernel_map_range *range, - vm_offset_t va, pml4_entry_t pml4e, pdp_entry_t pdpe, pd_entry_t pde, - pt_entry_t pte) + vm_offset_t va, pml5_entry_t pml5e, pml4_entry_t pml4e, pdp_entry_t pdpe, + pd_entry_t pde, pt_entry_t pte) { pt_entry_t attrs; - attrs = pml4e & (X86_PG_RW | X86_PG_U | pg_nx); + if (la57) { + attrs = pml5e & (X86_PG_RW | X86_PG_U | pg_nx); + attrs |= pml4e & pg_nx; + attrs &= pg_nx | (pml4e & (X86_PG_RW | X86_PG_U)); + } else { + attrs = pml4e & (X86_PG_RW | X86_PG_U | pg_nx); + } attrs |= pdpe & pg_nx; attrs &= pg_nx | (pdpe & (X86_PG_RW | X86_PG_U)); @@ -12061,8 +12067,8 @@ restart: pa = pdpe & PG_FRAME; if ((pdpe & PG_PS) != 0) { sva = rounddown2(sva, NBPDP); - sysctl_kmaps_check(sb, &range, sva, pml4e, pdpe, - 0, 0); + sysctl_kmaps_check(sb, &range, sva, 0, + pml4e, pdpe, 0, 0); range.pdpes++; sva += NBPDP; continue; @@ -12090,7 +12096,7 @@ restart: if ((pde & PG_PS) != 0) { sva = rounddown2(sva, NBPDR); sysctl_kmaps_check(sb, &range, sva, - pml4e, pdpe, pde, 0); + 0, pml4e, pdpe, pde, 0); range.pdes++; sva += NBPDR; continue; @@ -12115,7 +12121,7 @@ restart: continue; } sysctl_kmaps_check(sb, &range, sva, - pml4e, pdpe, pde, pte); + 0, pml4e, pdpe, pde, pte); range.ptes++; } }