From nobody Tue Jun 30 19:12:31 2026 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 4gqXpR4ZHXz6jkZM for ; Tue, 30 Jun 2026 19:12:31 +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 4gqXpR3c5fz3sFs for ; Tue, 30 Jun 2026 19:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782846751; 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=D3e5t7qAacE+uK69XmLSkbC1N7UYVD8RZa3hDU71Dv0=; b=r13ouVAH1sBgDvWsKx2fkvVHA567TWk22ravh+Bx9510fQmiRCSb6tvAd+LbX6/HGfi6bY Qb0xjNGmYjb6DKKjEsMNl+fVMo4i6soQcfUF3QBtTlgy/c23UPpm4YToin+eQ5LLzjXvYD qAKPQq/Ft0LzhFcMgO33sKCzalV3e+8Bp60C71iuVeEsaSDEcKNpN4JTtWyLL0Hgbtz65v rZKUuvaRTWwK4SFZx7Pt/gN0VFaIcWBDrtVig7S9gpWgtIqgGBuTOieDoy1YEsT/YAur8Z g6pF1ssY/Bai+o2oSEXNU+t/KT7th4U0fPSOnYraa/Ik5gtaCIt/WEKp3gWC9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782846751; a=rsa-sha256; cv=none; b=x5sQav6Ej4Tv2tdLwaP8YwZt8IgQXiylc3YV0jiTQ+/6Gp61pg5wTa+21TcbqM9ybdQA5o NTf2m+GTrE8vh74AhoEf5wLjEVkYMi5glCF9z5jcB3jAHqiimwvb5A5Ww3AfPbVQ4rD+cS 6KWBZBo7XpP9BTTsKUVNEv++fEdsjt/r6Hxf3bv1eDpU5rbv2dzNPBf4/2FDD+l+mkGGjt 0xQ//lwdfqjcu8pTxhsSiJ0zk5++VrqghNu64fMVIsUcxMq0bZds6bM8FS2jDVAd+OKOz9 60eWcXgl0tzkk19a8m/AEKEDLwF4ueTNo5VFVylEeGioCY7HbqKVIhIrcOtq5w== 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=1782846751; 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=D3e5t7qAacE+uK69XmLSkbC1N7UYVD8RZa3hDU71Dv0=; b=UEyuqPcv2RzOW5xQv4pKyrvqPMJ7CkxCWKLZauP7AAEJBq6aZuyhx/dV5Eu2ikTE0FkEWf twx+ml/coi9I5GLNnzRpWYjOxG1EgdKq1179zQLYNOhO6wSdMx3MGbVjiEkDPl/5UlI5yp OVqKaNjQKCvwWk5oNzOegERb2VVIddaE8XYLbId/4I0Ki84w5mZygWPq+XICcf6heECdNX TugXmpoAm555I8hfvR7CX6to3VKnVLizX01LfgS1ApCRKqgOdsuTNlD939Xif7gdTjUxyq m/RWhciydc8sy8bMBoXPQ4mhF1hL99KdYva/kqCBpjljDhp2l66RttWsJ5XRtA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gqXpR2H5jzxmx for ; Tue, 30 Jun 2026 19:12:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 22179 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 30 Jun 2026 19:12:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: eca26803d880 - main - kern: syscall_thread_enter() cannot fail 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 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eca26803d880060555393ab89b44b967cd467a0e Auto-Submitted: auto-generated Date: Tue, 30 Jun 2026 19:12:31 +0000 Message-Id: <6a44151f.22179.265e9a60@gitrepo.freebsd.org> The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=eca26803d880060555393ab89b44b967cd467a0e commit eca26803d880060555393ab89b44b967cd467a0e Author: Kyle Evans AuthorDate: 2026-06-30 19:12:10 +0000 Commit: Kyle Evans CommitDate: 2026-06-30 19:12:10 +0000 kern: syscall_thread_enter() cannot fail Attempting to handle the error gracefully can easily result in missing SIGSYS, so this was made to always succeed in 39024a89146 ("syscalls: fix missing SIGSYS for several ENOSYS errors") and returns the nosys entry on failure. Drop the pretense of returning an error and clean up a few dead error paths. Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D57848 --- sys/kern/kern_sig.c | 8 ++------ sys/kern/kern_syscalls.c | 5 ++--- sys/kern/subr_syscall.c | 6 +----- sys/sys/sysent.h | 2 +- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index fed5b62ee1c7..4c66ed24baf1 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -2690,7 +2690,7 @@ ptrace_syscallreq(struct thread *td, struct proc *p, struct sysent *se; register_t rv_saved[2]; unsigned int sc; - int error, nerror; + int nerror; bool audited, sy_thr_static; sc = tsr->ts_sa.code; @@ -2734,12 +2734,8 @@ ptrace_syscallreq(struct thread *td, struct proc *p, audited = AUDIT_SYSCALL_ENTER(sc, td) != 0; if (!sy_thr_static) { - error = syscall_thread_enter(td, &se); + syscall_thread_enter(td, &se); sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0; - if (error != 0) { - tsr->ts_ret.sr_error = error; - return; - } } rv_saved[0] = td->td_retval[0]; diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index 7ddc28ed4e26..63572cd13215 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -88,7 +88,7 @@ syscall_thread_drain(struct sysent *se) pause("scdrn", hz/2); } -int +void syscall_thread_enter(struct thread *td, struct sysent **se) { uint32_t cnt, oldcnt; @@ -100,11 +100,10 @@ syscall_thread_enter(struct thread *td, struct sysent **se) oldcnt = (*se)->sy_thrcnt; if ((oldcnt & (SY_THR_DRAINING | SY_THR_ABSENT)) != 0) { *se = &nosys_sysent; - return (0); + break; } cnt = oldcnt + SY_THR_INCR; } while (atomic_cmpset_acq_32(&(*se)->sy_thrcnt, oldcnt, cnt) == 0); - return (0); } void diff --git a/sys/kern/subr_syscall.c b/sys/kern/subr_syscall.c index 48896529f685..660170cc7a5f 100644 --- a/sys/kern/subr_syscall.c +++ b/sys/kern/subr_syscall.c @@ -146,12 +146,8 @@ syscallenter(struct thread *td) if (__predict_false(AUDIT_SYSCALL_ENABLED() || SYSTRACE_ENABLED() || !sy_thr_static)) { if (!sy_thr_static) { - error = syscall_thread_enter(td, &se); + syscall_thread_enter(td, &se); sy_thr_static = (se->sy_thrcnt & SY_THR_STATIC) != 0; - if (error != 0) { - td->td_errno = error; - goto retval; - } } #ifdef KDTRACE_HOOKS diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index 6de391dcc03e..b2a559da7844 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -328,7 +328,7 @@ struct nosys_args; int lkmnosys(struct thread *, struct nosys_args *); int lkmressys(struct thread *, struct nosys_args *); -int syscall_thread_enter(struct thread *td, struct sysent **se); +void syscall_thread_enter(struct thread *td, struct sysent **se); void syscall_thread_exit(struct thread *td, struct sysent *se); int shared_page_alloc(int size, int align);