From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 6D5472853F8 for ; Wed, 15 Apr 2026 14:33:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776263605; cv=none; b=gEzJk1DAqI18EQuZ+YVs7IhwKFb+N2Mh4/jmXU82/1gUyNYsixL5hfrz4De2HZQieK2PgAPl+Hu2aN6Jhzr4Gy+lLM46jhioWh4GljUZ34qfxO42Sos5BvTKlGOF6smzKVxL+sujS9GSggNB+Vm5cdUEWctEUlqYIcLi8Nje2Yw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776263605; c=relaxed/simple; bh=ncYLpANUEqjiK+lrWZ+15aJWUEhTp3NC51cBqmau3wc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=PwLeFOA4XCUSv4OSgYD9yWpuxEz51vbx0fOvT9tIjVH50FIysySsb8hizUaYkqGdlWTqDXjFLmKQlcX+jrBgB9zWC2FALdhJzbBkhMkdymjgRh8jXxEfcF2iogdZXv773ymnCl4Bd8ZC4gy8/Zmbv83y61aj6rXyUSPWSeXIaqg= 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=bkUOcPpZ; arc=none smtp.client-ip=209.85.128.42 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="bkUOcPpZ" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-488b0e1b870so106039845e9.2 for ; Wed, 15 Apr 2026 07:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776263603; x=1776868403; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=KYdaXOUNBM5BakQBjjVuu9J4b98oS6k7ObySiqMkXg8=; b=bkUOcPpZJRTq908zunf9NMiuVMjbRRbdcPeSPqh4p+iDOo1NXpfqtYZbiZFh2r7eMw sIPNN/evRsbLkZMLG95IYzhj7/m7P1jG6e7N2LN1Bs+prH65oKWmpNzJ32B26MNbAHiY 3XNfp8Fxw7OuWqHPr/3o5y49NDC0tQFHm9sPmXghAobwNaeMGV8w5HDcfbxKazh/pV6b u9KeZ1u8UqWSzqGVWt85sGT0+zwuz9mR8txUN7Q5JBDE91EKe7kiccI4s5jWgikVEGvj CtXYwuvhTNxppqCxQNsOqfNXYj35NmJzvcH733DC9XyngWr0TjQTVxObjyeRf6gPbJhf RE0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776263603; x=1776868403; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-gg:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=KYdaXOUNBM5BakQBjjVuu9J4b98oS6k7ObySiqMkXg8=; b=kcV4tjsUWO2QhyX0+eAlRpUegnDArYC4q4hU0ed9WqYrAVqjfiEyXKRFslHzyNA0Ds lDS/kBzziiXLrSpXYn2Xw6rqAcLOtVPMfWlpmXcfv2kuN+3djXwYFEq2oDLnybNnPuhR BszjTOa8mJSMg/SOE6SAOLrQWXzG9CFZ7Zq/3xI3FL8spnoVJUlRWDTHgGQDPcSXyFZ/ gjdGpJ4ZDTSkxXG4+AVkRgi6qNQ+baCBSjTjeTuRctxsOB8O/J6eGHbfK5pABwbnPqB0 oZkS6yCXFNFZxnVXSkcsjuiQO/8+G1lr9pW8H4cJp1LhI2v2SXS127tPSfBJFq7a+jpV RWXQ== X-Forwarded-Encrypted: i=1; AFNElJ89ljq2tcypuY+PE6kluJOIKtTXRJsnXlupBdL8ieLBenhMtEjY0jHh270opSrW0cTicrWHHSa3QHKAzRc=@vger.kernel.org X-Gm-Message-State: AOJu0Ywq77PR3L6VGdcFLpDRQ1stsUiVhTw48JhnGBNWgK0BbYTs4RxF YHz4bBXcm5A/2Kj647DMIWpOMcGOsMIuC8bxjl8qxq8wQZf0mowvymZZxEFTqa1Kgmw= X-Gm-Gg: AeBDievAe8P05qmTTNgdVA0AULW1fu3+3xdCmOhmkIarVLLHZh8FLNXI2oceO+DpkWA Q2Paf23/jVHdF+i3by+0d+S+OaKPHTjq4wQ4kZ/36jHa3epl0ykj68Rdtjd+v1uB7suhqWDRLoi fW2iK8mrMuI8ohybtjb7QTvUuzTiiO+KBD23zye08dqe+3/UhneIFSENp2zBSgqqa5wb70V1wbH xOmZi0bNOINhq84XxoDypPG6FPXYxaDCYnIUUvnOaNb1ZJzik72CcWfCOe1DnusRJzg21UZbL9c 7Ei50339/ttg67Nl87nA3qTkWEPk3VkxBEVchWmpu5CKN0022Q53aJD202NEOG2zPBYSDR01X1J 3v8vZpj/k2cH7WzmWHDLCJFPsRPSZoST7//vhvS0P3klWkDZb786SF+nvaNIhNCP0cavO9qP13G jXMp0j/gR4Ocs5D8Uh6n368O4kjSnq7rkUJHGjvpXe6oo6UIydKHtup+WQUddw X-Received: by 2002:a05:600c:c08e:b0:488:9619:9bf4 with SMTP id 5b1f17b1804b1-488d686093bmr210608955e9.20.1776263602600; Wed, 15 Apr 2026 07:33:22 -0700 (PDT) Received: from ?IPV6:2a03:83e0:1126:4:cbe8:6434:118f:886d? ([2620:10d:c092:500::5:3ecd]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488ee042f3dsm118049065e9.12.2026.04.15.07.33.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 15 Apr 2026 07:33:21 -0700 (PDT) Message-ID: <3afdf4fa-7e4e-4e56-8aaa-c8a04085432d@gmail.com> Date: Wed, 15 Apr 2026 15:33:20 +0100 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH bpf-next] selftests/bpf: Fix timer_start_deadlock failure due to hrtimer change To: Shung-Hsi Yu , bpf@vger.kernel.org Cc: 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 References: <20260415120329.129192-1-shung-hsi.yu@suse.com> Content-Language: en-US From: Mykyta Yatsenko In-Reply-To: <20260415120329.129192-1-shung-hsi.yu@suse.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/15/26 1:03 PM, Shung-Hsi Yu wrote: > 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, there > is now only a since hrtimer_start tracepoint event with the new was_armed field > set to 1, to indicated that the hrtimer was previously armed. > > Update timer_start_deadlock accordingly so it traces hrtimer_start tracepoint > instead, with was_armed used as guard. > > Signed-off-by: Shung-Hsi Yu > --- > Currently only fails on Linus' tree since hrtimer changes haven't made > its way into bpf-next yet. > --- This patch fixes the failing test. Tested-by: Mykyta Yatsenko The logic is also looks correct, tracepoint used to run on timer_cancel, which was called due to the second timer_start, now it's running on timer_start with was_armed=true, so the logic is kept the same. Acked-by: Mykyta Yatsenko > 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/tools/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 *value) > return 0; > } > > -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 = 0; > > - if (!in_timer_start) > + if (!in_timer_start || !was_armed) > return 0; > > tp_called = 1; > @@ -60,7 +60,7 @@ int start_timer(void *ctx) > > /* > * call hrtimer_start() twice, so that 2nd call does > - * remove_hrtimer() and trace_hrtimer_cancel() tracepoint. > + * trace_hrtimer_start(was_armed=1) tracepoint. > */ > in_timer_start = 1; > bpf_timer_start(timer, 1000000000, 0);