From nobody Mon Feb 20 17:29:02 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 4PL8Xt6tcnz3rNdj; Mon, 20 Feb 2023 17:29:02 +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 4PL8Xt6MYHz4Pr0; Mon, 20 Feb 2023 17:29:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676914142; 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=59WdTgjfYwmNHOeXnkhu/GDaENLp6VqDpOXGL6F50/Y=; b=xAXmyGYW56qNK07l5Fc/PoOT6vXOPX7hw1hiL1NTuR+4F69Izsl7Ar8iGD7ee+OgJCmH2B rrxhVFL7l61dYG3Kf/PZLuY3Pdl2JyIvAFtCneBMvT1uMUEPZe9j4urZWmO6K3/eKfnbuc h1KOFy5bgcqb30uhx2Lczzc0dNAAXBO9ctyMATXBHzehmxjl9LHFpEL1cMzH58/LrnSwwf sFRQT8ZN/kV6HYadqjiXvVxIswuLI36Ag1klwuYqogM7syVB6jiAMoyzfrlinm99Hetid9 LVam2OWQgULrFgOG8Tmik4ITg2DX53BgvZQom1juxMwk90bkC9+9BI2VxdG94Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676914142; 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=59WdTgjfYwmNHOeXnkhu/GDaENLp6VqDpOXGL6F50/Y=; b=EYe81scMY6LO2yJXHftHEhQ+QaciC1DVs1cNjSho6e4Cj+T02Q6sbLbGKDENLKLSGnR8fJ Yc4WfMbgiwLjXh5z8Zxo9Pose08WIvq6cksG8K6e5QHhAxc+h2uNznoOc0gZJNWzwbiNHf Bs1nbyc8BfR3nWpVj3SSnqy7b7AjIaxMmrEdqyOHXWhk2qgGDPYXjodMkzl+fnGKTjjye2 3SnT/Y9p63wlblvB7Wonoor3EM7Ula6ogVNp9DGqKgOZRKVTeA6mXaCAH+ZjwG/gPzHU+u eDxhYxoTrs4jyCklb3zgh6bRcrT/b9ev1B6Sp+ukdZFFuV9KhdFg2HpYmGqiYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676914142; a=rsa-sha256; cv=none; b=HNgVC/YBCCUgUWkgLZaDT5zOYgQ/2XaA8xAD1yOEvA2yVehWgLyBMzSZE+8VO5Hi0oCmlw lvTnC9B6hnTYttFdW/hFs3KHyWl9yZUiesu7mlDOWj1dTHjl6m3f7D+B5oNUpQL1pXnO5U ENGTqNunt7W862XQFjKwF3xYPbXszniU++njl7tnJGo0YzblUO74T+5OnREYHNbKDPbm7h uY2Kmsgzmu1CFyjtIh1OsfFMOmxxo1ygZ7OvXTfJy1bpYdJRiMl9CKsnbxMoxseKfck8bx Hg7pQYaq8WkyvPHlhr1htSUXlqFjg2/OCaxyD0/7SJCqeRB75H9Ev8p5Urhjtw== 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 4PL8Xt5QD9zpvP; Mon, 20 Feb 2023 17:29:02 +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 31KHT2sT051909; Mon, 20 Feb 2023 17:29:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31KHT2rj051908; Mon, 20 Feb 2023 17:29:02 GMT (envelope-from git) Date: Mon, 20 Feb 2023 17:29:02 GMT Message-Id: <202302201729.31KHT2rj051908@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 24a7d1392823 - stable/13 - cpuset: Adapt sched_affinity compat shims to the stable/13 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 24a7d13928234ff989bdbf8a5f1397b94f086bdd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=24a7d13928234ff989bdbf8a5f1397b94f086bdd commit 24a7d13928234ff989bdbf8a5f1397b94f086bdd Author: Dmitry Chagin AuthorDate: 2023-02-20 17:28:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-02-20 17:28:36 +0000 cpuset: Adapt sched_affinity compat shims to the stable/13 Use compat shims to run the stable/13 world on a kernels which does not support CPU_WHICH_TIDPID. This is direct commit to the stable/13. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D38677 --- lib/libc/gen/sched_getaffinity.c | 6 ++++-- lib/libc/gen/sched_setaffinity.c | 6 ++++-- sys/sys/param.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/libc/gen/sched_getaffinity.c b/lib/libc/gen/sched_getaffinity.c index fce47fbfc0d2..0275a2190afa 100644 --- a/lib/libc/gen/sched_getaffinity.c +++ b/lib/libc/gen/sched_getaffinity.c @@ -38,9 +38,11 @@ int sched_getaffinity(pid_t pid, size_t cpusetsz, cpuset_t *cpuset) { cpuwhich_t which; - int error; + int error, osrel; - if (__getosreldate() < P_OSREL_TIDPID) { + osrel = __getosreldate(); + if (osrel < P_OSREL_TIDPID_13 || (osrel < P_OSREL_TIDPID && + P_OSREL_MAJOR(osrel) == P_OSREL_MAJOR(P_OSREL_TIDPID))) { if (pid == 0 || pid > _PID_MAX) which = CPU_WHICH_TID; else diff --git a/lib/libc/gen/sched_setaffinity.c b/lib/libc/gen/sched_setaffinity.c index b878e1affc41..7fbebbfe6b6e 100644 --- a/lib/libc/gen/sched_setaffinity.c +++ b/lib/libc/gen/sched_setaffinity.c @@ -41,10 +41,12 @@ sched_setaffinity(pid_t pid, size_t cpusetsz, const cpuset_t *cpuset) static int mp_maxid; cpuwhich_t which; cpuset_t c; - int error, lbs, cpu; + int error, lbs, cpu, osrel; size_t len, sz; - if (__getosreldate() < P_OSREL_TIDPID) { + osrel = __getosreldate(); + if (osrel < P_OSREL_TIDPID_13 || (osrel < P_OSREL_TIDPID && + P_OSREL_MAJOR(osrel) == P_OSREL_MAJOR(P_OSREL_TIDPID))) { if (pid == 0 || pid > _PID_MAX) which = CPU_WHICH_TID; else diff --git a/sys/sys/param.h b/sys/sys/param.h index d2fbad6c127b..6c95088e783d 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -92,6 +92,7 @@ #define P_OSREL_CK_INODE 1300005 #define P_OSREL_POWERPC_NEW_AUX_ARGS 1300070 #define P_OSREL_TIDPID 1400079 +#define P_OSREL_TIDPID_13 1302501 #define P_OSREL_MAJOR(x) ((x) / 100000) #endif