From nobody Thu May 11 04:40:31 2023 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 4QGzjC5F54z49fVn; Thu, 11 May 2023 04:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QGzjC2XVxz4Fpm; Thu, 11 May 2023 04:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683780031; 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=1xTPystHV8kv3viAhMzpd8KlfqqR96EdQMbFKJBmerA=; b=mML1cAKJffXE1FgrYFdqZaFwV3d2gfyYQnJ12riFV7wSxZqwoyROoPtM5i8pMQiFFSWTC1 gZyOCu3U2yhFfVYuGpUmgr6oLgKpG+GuGxal1k41HSOMEgTPol+jnQhXXi5HeQH/q7n8dk Mo+YeJppkNP3NyRlCTgpHtFLSVBhQNwcNIewKuEC5ubhB3+9CSLJ+Drh8L+vPZqKxMzpv2 85FCIhCoidvR4bpz4nV1qXXtph41nPgg+kxhf50u6Lb6oYq3c5DAm5+coaT5bq+42Yt3bR +xc2Z8O5V6aSvcUnK58nBxKVWMDofOz4+yodjUcQ211yC28bgKwU4WzUWgSRyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683780031; 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=1xTPystHV8kv3viAhMzpd8KlfqqR96EdQMbFKJBmerA=; b=ORA9sS41MMMxY6cwO2NbIcgir2UtuPQiINKRNAofowxs+3ikl3f2Lrxk2WOhheL30nWaBA vHBjvjctpHV34i4Ph/BgDXNI+QOtDhCmYh92866ls54rLzu1HLH8b94j0vm/aKQi5NsQ+a nRoQ0Wsxg0hH4CPOhsWOKbz6ZhN3n8Uh45C7OTrGn+pyggcjCtwvbmw2DqM9eqCY1MVDzk F4K8VChsc+hgxuTE8oPTSgQdZV4bCFDdvMq9eftBr9rQVOnYuaVF6grADBobGtsq724Udu Y86Dyu7rl8UrUpq7S6ntoU1gy6tw4CHZHJ++hEZuIR/kzP3xAad9Zvgt5tpRgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683780031; a=rsa-sha256; cv=none; b=TDqTEvEFMrqUfdgzE1noDsx017ni/41Cop4aaYToL8ULzXxJNL+0gESopNmhiTjaOm0Bnj UrxF2L+ClpFTGkhpc4RvgO6LmP2uXNGa27/Rw2+OlwcpzdyRbQr4r4c2Km99faZMKZihXX 3rcPJ1ky1HPjS5GlXh1YiklNFc8DJRyjFhSrJ2MGMrXZtuuDxLBm/3oaLg7dPtspjIVWm5 jXhjtxIPgm8EdYXMUMKftRbh+TJULOviLzYQbxsujodNdbOYImuXcocTLPqRWhGsNs7RAT w3ge+Y2BxUxoAQzI0IfWt2/l5vhHaZmqJR+EsGZXKk6Nw1D+FMZffj09dVKKCg== 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 4QGzjC1c8SzfHs; Thu, 11 May 2023 04:40:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34B4eVo7095474; Thu, 11 May 2023 04:40:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34B4eVht095473; Thu, 11 May 2023 04:40:31 GMT (envelope-from git) Date: Thu, 11 May 2023 04:40:31 GMT Message-Id: <202305110440.34B4eVht095473@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 0661f93892a2 - main - rc: add support for cpuset(1) 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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: 0661f93892a2564a64c5650ffffa3d73417172a9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=0661f93892a2564a64c5650ffffa3d73417172a9 commit 0661f93892a2564a64c5650ffffa3d73417172a9 Author: Miroslav Lachman <000.fbsd_quip.cz> AuthorDate: 2023-05-11 04:38:23 +0000 Commit: Kyle Evans CommitDate: 2023-05-11 04:40:18 +0000 rc: add support for cpuset(1) If ${name}_cpuset is specified (and /usr is mounted), cpuset(1) will be run to limit the service to the configured cpuset. PR: 142434 Reviewed by: kevans --- libexec/rc/rc.subr | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr index 1c01f1cfd071..9b5b3d8b37e7 100644 --- a/libexec/rc/rc.subr +++ b/libexec/rc/rc.subr @@ -52,6 +52,8 @@ ID="/usr/bin/id" IDCMD="if [ -x $ID ]; then $ID -un; fi" PS="/bin/ps -ww" JID=0 +CPUSET="/usr/bin/cpuset" + # rc_service provides the path to the service script that we are executing. # This is not being set here in an execution context, necessarily, so it's # really just a reasonable guess, and it will get overwritten later if @@ -777,6 +779,9 @@ startmsg() # ${name}_chdir n Directory to cd to before running ${command} # (if not using ${name}_chroot). # +# ${name}_cpuset n A list of CPUs to run ${command} on. +# Requires /usr to be mounted. +# # ${name}_flags n Arguments to call ${command} with. # NOTE: $flags from the parent environment # can be used to override this. @@ -963,6 +968,23 @@ run_rc_command() _pidcmd= _procname=${procname:-${command}} + eval _cpuset=\$${name}_cpuset + + # Loose validation of the configured cpuset; just make sure it starts + # with a number. There have also been cases in the past where a hyphen + # in a service name has caused eval errors, which trickle down into + # various variables; don't let a situation like that break a bunch of + # services just because of cpuset(1). + case "$_cpuset" in + [0-9]*) ;; + *) _cpuset="" ;; + esac + + _cpusetcmd= + if [ -n "$_cpuset" -a -x $CPUSET ]; then + _cpusetcmd="$CPUSET -l $_cpuset" + fi + # setup pid check command if [ -n "$_procname" ]; then if [ -n "$pidfile" ]; then @@ -1059,7 +1081,7 @@ run_rc_command() eval "export -- $_env" fi _run_rc_precmd || return 1 - _run_rc_doit "$_cmd $rc_extra_args" || return 1 + _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" || return 1 _run_rc_postcmd return $_return fi @@ -1105,6 +1127,11 @@ run_rc_command() _run_rc_precmd || return 1 if [ -n "$rc_pid" ]; then echo "${name} is running as pid $rc_pid." + # for cpuset debug only, not committable (cut) + if [ -n "$_cpuset" -a -x $CPUSET ]; then + echo -n "on CPU(s)" + $CPUSET -g -p "$rc_pid" | cut -s -d: -f 2 + fi else echo "${name} is not running." return 1 @@ -1130,6 +1157,7 @@ run_rc_command() _cd= _doit="\ ${_nice:+nice -n $_nice }\ +$_cpusetcmd \ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ chroot ${_user:+-u $_user }${_group:+-g $_group }${_groups:+-G $_groups }\ @@ -1139,7 +1167,7 @@ $_chroot $command $rc_flags $command_args" _doit="\ ${_fib:+setfib -F $_fib }\ ${_env:+env $_env }\ -$command $rc_flags $command_args" +$_cpusetcmd $command $rc_flags $command_args" if [ -n "$_user" ]; then _doit="su -m $_user -c 'sh -c \"$_doit\"'" fi