From nobody Sun Jan 02 22:16:30 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 88F02192F16F; Sun, 2 Jan 2022 22:16:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (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 mx1.freebsd.org (Postfix) with ESMTPS id 4JRtWw2Dv2z3m21; Sun, 2 Jan 2022 22:16:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 202MGUiT079414 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Mon, 3 Jan 2022 00:16:33 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 202MGUiT079414 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 202MGU6F079413; Mon, 3 Jan 2022 00:16:30 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Mon, 3 Jan 2022 00:16:30 +0200 From: Konstantin Belousov To: Stefan Esser Cc: Antoine Brodin , Konstantin Belousov , src-committers , dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org, FreeBSD Ports Management Team Subject: Re: git: e2650af157bc - main - Make CPU_SET macros compliant with other implementations Message-ID: References: <202112301154.1BUBsR1q017491@gitrepo.freebsd.org> <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> 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=us-ascii Content-Disposition: inline In-Reply-To: <9dffb50a-9374-be91-8007-ce8933571398@freebsd.org> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.5 X-Spam-Checker-Version: SpamAssassin 3.4.5 (2021-03-20) on tom.home X-Rspamd-Queue-Id: 4JRtWw2Dv2z3m21 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-ThisMailContainsUnwantedMimeParts: N On Sun, Jan 02, 2022 at 10:45:14PM +0100, Stefan Esser wrote: > Am 02.01.22 um 20:51 schrieb Antoine Brodin: > > Hi, > > > > It seems that the 2 main ports failing are math/py-numpy (503 ports > > skipped) and sysutils/slurm-wlm (232 ports skipped) > > Hi Antoine, > > thank you for the information! > > > Failure logs: > > http://beefy18.nyi.freebsd.org/data/main-amd64-default/pe2d17ded99d5_s5169832c96/logs/errors/py38-numpy-1.20.3,1.log > > Python 3.8.12 (default, Dec 31 2021, 10:50:47) > >>> import os > >>> os.sched_getaffinity(0) > Traceback (most recent call last): > File "", line 1, in > OSError: [Errno 34] Result too large > > This is a Python interpreter problem: it seems that the wrapper > for the sched_getaffinity() function that has been introduced by > kib in is buggy. > > As a work-around I have added a patch to comment out the > os.sched_getaffinity(0) call (which used to cause an Attribute > error that was caught by try/except, before). > > See ports commit 507c189b2876. Buggy in which way? Our cpuset_getaffinity(2) syscall returns ERANGE for cpuset size not equal to CPU_SETSIZE. It seems that python source expects EINVAL in this case. I can change the wrapper to translate ERANGE to EINVAL. sched_setaffinity() probably would require a symmetrical patch, but lets postpone it. diff --git a/lib/libc/gen/sched_getaffinity.c b/lib/libc/gen/sched_getaffinity.c index 2ae8c5b763a3..8748d7a60278 100644 --- a/lib/libc/gen/sched_getaffinity.c +++ b/lib/libc/gen/sched_getaffinity.c @@ -26,11 +26,29 @@ * SUCH DAMAGE. */ +#include #include +#include int sched_getaffinity(pid_t pid, size_t cpusetsz, cpuset_t *cpuset) { + /* + * Be more Linux-compatible: + * - return EINVAL in passed size is less than size of cpuset_t + * in advance, instead of ERANGE from the syscall + * - if passed size is larger than the size of cpuset_t, be + * permissive by claming it back to sizeof(cpuset_t) and + * zeroing the rest. + */ + if (cpusetsz < sizeof(cpuset_t)) + return (EINVAL); + if (cpusetsz > sizeof(cpuset_t)) { + memset((char *)cpuset + sizeof(cpuset_t), 0, + cpusetsz - sizeof(cpuset_t)); + cpusetsz = sizeof(cpuset_t); + } + return (cpuset_getaffinity(CPU_LEVEL_WHICH, CPU_WHICH_PID, pid == 0 ? -1 : pid, cpusetsz, cpuset)); }