From nobody Tue Jul 22 14:03:08 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 4bmf9p03YFz5pS3s; Tue, 22 Jul 2025 14:03:10 +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 4bmf9n186vz418y; Tue, 22 Jul 2025 14:03:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753192989; 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=kYV9bcR2UfldIjG0w+Lkx4bzv9XGqdtnID2Y7Zt5eOM=; b=OwPh5/vOF1x6j6b2pCZPY8pw9j9YD0ARRTskwmgXG2Uz+bfYPW4u7qtqYrVBgHe5QXJp3A h9++KBAASu7La8zDV60RapnZcn4yP6Vmn2m8FYgn/X6qxhjX/eZFXdiSUzbJFdfoT09fKM fgOxvyq7D+ycwFTtABR3Qajl9TOEvjuOC/iKt12lbbVI1RODJ0T/wS0b8gL109iMfTPCcP RHPYbjOt8R/difFZHp8mltYwhRS2pu2ywTG+xiDFNVPqS7ZecqQ0q6RQF31tybaR9zvQfC Kgo5LO6X0P8MewS5FEwg0j+3r4ZbwEqc3B9NDUFoNP6oumHRujH+FEq9vN7/4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753192989; 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=kYV9bcR2UfldIjG0w+Lkx4bzv9XGqdtnID2Y7Zt5eOM=; b=mAvhAZPAau/mc1Scahi3dh0NW3fH8PFswoBTMKeJ731IYdneQyVhAeT6KX5SVv0BkfHtra zmZMRMLb2p03cqjy9YwagN7q1k9GujmKG0zxA5LWvNRP8ReIjSiHw3DioHgaNxQ9wcFPvD IhdgCP8livO3gqahXxWPQ1sgUncfM2encO93vVL/DDHxdBB9WZxlW1qK7gR2awrO+CsZTc B6Vp5LVMDX2IER1t7S1aL4nbkjZn86QdwcDJIenFn+LmTBxhmcaZkwJNU2G/tgN5N+vuXC iPll4+ayjeVmbwiCQQ8R+SsHOEQSXyH6bczGWYxrt9oZ65kV4yA9vARW0VEKog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753192989; a=rsa-sha256; cv=none; b=uAGC94j5gMIKUt4B5U3pSVntJTo/cQxU1XyiPYw6g0hZPXAcjXTUhr4p4nHtlppSK88YoT klJ+jOs0qQG/kapEvU3amzrLlq7T+t00KjPAf8YHwz+hu3QQRl3fr/DyPHjNMYO+hXzq55 ThtUSEuzQlnhm6vGQxp4HFrVQgV6JvlprhmJFofSyuQYUJo9ci1807y5bVvL+s3FfD6qYT 04SpoT4fnv819gnRR/ABxW3/ywX/pSQIfGngqTEFB2+jvZ26z7PF6zEHXnZIKbu70ykLk/ E6y2TvBqJ8b5m18gVRtwuIuPJUeG7sCyznJFVVgHFVkyZ5UgmnldnQjm0srT5w== 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 4bmf9m6bh7zTtY; Tue, 22 Jul 2025 14:03:08 +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 56ME38X6071107; Tue, 22 Jul 2025 14:03:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56ME38BT071104; Tue, 22 Jul 2025 14:03:08 GMT (envelope-from git) Date: Tue, 22 Jul 2025 14:03:08 GMT Message-Id: <202507221403.56ME38BT071104@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: f6ec18e200ab - main - amd64 vm.pmap.kernel_maps: provide canonical address switch for la57 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: f6ec18e200ab323d50ec8d051bda8f22f4beaf69 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=f6ec18e200ab323d50ec8d051bda8f22f4beaf69 commit f6ec18e200ab323d50ec8d051bda8f22f4beaf69 Author: Konstantin Belousov AuthorDate: 2025-07-20 13:24:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-22 13:59:10 +0000 amd64 vm.pmap.kernel_maps: provide canonical address switch for la57 Reviewed by: markj Sponsored by: The FreeBSD Foundation Differential revision: https://reviews.freebsd.org/D51453 --- sys/amd64/amd64/pmap.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 9805184bd07e..6fac8318df05 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -12042,8 +12042,13 @@ sysctl_kmaps(SYSCTL_HANDLER_ARGS) } /* Convert to canonical form. */ - if (sva == 1ul << 47) - sva |= -1ul << 48; + if (la57) { + if (sva == 1ul << 56) + sva |= -1ul << 57; + } else { + if (sva == 1ul << 47) + sva |= -1ul << 48; + } restart: pml4e = kernel_pml4[i];