From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 258E448A8A3; Tue, 6 Oct 2026 14:57:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791298672; cv=none; b=t/Rbwm9w04uNohg5jYaOkPSdQMNhCOaxQjvUi91EnlPgajHRjKqSTiydDe2SZUC52ElSoxIWvJgKtPq+XHJmANs5gS1SRkPkm+o0L0aZFtf8fHg5i9ISHUiM/N792qXHjvFwf95fWRpDuM5KAqc9WQbdOzt3PvOcTN//kVFppZA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791298672; c=relaxed/simple; bh=04nKJxb7KBkfm5qtc3Gm0+HVdy1gaDWmg5x6ec/HShA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fOvn7kJ9w9dx/2D6hggLTrffUnNTT4LmBPfJHV1GlTnRam/ElD+UQvmBgj+kInr3x3uwkobGXYSIYeIKGx+I7Jd+wip6fX03EPHuZcm7JwYaNOFM29s03p+F9cL9HR9EgWTeKVAutPJ2UU9TDI69uTPqqOVzUI9KUF2Sv48dyvY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=eXFQPbP0; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="eXFQPbP0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02E801F0089C; Tue, 6 Oct 2026 14:57:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791298670; bh=qDnbwqNz/qkKaYJQY1gH1IVgC/6lZFFcRASabjBz9q4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=eXFQPbP0rRZXzikHP70kCFPedn5SVCijCvpwVCuHlrE3Bchv4MOv7fFQiw1gzkzXL T4HRyRvzCli6Z1dNk6AxzQEzV9u1+1LKr4gmc7ig0ThsYHLAo9Dt8hcvYahoxC4nTi UesTm3tDTtIp0S0KqDZga3wCGeAhVk8Do68bREWOT0foX1FDP0q+67EMAw1dWBSCRf 4NITcmDBhfE5HbYVnHxAHs6F6HYoiNjuucxQJ177Q9yBg83eL0jOcgmVvrAO+56Hxv ZYGqtIUQ4d1xlXorAQyGMnCnbRka5PkngrbrZYbBqcG5KLA9OdKjMr62h3BVH1OL7w txu3XH/zuzj9w== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo Subject: [PATCH 3/8] perf mutex: Add DEFINE_MUTEX() static initializer Date: Tue, 6 Oct 2026 16:57:24 +0200 Message-ID: <20261006145729.3028247-4-acme@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261006145729.3028247-1-acme@kernel.org> References: <20261006145729.3028247-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnaldo Carvalho de Melo For file scope mutexes, so that they don't need a constructor function to initialize them at startup, mirroring PTHREAD_MUTEX_INITIALIZER while keeping the clang -Wthread-safety annotations of struct mutex. DEBUG=1 builds have mutex_init() set PTHREAD_MUTEX_ERRORCHECK, making the CHECK_ERR() paths in mutex_lock()/mutex_unlock() report relocking a held mutex and unlocking one that isn't held. PTHREAD_MUTEX_INITIALIZER gives a default type mutex, so statically initialized ones would silently lose that: use PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP, a glibc extension, falling back to the default type in libcs that lack it. Assisted-by: LLM Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/mutex.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/perf/util/mutex.h b/tools/perf/util/mutex.h index 70232d8d094f8bfc..fe04db21d19c5b0b 100644 --- a/tools/perf/util/mutex.h +++ b/tools/perf/util/mutex.h @@ -92,6 +92,18 @@ struct LOCKABLE mutex { pthread_mutex_t lock; }; +/* + * Statically initialized mutex, for the file scope ones. Error checking + * in !NDEBUG builds, like mutex_init(); the glibc-only errorcheck + * initializer falls back to the default type elsewhere. + */ +#if !defined(NDEBUG) && defined(PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP) +#define __PERF_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP +#else +#define __PERF_MUTEX_INITIALIZER PTHREAD_MUTEX_INITIALIZER +#endif +#define DEFINE_MUTEX(name) struct mutex name = { .lock = __PERF_MUTEX_INITIALIZER } + /* A wrapper around the condition variable implementation. */ struct cond { pthread_cond_t cond; -- 2.55.0