From nobody Sun Jun 28 23:51:28 2026 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 4gpR5K3smGz6jRxv for ; Sun, 28 Jun 2026 23:51:33 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gpR5K3M4Dz3ShK for ; Sun, 28 Jun 2026 23:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782690693; 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=N3Tg05frAAWfG2XODYwwkNpDihXrdS5ki+BDeYoZzKs=; b=hXUQgR4mWGGq0vfWl9PY3Vajcz/USLc7Pl48q0jN8reKz4qsNyoE48lojkB4PsrYep7tZB 9p4RisZGACklFDoxziRNH5Re+BR499LJWu7gVIyIaV4KhVXS/a7Sa8zUy2wLv2iOrrH8n3 R+ZGDuw8d2j7TwommvnydSEs672sU4o82AlzYyFB+z2sUxBCH9QxcOEHIyIUiwhoprsews 4spyOYwjhGsttMFIpu5fJWkKmqD3/EASKEqwsuFKmg1XRAbm8Ss5oUnQYEyvoi+tUGlxNx NOTa3X0M1tQ8lcx5ig1y0Nfm287uD7NXYvdghV90kP4xD7JPJioMrGWxJkmeLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782690693; a=rsa-sha256; cv=none; b=ZfK0e9wtH/6lbWlTca90sgbUsiw7uMuvWOXQxMMmlEvKN+8pUxn7pK+zeW3tXnpvem9iFR /pHPXmUs/w61wuFc+QM2eBNom9JMVyu+u5Vt8V2ExiSVr1h7RZb7uQsM77zV6F5G3wI7wf BEB0C7csi4AgWCNbxefzKtUdRAMCVdI8clZ/IRA4qJT0E8CNF6QPPucbPphAele76rWEJm +P3E7TUh/JqCTE4QMSmxqlj9A07O06iLFUbeH7zgvsqzI96Nz9ny3KVVru4weXYVfYipVu ntCJyuKkzdltVOJEoGSeHmwS4dngBnJn7n0rWyG4uWR3fKhOb9ScDyCS7rCHsg== 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=1782690693; 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=N3Tg05frAAWfG2XODYwwkNpDihXrdS5ki+BDeYoZzKs=; b=LwNntkJuukriZIDgMISDVoedS7PgcBq9QSDYjUdoEP15k5SlYTRtsTyV9Ifj/Pc5Uz37VH 6KvjfdgRZ4vV4eVp5dd4aFpzNFUu5HdeFHaifNSC5VKm1kKQQlyMgRHYHfZ1N48pyzPNwd 2EcKUqJbTvkzD+gj8TNrDD2ttdA1gBk6zhBKN/bUxfpbPiBW1yRtevL8oNbAAh74pNOhVi zhC6ob/L6APcaHJy8Jdp6DvTV5riycouX/8BDOpXHhsCdM+wT12EPV/3QsGxI+oYBoz8zC p2urra/hTBxE7x0KT3rPmnBzAKjHbjZ5hjRFA8pjkqlmsy6FXGPC6N9Y5OL7/g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gpR5K1qbRzYwW for ; Sun, 28 Jun 2026 23:51:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4387e by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 28 Jun 2026 23:51:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 59667b7653a3 - stable/14 - amd64: do not restore fsbase/gsbase for 32bit processes 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 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 59667b7653a36da41a647d279461f8721cd66e6e Auto-Submitted: auto-generated Date: Sun, 28 Jun 2026 23:51:28 +0000 Message-Id: <6a41b380.4387e.47a7477d@gitrepo.freebsd.org> The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=59667b7653a36da41a647d279461f8721cd66e6e commit 59667b7653a36da41a647d279461f8721cd66e6e Author: Konstantin Belousov AuthorDate: 2026-06-16 21:44:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-28 23:48:26 +0000 amd64: do not restore fsbase/gsbase for 32bit processes (cherry picked from commit c7e5802ab6e6230a5782a09c914585d055eb5223) --- sys/amd64/amd64/exception.S | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index 797b2fe748f3..3617bc4c9192 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1161,12 +1161,15 @@ do_segs: .globl ld_fs ld_fs: movw %ax,%fs + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz after_ld_fsbase movl $MSR_FSBASE,%ecx movl PCB_FSBASE(%r8),%eax movl PCB_FSBASE+4(%r8),%edx .globl ld_fsbase ld_fsbase: wrmsr +after_ld_fsbase: /* Restore %gs and gsbase */ movw TF_GS(%rsp),%si pushfq @@ -1179,6 +1182,8 @@ ld_fsbase: .globl ld_gs ld_gs: movw %si,%gs + testl $PCB_32BIT,PCB_FLAGS(%r8) + jnz ld_gsbase_32 /* Restore kernel %gs base */ movl %r12d,%eax movl %r13d,%edx @@ -1194,6 +1199,8 @@ ld_gs: .globl ld_gsbase ld_gsbase: wrmsr /* May trap if non-canonical, but only for TLS. */ + +after_ld_gsbase: .globl ld_es ld_es: movw TF_ES(%rsp),%es @@ -1241,6 +1248,30 @@ ld_regs: doreti_iret: iretq + /* + * 32bit gsbase path. + * The KGSBASE is not loaded from the pcb_gsbase, instead we move + * the GSBASE value into KGSBASE right after loading user %gs, then + * restore kernel gsbase. + */ +ld_gsbase_32: + /* Read the user gsbase into %r14d:%r15d. */ + movl $MSR_GSBASE,%ecx + rdmsr + movl %eax,%r14d + movl %edx,%r15d + /* Restore kernel %gs base */ + movl %r12d,%eax + movl %r13d,%edx + wrmsr + popfq + /* Load the user gsbase into KGSBASE. */ + movl $MSR_KGSBASE,%ecx + movl %r14d,%eax + movl %r15d,%edx + wrmsr + jmp after_ld_gsbase + set_segs: movw $KUDSEL,%ax movw %ax,TF_DS(%rsp)