From nobody Sun Nov 24 14:57:29 2024 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 0900C1E572D; Tue, 5 Nov 2024 17:26:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730827602; cv=none; b=ZezHTLKP8HPzBjQuVr+znx+/q2/IQCi0DJGB2hL/0F1GUi1GBunY2D8ZWIYdp0x6722LjtrFV7F/8zxvz2Mtr2xoeJ0CU+F6Lp9OancE4Q0O9lZ+O0++l+UkMTcmmmqHYGhW9cYG7QFWRf3vGFaWxctwTGF0pA8FovbHICM9ibE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730827602; c=relaxed/simple; bh=rklxV/2//4lWBAPsekffYOBgTTnrf7YeFUf2y+iWzfs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Phmxs1uH+9t8LG+J0vLv5W22piXmKJOznLYvO/zLj2++4cHFmsP1wWqXXCPG0zcm2/NF2isMXsLmlAd5MdCEX9qKAq92zlViE/D8EdWKENbwE/Pn3QNoLnR4I/F4/gKnq8y2bWdTDq7iQ0sMJGvxrAltCne06xW8lRUbTvHPthY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KhnfUAkN; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KhnfUAkN" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 159DAC4AF0F; Tue, 5 Nov 2024 17:26:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1730827601; bh=rklxV/2//4lWBAPsekffYOBgTTnrf7YeFUf2y+iWzfs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KhnfUAkNd+26fCsREoBcuI2sinLC4XQnbVuXzUzDdNNNvzIv7MDvYSyjcOKLzsEDR StxuoHO+cfGPJS11GQS8aZP+2xdh8SLWWaXlOSp4yaQzVUiALtKI/fmuKBJ5zUtiRp XDwKUYpxh49/h1uPO/qItUXhKhfsuVC0tkOxev88lLGYv/ND9I2EEPn4svQnDTFsh3 EMIM5fw862gsLbxkFtUWS+tB2cNCR9xiBK5cioftotgR8feWTcJy3dw2JkLJFiU0QA OxaAA31qkgJJoSRMHka18wpH/bVpdO7Fiqjb9nyNZBzt6Uf48c0nQkWL3KuJnaStZl ZR4NJ5RGtwZEQ== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers , Kan Liang Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Song Liu , bpf@vger.kernel.org, Stephane Eranian , Vlastimil Babka , Kees Cook , Roman Gushchin , Hyeonggon Yoo <42.hyeyoo@gmail.com> Subject: [PATCH 4/4] perf lock contention: Handle slab objects in -L/--lock-filter option Date: Tue, 5 Nov 2024 09:26:35 -0800 Message-ID: <20241105172635.2463800-5-namhyung@kernel.org> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog In-Reply-To: <20241105172635.2463800-1-namhyung@kernel.org> References: <20241105172635.2463800-1-namhyung@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: quoted-printable Content-Type: text/plain; charset="utf-8" This is to filter lock contention from specific slab objects only. Like in the lock symbol output, we can use '&' prefix to filter slab object names. root@virtme-ng:/home/namhyung/project/linux# tools/perf/perf lock con -ab= l sleep 1 contended total wait max wait avg wait address sy= mbol 3 14.99 us 14.44 us 5.00 us ffffffff851c0940 pa= ck_mutex (mutex) 2 2.75 us 2.56 us 1.38 us ffff98d7031fb498 &t= ask_struct (mutex) 4 1.42 us 557 ns 355 ns ffff98d706311400 &k= malloc-cg-512 (mutex) 2 953 ns 714 ns 476 ns ffffffff851c3620 de= layed_uprobe_lock (mutex) 1 929 ns 929 ns 929 ns ffff98d7031fb538 &t= ask_struct (mutex) 3 561 ns 210 ns 187 ns ffffffff84a8b3a0 te= xt_mutex (mutex) 1 479 ns 479 ns 479 ns ffffffff851b4cf8 tr= acepoint_srcu_srcu_usage (mutex) 2 320 ns 195 ns 160 ns ffffffff851cf840 pc= pu_alloc_mutex (mutex) 1 212 ns 212 ns 212 ns ffff98d7031784d8 &s= ignal_cache (mutex) 1 177 ns 177 ns 177 ns ffffffff851b4c28 tr= acepoint_srcu_srcu_usage (mutex) With the filter, it can show contentions from the task_struct only. root@virtme-ng:/home/namhyung/project/linux# tools/perf/perf lock con -ab= l -L '&task_struct' sleep 1 contended total wait max wait avg wait address sy= mbol 2 1.97 us 1.71 us 987 ns ffff98d7032fd658 &t= ask_struct (mutex) 1 1.20 us 1.20 us 1.20 us ffff98d7032fd6f8 &t= ask_struct (mutex) It can work with other aggregation mode: root@virtme-ng:/home/namhyung/project/linux# tools/perf/perf lock con -ab= -L '&task_struct' sleep 1 contended total wait max wait avg wait type caller 1 25.10 us 25.10 us 25.10 us mutex perf_eve= nt_exit_task+0x39 1 21.60 us 21.60 us 21.60 us mutex futex_ex= it_release+0x21 1 5.56 us 5.56 us 5.56 us mutex futex_ex= ec_release+0x21 Signed-off-by: Namhyung Kim --- tools/perf/builtin-lock.c | 35 ++++++++++++++++ tools/perf/util/bpf_lock_contention.c | 40 ++++++++++++++++++- .../perf/util/bpf_skel/lock_contention.bpf.c | 21 +++++++++- tools/perf/util/lock-contention.h | 2 + 4 files changed, 95 insertions(+), 3 deletions(-) diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 89ee2a2f78603906..405e95666257b7fe 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c @@ -1646,6 +1646,12 @@ static void lock_filter_finish(void) =20 zfree(&filters.cgrps); filters.nr_cgrps =3D 0; + + for (int i =3D 0; i < filters.nr_slabs; i++) + free(filters.slabs[i]); + + zfree(&filters.slabs); + filters.nr_slabs =3D 0; } =20 static void sort_contention_result(void) @@ -2412,6 +2418,27 @@ static bool add_lock_sym(char *name) return true; } =20 +static bool add_lock_slab(char *name) +{ + char **tmp; + char *sym =3D strdup(name); + + if (sym =3D=3D NULL) { + pr_err("Memory allocation failure\n"); + return false; + } + + tmp =3D realloc(filters.slabs, (filters.nr_slabs + 1) * sizeof(*filters.s= labs)); + if (tmp =3D=3D NULL) { + pr_err("Memory allocation failure\n"); + return false; + } + + tmp[filters.nr_slabs++] =3D sym; + filters.slabs =3D tmp; + return true; +} + static int parse_lock_addr(const struct option *opt __maybe_unused, const = char *str, int unset __maybe_unused) { @@ -2435,6 +2462,14 @@ static int parse_lock_addr(const struct option *opt = __maybe_unused, const char * continue; } =20 + if (*tok =3D=3D '&') { + if (!add_lock_slab(tok + 1)) { + ret =3D -1; + break; + } + continue; + } + /* * At this moment, we don't have kernel symbols. Save the symbols * in a separate list and resolve them to addresses later. diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lo= ck_contention.c index 50c3039c647d4d77..2891a81380204b1d 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -113,7 +113,7 @@ static void exit_slab_cache_iter(void) int lock_contention_prepare(struct lock_contention *con) { int i, fd; - int ncpus =3D 1, ntasks =3D 1, ntypes =3D 1, naddrs =3D 1, ncgrps =3D 1; + int ncpus =3D 1, ntasks =3D 1, ntypes =3D 1, naddrs =3D 1, ncgrps =3D 1, = nslabs =3D 1; struct evlist *evlist =3D con->evlist; struct target *target =3D con->target; =20 @@ -202,6 +202,13 @@ int lock_contention_prepare(struct lock_contention *co= n) =20 check_slab_cache_iter(con); =20 + if (con->filters->nr_slabs && has_slab_iter) { + skel->rodata->has_slab =3D 1; + nslabs =3D con->filters->nr_slabs; + } + + bpf_map__set_max_entries(skel->maps.slab_filter, nslabs); + if (lock_contention_bpf__load(skel) < 0) { pr_err("Failed to load lock-contention BPF skeleton\n"); return -1; @@ -272,6 +279,36 @@ int lock_contention_prepare(struct lock_contention *co= n) bpf_program__set_autoload(skel->progs.collect_lock_syms, false); =20 lock_contention_bpf__attach(skel); + + /* run the slab iterator after attaching */ + run_slab_cache_iter(); + + if (con->filters->nr_slabs) { + u8 val =3D 1; + int cache_fd; + long key, *prev_key; + + fd =3D bpf_map__fd(skel->maps.slab_filter); + + /* Read the slab cache map and build a hash with its address */ + cache_fd =3D bpf_map__fd(skel->maps.slab_caches); + prev_key =3D NULL; + while (!bpf_map_get_next_key(cache_fd, prev_key, &key)) { + struct slab_cache_data data; + + if (bpf_map_lookup_elem(cache_fd, &key, &data) < 0) + break; + + for (i =3D 0; i < con->filters->nr_slabs; i++) { + if (!strcmp(con->filters->slabs[i], data.name)) { + bpf_map_update_elem(fd, &key, &val, BPF_ANY); + break; + } + } + prev_key =3D &key; + } + } + return 0; } =20 @@ -397,7 +434,6 @@ static void account_end_timestamp(struct lock_contentio= n *con) =20 int lock_contention_start(void) { - run_slab_cache_iter(); skel->bss->enabled =3D 1; return 0; } diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/ut= il/bpf_skel/lock_contention.bpf.c index b5bc37955560a58e..048a04fc3a7fc27d 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -100,6 +100,13 @@ struct { __uint(max_entries, 1); } cgroup_filter SEC(".maps"); =20 +struct { + __uint(type, BPF_MAP_TYPE_HASH); + __uint(key_size, sizeof(long)); + __uint(value_size, sizeof(__u8)); + __uint(max_entries, 1); +} slab_filter SEC(".maps"); + struct { __uint(type, BPF_MAP_TYPE_HASH); __uint(key_size, sizeof(long)); @@ -131,6 +138,7 @@ const volatile int has_task; const volatile int has_type; const volatile int has_addr; const volatile int has_cgroup; +const volatile int has_slab; const volatile int needs_callstack; const volatile int stack_skip; const volatile int lock_owner; @@ -213,7 +221,7 @@ static inline int can_record(u64 *ctx) __u64 addr =3D ctx[0]; =20 ok =3D bpf_map_lookup_elem(&addr_filter, &addr); - if (!ok) + if (!ok && !has_slab) return 0; } =20 @@ -226,6 +234,17 @@ static inline int can_record(u64 *ctx) return 0; } =20 + if (has_slab && bpf_get_kmem_cache) { + __u8 *ok; + __u64 addr =3D ctx[0]; + long kmem_cache_addr; + + kmem_cache_addr =3D (long)bpf_get_kmem_cache(addr); + ok =3D bpf_map_lookup_elem(&slab_filter, &kmem_cache_addr); + if (!ok) + return 0; + } + return 1; } =20 diff --git a/tools/perf/util/lock-contention.h b/tools/perf/util/lock-conte= ntion.h index 1a7248ff388947e1..95331b6ec062410d 100644 --- a/tools/perf/util/lock-contention.h +++ b/tools/perf/util/lock-contention.h @@ -10,10 +10,12 @@ struct lock_filter { int nr_addrs; int nr_syms; int nr_cgrps; + int nr_slabs; unsigned int *types; unsigned long *addrs; char **syms; u64 *cgrps; + char **slabs; }; =20 struct lock_stat { --=20 2.47.0.199.ga7371fff76-goog