From nobody Mon Apr 25 14:22:36 2022 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 6E07B1995BD0; Mon, 25 Apr 2022 14:22:36 +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 4Kn6fh2KjWz3D96; Mon, 25 Apr 2022 14:22:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650896556; 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=vwMNYWj8uqizR0JovORQvUch5QfBCtZKsRUKtdN4SLY=; b=uoiX5r6q+P/c93LntckFVa8PXRytDP2UTid4ctsO31EONgXiC1DEmzb5sAh2iAe5aB4Ao6 31iQ7a7ik9Lz4Z3d8fucgIxdXBX9A6Pe96amw5jlZ0Ext7/tLn0g+V8klrFmkpPMsJoNrk ZOn11mVgQhBOfzpjEBkWCOO+3SzKHz3PkMzkqynFPbZK1UMsMB5nVE3114r7qIEYeb8OBn RiU3k7265Dlak4P22gryp5TsQVzSA7TK3H3y+cfuo4Lhrpl5M6KjuKPd9nQTxOxcBs71GC 5oGs/SXnlWNyUzFcDv1dz21yF+o/YEQQ5Om4w8rMAJdGbw1/JHuzvJ5SgRxQig== 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 2FA671C4DD; Mon, 25 Apr 2022 14:22:36 +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 23PEMaTZ032774; Mon, 25 Apr 2022 14:22:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23PEMaoX032773; Mon, 25 Apr 2022 14:22:36 GMT (envelope-from git) Date: Mon, 25 Apr 2022 14:22:36 GMT Message-Id: <202204251422.23PEMaoX032773@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 67fc95025ccf - main - sched_getaffinity(3): more compatibility with Linux 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67fc95025ccfc696ea5eaea0ecb1fff295760723 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650896556; 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=vwMNYWj8uqizR0JovORQvUch5QfBCtZKsRUKtdN4SLY=; b=J6px3a64RQzluZW11sSCLfOjLLsh4vSt1djs2V0jOrKYvLbVzKUZTJB2HCEc6l7Bz3MQt1 OTzTRRmQg+tYEl/kafSqfiBFRWT17KDMlAKxcBQBtv7eNF4fVrtklPDKDzHa9xnmFQeUAD JKWqkibfURIdJAG4G/GglCMWqvwfWnUXwmJCojvF05VP80PDfMYb74WeFONkUW1c2ERBX2 wtQUZUbP4DZEt0edYFWouAipurWJbgYtl70BhxipPkVbLnBqq4NSOJB33jMsicln+QU1r/ 9wd62Ax3+YPQBfMoeVACrIBqiFAka5N1qE1nyJ7g2F0qR0Tp5FAc6mlh8oKeeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650896556; a=rsa-sha256; cv=none; b=Cof/ZGb2YOmd4PFb6LWzEG1vJ+Iu1JyZ7ISqLpd4itxZwjaHIRLMKNB8ynBOC1R6a1V3oe l2ReBfQe/xaOn1t9l20zU6aBX64XBVu2nQArIIP2H2jELmFq7mQVKZuq2vgn66rZslCVQc uH0ERk5O1BEPKSSSWKWGes//dXMG84GqQOvgt7uUVO+EgeH/bKOyKI1DLuIIqWGU30r6u4 h0KMm1Zh8Uq0ZFZfWCIcuu/EMpPywGGkcF+W5NyVMFIILXfkU6oMtxhKmegokDNqphQ7+Q fJxsLY7hubjYvbCL8xfBISfgkqFdYs3NiD0pW4rGt/EAVhhduwT93hEsUOgSKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=67fc95025ccfc696ea5eaea0ecb1fff295760723 commit 67fc95025ccfc696ea5eaea0ecb1fff295760723 Author: Konstantin Belousov AuthorDate: 2022-04-24 22:10:18 +0000 Commit: Konstantin Belousov CommitDate: 2022-04-25 14:22:09 +0000 sched_getaffinity(3): more compatibility with Linux Report EINVAL instead of EDEADLK when impossible cpu mask is set. Noted by: dchagin Reviewed by: dchagin (previous version), markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D35045 --- lib/libc/gen/sched_setaffinity.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libc/gen/sched_setaffinity.c b/lib/libc/gen/sched_setaffinity.c index 91ab2a401bda..09e2b9097d5a 100644 --- a/lib/libc/gen/sched_setaffinity.c +++ b/lib/libc/gen/sched_setaffinity.c @@ -34,6 +34,7 @@ int sched_setaffinity(pid_t pid, size_t cpusetsz, const cpuset_t *cpuset) { cpuset_t c; + int error; if (cpusetsz > sizeof(cpuset_t)) { errno = EINVAL; @@ -42,6 +43,10 @@ sched_setaffinity(pid_t pid, size_t cpusetsz, const cpuset_t *cpuset) memset(&c, 0, sizeof(c)); memcpy(&c, cpuset, cpusetsz); } - return (cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, - pid == 0 ? -1 : pid, sizeof(cpuset_t), &c)); + error = cpuset_setaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, + pid == 0 ? -1 : pid, sizeof(cpuset_t), &c); + if (error == -1 && errno == EDEADLK) + errno = EINVAL; + + return (error); }