From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) (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 B2A583B7B6B for ; Mon, 20 Apr 2026 18:47:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.170 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776710838; cv=none; b=QmxbU2FYPPSkfPDm+7D4wYjhWTkIzDP/559AOjxosi45UVeJR6Yg7ox/Lkhxvwrd1jc6iBT0MR02u9Z+dCHY0//DIJWiLeFwlMV6nve8pwZbGRYpm9ZHeVY9c4bv0AqlfWioaf9VaST23xVFWPKRYRwAI9uDNJvtlgoctURTbLA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776710838; c=relaxed/simple; bh=vW02KOU5qndWFI5Kbr8zih/4D7EhB9UqxDCMlU5uBtE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PqKeCqVX+y3ziyCRqRO/DomO/CuSL16sOR+Xo+F4uVg/to3CebejpCfFR4K9jAhne0z4ABnEVHo4/T1PmgjpqTPPH4zy4g/AIkFho888HlyVO1c0a8u8cLLbbcqsKs1XMax8h0dHkXkVhDZMF2njGIKgj2Dg4V6Ub5FheXYhALw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=c7VfrFoP; arc=none smtp.client-ip=209.85.215.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="c7VfrFoP" Received: by mail-pg1-f170.google.com with SMTP id 41be03b00d2f7-c76c60c7502so1590138a12.0 for ; Mon, 20 Apr 2026 11:47:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776710829; x=1777315629; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9zb1CzXElV/JafdZJDqAqdzrpLqJEbxaPbWiaVDaWpI=; b=c7VfrFoPzfksxrVeKnfwPUcPAmNou4e30BlJP8q8rgwgTE7Km/f0qOvDPrg48NUD4A Ym4ST+iPmDXhx106c+h9+yOATQxcAHbhkmYv5COGGsPnydF6P8KkVWWRFv09tU8cwOOQ AH/nGvpXtlicD6RD60yjSU1dqv2/JefDTop/WAOv2DNGXuohlY50pYL65EMQobiPWn+A smwJzNdlldSs0S2yxZLynHC1hElB0aOanRjrzhTdPVzcF1oFhG7M51QJm8Q2975g49Bx Gx6ULK+NYFsQFd2uFvcTPGaiWntWRGabg3kYai0q4yz1sSkKGUoc4V/QoqVJvIOJHwJB PQOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776710829; x=1777315629; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=9zb1CzXElV/JafdZJDqAqdzrpLqJEbxaPbWiaVDaWpI=; b=mDIkpRCsusoD/wRO0lq1xNNSXWOQjx24m0rnwUF/0wMq9/wxmSUlnpvLDVu8Z1OFVF smflirfaWdjCmOxzCcFe/SHAZVmt5Txgr3wXZFdz983ooeddtWW/xns/rgfyxtNoQEcj TMr3NTKCPk+Yqz/RZW3V5wrAQ79V9S1zJlLeNbTvplyrj4HSjDgDNKIu0MDfmhUGwDmj euYoP3/ctNKC6u+nNnR+Ko4ZGpnkiw4r7W4PXywVPxthE+RIWtkZT3Q1DUPof0c59hC0 zLwtBAZEM86zzNRq2NpxvqeA7qFcp/4Fa/+O8tw6Li23sPPYNr6ApdiPDkmCRlN47URh Jp7w== X-Forwarded-Encrypted: i=1; AFNElJ9vkUS5Tzy2sXrBhcjXkCMMradFnUchyeH1t/+pZoTOo0TpNdtMiylM0QCnFjQgOA4k8+sFIyu8p1GjgVc=@vger.kernel.org X-Gm-Message-State: AOJu0YwcBD6geL5A7n5hzuNIJoJDfpKWLua7N9/LhU084DH0ABtgGTPY jBj8HLlyF//o21EDh8f++bN1M8btGkWYmaDbjKNUACpBm8wekv5rlLA0 X-Gm-Gg: AeBDies7DyF4t8ohup1FtsnhDQV4hKJovOE3SVdU/K2CNyV0339oAxKQ7Z/A9a9Vq7f VlcnibIJLpcsa4Y7cHvVf9g8VmI1EBcvsviR4FDseHg0eQYJwBhLGyEqyAekBkiF4cSbBQS2zV0 zTrHmP2XNQf65vxyOM6HMXvE038gdr4kfxMp4KnjsQwr48Lu23XXv8HrbAeGoU8Y8Xs0Yuu6JyI ONnF/WwD3YIj8141Pbrxo2cEAQ0hJYaIw742tGMQhmr/Qk6epas9TCeZbyWGR1ODHp8c0pQf2l7 VI7c5NE3P/7y6c//Jk4xaKSzUZejVCksjJTuD83HAUwHhGjT7WG2XAfOmJysklVJDRAr6s/EKvl lkrcUxdyTdwhzZAkGEvQb1GV29/NB7NYPN7/Ab/JGQLcb+iJ/Iyql7xqEgmC3xIBo2weXlfxLfC z1jeP8DTWYf+2LD/aQwn7TASC4euNHPQcj3Aozy7LF3A== X-Received: by 2002:a17:903:11c3:b0:2ae:5346:d4e6 with SMTP id d9443c01a7336-2b5f9ef78e0mr130724395ad.28.1776710828613; Mon, 20 Apr 2026 11:47:08 -0700 (PDT) Received: from archlinux ([205.254.163.40]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab0d0f8sm103913295ad.47.2026.04.20.11.47.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2026 11:47:08 -0700 (PDT) From: Suchit Karunakaran To: peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org Cc: mark.rutland@arm.com, alexander.shishkin@linux.intel.com, jolsa@kernel.org, irogers@google.com, adrian.hunter@intel.com, james.clark@linaro.org, tycho@kernel.org, suchitkarunakaran@gmail.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH] perf/lock: enable end-timestamp accounting for cgroup aggregation Date: Tue, 21 Apr 2026 00:16:56 +0530 Message-ID: <20260420184656.331306-1-suchitkarunakaran@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit update_lock_stat() handles lock contentions that start but never reach a contention_end event (e.g., locks still held when profiling stops), but previously treated LOCK_AGGR_CGROUP as a no-op due to missing cgroup context in userspace; fix this by adding a cgroup_id field to struct tstamp_data, recording it at contention_begin using get_current_cgroup_id() when aggr_mode == LOCK_AGGR_CGROUP, and using ts_data->cgroup_id to build the aggregation key in update_lock_stat(), matching the contention_end behavior in BPF and ensuring correct attribution of incomplete events. Signed-off-by: Suchit Karunakaran --- tools/perf/util/bpf_lock_contention.c | 4 ++-- tools/perf/util/bpf_skel/lock_contention.bpf.c | 2 ++ tools/perf/util/bpf_skel/lock_data.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/bpf_lock_contention.c b/tools/perf/util/bpf_lock_contention.c index cbd7435579fe..1a5bd2ff8ee4 100644 --- a/tools/perf/util/bpf_lock_contention.c +++ b/tools/perf/util/bpf_lock_contention.c @@ -463,8 +463,8 @@ static void update_lock_stat(int map_fd, int pid, u64 end_ts, stat_key.lock_addr_or_cgroup = ts_data->lock; break; case LOCK_AGGR_CGROUP: - /* TODO */ - return; + stat_key.lock_addr_or_cgroup = ts_data->cgroup_id; + break; default: return; } diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/util/bpf_skel/lock_contention.bpf.c index 96e7d853b9ed..d0e2cad02fa3 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -536,6 +536,8 @@ int contention_begin(u64 *ctx) pelem->timestamp = bpf_ktime_get_ns(); pelem->lock = (__u64)ctx[0]; pelem->flags = (__u32)ctx[1]; + if (aggr_mode == LOCK_AGGR_CGROUP) + pelem->cgroup_id = get_current_cgroup_id(); if (needs_callstack) { u32 i = 0; diff --git a/tools/perf/util/bpf_skel/lock_data.h b/tools/perf/util/bpf_skel/lock_data.h index 28c5e5aced7f..652e114e6b87 100644 --- a/tools/perf/util/bpf_skel/lock_data.h +++ b/tools/perf/util/bpf_skel/lock_data.h @@ -13,6 +13,7 @@ struct owner_tracing_data { struct tstamp_data { u64 timestamp; u64 lock; + u64 cgroup_id; u32 flags; s32 stack_id; }; -- 2.53.0