From nobody Tue Sep 22 14:49:23 2026 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 4hq3035kyYz6sK1D for ; Tue, 22 Sep 2026 14:49: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hq3033rJLz4gs3 for ; Tue, 22 Sep 2026 14:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790088563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1wRNZ8KIjdccVptZ6HqRCXJ1bv3pUAfpzcg7I8gZmI=; b=UEet4BW+lV7UKtJWGvnzPsbw0sYtYrjEM26HeBFzwKtJMe7EewudASYs5TQYQKr+ONRfVS QPtD2Tg/VFNM6rXY8dUQ7531m6mU0L9wN/tkZxiyx6Vf8BFmIzHJfN8wTgP8pYseNtBcFo VTM2wjzd4m9BD/b5mrX4MQ+Uqt+MqMS0AWX7fNEDqiHiQpMrOHaihEZQdqhlGoCGsac1hU PuuGC9F1nPrX6hnyZKDKCTRFo0qpI1jLm12HpHuCWLt316KWqmUyIp7rZcjg3N0NZpy6eu viyH49+3xq7kel8JkBzC9LxgchlihxVxG0Hk3chtSuGt/5kTP4tKnsAk4oQM/A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790088563; b=ZUrbHEqjRDSBU9J4iU9ec2apWEqxLipvqlzP9mu0hf7ZfSUErSb074/JyQdcDTWN+6RwfF F4ko7uyOy6AnyFpzNSdEoS5oJCN3ttTSexLREoELHymWTr6dppwecHG7CHFBr2SHVRwiuq G3QZOLgjoKDe15j/68Ni/EMTtTPh7n+FnmO/jotLXL6c+L647ZWuFO/HiEtEBmrXzWB3Ro hqylNa/au3QPif781hk/6utm2JIamMLDk8c3qSFLt87r0+SnYXijw7Tknb4wrAtOvbCwrV swpZp+KxPLvARDSuLI46kEwod1yLLXBoRzF8YyBTxVlsHuSM7RvcUNbw5LT36w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790088563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z1wRNZ8KIjdccVptZ6HqRCXJ1bv3pUAfpzcg7I8gZmI=; b=Afayzly3faHzn6Uk+vsNSDyq+omrcB+tmt0O+d3bT4oUhY7osbAe0nV8CwQiBWpFJVFbcm V/zW5pErNDxUTQzHGXXqRizGi1npuJrl7tRrqH6c1buhuJmP7Tl0QuvOhUNdEc28unMzBZ OwYAoK/i8e/awhKetSQHJi0+u3KFxcGXklXYq1af2Spce3e4xRcFZ6WwiVNG+uKm23GPtM Jda3QX6LaNmQVxjdCxxcgL0ZkQChXKRH3gHjCseiSEm/UEh/5ETGGil5aiLaj1GaifdsVU PyJyIYYpLT0ot3+TOWsOr6q+LjHvZCs0rXocTvMAZSRWaXzcPNVWaFM5IEUKNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hq3031Q1vz19YG for ; Tue, 22 Sep 2026 14:49:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2617c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 22 Sep 2026 14:49:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: ShengYi Hung From: Mark Johnston Subject: git: 9d9063e123da - stable/14 - amd64/pmap: Return la57 in amd nested page 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d9063e123daa9dab485f01d9087b5c7b984f6e1 Auto-Submitted: auto-generated Date: Tue, 22 Sep 2026 14:49:23 +0000 Message-Id: <6ab29573.2617c.36694477@gitrepo.freebsd.org> The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9d9063e123daa9dab485f01d9087b5c7b984f6e1 commit 9d9063e123daa9dab485f01d9087b5c7b984f6e1 Author: ShengYi Hung AuthorDate: 2026-09-11 08:22:39 +0000 Commit: Mark Johnston CommitDate: 2026-09-22 13:01:16 +0000 amd64/pmap: Return la57 in amd nested page AMD doesn't encode page depth in eptp. As a result, the page level is decided by the host la57 value. Without this, it uses 4 level page and therefore cause machine enable la57 have garbage page translation. PR: 291768 Reviewed by: kib Tested by: Antranig Vartanian MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D57978 (cherry picked from commit ef26f64c11220ea303de16d088c585f9d2908b0f) --- sys/amd64/amd64/pmap.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index bae3735eeafe..af0bb5cea262 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -448,7 +448,19 @@ pmap_is_la57(pmap_t pmap) { if (pmap->pm_type == PT_X86) return (la57); - return (false); /* XXXKIB handle EPT */ + if (pmap->pm_type == PT_RVI) { + /* + * AMD nested paging has no field to specify the nested + * page table walk length; the hardware derives it from + * the host CR4.LA57 setting (see svm.c, where nCR3 is + * loaded directly from pm_pmltop with no level encoding). + * The NPT must therefore have the same number of levels + * as the host page tables, otherwise guest-physical + * translations are walked at the wrong depth. + */ + return (la57); + } + return (false); /* Intel EPT encodes its own walk length. */ } #define PAT_INDEX_SIZE 8