From nobody Thu Jun 25 00:50:54 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 4gm0bg1zPtz6k5H7 for ; Thu, 25 Jun 2026 00:50:55 +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 4gm0bf6rtMz3Zjc for ; Thu, 25 Jun 2026 00:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782348655; 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=xKCIxEMiOVbLst+NC3Nzqw7Vr/SSPtNiy0l+ODYzl0Q=; b=ftDgpcs52Hi0QT5KqVMo1PoDrmBbcrc6aAov2PlfG70olW9D9dMBKNzSSU/AbhLgit7bWq 1domLdIUoaW3rUlnf0EeuYJV0Uf5Yj9Y5OTweCWvzxqUvC+N0/+qBQ2xj8+gL+8wCngHdn 6uraAsuXZzMHKW7Xa1dUHOrhLBuuIQ2SN72oxuwRR5zKNaiYL+RCleDHTxvgIxLn2h2Nfx Q9je6IbuBb7tIumZ1xMAAZgt/P2vgX2P4dtnyiPhLkmFYvJFiO2YDQNOs/Dk6Kr0FLmDMS zyDMHeA4fhbXbq5yOjRRqAam45Pfm9cM041CNs6FYTly5rH4zoZQmqk2hevLFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348655; a=rsa-sha256; cv=none; b=BZik59IOEuZJbe2m3kyG2MN4HlZmhsD7HjtNRZjC9A9IeElsTA3lG7DKdeGC8repy0hfb0 vNdY2Sj5UlsqQeu2OwDyW2AgqBFLY+37QP9SKWv4X/+vnbMEDxJ3oV83ug54mIBVI6rlqo NRwJPJZ579/42FC62TKMKctMaB9Yk96DKpiTy3YhMZ1PJvZ+zsRztVkVeppFdWtH5C8LbE alsk9/Ni22eLnDa7uuDKDLf9hpB2fIINPTmvVYPSjhBXx9Tu9WuNaku6ItpzOq0/FJ0EO4 T8S8s8gF3K5qkcJLEVIY4H4IXZxJLASk79G9A7JR5EC4yPfm8xpizQddo0ApUQ== 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=1782348655; 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=xKCIxEMiOVbLst+NC3Nzqw7Vr/SSPtNiy0l+ODYzl0Q=; b=xMMidgeTgbZqqHe1ffGLuL7Nf6tOIdHm86Uyh5cdWHRTT1B6VM/mKABcyAlN8PdU37J37y SAR8frzKNAPM3fUIGK73D0o6YcS4bzEemwdC0WP+pHzA5rp64i0SXyEhb+OY3m/v3xbbtW BReqWMR8+C1RqcsuGlnAJFlkKL8eRMp69yhPy29YzdWnckgDl+1bFI0t9Ef5EdKW5m9u8A BtWUCh4xQhTZr6eY1m70imPhSnyarTXVB8jshQDKOlrb9JisotezQ+yLhzGAer7s8aCjT6 X9y1CzOV0173KNP7XM17PXqaPMkWMvIVUcBx8d2v3M8GOk8VlDoPSYBZa3RfAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bf500Zzkby for ; Thu, 25 Jun 2026 00:50:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3e35c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 25 Jun 2026 00:50:54 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b4bbe15fe4c7 - stable/15 - amd64: do not restore fsbase/gsbase for 32bit processes 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: b4bbe15fe4c7f168af996e1bea62b947f2fc500a Auto-Submitted: auto-generated Date: Thu, 25 Jun 2026 00:50:54 +0000 Message-Id: <6a3c7b6e.3e35c.791c1ef8@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4bbe15fe4c7f168af996e1bea62b947f2fc500a commit b4bbe15fe4c7f168af996e1bea62b947f2fc500a Author: Konstantin Belousov AuthorDate: 2026-06-16 21:44:00 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-25 00:50:23 +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 babfbacf92ef..afdcdeedf0f5 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)