From nobody Tue Nov 18 16:24:45 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 4d9qhF3RlRz6HNvk for ; Tue, 18 Nov 2025 16:24:45 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d9qhF1HvRz4J8m for ; Tue, 18 Nov 2025 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483085; 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=iC6FjOrhK3kVOxjL3zaoIlViUmoHCbOKyDjZFUG12Kc=; b=Dz0VXa9ZfFai2Dw2evMS9SZmUYe9T8IOLxh2JFlchMfWXkRxyFucke8ngx7NG2AYh7Qqh5 pgtqPJZGbfQkKP9LNi830mYzblTCqrG27be28d1DksJv0PBiekiuYbeUR6aOfpmRUhZJHB laeegwgalTFhSzT9TagyGITEqXmHJ5IzV0qDV5uKP/aGXorwLt/db5LY87x0KjBpiKVl6E ecmTVyXaEhbKPYGTAk1Lv7Gc4uHnFgK6IwVJIrFGmZI+DxKEhzijCb1C1H2Y++rKzoyu1B KeyowOmb2nSaa+5u7Bgq4OtGnkuNmJxrelM/kk5pbwuVJ4FFm73rbg2U6RzSFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763483085; 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=iC6FjOrhK3kVOxjL3zaoIlViUmoHCbOKyDjZFUG12Kc=; b=dy3tWzbuG1h1Cty7z58jrUwIAs2WyIQdlm2AacZmzs07YjXxgaXdmijI0QwO8LdwjKtyka 9wisgRzu3XmH6xldPMCYgtsFHEXrPQR8U76+QV/1Ch0JNP6QC3ddUt5mDfi5Nf6SA6KL0h P9eIN+na7rtqiuuAuMrIwYUupnxNAGxBAJzMSqIZQmXngpMnqlu/KXIPRW9vcxAQ37vEIK /5XojG8DBoAZkSAeggUCbP/R3sJ0ty36aHDp1C2upIKXFBwiBkRZhwtWKQ/kfhhwpzvvFo dMrU284DZcxJBXRYPZmGq9VOCp4VNIKt9Jm/IG2Z2NIWhgZY1RTdwH0CC+0b2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763483085; a=rsa-sha256; cv=none; b=yVwyFsx5n3rb1d/Yj1MtN9RW402piW2t29qPo5+ebyuEb5ELxgYEJcbaMv0cPeGK2TxhkI /08BO/Oki/Ip5zZ0DAzTqM0DV1BTJ7nlTvjJCJMAnVEluvv79cWyZM2oeFsr2SXX5PAM1z 94kSywF2MFfOjtm4i0e7i+JBnpwGM9/PT1ACcOQ0XwRGNTEZx/1QUnetQZVRDbom/f8Pbg aQat7VzU8/Gjq0QTVLfSHgqE1DuiGkavzd/VFrK4Mp09nB6X66ZXvMK5cZ+ykrgRGjf2uZ qQJBee0Qmu1V/Q8kiZV0XX2XsEM6aLYgPiw4ipxFGVomGahe691pwhE2Dj52Gg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4d9qhF0SjZz121v for ; Tue, 18 Nov 2025 16:24:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 88aa by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Nov 2025 16:24:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 71f6592a0150 - main - rc.subr: Remove misguided cpuset usage 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71f6592a01506899efd91306b6d8147f14a6b219 Auto-Submitted: auto-generated Date: Tue, 18 Nov 2025 16:24:45 +0000 Message-Id: <691c9dcd.88aa.164dcddc@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=71f6592a01506899efd91306b6d8147f14a6b219 commit 71f6592a01506899efd91306b6d8147f14a6b219 Author: Mark Johnston AuthorDate: 2025-11-17 16:45:44 +0000 Commit: Mark Johnston CommitDate: 2025-11-18 16:24:21 +0000 rc.subr: Remove misguided cpuset usage When running an rc command, if the target rc script defines _cmd, e.g., start_cmd=..., then the run_rc_command() executes that instead of $command. In general it's a shell function, and "cpuset -l " doesn't work. Moreover, it doesn't really make sense to run cpuset for anything other than start_cmd. Other optional isolation mechanisms (e.g., _fib, _chroot) are only used when invoking $command directly as part of the "start" command. Make _cpuset consistent with everything else by removing these extraneous cpuset invocations. Reviewed by: 0mp MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D53746 --- libexec/rc/rc.subr | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 4718123a71e9..b0b255e8b6ff 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1375,7 +1375,7 @@ run_rc_command() _run_rc_precmd || return 1 fi if ! checkyesno ${name}_svcj; then - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || return 1 + _run_rc_doit "$_cmd $rc_extra_args" || return 1 else case "$rc_arg" in start) @@ -1404,7 +1404,7 @@ run_rc_command() name=svcj-${name} && _return=0 fi else - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; stop) @@ -1412,7 +1412,7 @@ run_rc_command() $SERVICE -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}stop $rc_extra_args || _return=1 $JAIL_CMD -r svcj-${name} 2>/dev/null else - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; restart|status) ;; # no special case needed for svcj or handled somewhere else @@ -1422,7 +1422,7 @@ run_rc_command() if checkyesno _rc_svcj_extra_cmd && [ "${_rc_svcj}" != jailing ]; then $SERVICE -v -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}${rc_arg} $rc_extra_args || _return=1 else - _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || _return=1 + _run_rc_doit "$_cmd $rc_extra_args" || _return=1 fi ;; esac