From nobody Mon Dec 8 14:17:45 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 4dQ3wT5QJ2z6Js3G for ; Mon, 08 Dec 2025 14:17: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 4dQ3wT3d4Wz3q9s for ; Mon, 08 Dec 2025 14:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203465; 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=Y3OPSVZ4oTDvMeHrhoVdUsotDObPvc0a26JdGvyofOE=; b=HoQQkUhTFz7+5pU1CXvai/lftj38Ocxf6fl7gKyL3dODk9lyvybkQmbFijxVBcS99fqgS/ 1RxwYWbxb56cQuMvJ3LOaCCFAi7GTAPDNWqs6SqR5uF3MhS8ft821HtZ0dVC0CH2sIDoNh 461nYNK2um6+5dzYOP/N2bKZYyxGvBtACJrOKEIIMtvWoHMBZ1MsCl+CgrxQsEhsMcpqMm DCVTqsPu8yeNNFKp5BjZnFR1hNFv75gqWKoNW6qbkMrGYnAOF4bJLBa0RKjePuGaINvcas uyDeo9X5hBMu4b26FHexKCC5317NqyGg+5W1yNFytbpVTFRr9/EUIm5J9lUTCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1765203465; 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=Y3OPSVZ4oTDvMeHrhoVdUsotDObPvc0a26JdGvyofOE=; b=CY0PhxEEc9fqogyHDcgHszDQJZznYy18x8WQX0zzZ6A4O9J6eiPoV/rayEH5yqKckw5Z1t i/8lGBLAidqVebY/z1ijrS+8q/lC1vMBJyyFBWL8nJUFxBnFLHJqFZ+M61ha9oLh6i2jpH V6FPb1npIsa2q+Jza1z7Hs8aDHY2iLu935b8Sjn2oNKgFhoZGGdFaimclBMdHToxsRiO0q 5V/mskk9m4OvwU8wJfKB35Q9zqQUe5UPLrzeGlF7zwkvQQwS9+NwvQcX3+nkrq23azoQMi iZCF4PfBFez4IsqUxoULD5M2PwrtQueznqpbin8PRA7Sl2LU0OR7+33kXxJUqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1765203465; a=rsa-sha256; cv=none; b=WRVAmXLz23r8qfe/tLrrd2iIZ/GVVCWD6TqKLFcadIpaHPK40TqWwu8vfwuozDEdUDWaH5 +iMjWV9TrWfYYDaSmM1J1YmK3dk2QH0ZVoNJ4S4DkeLAq/xYnFDWjk1DFbIczPP73l5jJs 1NbHrWMmoIp2VraL+f22xnj3lOBIvH4N9q7Vaqx2Sqsz3evNj3eI/iTDj+g9QMAJlzKODS qD/a3QZtQYwlf40o3/Ikh+IxUJ/Ylzi/fzCsOt7r18/H9826nZHaqZNgUtLWqIRJwOSjrO wxxhGGiGyAyXyKMjOHBQmXbp2dUa/TaMI87Dn9/U9rEPfkMQG0jieOLFiAH07g== 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 4dQ3wT2QWGz1B6 for ; Mon, 08 Dec 2025 14:17:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2eed7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 08 Dec 2025 14:17:45 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: e4e7b5840f97 - stable/15 - rc.subr: Remove misguided cpuset usage 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: e4e7b5840f97d7ee7963f8a4d3fc30ad0ad802af Auto-Submitted: auto-generated Date: Mon, 08 Dec 2025 14:17:45 +0000 Message-Id: <6936de09.2eed7.6577f819@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e4e7b5840f97d7ee7963f8a4d3fc30ad0ad802af commit e4e7b5840f97d7ee7963f8a4d3fc30ad0ad802af Author: Mark Johnston AuthorDate: 2025-11-17 16:45:44 +0000 Commit: Mark Johnston CommitDate: 2025-12-08 14:14:58 +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 (cherry picked from commit 71f6592a01506899efd91306b6d8147f14a6b219) --- 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 ec4970c8db94..c8060c87eb6e 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -1365,7 +1365,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) @@ -1394,7 +1394,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) @@ -1402,7 +1402,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 @@ -1412,7 +1412,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