From nobody Wed Dec 17 12:44:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD219C4167B for ; Mon, 27 Nov 2023 22:09:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233551AbjK0WJT (ORCPT ); Mon, 27 Nov 2023 17:09:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233490AbjK0WJR (ORCPT ); Mon, 27 Nov 2023 17:09:17 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A4803EA for ; Mon, 27 Nov 2023 14:09:23 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-5cdde93973aso57444107b3.1 for ; Mon, 27 Nov 2023 14:09:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1701122963; x=1701727763; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=qbPv4PyEdmBWH7WUrzt8/XaXbmHzexj4Rz5EFZB1OQM=; b=Km0rF0ZHW0TaTKx+npA8OJvPAtKyQKPO0A8M2mJ/DBBM41qhFvDyHLcEZxTP3w4vaS NwknOG+NnF1RF1aat0v7kfg2YfEpZn+q9ULMB4TONRjsECUCb8RdWk1SvrJjGGC2h3t7 jNmmImB82KKjBgexV9sN64hmZU85VFmA8SO5GNZnXKxbfsPcmnLVdZb79Y4U7X07Cyii R7R8wv9Pw/BsiSbhDOc/CmjIe/9diA7ZDgl/UMgusk9oDsMg4f0bEDNDf0wbhQfVLMY0 3uB5/YY3q1N5VdPdRG8gkqZV9iYZISz2aC1K7m9MJ0dNfvGx3N/4CqwWyc3ocgAzmdG/ pACA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701122963; x=1701727763; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qbPv4PyEdmBWH7WUrzt8/XaXbmHzexj4Rz5EFZB1OQM=; b=mKkISyRUplI6hENVjh9oDr3NTZkMhn6KSfQqUtu716Stu6qGcBDqTHptAQ+6LxYFyj MkIO0NPIYU7jTpEfsgwC1fOxZRSri2obp2i0ee8PkORKe2X866tsRTy7x5Op6TORZP1z mYTPwfE6E5rlzRzEvsV4KGyuHwxuEx/0KvDNSebyk3PLgxwWB7OUAW2xcUXef3R/yV7y YPsj7RrdT/ySlUzfpNvsgCP+hrXGS66qOOVhqghk1YpP/NyA8BPZpCkQmuIGhah6G/ua ug2UEhBl50Krh9ewTL33N2YIRuwCCDZR3GWxy0UYnnS3sUegCAnau2QAi0oBK19Oyai/ Dvuw== X-Gm-Message-State: AOJu0Ywn9kk4G8iqDGL4Kwz7QDQTlE1/QsrThJ/PYy7kYYW6fJCe2yUn BHwX8PFPot5kifgIBP2NzA00/XpbMXLG X-Google-Smtp-Source: AGHT+IExUtMtiR+ptGG23+Vabnoaqo7AIZnyIS3yKYDbfx4Y1r3PAu2qXUtV6Z+us//6QncipclrfVxBHfi9 X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:829:6e77:9093:f39b]) (user=irogers job=sendgmr) by 2002:a25:d081:0:b0:d9a:c946:c18c with SMTP id h123-20020a25d081000000b00d9ac946c18cmr452645ybg.6.1701122962825; Mon, 27 Nov 2023 14:09:22 -0800 (PST) Date: Mon, 27 Nov 2023 14:08:13 -0800 In-Reply-To: <20231127220902.1315692-1-irogers@google.com> Message-Id: <20231127220902.1315692-2-irogers@google.com> Mime-Version: 1.0 References: <20231127220902.1315692-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.rc1.413.gea7ed67945-goog Subject: [PATCH v5 01/50] perf comm: Use regular mutex From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , Nick Terrell , Kan Liang , Andi Kleen , Kajol Jain , Athira Rajeev , Huacai Chen , Masami Hiramatsu , Vincent Whitchurch , "Steinar H. Gunderson" , Liam Howlett , Miguel Ojeda , Colin Ian King , Dmitrii Dolgov <9erthalion6@gmail.com>, Yang Jihong , Ming Wang , James Clark , K Prateek Nayak , Sean Christopherson , Leo Yan , Ravi Bangoria , German Gomez , Changbin Du , Paolo Bonzini , Li Dong , Sandipan Das , liuwenyu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Guilherme Amadio Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The rwsem is only after used for writing so switch to a mutex that has better error checking. Fixes: 7a8f349e9d14 ("perf rwsem: Add debug mode that uses a mutex") Signed-off-by: Ian Rogers --- tools/perf/util/comm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/comm.c b/tools/perf/util/comm.c index afb8d4fd2644..4ae7bc2aa9a6 100644 --- a/tools/perf/util/comm.c +++ b/tools/perf/util/comm.c @@ -17,7 +17,7 @@ struct comm_str { =20 /* Should perhaps be moved to struct machine */ static struct rb_root comm_str_root; -static struct rw_semaphore comm_str_lock =3D {.lock =3D PTHREAD_RWLOCK_INI= TIALIZER,}; +static struct mutex comm_str_lock =3D {.lock =3D PTHREAD_ERRORCHECK_MUTEX_= INITIALIZER_NP,}; =20 static struct comm_str *comm_str__get(struct comm_str *cs) { @@ -30,9 +30,9 @@ static struct comm_str *comm_str__get(struct comm_str *cs) static void comm_str__put(struct comm_str *cs) { if (cs && refcount_dec_and_test(&cs->refcnt)) { - down_write(&comm_str_lock); + mutex_lock(&comm_str_lock); rb_erase(&cs->rb_node, &comm_str_root); - up_write(&comm_str_lock); + mutex_unlock(&comm_str_lock); zfree(&cs->str); free(cs); } @@ -98,9 +98,9 @@ static struct comm_str *comm_str__findnew(const char *str= , struct rb_root *root) { struct comm_str *cs; =20 - down_write(&comm_str_lock); + mutex_lock(&comm_str_lock); cs =3D __comm_str__findnew(str, root); - up_write(&comm_str_lock); + mutex_unlock(&comm_str_lock); =20 return cs; } --=20 2.43.0.rc1.413.gea7ed67945-goog