From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) (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 0533D3264C8 for ; Mon, 4 May 2026 13:51:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777902713; cv=none; b=AFFQxiClWQ9cFKoxc20DHAAazURqHrek3o22geHu5M5pZHqhdFMXKkPKaqwoKPPx7CiZouv3AWo9NcUKeilpMJwfvdvsx0K3UhvNdm2wsDZbOmcXH38WVNjwcenTpnr34PUrUM+9vLC5M/Yr/0AZB3ORDc6mrzvomBVpjwNc/zM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777902713; c=relaxed/simple; bh=pYfIPqorxDE0R0e1j+wNyGgwgZvWB98Ly7fIhs/gcfc=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=ZhaQ4dvVPaFfwuzEWUmFpPlZQ8fH0wqP+u09Y29LdLj6G65rga7m+DrREEYpVlvjpG+q9T77iwmpqYc7R4ibVnOYEFT8fe1OxhNu2S1zg3X05sGR9vcoAdchfChKC9/r/vjbeXLs2Zd7gwlMMido9WpaXH3KvRGxkkvs7b8oThU= 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=B1+p02RZ; arc=none smtp.client-ip=209.85.216.43 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="B1+p02RZ" Received: by mail-pj1-f43.google.com with SMTP id 98e67ed59e1d1-364ff382b0bso2811194a91.2 for ; Mon, 04 May 2026 06:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1777902711; x=1778507511; 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=LzRxffteXPHemRjDMy2wtgMLKIg+EY5vkIJp2WjdWj0=; b=B1+p02RZ/RU564lyAniHTq6vP0z6LCZpbbc9v069p4dgj8Yy9AtcECWnTOkY2DgoUe yApOiL62FH8i/gFtEMSxiFpO2VT7l7gQDW3LKmzpcePHi/Ys8DzReJf3kFowiqkKnMic kgOsXg2XPavpz2pce1ZdA0Z1T1/oEfdrWFQDqZCZVZ6TweK5eitvLiDM2M7Ocq6OmpkV TS8d4sWxTbBXOewMQDvrd1a4LuHZbc9xG/Lk1woAajMJxtSBSz93d8KZuDrS4PX+287x Oos62oK4Dd9GHo0A8eYQBR6XK4R7U/iDVdZXSwEoP+qQO++dmfAnHNMehtFpKerEq0zl FSQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777902711; x=1778507511; 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=LzRxffteXPHemRjDMy2wtgMLKIg+EY5vkIJp2WjdWj0=; b=M9HggRzSjDc9MSLPf9KTl/KJNfVaYsSaVxlQxi6azzrHrAeQVQbjfrwPQ8tpufMs5a eot/YDVP3mjIlNlu2mnVkiUTDBUk53HkEupe6kBYSN92KyM6wUc/g9n0m+3aWQ+46isM Xa8IlR12JxwxGOpAkvoFEQkEKuZtwJseVWiT3hmY8+zd//025V/IeTop/g6u6JCGiFAi Mblu6R6AcVUhT1mCXhQHQ0YWuOuES/n1SvMzfN31zjFl8ydWlfA2LoHUe7jumiWNd0Nt t7Gnqp5d0yMOcOnwY6hJR8vhGKVohkLCDldPoddUAiXuzwgTNXXrqyj4Hl+d9pey895c nEBA== X-Forwarded-Encrypted: i=1; AFNElJ/zZbfO3VdEMl8UAGlGsb6eD4VLNNvaXXTerq9oUToCgAjV65J2beuBGk8CZgAHIdPo1as=@vger.kernel.org X-Gm-Message-State: AOJu0YxwDpZwbBo1JQxo/XRMi8qSxXGAh1F1lWNXeboC/mdFBNhoGaMa sJ4X4Yhy9vYtSxykiRd7mz3S+SsXTlQEhbM5rqUjLAW/BBoeaABYde5zZ6Lr7Q== X-Gm-Gg: AeBDievUktie6vPrVueXGqJPrXjjfhSRFbtfSEM4uF2ouxVZSAV7nRRLX2k2ARBGodL SYcZ4cf/vohvKKbxW9gWfDGMjq7ZqCeuOCAggaVR4dlPopuiMZL+vaNgoFyvyawUlRMSsiIw3P4 jfW5gxj3KErUgpvmHVDqyu5k22Lh7QEJMCUtmkrXNQnF78VfcY3jdkAlGOnOkCiIrz4LXHAAnQ5 n4vj2TLib771wnGWFFTkrH2VH6MAAcTGofcup19V+L4cC/+ua9KDFSRqffqxmnFu+h8agEE9zO2 NMrKU2Q95OJCXib9duRhifizfsAZoGNeiRdjKizAbz4g12Ol72HSBxyCk2//QiQOfxC+4yiGmxK HAWLbugyDXXiPqo43EyxlhHYLgwCe9mjAjklwVIq0uZhzl7cBkYWsZ+KkK1TUa2SUcGcF5Ndh9b Yu0PPLHRwEOb2BWLFIGQoU3GV3QDL2syLpv6Ag7l0vHw== X-Received: by 2002:a17:90a:ec86:b0:35f:bd29:75b9 with SMTP id 98e67ed59e1d1-3650cee7ca6mr9603800a91.22.1777902711104; Mon, 04 May 2026 06:51:51 -0700 (PDT) Received: from archlinux ([205.254.163.52]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b9cae15fb6sm109688945ad.43.2026.05.04.06.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 May 2026 06:51:50 -0700 (PDT) From: Suchit Karunakaran To: 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, james.clark@linaro.org Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Suchit Karunakaran Subject: [PATCH RESEND] perf/lock: Fix non-atomic max/time and min_time updates in contention_data Date: Mon, 4 May 2026 19:21:38 +0530 Message-ID: <20260504135138.17050-1-suchitkarunakaran@gmail.com> X-Mailer: git-send-email 2.53.0 Precedence: bulk X-Mailing-List: bpf@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The update_contention_data() had a FIXME noting that max_time and min_time updates lacked atomicity. Two CPUs could simultaneously read a stale value, pass the comparison check and race on the write-back, with the smaller value potentially overwriting the larger one and silently corrupting the statistics. Fix this by replacing the bare conditional assignments with a bpf_loop()-based CAS retry loop. Each field tracks its own convergence independently via max_done/min_done flags in cas_ctx, so a successful CAS on one field is never retried even if the other field needs more attempts. Acked-by: Namhyung Kim Signed-off-by: Suchit Karunakaran --- .../perf/util/bpf_skel/lock_contention.bpf.c | 50 +++++++++++++++++-- 1 file changed, 45 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/bpf_skel/lock_contention.bpf.c b/tools/perf/util/bpf_skel/lock_contention.bpf.c index 96e7d853b9ed..5c8431be674a 100644 --- a/tools/perf/util/bpf_skel/lock_contention.bpf.c +++ b/tools/perf/util/bpf_skel/lock_contention.bpf.c @@ -175,6 +175,13 @@ struct mm_struct___new { struct rw_semaphore mmap_lock; } __attribute__((preserve_access_index)); +struct cas_ctx { + struct contention_data *data; + u64 duration; + int max_done; + int min_done; +}; + extern struct kmem_cache *bpf_get_kmem_cache(u64 addr) __ksym __weak; /* control flags */ @@ -486,16 +493,49 @@ static inline s32 get_owner_stack_id(u64 *stacktrace) return -1; } +static long cas_min_max_cb(u64 idx, void *arg) +{ + struct cas_ctx *ctx = arg; + + if (!ctx->max_done) { + u64 old_max = ctx->data->max_time; + if (old_max >= ctx->duration) { + ctx->max_done = 1; + } else { + u64 r = __sync_val_compare_and_swap( + &ctx->data->max_time, old_max, ctx->duration); + if (r == old_max) + ctx->max_done = 1; + } + } + + if (!ctx->min_done) { + u64 old_min = ctx->data->min_time; + if (old_min <= ctx->duration) { + ctx->min_done = 1; + } else { + u64 r = __sync_val_compare_and_swap( + &ctx->data->min_time, old_min, ctx->duration); + if (r == old_min) + ctx->min_done = 1; + } + } + + return (ctx->max_done && ctx->min_done) ? 1 : 0; +} + static inline void update_contention_data(struct contention_data *data, u64 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 = duration; - if (data->min_time > duration) - data->min_time = duration; + struct cas_ctx ctx = { + .data = data, + .duration = duration, + .max_done = 0, + .min_done = 0, + }; + bpf_loop(64, cas_min_max_cb, &ctx, 0); } static inline void update_owner_stat(u32 id, u64 duration, u32 flags) -- 2.53.0