From nobody Mon Sep 23 13:03:52 2024 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 4XC38m5wyMz52Fgq; Mon, 23 Sep 2024 13:03:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XC38m3C0vz40jK; Mon, 23 Sep 2024 13:03:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096632; 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=xxQ5GJjv76ZDI9LTjbCqIilyLPQll5jsHUydGc+LvLI=; b=RH/bH1jY69yfomYXKBnM5pfbNOWn2ZEPVksmCazlSu2NJv0EeQErLv2MEbYbZN1evWNm/D L0eChhPKpWLM+CRQH4qbUZgLS4GOUudoz9LEJEGDrDPva1eSPI5MbOkaF5ru3H41GyMty3 d7DVp7huuv4NVZ5gPr+qoOzlZeroBaq1858kNEAKJK16yvzBM9RVvsdVnMZFKIeOlyiZsD wZgtYvJ/6FBtkVRHWSkg0IX4BjMkwezSJxMOUrbe+ut250X+3Zibx7uNQR7LUgMhvMOn9s Xc2GUvHPqMW1fJa6ql4zzS+GGBMQrQP94BDvz6XGwZkF06KqmoMAUsfo4zGpIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727096632; a=rsa-sha256; cv=none; b=DdEGk+GiwxKfK2w3dGU23xV75EC8/MQ1xubPvSbGF9rIVyIUHIxdBNe7IQrDiVaZd5uHb3 lI/TGfUvhszxYBB9Db4ls333OA2Ky607K4ngn7LTqpQCYhTFKGPJmNRJ15gZoRyD/LwMz+ xESE73XJgxCxHcDyWsFmAaNi+6N+nuK4ga7WDjI0yuX26wcxxL9NZTYTE/stAdQkKJSznI HdjtKz0ORolbfPWme8i42RRdZVw915CX90tDpjm85H+85QpEGqx7vr0CRevvpTx4yaFFlM ksO3cmNbp2niitEjyNcGsWKgosodLYB7KeQWjWlzAoY1zYSZgLwCOE1Xzhb1yA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727096632; 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=xxQ5GJjv76ZDI9LTjbCqIilyLPQll5jsHUydGc+LvLI=; b=NCI18H3fT9uq5+S/Sv405UVH2G4MuPIRxYpmtU3ftm8DrEGkYSZ/nUKVL4DcuPTWvZhaKo QG4hEsT0QrRVRr0EP9bZAFfiDI2xRgEVwC+7vZu+MAxdpyWDv4252TvUYZZ/Kuu4Ra5fYS Hx/RU3l+Pzt0gQ9Yq97mbMgAuTl3z14pyrmtYfw9qTaank/bcQWVYLMGtqyfrztJOKnttP EuLtqC7wK7X3Zaar4SpRBw3ELYxCRhKICK9/fs6I5od5+JrQymSM9LiiN4LDoXLx50sK1P oA/yHDK8FogsZmExxtK3RkQyKPPilubnOW2BWzvOfq8Qv5+wacVLgJp1nT4HGQ== 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 4XC38m2mTtzmVZ; Mon, 23 Sep 2024 13:03:52 +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 48ND3qXo007448; Mon, 23 Sep 2024 13:03:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48ND3qVn007445; Mon, 23 Sep 2024 13:03:52 GMT (envelope-from git) Date: Mon, 23 Sep 2024 13:03:52 GMT Message-Id: <202409231303.48ND3qVn007445@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 1ed40b45066d - stable/14 - amd64: pml5 entries do not support PAT bits 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ed40b45066dedea10fb306da8ca258bd7d69a40 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1ed40b45066dedea10fb306da8ca258bd7d69a40 commit 1ed40b45066dedea10fb306da8ca258bd7d69a40 Author: Konstantin Belousov AuthorDate: 2024-09-16 18:34:47 +0000 Commit: Konstantin Belousov CommitDate: 2024-09-23 13:03:07 +0000 amd64: pml5 entries do not support PAT bits (cherry picked from commit e134cd9580ad62e87c8e8678bdbc45936b11ee86) --- sys/amd64/amd64/pmap.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 567382f9924f..9e6196de2e89 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -4371,15 +4371,13 @@ pmap_pinit_pml5(vm_page_t pml5pg) * entering all existing kernel mappings into level 5 table. */ pm_pml5[pmap_pml5e_index(UPT_MAX_ADDRESS)] = KPML4phys | X86_PG_V | - X86_PG_RW | X86_PG_A | X86_PG_M | - pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, FALSE); + X86_PG_RW | X86_PG_A | X86_PG_M; /* * Install self-referential address mapping entry. */ pm_pml5[PML5PML5I] = VM_PAGE_TO_PHYS(pml5pg) | - X86_PG_RW | X86_PG_V | X86_PG_M | X86_PG_A | - pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, FALSE); + X86_PG_RW | X86_PG_V | X86_PG_M | X86_PG_A; } static void @@ -4408,8 +4406,7 @@ pmap_pinit_pml5_pti(vm_page_t pml5pgu) */ pm_pml5u[pmap_pml5e_index(UPT_MAX_ADDRESS)] = pmap_kextract((vm_offset_t)pti_pml4) | - X86_PG_V | X86_PG_RW | X86_PG_A | X86_PG_M | - pmap_cache_bits(kernel_pmap, VM_MEMATTR_DEFAULT, FALSE); + X86_PG_V | X86_PG_RW | X86_PG_A | X86_PG_M; } /* Allocate a page table page and do related bookkeeping */