From nobody Fri Jan 14 18:10:17 2022 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 7261C1942291; Fri, 14 Jan 2022 18:10:18 +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 4Jb8V21Xw2z4p06; Fri, 14 Jan 2022 18:10:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183818; 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=p2MjRuFYW4vAlghjLyTobxYNYLgi5qqtHToOyIFxf9o=; b=PWuXl6B/Sa5kEKdhyqD4B/CJF6eqqCwKzFTiVx+9nPv0UkYZgQIFvsXmOo48YsosjPN3La r+6+2XkaeWGXD7w3LENTWP0n2RzvX7xUJnc3kX8BJLiqRP11UYKnpvUqsSVtxcIZKjkmBV jgq+q6aEkNz5etCLFrWn/KsaZrsyH7NURb4hoLuSzzAcazUj3PuuLODnOUNy60KZtxKslx /Y4NNaLugAOidhtDaF3Ssf3TLxgWbGshiC6o9EwBV3jl4lVEHGaBBzVGhHq8g6iKS7K/zM Hm894FVHlAd+a/oYKMYmfHOo5bE97v8ddUU6IzcC0JFQQJzc0JbF3uJHRQz6ZQ== 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 14F341870C; Fri, 14 Jan 2022 18:10:18 +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 20EIAHAH093392; Fri, 14 Jan 2022 18:10:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20EIAHk4093386; Fri, 14 Jan 2022 18:10:17 GMT (envelope-from git) Date: Fri, 14 Jan 2022 18:10:17 GMT Message-Id: <202201141810.20EIAHk4093386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 526f94cc0ee1 - stable/13 - Add sched_get/setaffinity(3) 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 526f94cc0ee105f6d3fded2d49fb0fa67155a4a6 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642183818; 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=p2MjRuFYW4vAlghjLyTobxYNYLgi5qqtHToOyIFxf9o=; b=jAKNS4F34UaGz1C0xtTKlVjoXoT4tTqI614Kewmwwi3nl3Mrl/vua7PJ8by4uvMOXIuIry uML1saQUFxv7BzhCqaMShua7QBIX0LWC+5wfrSaUQ3YMqavpp0Tc8RkbLcBPAvzM51XvQm WsdfoeRkSnda8puoh/ngkn/MbUGdPgS5bNSpOrd0a0oVzoTq1+KfEmbZ+OsJhTYKBh9J3J 7cwULXv+By/Y/+nH8prplzOm8pUBJFyW9bHNw4vYdYMarle630AVbilhAbdO3TwY/Saz3r cUBgnGlVUl4I/iK4ACQM2mvAqZFrVxADO2gHdfvPLWNQa1UwvRcye3XTIbt95Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642183818; a=rsa-sha256; cv=none; b=A/6wC8wtGzTNTRhacv6uBxlQ4TMh2NTSbaFFOxhTsbzcoVRxFgt23RQFl93NgqGtcN0T/Y aUtK90tZ1dcyAM4I4D2bvnw0DUOUd/4cBFVCngC3BqzwDATfTNWZLMQEwuRthH6RzKkMy0 misdRGFrCD36lS9J/+aXRIXsWpvLCHdh1GJoA9DbMTWB/q+Rx2Db+qZ2Nr1yTA1K5iUsGg jJAnFxkH25v46MHmIj2mJBkEiZSZ41wdjAW89KNUkWxsjn4Ff1PPprDwrkI5zhDOSaiLW+ 3VxWyxtXFkZ1RxrZVU6bcXQzaT7M2f7OwnG2GozaN1wwyZALdDLfJnqOoUmqcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=526f94cc0ee105f6d3fded2d49fb0fa67155a4a6 commit 526f94cc0ee105f6d3fded2d49fb0fa67155a4a6 Author: Konstantin Belousov AuthorDate: 2021-10-22 15:21:33 +0000 Commit: Konstantin Belousov CommitDate: 2022-01-14 16:17:29 +0000 Add sched_get/setaffinity(3) (cherry picked from commit 43736b71dd051212d5c55be9fa21c45993017fbb) --- include/sched.h | 7 +++++++ lib/libc/gen/Makefile.inc | 2 ++ lib/libc/gen/Symbol.map | 2 ++ lib/libc/gen/sched_getaffinity.c | 36 ++++++++++++++++++++++++++++++++++++ lib/libc/gen/sched_setaffinity.c | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 83 insertions(+) diff --git a/include/sched.h b/include/sched.h index 1a8eac18109c..531ecb1bb9a3 100644 --- a/include/sched.h +++ b/include/sched.h @@ -43,4 +43,11 @@ typedef struct _cpuset cpu_set_t; #endif /* _WITH_CPU_SET_T */ #endif /* __BSD_VISIBLE */ +__BEGIN_DECLS +#if __BSD_VISIBLE +int sched_getaffinity(pid_t pid, size_t cpusetsz, cpuset_t *cpuset); +int sched_setaffinity(int pid, size_t cpusetsz, const cpuset_t *cpuset); +#endif /* __BSD_VISIBLE */ +__END_DECLS + #endif /* __SCHED_H__ */ diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index c1925482d8ce..6a9e284b5860 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -123,6 +123,8 @@ SRCS+= __getosreldate.c \ scandir.c \ scandir_b.c \ scandir-compat11.c \ + sched_getaffinity.c \ + sched_setaffinity.c \ seed48.c \ seekdir.c \ semctl.c \ diff --git a/lib/libc/gen/Symbol.map b/lib/libc/gen/Symbol.map index d5ed0681073c..a52131b34476 100644 --- a/lib/libc/gen/Symbol.map +++ b/lib/libc/gen/Symbol.map @@ -439,6 +439,8 @@ FBSD_1.7 { posix_spawn_file_actions_addchdir_np; posix_spawn_file_actions_addclosefrom_np; posix_spawn_file_actions_addfchdir_np; + sched_getaffinity; + sched_setaffinity; }; FBSDprivate_1.0 { diff --git a/lib/libc/gen/sched_getaffinity.c b/lib/libc/gen/sched_getaffinity.c new file mode 100644 index 000000000000..191374a3c5e3 --- /dev/null +++ b/lib/libc/gen/sched_getaffinity.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +int +sched_getaffinity(pid_t pid, size_t cpusetsz, cpuset_t *cpuset) +{ + return (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, + cpusetsz, cpuset)); +} diff --git a/lib/libc/gen/sched_setaffinity.c b/lib/libc/gen/sched_setaffinity.c new file mode 100644 index 000000000000..9368b1752b74 --- /dev/null +++ b/lib/libc/gen/sched_setaffinity.c @@ -0,0 +1,36 @@ +/*- + * Copyright (c) 2021 The FreeBSD Foundation + * + * This software were developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include + +int +sched_setaffinity(pid_t pid, size_t cpusetsz, const cpuset_t *cpuset) +{ + return (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid, + cpusetsz, cpuset)); +}