From nobody Wed May 28 11:11:42 2025 X-Original-To: dev-commits-src-main@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 4b6mzM0wkyz5xKWj; Wed, 28 May 2025 11:11:43 +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 4b6mzL401Xz42Hx; Wed, 28 May 2025 11:11:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748430702; 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=TjgkMFeH4iYVtPI9Bllm9+t2s/zXxeSb7s3wePGUzSI=; b=wNUD93xtkG/bymisFiAkD2JVw6EWcEQ0LDUq6sK9ZUlTsmJv9tVm+/WZb0DYglCTliUw4B QH9xLNCN/fM7GWu8WV7cH57K/dWMRvdeDSJB9YeFM9JwKZaQhgMVRbgN0Lwb9VcjW2PNmf HsrcDqD8cvlWM7OV1xuq/P6tQgG9zOzEr/9FyH/kNhrzgXlBQZzs8bnLc8doxtCmh/jkog P0jbgChUku0CKUK7pdxPY3ovhtgZOG4yuOX/eUbOzVDWIU75/ub8e8R9ozOirrlIrTyaMm knZIWGVI65shfwtL86Sc6SZmgjTwp+NwQIPNqUkf3FmPgDSzNL7lw42XeHFhmQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748430702; a=rsa-sha256; cv=none; b=y2ymOiCqu8XimJb8YONQW1bjAulFgXl7n69kcUZNxfUd5d/+kQdl39TxYjUVUNJSdtPWUZ ohUqh7wczTUwV4DwzQituzqgq14XaDWAYExevsksGVZS7xnSMTxcjHtR/McQJq0Eqw2JqF 5AAIrAkzwZBLUhHCM4+KzdTfEuD4I9v/+z5xQAkLh/xcjnNVxAVjGHsvw/y5mg/6BxJkMP jUfaqj9uEQlJjr0O2CjnTooUns54xRAcCRWeYrK2+6jtdZqqcG6RBgRr4iRfQajnk5Qw5Y ZTfk4C0xy/ljh+pU2VH9FtnguJJzcjqQZwISil2Wu0ovfVlJJ6EUK+WCIb0NDQ== 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=1748430702; 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=TjgkMFeH4iYVtPI9Bllm9+t2s/zXxeSb7s3wePGUzSI=; b=CUsDWD0cq1BsnFwhFUz8FTBSTf3zA8WlNNG7t8jJfqWKCNMmgTXeauHZDV7D43+fIByvPD GkI0fRmziyMs4Je3mati/mwrNc8yxifrofPPtq7l0AzvjPjY6FxQm9Z0kjLjW+ahqXK5/O cBrPWswev8mn4duOq0wIhvCFkaDXa0T227GIkKw0sd8APIq8TPwNFRPCmJOQIxp9SCMe6f UcfFW9lEy1rpVpX5XVV4xEkqxXzH2lQdYUToYfsybNvEf5BhkUKLgyzzW+sZl1haT0mcIC 9btuXst8BlN7EBGQnzI7AkZnrKEG50zJC3DiUzXG7HCkrUzzfxwzZpzpTq9eQg== 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 4b6mzL3YYzzc4Q; Wed, 28 May 2025 11:11:42 +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 54SBBgrU049585; Wed, 28 May 2025 11:11:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54SBBgf0049582; Wed, 28 May 2025 11:11:42 GMT (envelope-from git) Date: Wed, 28 May 2025 11:11:42 GMT Message-Id: <202505281111.54SBBgf0049582@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: eea3e4dd9703 - main - amd64: add mc_tlsbase member to mcontext List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: eea3e4dd9703a252509d75814049aa8da5007ebb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eea3e4dd9703a252509d75814049aa8da5007ebb commit eea3e4dd9703a252509d75814049aa8da5007ebb Author: Konstantin Belousov AuthorDate: 2025-05-22 06:55:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-28 11:11:23 +0000 amd64: add mc_tlsbase member to mcontext Tested by: pho Reviewed by: olce Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50482 --- 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 46e4f0c9e07b..da68289e2c83 100644 --- a/sys/amd64/amd64/exec_machdep.c +++ b/sys/amd64/amd64/exec_machdep.c @@ -635,6 +635,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); } @@ -709,6 +711,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 9574e8c0ed02..994e19b979fc 100644 --- a/sys/x86/include/frame.h +++ b/sys/x86/include/frame.h @@ -152,6 +152,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__ */