From nobody Wed May 08 18:47:33 2024 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 4VZPK20c2jz5JyZV; Wed, 08 May 2024 18:47:34 +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 4VZPK20BVDz47LM; Wed, 8 May 2024 18:47:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715194054; 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=GCMnN2pb3Hdxbl5OhrrOdCtu1EPZWYJX+5X3FZIII/8=; b=YwV8wVTla4xwRdRIfD+Z6Q06La9UtRfV8Q7Go5IfL1dayh9tj8OG0Z4uvlWDnbUWo4IQU0 FQ7AZ2DpPn4L1a/DcjOYutMssmiJlm497Ce+8jAY14or4Ve/Crf3cr4RXajrdiOewWslP9 0YfKzLvXh0e7nEFq8gW3/DTiKI+Sunye3dtVJyOvEuNIR76Hom0wB55yF00F1Jt6HZco5K sgJwaEkYl8C9c0ntOiOh9GW8LrEEYM9/uIShYpusj9MZf4f73N2TqEcOHkp/XKXOHLdMIH nO4yX0tBbO+uYtChuAj8rXs3MPawq5Ml4u71Ex0Z/Ws6i3kQJ/ZPB/g8TvqdEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715194054; a=rsa-sha256; cv=none; b=VPh9pEFolcq7UMcQGCSWV9CJKk/fLwi8Zj7dujspPe04KiQluk7E8c8oiHR+SARQhDCOlB 1BdpMcFJrUCLi86UA1wHZE6SfPg3Dkn5nQVEd4zIzvkf4P+3bvkOgDiY2i0+/EMiZNoi8e wILA7Jy6C1JOsPgN7eNwOuooXOHUp2DoIpZN9UyXX/iN6XOWQWJCIvcPJc4G+OzQ/Agzzi 5TYnhGt1lxLKvYhSuXvDc+DuopsKRb49EBH90JykiXU59Vb3b11pR02S7mq7ksmAZlEvsT EwUMnXO5aOgabE3sX/gVKOqhTFbCoJNDJ2OMNlfeTnB1BaM4NHMSzKJfQSoX+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715194054; 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=GCMnN2pb3Hdxbl5OhrrOdCtu1EPZWYJX+5X3FZIII/8=; b=yDDRZFBwNUetAnOSnv1tkEBiNpwMhXAGt0ZcTBs7A1MVzjnipD7MFq0hP6twgaBjPfqHjF ekpdakpqaZ6pHi6gyfHnqUAuvS+qw/IHS8+KBxOuy+LYx8JjjMbLMrpppAUw6BZuVAAweR cQs5kOoh4eIF+XRmLr8XS2Ho1cS2WxTRc4ElvWkkMCmlxwxa3MklmprLfRPF4dIXp+v1RC rUdHSktuAXwBLhzZcj4KwjIiDjcbYf9LZPdn1Mbpt2gEpqmwg0hJn0pyGEmHXHNlJmTE30 wlXmCSFLvTyhx7wZXSR2cwVD6ojHLzbLaPaMTbNAubdIykSoPqge2pxXQ68tqg== 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 4VZPK16TB7zcQR; Wed, 8 May 2024 18:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 448IlX4p054189; Wed, 8 May 2024 18:47:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448IlX8T054186; Wed, 8 May 2024 18:47:33 GMT (envelope-from git) Date: Wed, 8 May 2024 18:47:33 GMT Message-Id: <202405081847.448IlX8T054186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: da15ed2e9821 - main - Merge commit 5300a6731e98 from llvm-project (by Jonathan Peyton): 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da15ed2e982180198f77a0fa26628e6d414cb10e Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=da15ed2e982180198f77a0fa26628e6d414cb10e commit da15ed2e982180198f77a0fa26628e6d414cb10e Author: Dimitry Andric AuthorDate: 2024-05-08 16:55:08 +0000 Commit: Dimitry Andric CommitDate: 2024-05-08 18:45:44 +0000 Merge commit 5300a6731e98 from llvm-project (by Jonathan Peyton): [OpenMP] Fix re-locking hang found in issue 86684 (#88539) This was initially reported here (including stacktraces): https://stackoverflow.com/questions/78183545/does-compiling-imagick-with-openmp-enabled-in-freebsd-13-2-cause-sched-yield If `__kmp_register_library_startup()` detects that another instance of the library is present, `__kmp_is_address_mapped()` is eventually called. which uses `kmpc_alloc()` to allocate memory. This function calls `__kmp_entry_thread()` to access the thread-local memory pool, which is a bad idea during initialization. This macro internally calls `__kmp_get_global_thread_id_reg()` which sets the bootstrap lock at the beginning (before calling `__kmp_register_library_startup()`). The fix is to use `KMP_INTERNAL_MALLOC()`/`KMP_INTERNAL_FREE()` instead of `kmpc_malloc()`/`kmpc_free()`. `KMP_INTERNAL_MALLOC` and `KMP_INTERNAL_FREE` do not use any bootstrap locks. They just translate to `malloc()`/`free()` and are meant to be used during library initialization before other library-specific allocators have been initialized. Fixes: #86684 This should fix OpenMP processes sometimes getting locked with 100% CPU usage, endlessly calling sched_yield(2). PR: 278845 Reported by: Cassidy B. Larson MFC after: 3 days --- contrib/llvm-project/openmp/runtime/src/z_Linux_util.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/llvm-project/openmp/runtime/src/z_Linux_util.cpp b/contrib/llvm-project/openmp/runtime/src/z_Linux_util.cpp index b9ff96873702..97ddb8a608b7 100644 --- a/contrib/llvm-project/openmp/runtime/src/z_Linux_util.cpp +++ b/contrib/llvm-project/openmp/runtime/src/z_Linux_util.cpp @@ -2129,10 +2129,10 @@ int __kmp_is_address_mapped(void *addr) { // We pass from number of vm entry's semantic // to size of whole entry map list. lstsz = lstsz * 4 / 3; - buf = reinterpret_cast(kmpc_malloc(lstsz)); + buf = reinterpret_cast(KMP_INTERNAL_MALLOC(lstsz)); rc = sysctl(mib, 4, buf, &lstsz, NULL, 0); if (rc < 0) { - kmpc_free(buf); + KMP_INTERNAL_FREE(buf); return 0; } @@ -2156,7 +2156,7 @@ int __kmp_is_address_mapped(void *addr) { } lw += cursz; } - kmpc_free(buf); + KMP_INTERNAL_FREE(buf); #elif KMP_OS_DARWIN