From nobody Sun Feb 1 21:41:09 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 4f438k0KHyz6Qjvh for ; Sun, 01 Feb 2026 21:41:10 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f438j4gp0z3G19 for ; Sun, 01 Feb 2026 21:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769982069; 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=xKC96vP40nkRiNMrZgvjo/Mdnd2G7JR41/GEoKPUTjw=; b=OPEVMOz+6XurpVC+ae5bWWNuSQDyflNGpmzpNfeaKfbtal1UdaeUvU7dlJSF8FeruNcudX T/iPRUdtK3uw2CsoXz9fHNa/w7MptxQ9j/qCSRzoCOpZfCi7LAie2p2Cd75sbPWChLXOK1 dQq/NLvUqTyLYW10EjfbLmj9QO+PToBnJXOS26BOHMxfI9gcxXHfNipM9086X07hgxQyGc BPANhGUOH5DY8fnrRY5prwqekfx581f0W+R/jakfY9b0M+t3dUFvSLL6ijlEgY/wd+tDYz n03pqfeR+U+jdpzl/9odE3EDIPs1Rt1fooOewTj/Wp6zphH3BVBdAk5xDD0IUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769982069; a=rsa-sha256; cv=none; b=aTxn0IMWq/TSGTzUuf2JQBjKX+m0IBjXPsAcoU68Lv9mgwFz8/ojCTShvUPrqit3DQSvmV XT4zM8O9Hc5b3Nve2Az4mRq1vRBiooYPLJAyJDH/lfL1KN9VqIEKPwUm+LsheL6IgPhcg/ ho0V5b3sNiaRc01l1Ol42rwfwLyAUzEgCnaq+cfJ93EPDnnKzosZoXo0uFsyB+Ld0UCX4B aewP73limWAIKVnuZUjM610FhHwasdIDj7q6LjwNO0oN01FONzqXV3YYxvsiTWU+MZOQiD sOENt2mFSQ8EW8279mZafl9L44LSXDce/zWL0MehaokpJhtI4rJe1mrhBw+6uA== 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=1769982069; 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=xKC96vP40nkRiNMrZgvjo/Mdnd2G7JR41/GEoKPUTjw=; b=vSJECzGg+eyAnvcolgUA+yDE492YYmvOZpzJi5nu5sO2zwdC7RN+jtgWSxIZI5JTW+wRPG QFLunkaVyI3LPPxgpIHfQvrFXGhrjvNvzGMFB2a08YEP95+JfahmR/hYUSIYnMcjrIlKYM AT1VVog1OsSLfdIH5qQtUNLIaFfgVcrHrhn8+Mm65YJfsOvB4ql2TnvpghmEE47e4ZveJF 2oiB5HmedjxbZ3J3bpwS6WeTZDTUK1J7ZsY2oF5QXoMA345uMQASmmBXienrMKRD2XkiQq c0Rh6LbKSAOdT/3kSQntp2f2qB5g75sxZXToGK+CVr1QsgDWVX0Wh//iNC4BLw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f438j4CLJzy1B for ; Sun, 01 Feb 2026 21:41:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3dd03 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 01 Feb 2026 21:41:09 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: c5fc8e4fdb09 - stable/15 - libsys: add pdrfork_thread() on x86 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 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: c5fc8e4fdb094289f81f4aef8a7859d6fc9bcf73 Auto-Submitted: auto-generated Date: Sun, 01 Feb 2026 21:41:09 +0000 Message-Id: <697fc875.3dd03.57bd445d@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c5fc8e4fdb094289f81f4aef8a7859d6fc9bcf73 commit c5fc8e4fdb094289f81f4aef8a7859d6fc9bcf73 Author: Konstantin Belousov AuthorDate: 2026-01-25 17:33:05 +0000 Commit: Konstantin Belousov CommitDate: 2026-02-01 21:38:50 +0000 libsys: add pdrfork_thread() on x86 (cherry picked from commit 74a2bf1b7a7ff0c872499cb94df24713f61c872c) --- lib/libsys/amd64/Makefile.sys | 3 +- lib/libsys/amd64/Symbol.sys.map | 4 ++ lib/libsys/amd64/pdrfork_thread.S | 83 +++++++++++++++++++++++++++++++ lib/libsys/i386/Makefile.sys | 2 +- lib/libsys/i386/Symbol.sys.map | 4 ++ lib/libsys/i386/pdrfork_thread.S | 101 ++++++++++++++++++++++++++++++++++++++ sys/sys/procdesc.h | 1 + 7 files changed, 196 insertions(+), 2 deletions(-) diff --git a/lib/libsys/amd64/Makefile.sys b/lib/libsys/amd64/Makefile.sys index 8134bdc422a6..fc8ebe796081 100644 --- a/lib/libsys/amd64/Makefile.sys +++ b/lib/libsys/amd64/Makefile.sys @@ -4,6 +4,7 @@ SRCS+= \ amd64_set_fsbase.c \ amd64_set_gsbase.c \ amd64_set_tlsbase.c \ - rfork_thread.S + rfork_thread.S \ + pdrfork_thread.S MDASM= vfork.S cerror.S getcontext.S diff --git a/lib/libsys/amd64/Symbol.sys.map b/lib/libsys/amd64/Symbol.sys.map index 11e0507b6613..b037e12d45f5 100644 --- a/lib/libsys/amd64/Symbol.sys.map +++ b/lib/libsys/amd64/Symbol.sys.map @@ -17,6 +17,10 @@ FBSD_1.8 { amd64_set_tlsbase; }; +FBSD_1.9 { + pdrfork_thread; +}; + FBSDprivate_1.0 { _vfork; }; diff --git a/lib/libsys/amd64/pdrfork_thread.S b/lib/libsys/amd64/pdrfork_thread.S new file mode 100644 index 000000000000..cd187ae456ae --- /dev/null +++ b/lib/libsys/amd64/pdrfork_thread.S @@ -0,0 +1,83 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2000 Peter Wemm + * Copyright 2003 Alan L. Cox + * Copyright 2026 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by + * Konstantin Belousov under sponsorship from + * the FreeBSD Foundation. + */ + +#include +/* + * With thanks to John Dyson for the original version of this. + */ + +#include + +/* + * %rdi %esi %rdx %rcx %r8 %r9 + * pdrfork_thread(fdp, pdflags, rfflags, stack_addr, start_fnc, start_arg); + * + * fdp Pointer for the resulting fd location + * pdflags Flags as to pdfork. + * rfflags: Flags as to rfork. + * stack_addr: Top of stack for thread. + * start_fnc: Address of thread function to call in child. + * start_arg: Argument to pass to the thread function in child. + */ + +ENTRY(pdrfork_thread) + pushq %rbx + pushq %r12 + pushq %r13 + movq %r8, %rbx + movq %r9, %r12 + movq %rcx, %r13 + + /* + * Prepare and execute the thread creation syscall + */ + _SYSCALL(pdrfork) + jb 2f + + /* + * Check to see if we are in the parent or child + */ + cmpl $0, %edx + jnz 1f + popq %r13 + popq %r12 + popq %rbx + ret + + /* + * If we are in the child (new thread), then + * set-up the call to the internal subroutine. If it + * returns, then call __exit. + */ +1: + movq %r13, %rsp + movq %r12, %rdi + call *%rbx + movl %eax, %edi + + /* + * Exit system call + */ + _SYSCALL(exit) + + /* + * Branch here if the thread creation fails: + */ +2: + popq %r13 + popq %r12 + popq %rbx + jmp HIDENAME(cerror) +END(pdrfork_thread) + + .section .note.GNU-stack,"",%progbits diff --git a/lib/libsys/i386/Makefile.sys b/lib/libsys/i386/Makefile.sys index 2957dc548cf8..69507d930f25 100644 --- a/lib/libsys/i386/Makefile.sys +++ b/lib/libsys/i386/Makefile.sys @@ -1,7 +1,7 @@ SRCS+= i386_get_fsbase.c i386_get_gsbase.c i386_get_ioperm.c i386_get_ldt.c \ i386_set_fsbase.c i386_set_gsbase.c i386_set_ioperm.c i386_set_ldt.c \ i386_clr_watch.c i386_set_watch.c i386_vm86.c \ - rfork_thread.S + rfork_thread.S pdrfork_thread.S MDASM= vfork.S cerror.S getcontext.S syscall.S diff --git a/lib/libsys/i386/Symbol.sys.map b/lib/libsys/i386/Symbol.sys.map index 6b3169336a3f..a35349e4953b 100644 --- a/lib/libsys/i386/Symbol.sys.map +++ b/lib/libsys/i386/Symbol.sys.map @@ -20,6 +20,10 @@ FBSD_1.6 { x86_pkru_unprotect_range; }; +FBSD_1.9 { + pdrfork_thread; +}; + FBSDprivate_1.0 { _vfork; }; diff --git a/lib/libsys/i386/pdrfork_thread.S b/lib/libsys/i386/pdrfork_thread.S new file mode 100644 index 000000000000..92a45fc4783f --- /dev/null +++ b/lib/libsys/i386/pdrfork_thread.S @@ -0,0 +1,101 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright 2000 Peter Wemm + * Copyright 2026 The FreeBSD Foundation + * All rights reserved. + * + * Portions of this software were developed by + * Konstantin Belousov under sponsorship from + * the FreeBSD Foundation. + */ + +#include +/* + * With thanks to John Dyson for the original version of this. + */ + +#include + +/* + * 8 12 16 20 24 28 + * rfork_thread(fdp, pdflags rfflags, stack_addr, start_fnc, start_arg); + * + * fdp Pointer for the resulting fd location + * pdflags Flags as to pdfork. + * rfflags: Flags as to rfork. + * stack_addr: Top of stack for thread. + * start_fnc: Address of thread function to call in child. + * start_arg: Argument to pass to the thread function in child. + */ + +ENTRY(pdrfork_thread) + pushl %ebp + movl %esp, %ebp + pushl %esi + + /* + * Push thread info onto the new thread's stack + */ + movl 20(%ebp), %esi # get stack addr + + subl $4, %esi + movl 28(%ebp), %eax # get start argument + movl %eax, (%esi) + + subl $4, %esi + movl 24(%ebp), %eax # get start thread address + movl %eax, (%esi) + + /* + * Prepare and execute the thread creation syscall + */ + pushl 16(%ebp) + pushl 12(%ebp) + pushl 8(%ebp) + pushl $0 + _SYSCALL(pdrfork) + jb 2f + + /* + * Check to see if we are in the parent or child + */ + cmpl $0, %edx + jnz 1f + addl $16, %esp + popl %esi + movl %ebp, %esp + popl %ebp + ret + .p2align 2 + + /* + * If we are in the child (new thread), then + * set-up the call to the internal subroutine. If it + * returns, then call __exit. + */ +1: + movl %esi,%esp + popl %eax + call *%eax + addl $4, %esp + + /* + * Exit system call + */ + pushl %eax + pushl $0 + _SYSCALL(exit) + + /* + * Branch here if the thread creation fails: + */ +2: + addl $16, %esp + popl %esi + movl %ebp, %esp + popl %ebp + jmp HIDENAME(cerror) +END(pdrfork_thread) + + .section .note.GNU-stack,"",%progbits diff --git a/sys/sys/procdesc.h b/sys/sys/procdesc.h index 6a9168b04a68..b477903f8053 100644 --- a/sys/sys/procdesc.h +++ b/sys/sys/procdesc.h @@ -130,6 +130,7 @@ pid_t pdrfork(int *, int, int); int pdkill(int, int); int pdgetpid(int, pid_t *); int pdwait(int, int *, int, struct __wrusage *, struct __siginfo *); +pid_t pdrfork_thread(int *, int, int, void *, int (*)(void *), void *); __END_DECLS #endif /* _KERNEL */