From nobody Sun Apr 27 22:32:49 2025 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 4Zm1YY4sdsz5vQr1; Sun, 27 Apr 2025 22:32:49 +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 4Zm1YY1dlsz3tDv; Sun, 27 Apr 2025 22:32:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745793169; 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=CgbfATEmaurC+T8iC2BWHTmNNqw9nMTFtiWdn6Q8Bfc=; b=Ddl+iqIINKrvLTh6W2bGJxgQN83RPPv+OK02W66KS8Q82MX+7mhXjvD6kg30kjKRgeHI8s 6ipYN0yUHKzIGEZWfJOSFr7quRMj+L+ztUMPi2MZFahsyIWJpHYxjK3Lowp8RJ+SQeO+ty 4KDa2rvddSi2DUB5shzC+3boPCZjb9DpLmk75u63llRkW8UxfnaAVNQu5LeebZaCV+6One FgthUPoWhmzKPK1+EfyOmm0Xz/7GRyx1nAxQ3bk0uD9GJt9j7OEJNJFKFFwNcmzakFqFPL Fv5o+qoMUUN+5+PtoVWAtldtnnFlNY5jOGMk0ngq1zyvPPeox7qaVsZ3o/nKwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745793169; a=rsa-sha256; cv=none; b=g2sjNcmBN8OvNvYjjXvpRYg/7qhe8gXLVMY0qKhRV4R7EEFaWEZa3oLotjsWEuO3OaxqSH IKI5eLlbzgSDK56BuLXn4vMZLvN7NhyhU9ePjvxONGPR5TZLOEUqmK3qn1lqIgM7yEHtRN Rs24qTG00w5YI7kBsgYKNB9rRy32lCcI8/8xZKch5mZrNT/+1GxCbfJ46+aacYkmthaiU4 KQFwLdMAygUy69Cw6b6TtVjXk3o1ocZb2wIkqIGol2LrZdqSFJ5F3sBQv5Ob30iwE1KKi9 S/s9d/fdN8exHD3uGDriR7jkT7gc7urHYaLMW/dDhOwUNApsjKmpSMAaqjr0cA== 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=1745793169; 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=CgbfATEmaurC+T8iC2BWHTmNNqw9nMTFtiWdn6Q8Bfc=; b=shLAxglH+mU4Vx1gj989mt26H/AsHjPLMeYQnH7N03D/x6FJWs+oYS16VPC/vrHly+XjCT PNuzHJ7YRj9jDvHrM+AKtDptMsSFamFLqd5ZZqOLmut2YnP6SlZScIfItPx6FNNKgsnXq8 170RKaGtLbwjtBoUvp/tbAw1s2bnwpmYjzLvfnGxTB312+iQBS9JzWwzmh0o7MFs45+jDB Oh6HV4pctJMJI34SsK6CgReulEblPxXLimvfnsq7bq57KjK+rMnzj09gdvxpsa0P/nuZvC kgtGvJ8FF5Vm4Tzrpaip/BFv5zG81He6LqqnGHt/uPdJ7vcFfWkq+YECGnGVaQ== 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 4Zm1YY0tzQz1NS6; Sun, 27 Apr 2025 22:32:49 +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 53RMWnMJ069510; Sun, 27 Apr 2025 22:32:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53RMWnbn069507; Sun, 27 Apr 2025 22:32:49 GMT (envelope-from git) Date: Sun, 27 Apr 2025 22:32:49 GMT Message-Id: <202504272232.53RMWnbn069507@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: 7a8440bf0894 - main - amd64: make LA57 mode for a process opt-in by default 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/main X-Git-Reftype: branch X-Git-Commit: 7a8440bf0894f910f871e91a660a9f66dbb23f0b Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7a8440bf0894f910f871e91a660a9f66dbb23f0b commit 7a8440bf0894f910f871e91a660a9f66dbb23f0b Author: Konstantin Belousov AuthorDate: 2025-04-19 10:55:18 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-27 22:31:59 +0000 amd64: make LA57 mode for a process opt-in by default The vm.pmap.prefer_la48 manages the mode. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D49913 --- sys/amd64/amd64/elf_machdep.c | 4 +++- sys/amd64/amd64/pmap.c | 9 +++++++++ sys/amd64/include/md_var.h | 1 + 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/elf_machdep.c b/sys/amd64/amd64/elf_machdep.c index 0e6c8d310dfd..6cc2d58bbbcc 100644 --- a/sys/amd64/amd64/elf_machdep.c +++ b/sys/amd64/amd64/elf_machdep.c @@ -170,11 +170,13 @@ freebsd_brand_info_la57_img_compat(const struct image_params *imgp, { if ((imgp->proc->p_md.md_flags & P_MD_LA57) != 0) return (true); + if (fctl0 != NULL && (*fctl0 & NT_FREEBSD_FCTL_LA57) != 0) + return (true); if (fctl0 == NULL || (*fctl0 & NT_FREEBSD_FCTL_LA48) != 0) return (false); if ((imgp->proc->p_md.md_flags & P_MD_LA48) != 0) return (false); - return (true); + return (!prefer_uva_la48); } static Elf64_Brandinfo freebsd_brand_info_la48 = { diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 9ff630de5b6e..4ad1335329da 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -431,6 +431,15 @@ SYSCTL_INT(_vm_pmap, OID_AUTO, la57, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &la57, 0, "5-level paging for host is enabled"); +/* + * The default value is needed in order to preserve compatibility with + * some userspace programs that put tags into sign-extended bits. + */ +int prefer_uva_la48 = 1; +SYSCTL_INT(_vm_pmap, OID_AUTO, prefer_uva_la48, CTLFLAG_RDTUN, + &prefer_uva_la48, 0, + "Userspace maps are limited to LA48 unless otherwise configured"); + static bool pmap_is_la57(pmap_t pmap) { diff --git a/sys/amd64/include/md_var.h b/sys/amd64/include/md_var.h index ce6f05fa1739..b6ddc6eaaebe 100644 --- a/sys/amd64/include/md_var.h +++ b/sys/amd64/include/md_var.h @@ -50,6 +50,7 @@ extern vm_paddr_t intel_graphics_stolen_base; extern vm_paddr_t intel_graphics_stolen_size; extern int la57; +extern int prefer_uva_la48; extern vm_paddr_t kernphys; extern vm_paddr_t KERNend;