From nobody Thu Jun 25 00:50:54 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 4gm0bg0mPGz6h6X9 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 4gm0bf66Mjz3Zl8 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=1782348654; 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=MjxJLryWvcFJR+Sbnms7SMYkjYOYTilhUIuwI0ZpU5IImCkbzTcRI0EZjmSqWUnS1IK5Yb fAEqQZis9jO71vwFQH3bUl/xXM3hZkhk/DjYVkJUgn938odFb2TJjJtC//gILNRVs0wJF2 xfrr5lYPuKl+XNtgNQbecWP6GrfkXYnDTaf4PTvHpaJiagz+vCFEkrMZ2291oUNPCCsYFK LfJg6Jiu1X6jKm+AADlOqFHlgagPMhTaTDXzCdCQvBABWYiawEG91mLrCY59sGXnwFZ7un HFbJPQnmCgqCVkd/aAdnnRTIZ+S27/F+Vm9+0RVk7dY64IUFT7zkFTpiJm2XxA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782348654; a=rsa-sha256; cv=none; b=mU6Y3x8fQjdznoAbixI5Qrw+pqm/WfdQk6fB0sJW8l1Br+wDpfX8aXBnBemXqFUWQ5Aq2F z8EUJO2MGV2l6O1AveP6v51+VZcXmW2x7AVBw1YhHOh8BqgzWRE3uaM0qJxPyMQ68Cap72 ACS2NV8lyYTHzUAD6BOelLIa23fdSaUeuQYhMoEgNy7eaIdjXKYQ7t/RzpGknrRtut74Bf GCHe/ffGsnzoHldr+iVxOUXyc2Fy/tHysUhjZ5Ahm8HS7Zm+UJ+7Sn1m+VPASYNtlAL2eR flA6zuHWvrZiz4qbh0uWXQoZazjdXlQv5NFvpKrQmlqHZEM4gIHUUCKPLXzH6A== 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=1782348654; 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=oqVhLPFPbDL8KBbztfjkuBy6gu2FoA+VdL/snzLPRR4vR8ctwnwrtN47bn6DSo0cXLVJZz LeEfb34G9wed17hI+dWGDfnMTME7+IaVN00SpoH9ScNcefl09fq76EhL1jlmYjlSzVO2qc iwdksXPpLMDmQ05G7blELD2T/rSjESiTJfWxhYmZ9Ze/ZITXSq///yQ0yj9KRbVMvQhGKm ll2Q4o7LMyEkbJ+/gvaeOawZuXi//iWvOGAdWAXAcVGSyw9lYU6smhyg4viZcp/lTJWj85 dxuyXLXRuMEZErULf3jJc2yNwcLCNsM0aSS1trbxoejf+sAmfK3VhWlWVRRpVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gm0bf4zxhzkRg 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: 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/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)