From nobody Thu Dec 18 16:14:37 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14B2722B58A for ; Wed, 19 Feb 2025 21:44:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001496; cv=none; b=iJSCSRd6lkIzPXM+CemrG9jGrj8LgxX/6ks437bfEMFF++e8eg8YguxB59f3P1+RvqFvkUGcDMuVhg0LfMEdMa0zzr6rgI5jQyFvKsmoa+XZkikWz3Xm0plOkM27p+Ca1xHczbLns2/GtuEyk2M/6HKF3vrtTnNGz531TOVaa8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001496; c=relaxed/simple; bh=Jqgp2wmgjO178XP3RtYaAKQqy0yvqQ6UWL9YxILPX3w=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=saHapGrVxR2CJn1BMdLQR5cXHv6l/Pq95327qDbPsTub2A1S1mPYgT44oGkVZ3AeUGift57JSpkbyCjT5pB0BXMPVL7v3jSdBLM/SUYelpFMwCY7G1gSC1DdX22c0JoZDPeK/FcZQYpLhTC44keeaZSgOFyENI4Cwi+kSeh7BDI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=qThRStWT; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qThRStWT" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220d1c24b25so4083555ad.0 for ; Wed, 19 Feb 2025 13:44:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740001494; x=1740606294; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=9URqe4q5EaVTic8nJEv32s2nRRv6fRzN8VW0O0BkxXw=; b=qThRStWTwwG9bGhCLWI6Na1C5Md/fzZFMRped5r0u1qTS/40BUm4y0KFQa3q9G82xS Trhk5vfwglMiqLv8nDz3Evgyx3Z6kSSj/HodWcGrRMDwuzxoFIQyuX4lfX+ODLKjj0v0 r1qAJqSwnrxEYsn/Yq1/vE43WSkn2fCKbal1CZwEL6NIv+HC88o4sLjywrJ735OXe/WQ 7v7/hYseCmk9jyENJcBbo8BmapAq88ZRR9td07VKH8lrcGDfzIglGi0FcZINEvNC7bas 3yJqPxKrf15ScVPCQPWErf3gjuTDidQBIgHKkneXaULiTi5LVcdTSkUFsIJtlMJTsIOc yCaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740001494; x=1740606294; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=9URqe4q5EaVTic8nJEv32s2nRRv6fRzN8VW0O0BkxXw=; b=DBUjevqfazOnrBqC2EXpl/cAGA0baPvCXAmlgDw+SOSbIN4qzrii5hZ1B7Ssoqd2e0 j/WgRpaEURjbn+6RQUMtyodT95HXlzrS/MeaKZlr3s9sasqyUOVs/NJV1VwEmQCVrQ4G ho70L3ONjtPEW/tr1N1uCKnm1yCkeSsHHjuYIla5dW+GIao0HcLQ7YPUhCcTHlPW2Ft5 PhSgiz310k+WTLEdIip+hShpSHm/ubqVBHqOvScuKpm5jGvGRKhMkwAzS4j4aS+Jnb+c BYCk/cV0X24symh7aqb7ex7T3fUXkqtpxfqDo+VQ5rdB64PXtiRMP8V7b+Kcvf5et2Ye oYfw== X-Gm-Message-State: AOJu0Yxvb1csjNFFE7Oki+1Qr5IxJ5/tKbJUw8BrTIcM/n1Qb55fSFzd Ted1D9CoF0zN8IPiKEyveKXFvbQ6vSZiAcCiusenYQnjLS23B+nGLCHWHK6XgBa91rbWPNjQ6oo dse+ZnMYm5mYZYahQY0zS9T8XgXX/IKYCjqTexF0Sgu47uBWsL9joszA4jd9RSedAxTRVf0YpXT 8XKj8OPeUMEAKVGlH2wu7afnPh1mcHPF9QVzmXR7Bw X-Google-Smtp-Source: AGHT+IFCachULn5aG8Vg3yNDuNDsFvwav2GkkYQOOWjjAGy+PyXDys5e6Kf1Gx37Li5ywJnHT6LRVdxaBWQ= X-Received: from pfbct6.prod.google.com ([2002:a05:6a00:f86:b0:730:9499:1f46]) (user=ctshao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:32a3:b0:1ee:c75c:beda with SMTP id adf61e73a8af0-1eec75cc2c3mr15999778637.35.1740001494228; Wed, 19 Feb 2025 13:44:54 -0800 (PST) Date: Wed, 19 Feb 2025 13:40:00 -0800 In-Reply-To: <20250219214400.3317548-1-ctshao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250219214400.3317548-1-ctshao@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250219214400.3317548-2-ctshao@google.com> Subject: [PATCH v6 1/4] perf lock: Add bpf maps for owner stack tracing From: Chun-Tse Shao To: linux-kernel@vger.kernel.org Cc: Chun-Tse Shao , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, nick.forrington@arm.com, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a struct and few bpf maps in order to tracing owner stack. `struct owner_tracing_data`: Contains owner's pid, stack id, timestamp for when the owner acquires lock, and the count of lock waiters. `stack_buf`: Percpu buffer for retrieving owner stacktrace. `owner_stacks`: For tracing owner stacktrace to customized owner stack id. `owner_data`: For tracing lock_address to `struct owner_tracing_data` in bpf program. `owner_stat`: For reporting owner stacktrace in usermode. Signed-off-by: Chun-Tse Shao --- tools/perf/util/bpf_lock_contention.c | 14 ++++++-- .../perf/util/bpf_skel/lock_contention.bpf.c | 33 +++++++++++++++++++ tools/perf/util/bpf_skel/lock_data.h | 7 ++++ 3 files changed, 52 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lo= ck_contention.c index fc8666222399..76542b86e83f 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -131,10 +131,20 @@ int lock_contention_prepare(struct lock_contention *c= on) else bpf_map__set_max_entries(skel->maps.task_data, 1); =20 - if (con->save_callstack) + if (con->save_callstack) { bpf_map__set_max_entries(skel->maps.stacks, con->map_nr_entries); - else + if (con->owner) { + bpf_map__set_value_size(skel->maps.stack_buf, con->max_stack * sizeof(u= 64)); + bpf_map__set_key_size(skel->maps.owner_stacks, + con->max_stack * sizeof(u64)); + bpf_map__set_max_entries(skel->maps.owner_stacks, con->map_nr_entries); + bpf_map__set_max_entries(skel->maps.owner_data, con->map_nr_entries); + bpf_map__set_max_entries(skel->maps.owner_stat, con->map_nr_entries); + skel->rodata->max_stack =3D con->max_stack; + } + } else { bpf_map__set_max_entries(skel->maps.stacks, 1); + } =20 if (target__has_cpu(target)) { skel->rodata->has_cpu =3D 1; diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/ut= il/bpf_skel/lock_contention.bpf.c index 6533ea9b044c..23fe9cc980ae 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -27,6 +27,38 @@ struct { __uint(max_entries, MAX_ENTRIES); } stacks SEC(".maps"); =20 +/* buffer for owner stacktrace */ +struct { + __uint(type, BPF_MAP_TYPE_PERCPU_ARRAY); + __uint(key_size, sizeof(__u32)); + __uint(value_size, sizeof(__u64)); + __uint(max_entries, 1); +} stack_buf SEC(".maps"); + +/* a map for tracing owner stacktrace to owner stack id */ +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(key_size, sizeof(__u64)); // owner stacktrace + __uint(value_size, sizeof(__s32)); // owner stack id + __uint(max_entries, 1); +} owner_stacks SEC(".maps"); + +/* a map for tracing lock address to owner data */ +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(key_size, sizeof(__u64)); // lock address + __uint(value_size, sizeof(struct owner_tracing_data)); + __uint(max_entries, 1); +} owner_data SEC(".maps"); + +/* a map for contention_key (stores owner stack id) to contention data */ +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(key_size, sizeof(struct contention_key)); + __uint(value_size, sizeof(struct contention_data)); + __uint(max_entries, 1); +} owner_stat SEC(".maps"); + /* maintain timestamp at the beginning of contention */ struct { __uint(type, BPF_MAP_TYPE_HASH); @@ -143,6 +175,7 @@ const volatile int needs_callstack; const volatile int stack_skip; const volatile int lock_owner; const volatile int use_cgroup_v2; +const volatile int max_stack; =20 /* determine the key of lock stat */ const volatile int aggr_mode; diff --git a/tools/perf/util/bpf_skel/lock_data.h b/tools/perf/util/bpf_ske= l/lock_data.h index c15f734d7fc4..15f5743bd409 100644 --- a/tools/perf/util/bpf_skel/lock_data.h +++ b/tools/perf/util/bpf_skel/lock_data.h @@ -3,6 +3,13 @@ #ifndef UTIL_BPF_SKEL_LOCK_DATA_H #define UTIL_BPF_SKEL_LOCK_DATA_H =20 +struct owner_tracing_data { + u32 pid; // Who has the lock. + u32 count; // How many waiters for this lock. + u64 timestamp; // The time while the owner acquires lock and contention i= s going on. + s32 stack_id; // Identifier for `owner_stat`, which stores as value in `o= wner_stacks` +}; + struct tstamp_data { u64 timestamp; u64 lock; --=20 2.48.1.601.g30ceb7b040-goog From nobody Thu Dec 18 16:14:37 2025 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3547A1DE88C for ; Wed, 19 Feb 2025 21:45:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001537; cv=none; b=gUgNs9YZvWaYo+STIS/rE/UKfKfugPTShGFSK/FqMSMTPd3juSlb4zhazV4WkPEughKEMooJxkP10tDgydIYTjDDrfRYGwlbT2djKpG05TPdpcCOttNXV88UcYmNm1jU/yPS1Ry3+i/efR6Ya3JrlOy3zbEnYGnnAtcbxQfAbyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001537; c=relaxed/simple; bh=+eUkK/iMLMnPi2bDwVTw1Pgm27u0MPdVhFfDE74FNK4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=K2gHbCyfzREG5RtkgpQdv+Klt1pnIf2tCaLDkSxJAWivDDDkk7f8HfVl0eR2BHW1fwBAGWD8OuKtowkbeWobY3qWZgNpZVCjkLHKu+AWyH5Khiiwm8f1CTF7iAJFs6RHmFEwfSM1qCS5bO4CzaI+1OkxWkxVC1megHMSfgHOj+g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=JHgJS1Nz; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="JHgJS1Nz" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-220c86b3ef3so27279265ad.1 for ; Wed, 19 Feb 2025 13:45:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740001535; x=1740606335; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=R9XCsc+sgxUI5SOE40I45gWQYV0M4BiiAlFbbfMY96A=; b=JHgJS1NzZ/drNPp1YHQefAW3CNgne0Z3Qn8szAl04Hyg3678etRQos5nRflqMniWhB 0BC0iEKNhTZ3LyoID/KnLnacSP1RyCb82hbs5x1MT2gvb4aLm0Kp3isbbeldSLwukC5r XttV+6DfQ/XCy7k5j/VWhHdBDPqSPGM6SvIM1Usirg5Ekw0VrlbiVKrnscY81TZrDEap x2cmxxn+bMb9BOIvO95iJHxIc53baZa9PCZJxa5jLRIczL2NoL+yWY0Ecmg4ULbKxhJ9 5t91+xqlKgw43C3xvvbtiqd0/9f27Sj5UWo7Iq3327wXBRWXOszygyi+wPbkddzArNV/ fMfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740001535; x=1740606335; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=R9XCsc+sgxUI5SOE40I45gWQYV0M4BiiAlFbbfMY96A=; b=jho3Bh06rxd5vo4ffSmZKuRjc0kAp1yh0+v9YnwG62lMfXEjObciz6l1z6P+DFvurD FNOfsXgUKWZoHEzVGtVxiT9ETZztnJq6PS6vnlU4mbZV4vhx39c6xPgPd8KPsBecrwDI t9nPH8V0yY6LZhN94QJEbkFYcIdgFaXzjGirVvUMI5oQlNaDPSqsFdf23pHEmT4luHgw g6eAvtvQlsSxgYHTNfC2JSJHRrH30mPxd2+KzuMnJwGcQnQGbOyJ4q8lCHmYZc7/r4/V tTfeoPF7RZUE4ZncQK4qOOvkJHw16v1/59zk0yPFlAkxKEFJp8h9QxaP56jIOHmHOkHf j0nw== X-Gm-Message-State: AOJu0YwKz9JIxfHzfi4mgMJRqYJpOhmTXPJT/ynBKKHz6jSF2YBabsz6 BAJpU2i7hs8VYKgy0pbOshn5I6KFUOa3mdl8LB9TfRZY9Zbf0QZfM/6rhyAjWHmBNEVNJnMtPbr qyprLgmPKwliKRNHgE4yVJVuF1bEttMvg1iuVyIfSEcTE5R3bF+i/U///CKwDs0wKNxpBzoMplH 5CnuWoXr2D5vcv0VF8runvt1y02Pv0D1TMwq7daW57 X-Google-Smtp-Source: AGHT+IEr4XOJfbVGm62C1up0rxHHtYYCZ/jvQYmID3Q9Y23kgJjNXv8tTXR/JqI+FGWn2nzMhHvlem9jYWw= X-Received: from plqw12.prod.google.com ([2002:a17:902:a70c:b0:21f:4f0a:c7e2]) (user=ctshao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:8cb:b0:220:e98e:4f1b with SMTP id d9443c01a7336-2218c356405mr18224675ad.0.1740001535274; Wed, 19 Feb 2025 13:45:35 -0800 (PST) Date: Wed, 19 Feb 2025 13:40:01 -0800 In-Reply-To: <20250219214400.3317548-1-ctshao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250219214400.3317548-1-ctshao@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250219214400.3317548-3-ctshao@google.com> Subject: [PATCH v6 2/4] perf lock: Retrieve owner callstack in bpf program From: Chun-Tse Shao To: linux-kernel@vger.kernel.org Cc: Chun-Tse Shao , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, nick.forrington@arm.com, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This implements per-callstack aggregation of lock owners in addition to per-thread. The owner callstack is captured using `bpf_get_task_stack()` at `contention_begin()` and it also adds a custom stackid function for the owner stacks to be compared easily. The owner info is kept in a hash map using lock addr as a key to handle multiple waiters for the same lock. At `contention_end()`, it updates the owner lock stat based on the info that was saved at `contention_begin()`. If there are more waiters, it'd update the owner pid to itself as `contention_end()` means it gets the lock now. But it also needs to check the return value of the lock function in case task was killed by a signal or something. Signed-off-by: Chun-Tse Shao --- .../perf/util/bpf_skel/lock_contention.bpf.c | 218 +++++++++++++++++- 1 file changed, 209 insertions(+), 9 deletions(-) diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/ut= il/bpf_skel/lock_contention.bpf.c index 23fe9cc980ae..e8b113d5802a 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -197,6 +197,9 @@ int data_fail; int task_map_full; int data_map_full; =20 +struct task_struct *bpf_task_from_pid(s32 pid) __ksym __weak; +void bpf_task_release(struct task_struct *p) __ksym __weak; + static inline __u64 get_current_cgroup_id(void) { struct task_struct *task; @@ -420,6 +423,61 @@ static inline struct tstamp_data *get_tstamp_elem(__u3= 2 flags) return pelem; } =20 +static inline s32 get_owner_stack_id(u64 *stacktrace) +{ + s32 *id, new_id; + static s64 id_gen =3D 1; + + id =3D bpf_map_lookup_elem(&owner_stacks, stacktrace); + if (id) + return *id; + + new_id =3D (s32)__sync_fetch_and_add(&id_gen, 1); + + bpf_map_update_elem(&owner_stacks, stacktrace, &new_id, BPF_NOEXIST); + + id =3D bpf_map_lookup_elem(&owner_stacks, stacktrace); + if (id) + return *id; + + return -1; +} + +static inline void update_contention_data(struct contention_data *data, u6= 4 duration, u32 count) +{ + __sync_fetch_and_add(&data->total_time, duration); + __sync_fetch_and_add(&data->count, count); + + /* FIXME: need atomic operations */ + if (data->max_time < duration) + data->max_time =3D duration; + if (data->min_time > duration) + data->min_time =3D duration; +} + +static inline void update_owner_stat(u32 id, u64 duration, u32 flags) +{ + struct contention_key key =3D { + .stack_id =3D id, + .pid =3D 0, + .lock_addr_or_cgroup =3D 0, + }; + struct contention_data *data =3D bpf_map_lookup_elem(&owner_stat, &key); + + if (!data) { + struct contention_data first =3D { + .total_time =3D duration, + .max_time =3D duration, + .min_time =3D duration, + .count =3D 1, + .flags =3D flags, + }; + bpf_map_update_elem(&owner_stat, &key, &first, BPF_NOEXIST); + } else { + update_contention_data(data, duration, 1); + } +} + SEC("tp_btf/contention_begin") int contention_begin(u64 *ctx) { @@ -437,6 +495,72 @@ int contention_begin(u64 *ctx) pelem->flags =3D (__u32)ctx[1]; =20 if (needs_callstack) { + u32 i =3D 0; + u32 id =3D 0; + int owner_pid; + u64 *buf; + struct task_struct *task; + struct owner_tracing_data *otdata; + + if (!lock_owner) + goto skip_owner; + + task =3D get_lock_owner(pelem->lock, pelem->flags); + if (!task) + goto skip_owner; + + owner_pid =3D BPF_CORE_READ(task, pid); + + buf =3D bpf_map_lookup_elem(&stack_buf, &i); + if (!buf) + goto skip_owner; + for (i =3D 0; i < max_stack; i++) + buf[i] =3D 0x0; + + if (!bpf_task_from_pid) + goto skip_owner; + + task =3D bpf_task_from_pid(owner_pid); + if (!task) + goto skip_owner; + + bpf_get_task_stack(task, buf, max_stack * sizeof(unsigned long), 0); + bpf_task_release(task); + + otdata =3D bpf_map_lookup_elem(&owner_data, &pelem->lock); + id =3D get_owner_stack_id(buf); + + /* + * Contention just happens, or corner case `lock` is owned by process not + * `owner_pid`. For the corner case we treat it as unexpected internal e= rror and + * just ignore the precvious tracing record. + */ + if (!otdata || otdata->pid !=3D owner_pid) { + struct owner_tracing_data first =3D { + .pid =3D owner_pid, + .timestamp =3D pelem->timestamp, + .count =3D 1, + .stack_id =3D id, + }; + bpf_map_update_elem(&owner_data, &pelem->lock, &first, BPF_ANY); + } + /* Contention is ongoing and new waiter joins */ + else { + __sync_fetch_and_add(&otdata->count, 1); + + /* + * The owner is the same, but stacktrace might be changed. In this case= we + * store/update `owner_stat` based on current owner stack id. + */ + if (id !=3D otdata->stack_id) { + update_owner_stat(id, pelem->timestamp - otdata->timestamp, + pelem->flags); + + otdata->timestamp =3D pelem->timestamp; + otdata->stack_id =3D id; + } + } +skip_owner: pelem->stack_id =3D bpf_get_stackid(ctx, &stacks, BPF_F_FAST_STACK_CMP | stack_skip); if (pelem->stack_id < 0) @@ -473,6 +597,7 @@ int contention_end(u64 *ctx) struct tstamp_data *pelem; struct contention_key key =3D {}; struct contention_data *data; + __u64 timestamp; __u64 duration; bool need_delete =3D false; =20 @@ -500,12 +625,94 @@ int contention_end(u64 *ctx) need_delete =3D true; } =20 - duration =3D bpf_ktime_get_ns() - pelem->timestamp; + timestamp =3D bpf_ktime_get_ns(); + duration =3D timestamp - pelem->timestamp; if ((__s64)duration < 0) { __sync_fetch_and_add(&time_fail, 1); goto out; } =20 + if (needs_callstack && lock_owner) { + struct owner_tracing_data *otdata =3D bpf_map_lookup_elem(&owner_data, &= pelem->lock); + + if (!otdata) + goto skip_owner; + + /* Update `owner_stat` */ + update_owner_stat(otdata->stack_id, timestamp - otdata->timestamp, pelem= ->flags); + + /* No contention is occurring, delete `lock` entry in `owner_data` */ + if (otdata->count <=3D 1) + bpf_map_delete_elem(&owner_data, &pelem->lock); + /* + * Contention is still ongoing, with a new owner (current task). `owner_= data` + * should be updated accordingly. + */ + else { + u32 i =3D 0; + s32 ret =3D (s32)ctx[1]; + u64 *buf; + + __sync_fetch_and_add(&otdata->count, -1); + + buf =3D bpf_map_lookup_elem(&stack_buf, &i); + if (!buf) + goto skip_owner; + for (i =3D 0; i < (u32)max_stack; i++) + buf[i] =3D 0x0; + + /* + * `ret` has the return code of the lock function. + * If `ret` is negative, the current task terminates lock waiting witho= ut + * acquiring it. Owner is not changed, but we still need to update the = owner + * stack. + */ + if (ret < 0) { + s32 id =3D 0; + struct task_struct *task; + + if (!bpf_task_from_pid) + goto skip_owner; + + task =3D bpf_task_from_pid(otdata->pid); + if (!task) + goto skip_owner; + + bpf_get_task_stack(task, buf, + max_stack * sizeof(unsigned long), 0); + bpf_task_release(task); + + id =3D get_owner_stack_id(buf); + + /* + * If owner stack is changed, update `owner_data` and `owner_stat` + * accordingly. + */ + if (id !=3D otdata->stack_id) { + update_owner_stat(id, pelem->timestamp - otdata->timestamp, + pelem->flags); + + otdata->timestamp =3D pelem->timestamp; + otdata->stack_id =3D id; + } + } + /* + * Otherwise, update tracing data with the current task, which is the n= ew + * owner. + */ + else { + otdata->pid =3D pid; + otdata->timestamp =3D timestamp; + /* + * We don't want to retrieve callstack here, since it is where the + * current task acquires the lock and provides no additional + * information. We simply assign -1 to invalidate it. + */ + otdata->stack_id =3D -1; + } + } + } +skip_owner: switch (aggr_mode) { case LOCK_AGGR_CALLER: key.stack_id =3D pelem->stack_id; @@ -589,14 +796,7 @@ int contention_end(u64 *ctx) } =20 found: - __sync_fetch_and_add(&data->total_time, duration); - __sync_fetch_and_add(&data->count, 1); - - /* FIXME: need atomic operations */ - if (data->max_time < duration) - data->max_time =3D duration; - if (data->min_time > duration) - data->min_time =3D duration; + update_contention_data(data, duration, 1); =20 out: pelem->lock =3D 0; --=20 2.48.1.601.g30ceb7b040-goog From nobody Thu Dec 18 16:14:37 2025 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 14D8F1DE88C for ; Wed, 19 Feb 2025 21:46:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001579; cv=none; b=n/1vZMUVISIbj3ocxtWSIkCYrQuGwCBdtOzwWLn/4puiv4uvY/nm22b/NQHWBHRgY7NBQ7byFE9yMOwNp8yZt6QrmOb77zcCHODSHNb7LPVYC1iU/erAHDnoTGj64LHAGE+kvyBBlL5NmsQhQy4LG4sOdyGT1NtQjH6BPld/fTk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001579; c=relaxed/simple; bh=I2lDkKLdTF+XzkwyuAKaxLnLyGAXCmSHLqfNO5ARzI4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ranzM3TTKKgAcEHWQb/bi+7UBpAJyk6k8VhX/B0LBzb+EOCosOHKTVL5qXMWDNp5tFI6kCMUWuEizaqmbBz3bKzkhSgzJpfPtsffHR4vKDH3RvQTq8qDeR54roMugrHXQe8PeCHN228D/dGa4MKFoqG5/Z+oww85qmIBLB5SR0k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=kE5g4+eF; arc=none smtp.client-ip=209.85.214.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="kE5g4+eF" Received: by mail-pl1-f202.google.com with SMTP id d9443c01a7336-220d6018858so4030185ad.2 for ; Wed, 19 Feb 2025 13:46:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740001577; x=1740606377; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1bPKqrufA/2xIYAJseqgRoZ6IOxuWUNgXHgZ4Li3xvQ=; b=kE5g4+eFZ21RwcRY0rDayTDOAR455NSAjQdb4Utk8J1fHVAnAws6TxC2OJ4SAUkGFf JDZQR8cz6G6QPMPmTxJ+XYALpOV+JxXWq31Q9JTtI3wulmNYZ3IjCHxfS1RUlruHXMCo 1v+rqXAtH3C7NPLBubQwLGBl+RcT4kA8E1x8wr4A8g0Fp3TsS398gNsacziFX7xve9KQ l98qK65vKlqWxfJ7PWN9qOAHqcjtk6Fjiy8vpS5IiTVmxHcoFEEfwYSeCnLEyJ5Xg5ng tObFLbEBNvJJzTNt6bv5NBejKLfcYivPjq4N3VMzN7qOj4+7284mMJj6Tk3Re73dZjA4 UcZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740001577; x=1740606377; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1bPKqrufA/2xIYAJseqgRoZ6IOxuWUNgXHgZ4Li3xvQ=; b=sb44YjKhJkt+rhzPn97t4UTlK//YkTDLb4OuBI61pPbGoGpyYFEs7IvIQ8n5gHOXx6 ilsEDBB0LDU06az1msjEwuOBTruDU0SuaEgvjpRxtkMFfoGE9S8fSffFiwzEG5dGv8Iy JXGAq1DWMx5/I2BPAr+2tVO584GAT6fDpXVhLdvF+Y1dqV4kxbYgMj7xIjzenIM6CK7/ OyGbkZ93iFH6yYANCvFBch2wLY/XJ0KTtEZWmUIq3xjWgP5xsxri0CjKAko/B11pKSxU zlYR81F8fMC360wfRFE+6kWnkRhI0f5G2tpN7A56v0HTSsF2Kw34UcfbRECfNFFtcD4C Me+Q== X-Gm-Message-State: AOJu0YwPjWYbKYd36D99N6BlQ3yxkKaJ1Ib7Kr2E5lJkTtRZ3iPU8cBH iOi7BSzQ8ctw+5I8C8Nk4TWOyIfvFZtNTnMJlLdhlZe/PjutG1/b0/mvS17sQAhAUa0VkL+kKM6 mFv8vqJrKUFx9Z8H0NvrGN1tBI37dijMkhKA1Db2z6knDq7YL3CIp+JYJI9OwL7VeOLnZIwPM/9 LHdPc9t/cAaf77f+uFn0cxlo9I8CnbJ9+n69Zy1s8/ X-Google-Smtp-Source: AGHT+IHPuRPmO/3O1HSUOneJjxjlMEiHb2sZQ7LZdaWMUGYrTa5vuT0gkpzgWVT2Jke2mXEyfyhdPxrnJTk= X-Received: from pfbho22.prod.google.com ([2002:a05:6a00:8816:b0:730:96d1:c213]) (user=ctshao job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6a21:3384:b0:1ee:d06c:cddc with SMTP id adf61e73a8af0-1eed06ccea1mr11871720637.30.1740001577366; Wed, 19 Feb 2025 13:46:17 -0800 (PST) Date: Wed, 19 Feb 2025 13:40:02 -0800 In-Reply-To: <20250219214400.3317548-1-ctshao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250219214400.3317548-1-ctshao@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250219214400.3317548-4-ctshao@google.com> Subject: [PATCH v6 3/4] perf lock: Make rb_tree helper functions generic From: Chun-Tse Shao To: linux-kernel@vger.kernel.org Cc: Chun-Tse Shao , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, nick.forrington@arm.com, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The rb_tree helper functions can be reused for parsing `owner_lock_stat` into rb tree for sorting. Signed-off-by: Chun-Tse Shao --- tools/perf/builtin-lock.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 5d405cd8e696..9bebc186286f 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -418,16 +418,13 @@ static void combine_lock_stats(struct lock_stat *st) rb_insert_color(&st->rb, &sorted); } =20 -static void insert_to_result(struct lock_stat *st, - int (*bigger)(struct lock_stat *, struct lock_stat *)) +static void insert_to(struct rb_root *rr, struct lock_stat *st, + int (*bigger)(struct lock_stat *, struct lock_stat *)) { - struct rb_node **rb =3D &result.rb_node; + struct rb_node **rb =3D &rr->rb_node; struct rb_node *parent =3D NULL; struct lock_stat *p; =20 - if (combine_locks && st->combined) - return; - while (*rb) { p =3D container_of(*rb, struct lock_stat, rb); parent =3D *rb; @@ -439,13 +436,21 @@ static void insert_to_result(struct lock_stat *st, } =20 rb_link_node(&st->rb, parent, rb); - rb_insert_color(&st->rb, &result); + rb_insert_color(&st->rb, rr); } =20 -/* returns left most element of result, and erase it */ -static struct lock_stat *pop_from_result(void) +static inline void insert_to_result(struct lock_stat *st, + int (*bigger)(struct lock_stat *, + struct lock_stat *)) +{ + if (combine_locks && st->combined) + return; + insert_to(&result, st, bigger); +} + +static inline struct lock_stat *pop_from(struct rb_root *rr) { - struct rb_node *node =3D result.rb_node; + struct rb_node *node =3D rr->rb_node; =20 if (!node) return NULL; @@ -453,8 +458,15 @@ static struct lock_stat *pop_from_result(void) while (node->rb_left) node =3D node->rb_left; =20 - rb_erase(node, &result); + rb_erase(node, rr); return container_of(node, struct lock_stat, rb); + +} + +/* returns left most element of result, and erase it */ +static struct lock_stat *pop_from_result(void) +{ + return pop_from(&result); } =20 struct trace_lock_handler { --=20 2.48.1.601.g30ceb7b040-goog From nobody Thu Dec 18 16:14:37 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B44691DED6F for ; Wed, 19 Feb 2025 21:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001620; cv=none; b=kQdp2LK9cyn/MEhzPaIOokOtwAboIMMEzB5DW+VquXwZ38lJYF8BWcRGitMzrprtFcO8Y6NR9V2qlbxfEooh16B6ExjcXQP8RwXW5R/2deL4UwirHK2r5J8wo/lJ4B1EkYJIZVRhz+mssm4wPEKEJoCPJkqjl9/1jF55YeUS+Ss= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740001620; c=relaxed/simple; bh=spD2IPWHJbNfrqj6V6dM25YSx0bpjkKaL8KOXqwmYUg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=TctdveGO+0R3MaiL1FaNC24Co9kU6KSTWp9vDiQxGVUQVhTttOMysdRLwEfFWIj8vh2+IPodaNl0uEMkSFfRb8gqHScm4JD43ULxFrDCUXTqVuetkZBNZ/MoT7mcizhKh0wKT9N+yZ6shPxotUonLLpxaJhgAiXeHzpcnHO6qfY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=c1eWa90s; arc=none smtp.client-ip=209.85.216.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ctshao.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="c1eWa90s" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2fc57652924so586201a91.1 for ; Wed, 19 Feb 2025 13:46:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1740001618; x=1740606418; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=OkPOCIzCxbN6rf/sOEoHDE1WwJEvz8ihPapEp19yOIo=; b=c1eWa90s9ERsbaiZYM38IPbBNQIPqdj3ImaIOqntQI5ADcOBq7CUDSRbhKZ60PdtAJ aB+mhMNTwlieI7YaAPGrRhM1NSaSoiD4yRnNwDK6UBs2oSP0jO9YBSEiF4hz2Z/9CkdB BvpQPwGDE/HUWo8jYvHhtNHJntOP+hMfq8jA8B2eKwh17yr9nw1z1I16z6gTNqPwECUU D5LIxsvFlu/4aFp16SeGqJjxzW5eL8l0P5A52cB4DffTN0JVRcb1ZvHdEP/759VEimxO cbpNSBhQck6wF93zk1IXiXlyaxmipxDtnXDGMNTyWtenMGCWQcDSGBNyP84JB3Y2wHmp qYSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740001618; x=1740606418; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OkPOCIzCxbN6rf/sOEoHDE1WwJEvz8ihPapEp19yOIo=; b=YO16fw4vWMWCLTBl5sGN+2iT9Qu8GghKkXJBsCmL3kpJXABrBBfvqeVKb6Hv8WtDOQ 7pFRVrRrMN0PvZTKPbJOWqDpFrKcYKwENlkbwk9kSo4zj+h4BnNW9nYhA4j++KlVQ93S i+tydZyngFEi7xpuxPjgS5sIO3960g77/hGEu2QYT8aqsJ84nypcI7XijjRbioiQCXYc 3Cn2IsLI6RmvqHBfri84dTnCXbq6TSOEuOWlb/A/O8BYvqYWV9BsSDJHq2S15BO7ysRf TDNAGHlbnYtg25Z8Vx03Acr4RpYazR5Sq/ahYm37MVzQkQq7DC5/KhDU95/BJnexs60l OoPg== X-Gm-Message-State: AOJu0YxqyEhQ5rJBRg+n8/MiQxYC3HkGeauAvCI6JGBBJkjK769IkpYG pAxBkrVR7AWJAuj3Prh5/FfRuCj4QD4X/ZlfX29eZIT5GlEtmaX9dFrh887Nittw+E5ujhJksE9 DJKpvyH7fdYZ0eQ1Y5bbsYndzqXB9IqPi8YSss6n9r5oFxNR0QLai9mLFWcwbR4/kMdv3oIZFNS g+Yco9sAQLnSg1dNpvq4JdpaRmDOQav6zuOckiqXe+ X-Google-Smtp-Source: AGHT+IFGsQ/ogkH6Qc8tr0rSOEGSPQyrMKMzjcxJTwdValwJTShzBiJFZhHTH8RKTn3adEgMSV+4z8lxcII= X-Received: from pjtd4.prod.google.com ([2002:a17:90b:44:b0:2fb:fa62:d40]) (user=ctshao job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90a:d498:b0:2fa:9c9:20a3 with SMTP id 98e67ed59e1d1-2fccbfd9f9amr1540053a91.0.1740001617948; Wed, 19 Feb 2025 13:46:57 -0800 (PST) Date: Wed, 19 Feb 2025 13:40:03 -0800 In-Reply-To: <20250219214400.3317548-1-ctshao@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250219214400.3317548-1-ctshao@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250219214400.3317548-5-ctshao@google.com> Subject: [PATCH v6 4/4] perf lock: Report owner stack in usermode From: Chun-Tse Shao To: linux-kernel@vger.kernel.org Cc: Chun-Tse Shao , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, kan.liang@linux.intel.com, nick.forrington@arm.com, linux-perf-users@vger.kernel.org, bpf@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch parses `owner_lock_stat` into a RB tree, enabling ordered reporting of owner lock statistics with stack traces. It also updates the documentation for the `-o` option in contention mode, decouples `-o` from `-t`, and issues a warning to inform users about the new behavior of `-ov`. Example output: $ sudo ~/linux/tools/perf/perf lock con -abvo -Y mutex-spin -E3 perf benc= h sched pipe ... contended total wait max wait avg wait type caller 171 1.55 ms 20.26 us 9.06 us mutex pipe_rea= d+0x57 0xffffffffac6318e7 pipe_read+0x57 0xffffffffac623862 vfs_read+0x332 0xffffffffac62434b ksys_read+0xbb 0xfffffffface604b2 do_syscall_64+0x82 0xffffffffad00012f entry_SYSCALL_64_after_hwfram= e+0x76 36 193.71 us 15.27 us 5.38 us mutex pipe_wri= te+0x50 0xffffffffac631ee0 pipe_write+0x50 0xffffffffac6241db vfs_write+0x3bb 0xffffffffac6244ab ksys_write+0xbb 0xfffffffface604b2 do_syscall_64+0x82 0xffffffffad00012f entry_SYSCALL_64_after_hwfram= e+0x76 4 51.22 us 16.47 us 12.80 us mutex do_epoll= _wait+0x24d 0xffffffffac691f0d do_epoll_wait+0x24d 0xffffffffac69249b do_epoll_pwait.part.0+0xb 0xffffffffac693ba5 __x64_sys_epoll_pwait+0x95 0xfffffffface604b2 do_syscall_64+0x82 0xffffffffad00012f entry_SYSCALL_64_after_hwfram= e+0x76 =3D=3D=3D owner stack trace =3D=3D=3D 3 31.24 us 15.27 us 10.41 us mutex pipe_rea= d+0x348 0xffffffffac631bd8 pipe_read+0x348 0xffffffffac623862 vfs_read+0x332 0xffffffffac62434b ksys_read+0xbb 0xfffffffface604b2 do_syscall_64+0x82 0xffffffffad00012f entry_SYSCALL_64_after_hwfram= e+0x76 ... Signed-off-by: Chun-Tse Shao --- tools/perf/Documentation/perf-lock.txt | 6 +-- tools/perf/builtin-lock.c | 22 +++++++++- tools/perf/util/bpf_lock_contention.c | 58 ++++++++++++++++++++++++++ tools/perf/util/lock-contention.h | 7 ++++ 4 files changed, 88 insertions(+), 5 deletions(-) diff --git a/tools/perf/Documentation/perf-lock.txt b/tools/perf/Documentat= ion/perf-lock.txt index d3793054f7d3..255e4f3e9d2b 100644 --- a/tools/perf/Documentation/perf-lock.txt +++ b/tools/perf/Documentation/perf-lock.txt @@ -140,7 +140,6 @@ CONTENTION OPTIONS --use-bpf:: Use BPF program to collect lock contention stats instead of using the input data. - -a:: --all-cpus:: System-wide collection from all CPUs. @@ -179,8 +178,9 @@ CONTENTION OPTIONS =20 -o:: --lock-owner:: - Show lock contention stat by owners. Implies --threads and - requires --use-bpf. + Show lock contention stat by owners. This option can be combined with -t, + which shows owner's per thread lock stats, or -v, which shows owner's + stacktrace. Requires --use-bpf. =20 -Y:: --type-filter=3D:: diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 9bebc186286f..34cffa3c7cad 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1817,6 +1817,22 @@ static void print_contention_result(struct lock_cont= ention *con) break; } =20 + if (con->owner && con->save_callstack && verbose > 0) { + struct rb_root root =3D RB_ROOT; + + if (symbol_conf.field_sep) + fprintf(lock_output, "# owner stack trace:\n"); + else + fprintf(lock_output, "\n=3D=3D=3D owner stack trace =3D=3D=3D\n\n"); + while ((st =3D pop_owner_stack_trace(con))) + insert_to(&root, st, compare); + + while ((st =3D pop_from(&root))) { + print_lock_stat(con, st); + zfree(st); + } + } + if (print_nr_entries) { /* update the total/bad stats */ while ((st =3D pop_from_result())) { @@ -1962,8 +1978,10 @@ static int check_lock_contention_options(const struc= t option *options, } } =20 - if (show_lock_owner) - show_thread_stats =3D true; + if (show_lock_owner && !show_thread_stats) { + pr_warning("Now -o try to show owner's callstack instead of pid and comm= .\n"); + pr_warning("Please use -t option too to keep the old behavior.\n"); + } =20 return 0; } diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lo= ck_contention.c index 76542b86e83f..226ec7a06ab1 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -549,6 +549,64 @@ static const char *lock_contention_get_name(struct loc= k_contention *con, return name_buf; } =20 +struct lock_stat *pop_owner_stack_trace(struct lock_contention *con) +{ + int stacks_fd, stat_fd; + u64 *stack_trace =3D NULL; + s32 stack_id; + struct contention_key ckey =3D {}; + struct contention_data cdata =3D {}; + size_t stack_size =3D con->max_stack * sizeof(*stack_trace); + struct lock_stat *st =3D NULL; + + stacks_fd =3D bpf_map__fd(skel->maps.owner_stacks); + stat_fd =3D bpf_map__fd(skel->maps.owner_stat); + if (!stacks_fd || !stat_fd) + goto out_err; + + stack_trace =3D zalloc(stack_size); + if (stack_trace =3D=3D NULL) + goto out_err; + + if (bpf_map_get_next_key(stacks_fd, NULL, stack_trace)) + goto out_err; + + bpf_map_lookup_elem(stacks_fd, stack_trace, &stack_id); + ckey.stack_id =3D stack_id; + bpf_map_lookup_elem(stat_fd, &ckey, &cdata); + + st =3D zalloc(sizeof(struct lock_stat)); + if (!st) + goto out_err; + + st->name =3D strdup(stack_trace[0] ? lock_contention_get_name(con, NULL, = stack_trace, 0) : + "unknown"); + if (!st->name) + goto out_err; + + st->flags =3D cdata.flags; + st->nr_contended =3D cdata.count; + st->wait_time_total =3D cdata.total_time; + st->wait_time_max =3D cdata.max_time; + st->wait_time_min =3D cdata.min_time; + st->callstack =3D stack_trace; + + if (cdata.count) + st->avg_wait_time =3D cdata.total_time / cdata.count; + + bpf_map_delete_elem(stacks_fd, stack_trace); + bpf_map_delete_elem(stat_fd, &ckey); + + return st; + +out_err: + if (stack_trace) + free(stack_trace); + if (st) + free(st); + return NULL; +} + int lock_contention_read(struct lock_contention *con) { int fd, stack, err =3D 0; diff --git a/tools/perf/util/lock-contention.h b/tools/perf/util/lock-conte= ntion.h index a09f7fe877df..97fd33c57f17 100644 --- a/tools/perf/util/lock-contention.h +++ b/tools/perf/util/lock-contention.h @@ -168,6 +168,8 @@ int lock_contention_stop(void); int lock_contention_read(struct lock_contention *con); int lock_contention_finish(struct lock_contention *con); =20 +struct lock_stat *pop_owner_stack_trace(struct lock_contention *con); + #else /* !HAVE_BPF_SKEL */ =20 static inline int lock_contention_prepare(struct lock_contention *con __ma= ybe_unused) @@ -187,6 +189,11 @@ static inline int lock_contention_read(struct lock_con= tention *con __maybe_unuse return 0; } =20 +struct lock_stat *pop_owner_stack_trace(struct lock_contention *con) +{ + return NULL; +} + #endif /* HAVE_BPF_SKEL */ =20 #endif /* PERF_LOCK_CONTENTION_H */ --=20 2.48.1.601.g30ceb7b040-goog