From nobody Tue Jun 16 02:35:41 2026 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 AC5331DC198 for ; Wed, 15 Apr 2026 12:03:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776254623; cv=none; b=HESl7GJwrelAF+OU8eqqit62PC1R4W39L5TRYWQiyoSn5Eoh3H4fj9ZA1zQN3ygpJe9rD3IGfwnA/Gb3sJamDa3UiLWWdLwjj97HXHSK1cYc1P6sIzklpLnLbz50U4lGhBomLabzA4MgyPeOHkiBWtcFyO95MYPlMe6rIxCdl6w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776254623; c=relaxed/simple; bh=3U6UHJgt835GYv40BhwoYNP4PwkYd8x9aLaj/9Mma14=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=JCF4yGs9D/k6wPTq1FQK1Gw77z3zb4O3qHS/CCTxq+XsbMZyOdWfDzjzw8AZciX42u6bjGesHwaCsnySjU4J8pJlTeRSFHCslFUoW2j0xE6GPlKAfmqF8FOpmvdy2eKrqCSMKhH4tXbUxftiXZukNvzpvXGgYd1JYXDYsCvfBXU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=K3tGrjLb; arc=none smtp.client-ip=209.85.221.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="K3tGrjLb" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-43cfde3c3f3so6783215f8f.3 for ; Wed, 15 Apr 2026 05:03:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1776254619; x=1776859419; 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=MY7KppkO24AIxEJgw2x9OFRmnNC7DRzHfNEKohz8ESc=; b=K3tGrjLbd6yDHpJ0f/H2z7zGvYNrKp8VcNp62WUe2KHkJxXopaqAUC4N6clumbRBos 7VAXcmcRFHTn1wDnwKhhUCD+Nd6V8xAeIuYEeoOMibYgvCXeg9a+fExmOWLuB3cdxVkZ BSdxvTkHHxoPAxfmkCxE1xnndEwVhmP15rf0I1qlTdGcQR5NuBV9/gi+LI97NRGnSQMB R6+UemVi50sL+thMMLIhN8hWOVwgepgr3ol5NG9nqPCR8qoUoT29OMqSqtzwpkBF1YvJ yhPBWQXuKs7GkvLuFJrp3eyfdeRQ/IC10ImEt1cQQd0XhT3TNJaAmbrr4Uoq72+E6W4K RSFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776254619; x=1776859419; 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=MY7KppkO24AIxEJgw2x9OFRmnNC7DRzHfNEKohz8ESc=; b=QTO3vABq/rbZ/T/QiNj+G+YugvRkK1eNnB0atsXUq71or58+BL1wZvrO53SH+P9qpI iQ7Q5cMHvvt6ueoC72A90XVv1Yn0nOpnPopj43xgsOm20k5sc3t1bH8jKdYCSkX+JzFO bhLOs5n56+Y0QIV3+MwSBY+8LoGlO2FjK+Sg4yH8nGZQHC5SrcajnHd4kXc99uGswP+3 sPH8PnAndOc9lZoDeSTU5+DeBSktbJk4GKc5GhF1ZLmzHiECcs1WYmINGbT9AGwZAW+k 8VOdJSwXi1Pq+rxQu4iH9fS9pn6D8TuGXkZ6sgX+BBCNOO2lnb7MXWK2a29kFaEWB5iS iljw== X-Forwarded-Encrypted: i=1; AFNElJ+Lf/H+rMOkq4/Qngl1681LSRX43+XKj7dKHAkH3OvenG5JyE8XQFS62LiQZ5u6X0XxRrAxwd+gaKd2PLI=@vger.kernel.org X-Gm-Message-State: AOJu0YwIPly0l3+c5wHIF0vVqjMemBwyLxOZ5WduoOvrVsZ965g34kJ7 CX9SF0k1dOkGREhM/eUaxoH1W2RJSe3XP3vMqbEJT4fddMP+cUBVI0lnxwQD9pOaKks= X-Gm-Gg: AeBDieuiG03cFY6+YYHalFwaOIJxEn8oQwAGHFbhu2c8/T+KoRXbVgtrwDcZgnfDoop 3p0ZTCvGGlvZxSomEmHrk7/JbXsbdtldMuvhsWuxBu8onsFroT+S58K0kK6mDaYUJB0np1OnxU6 crov+ds8wO7U4eyJ8ApOgsMwJO2bkarr0hmL3VnRjxIHCUNF3VWqgvm26zcT5SRiNVzYQY2TJxo pdT7wb5r4ah920Dz4/Z0lrCUHMu6d9EzWebQLa04OnZvrNfOSMVh/Oc2sujRSpDQ1B1LKY31yat 1XDC9Z41jZVkbb7JQYi1aVEnTSqIEPxUp8yLfX2WRw5rKi/suMvh5wd/wQ5G6p2jKanTnDX54tC TGg5jQnU6qt9rSSetqE+I5sEHFDj02eLdJehNoPkzqLR4LDRQEtODt6bDOvvh0Y4NA0ibl0f4Hp t8RxZpxk3MiBcpyYXOkjpp2LviHymDtkO9XPR2gncGwTfCT+ilfFfgDidc3Q== X-Received: by 2002:a05:600c:46d0:b0:485:40c6:f507 with SMTP id 5b1f17b1804b1-488d689dbfcmr301107095e9.30.1776254618851; Wed, 15 Apr 2026 05:03:38 -0700 (PDT) Received: from localhost (27-51-0-223.adsl.fetnet.net. [27.51.0.223]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b4780f035csm19983145ad.15.2026.04.15.05.03.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Apr 2026 05:03:37 -0700 (PDT) From: Shung-Hsi Yu To: bpf@vger.kernel.org Cc: Shung-Hsi Yu , Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Eduard Zingerman , Kumar Kartikeya Dwivedi , Song Liu , Yonghong Song , Jiri Olsa , Thomas Gleixner , Shuah Khan , linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH bpf-next] selftests/bpf: Fix timer_start_deadlock failure due to hrtimer change Date: Wed, 15 Apr 2026 20:03:28 +0800 Message-ID: <20260415120329.129192-1-shung-hsi.yu@suse.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: quoted-printable Content-Type: text/plain; charset="utf-8" Since commit f2e388a019e4 ("hrtimer: Reduce trace noise in hrtimer_start()"= ), hrtimer_cancel tracepoint is no longer called when a hrtimer is re-armed. So instead of a hrtimer_cancel followed by hrtimer_start tracepoint events, th= ere is now only a since hrtimer_start tracepoint event with the new was_armed f= ield set to 1, to indicated that the hrtimer was previously armed. Update timer_start_deadlock accordingly so it traces hrtimer_start tracepoi= nt instead, with was_armed used as guard. Signed-off-by: Shung-Hsi Yu Acked-by: Mykyta Yatsenko Tested-by: Mykyta Yatsenko --- Currently only fails on Linus' tree since hrtimer changes haven't made its way into bpf-next yet. --- tools/testing/selftests/bpf/progs/timer_start_deadlock.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/bpf/progs/timer_start_deadlock.c b/too= ls/testing/selftests/bpf/progs/timer_start_deadlock.c index 019518ee18cd..afabd15bdac4 100644 --- a/tools/testing/selftests/bpf/progs/timer_start_deadlock.c +++ b/tools/testing/selftests/bpf/progs/timer_start_deadlock.c @@ -27,13 +27,13 @@ static int timer_cb(void *map, int *key, struct elem *v= alue) return 0; } =20 -SEC("tp_btf/hrtimer_cancel") -int BPF_PROG(tp_hrtimer_cancel, struct hrtimer *hrtimer) +SEC("tp_btf/hrtimer_start") +int BPF_PROG(tp_hrtimer_start, struct hrtimer *hrtimer, enum hrtimer_mode = mode, bool was_armed) { struct bpf_timer *timer; int key =3D 0; =20 - if (!in_timer_start) + if (!in_timer_start || !was_armed) return 0; =20 tp_called =3D 1; @@ -60,7 +60,7 @@ int start_timer(void *ctx) =20 /* * call hrtimer_start() twice, so that 2nd call does - * remove_hrtimer() and trace_hrtimer_cancel() tracepoint. + * trace_hrtimer_start(was_armed=3D1) tracepoint. */ in_timer_start =3D 1; bpf_timer_start(timer, 1000000000, 0); --=20 2.53.0