From nobody Thu Jun 12 18:03:00 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 4bJ9P147pNz5yBLq; Thu, 12 Jun 2025 18:03:01 +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 4bJ9P04vvmz4Pgs; Thu, 12 Jun 2025 18:03:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751380; 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=/Fw8GRt+CyqtLt/CP/PGDo0YejxBqdlArpKNVopXWOU=; b=F+W4s/xwZHXhqT3nO/PQEQCHkdr+8uLc4TiP0KSQt4c7hzZ8AIISITMf+9ZrknvVmlgF71 smM1VEJtapoyWwkUD1KSjfvBLBJt/tPvPbN470J+sc9PFq7negWe6oso0UpoILSy5avgBt KrHDiYem3WZCglf+3hkdYfaR2uD4YBbte9NTi7kghiYP+uzMoBGfLA5xkGGn5LLXul47zG aT6VsE4rRi9TrmdBkkN6/LdNHgl+Pxr2wt9wwsjAbsQWAelQQcENsYXMlNpkoFv2bkXSmp LqRlBBUDHifFn84LCMIz0Q9WUwpVsq5QPm4kiPdzqZP6l5eybeCuy3Q+Bn7zSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749751380; 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=/Fw8GRt+CyqtLt/CP/PGDo0YejxBqdlArpKNVopXWOU=; b=RVTdDSwQW5Yhrv4KdwiS1vFbmzEcYeDKh3jjTYBAHcwagX7XwoJakmSRRNXZWetWhowt75 bFH5T1jtdM1CD6xXrxaECgN2rGH/ppP232SQ002QwP2V2RjEM46ozF3SCWSk+/HfWeFEA+ bjTdpw7KfBWbQk81fSy61+jZLEacogb7voOytB6UyiCxa3rLtuycLuUIjxLerogZTgdT9O +oed2Fukwp7xCgJwLNTTB0lqeP9xc7SuXFKlwHeoHwWBYKgSTzUuaw6zqWn4mVEIRFSYe8 bC+ZSaGA7Plb3J3chlrIAd1Le9CYsSD6wkoYJ3nHf+R4y+Y7PQ5wVoCmUHaXkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749751380; a=rsa-sha256; cv=none; b=MLMLVEdI5VcRFg17T9sJRVLcQOlzWw/famrv6ReIjDnLS26wOij5O2scVhjP953tKniWBZ 20EIu2ziyKljuQeDreXyvn023jItUzd0b7z2YknFXRrE9Pu/vJRDxuweGuwm7GwikrUAOD 3PiPWE71Ns1QEa/L9pRHuiopfBtB6A1LviZCNR/NCerFmNOCezMr5SMvLSS/yY8/ljpRi9 dCseFKFhDrI2q7dVITPdPqy21hqUxAHRwUFDIJVTzuqpJzb7T2PQA4iL7zI1Dd0PUVBFw3 OrMVu4ufLgz270AKLJUMUhhFOetBXpMlguz3jU3gjTOAiZZRuUZNUErCphe3TQ== 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 4bJ9P04PZ6z7WW; Thu, 12 Jun 2025 18:03:00 +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 55CI30lw067081; Thu, 12 Jun 2025 18:03:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55CI30Je067078; Thu, 12 Jun 2025 18:03:00 GMT (envelope-from git) Date: Thu, 12 Jun 2025 18:03:00 GMT Message-Id: <202506121803.55CI30Je067078@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: fa10e2fb8822 - stable/14 - amd64: add mc_tlsbase member to mcontext 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/stable/14 X-Git-Reftype: branch X-Git-Commit: fa10e2fb88224b1b30abb6c94a9cf4c99ce5103f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fa10e2fb88224b1b30abb6c94a9cf4c99ce5103f commit fa10e2fb88224b1b30abb6c94a9cf4c99ce5103f Author: Konstantin Belousov AuthorDate: 2025-05-22 06:55:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-12 18:02:50 +0000 amd64: add mc_tlsbase member to mcontext (cherry picked from commit eea3e4dd9703a252509d75814049aa8da5007ebb) --- sys/amd64/amd64/exec_machdep.c | 6 ++++++ sys/x86/include/frame.h | 1 + sys/x86/include/ucontext.h | 8 ++++++-- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/exec_machdep.c b/sys/amd64/amd64/exec_machdep.c index 71e33e5b14c1..b9c69b7d5a2f 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -637,6 +637,8 @@ get_mcontext(struct thread *td, mcontext_t *mcp, int flags) mcp->mc_gsbase = pcb->pcb_gsbase; mcp->mc_xfpustate = 0; mcp->mc_xfpustate_len = 0; + mcp->mc_tlsbase = (pcb->pcb_flags & PCB_TLSBASE) != 0 ? + pcb->pcb_tlsbase : 0; bzero(mcp->mc_spare, sizeof(mcp->mc_spare)); return (0); } @@ -711,6 +713,10 @@ set_mcontext(struct thread *td, mcontext_t *mcp) pcb->pcb_fsbase = mcp->mc_fsbase; pcb->pcb_gsbase = mcp->mc_gsbase; } + if ((mcp->mc_flags & _MC_HASTLSBASE) != 0) { + pcb->pcb_tlsbase = mcp->mc_tlsbase; + set_pcb_flags(pcb, PCB_TLSBASE); + } return (0); } diff --git a/sys/x86/include/frame.h b/sys/x86/include/frame.h index 80e4a968ed60..a8836a705d39 100644 --- a/sys/x86/include/frame.h +++ b/sys/x86/include/frame.h @@ -154,6 +154,7 @@ struct trapframe { #define TF_HASSEGS 0x1 #define TF_HASBASES 0x2 #define TF_HASFPXSTATE 0x4 +#define TF_RESERV0 0x8 /* no tlsbase in the trapframe */ #endif /* __amd64__ */ #endif /* _MACHINE_FRAME_H_ */ diff --git a/sys/x86/include/ucontext.h b/sys/x86/include/ucontext.h index b7964e8c7141..00edc8c16bce 100644 --- a/sys/x86/include/ucontext.h +++ b/sys/x86/include/ucontext.h @@ -99,7 +99,9 @@ typedef struct __mcontext { #define _MC_HASSEGS 0x1 #define _MC_HASBASES 0x2 #define _MC_HASFPXSTATE 0x4 -#define _MC_FLAG_MASK (_MC_HASSEGS | _MC_HASBASES | _MC_HASFPXSTATE) +#define _MC_HASTLSBASE 0x8 +#define _MC_FLAG_MASK (_MC_HASSEGS | _MC_HASBASES | _MC_HASFPXSTATE | \ + _MC_HASTLSBASE) typedef struct __mcontext { /* @@ -158,7 +160,9 @@ typedef struct __mcontext { __register_t mc_xfpustate; __register_t mc_xfpustate_len; - long mc_spare[4]; + __register_t mc_tlsbase; + + long mc_spare[3]; } mcontext_t; #endif /* __amd64__ */