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 61FD8471276; Sun, 4 Oct 2026 17:30:24 +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=1791135025; cv=none; b=V+eCIUp9vbUG4T4XJeo138oekcvQQOEgLSK7sZyFZeOxIJkYDbY6KRgXGxh23x80ZunMYrlIz7YcJvawWSXth58kS5iQkgVHJdrhCFgtQ+LRWWQQjgPRSK0Z7QbdbCZXk9muq9iAijAQ0ojdgtw6xX2cep9EW9UlR3AJ3EiIpIg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1791135025; c=relaxed/simple; bh=04nKJxb7KBkfm5qtc3Gm0+HVdy1gaDWmg5x6ec/HShA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ltl/JiAt5axvyAKAKdsClzTDSHe5R9a4iOj/v8vQlV+W7W25mB1/rU04QMlBZobZXbFPPiEHGj0SCelR6uLqNhIO2FgFWnMkdNcFGPYGbsZwg/x4eZAtSYQwlyAw3MsTxp0a6xR46calcJopxLc/UfL0X/fflIfpfWQKbrCPciA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CZM+biu2; 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="CZM+biu2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEC3B1F00893; Sun, 4 Oct 2026 17:30:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1791135024; bh=qDnbwqNz/qkKaYJQY1gH1IVgC/6lZFFcRASabjBz9q4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CZM+biu2q7EiqSZFp1zIU8uZtVqkbXgLOF8G4vM3MG58K+I5HFUIjXprqxJLHhmxL gneb0o0KCNK943m7Awwk/ZPURod6p0YHjjYK43yKa9JGRCVEjrpRSOwqhnV/JelpWq lJCHYuGfErcqnj167ahTzBGgxpmFCWhNFD5pRopBt0aIbiEU1cf7pjZoUv+eCIm7Bo 6ZO81w7IRcd2idrzntXal5wFW7BEbbA0phGiBHtf5caQuyXxCiHTA8cmWYOS1AIuqt Xs6CznVRcZackJ13ibs5Q8iAcG5MGMPSb1KIGYi+VwScMSnTL24R8g1Ru2nChLUBI+ o0xWho578XGug== 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 v11 3/9] perf mutex: Add DEFINE_MUTEX() static initializer Date: Sun, 4 Oct 2026 19:29:54 +0200 Message-ID: <20261004173000.2863935-4-acme@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20261004173000.2863935-1-acme@kernel.org> References: <20261004173000.2863935-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