From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 24A273C3459 for ; Fri, 7 Aug 2026 20:50:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786135850; cv=none; b=YlLt4Z0e5CjMyzELdRlSdzhIYQW4c7EAeyM+ha4C90up9EVIb1Vq+Tz/oX31cZv4ks8nVi6PgDYEhIe22AmmEhvr/7F2WM6auIJ0NOoXGs2Sj4h6wE2iU4Z/IXFGNdMRXP08U8NVYFjydBKWzRHNMB45ZoFOa3lWdOOHuvQqKds= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786135850; c=relaxed/simple; bh=KOYg+Pv290TZMNk/QShSD00q8YL33RcIolzJODdsXv8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=a22e9vO39o5fTW2RTz9BO81R4+q1CwLYB4YvQb9YFOV/k7MAOKoyJBJh8gPgyhkZUHeY9ID++muuzhXnMY4MCeU7S7oXIFsHoWelB0zMBTYSaIVpQdK25IKqpfknaloCiMyhOyJejs+X1vJgIqKNiBfaaXf6mx1gjL6p5pIEC4o= 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=AzWapSeG; arc=none smtp.client-ip=209.85.128.53 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="AzWapSeG" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-4954a2e73a9so23541855e9.3 for ; Fri, 07 Aug 2026 13:50:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786135847; x=1786740647; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=hQ3DafFqgnmpQY2l1YNbgVGcuwBaYHrzebpedzGAFHc=; b=AzWapSeGTXzKH94uTFkUKiec+DTc2qwg65j/b24x9dwHWAjlqJmHyxvyWRFVmTjsVV oqrpv4I38m+OBGCyLLKCp29v33BXqLviBk75DD7HLhN4Gf3p6oieUluUaREnhTNwkJHp 63AKC93/Ci1mTR0vycbRMREcjyBfMq1r++OuuONjDGFTZ4z/jZ6GN9lvPoGSaLjDlpS5 kjft+TTf/uD9wiDPHfeqk1f/NiiL1zJsDdp/8d+0/JxOCg0cFuWX8vgkWFFgC/E6ZAzf X9q6v+QSv3hWJak9cEdL60ARimyb6AeXUQQdQ+whhYvsFFt1XovBwwJcdQ/3gCzpthtb DjWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786135847; x=1786740647; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=hQ3DafFqgnmpQY2l1YNbgVGcuwBaYHrzebpedzGAFHc=; b=AJCFDuboi9tdr8BDhmi5JniMv/AUgDjOuMJNxzi16RPyiWhX27QAAkdOFVX5FcBTeA WEklTwDjFg6RueYw8XnQ2FXRECqBkOv+0Z0/inNYSQOSN7N47cd84y80AqtnUfBH1UhL E56lH9m5M/vNSmdv669zOSOnNA3fpFwFnGiwNAqfmJMLd7EmQ+fzGsJMdTVTFsh95NAO YDxmbuvm26DTREoFIBZY4uWY+2Ks2rycqrloAG+Abuusv8UJxN9MIuPUBR049shiNVsu BIEGAxzPxly4gReHov6qEnZwMuVlN5cryafg3Q/JViWHyTUXXtuP+tQDR1ExgOn02CtE iFjQ== X-Forwarded-Encrypted: i=1; AHgh+RqTPvcyk4dc617VlNlUrEfn96QreXtkAQb5nXJq+GbcJS5jWVGgas/XPKV+ztq+HrHQaZ+RSWUNihlqEkg=@vger.kernel.org X-Gm-Message-State: AOJu0YzaNZ1JdBWWJb7HKc3UxzM9kQtLk2hSuxlWtpbKH7XDwlC3CDVN KnKgdAcsX9TXsDiteAUUZl/U9kmts5dPJQ5ZrGSxRVSYfLNXNbNcr9rU X-Gm-Gg: AR+sD13cQ1TqPNltbsx7QNfyz7ABE9aae+kwbp3JTYfBJs6OkRXeop/WfK44Z7K+Jwe 0FZfLofO22cxgYPH9qzDW4A/VYvnWVNH9oLAOnvoaW0knXidD9uXor8cmuP/UkKW7hxl8ela+o5 M9YahGjTcfoPu2xRY1RVEnTZydK4VdkYQcmtuv73+XcF5CSdMABirBweqoWfjmDsqcfJ6D/obMC UtFXthnwfg3dSYEkOjCSzdkxQOTYcdAM1GldbrViCa1svy+QAJvrVuc6j5hFT/e6h/VACWoD9dB fMmIPkbTQFm/sfzWeZsWjWPOrkxOfLSsVA6GXw1ktXN9lhYzBI625FQoejNI3OxBMWzucZLS4iK S2AQZk3jGiaKBDYOuWCVf3VPiLjFJevMaLhLQXvRy4qyjNk01OJ8Xh/oGqoskhulKn5DEDkxf0a YLJNgN1ZyWl4O0ngaGrQrZ8xGZ/e+hqJlxfTcAyI9U/agxf8lPa/+Pi8G8yOoUade3rRKlXRj/j rTyPGLqR3zIrcdfjVGji0BcVsfdIPVhyfmRpuODHe/47R8P6kcnd8sIRHuLplCburQSmHQyatQK rSp3Jc2tS710el/9ShytDt96Oz6OCGs3neSUHEunAjprmjPapZqW0VjRTsB6BQpC4NCc X-Received: by 2002:a05:600c:4455:b0:499:50ec:a3fd with SMTP id 5b1f17b1804b1-49950eca404mr300209385e9.19.1786135847025; Fri, 07 Aug 2026 13:50:47 -0700 (PDT) Received: from localhost.localdomain (dynamic-2a02-3100-b105-e101-a437-493a-4de9-ee3e.310.pool.telefonica.de. [2a02:3100:b105:e101:a437:493a:4de9:ee3e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-499542851d6sm192408105e9.12.2026.08.07.13.50.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 07 Aug 2026 13:50:46 -0700 (PDT) From: Karl Mehltretter To: Andrew Morton Cc: Karl Mehltretter , Andrey Konovalov , Dmitry Vyukov , Alexander Potapenko , Marco Elver , Bradley Morgan , kasan-dev@googlegroups.com, linux-kernel@vger.kernel.org, Thomas Gleixner , Anna-Maria Behnsen , Frederic Weisbecker , Peter Zijlstra , Ingo Molnar , Juri Lelli , Vincent Guittot Subject: [PATCH 2/5] hrtimer: pause KCOV during deferred rearm Date: Fri, 7 Aug 2026 22:50:24 +0200 Message-Id: <20260807205027.31972-3-kmehltretter@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20260807205027.31972-1-kmehltretter@gmail.com> References: <20260807205027.31972-1-kmehltretter@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Deferred hrtimer rearm can run after HARDIRQ_OFFSET is dropped. in_task() is then true, so KCOV attributes the instrumented timer-reprogramming subtree to current. With CONFIG_KCOV_SELFTEST, the interrupt selftest fails on x86_64 defconfig under QEMU, detecting spurious coverage in __hrtimer_rearm_deferred(). The same happens on s390, RISC-V and LoongArch, which also enable HRTIMER_REARM_DEFERRED. Excluding the involved files instead would cost their coverage on real task-context paths, e.g. the hrtimer and timekeeping syscalls. Pause in the __always_inline wrappers, including hrtick_schedule_exit(). Call sites where task KCOV can be active are KCOV-disabled or noinstr. HAVE_NOINSTR_HACK covers pre-GCC-12 x86. The other affected architectures restrict KCOV to GCC 12 or Clang through ARCH_WANTS_NO_INSTR. This avoids relying on __no_sanitize_coverage, which is empty before GCC 12. Tested with GCC 8.1 and 15 on x86_64. Fixes: 15dd3a948855 ("hrtimer: Push reprogramming timers into the interrupt return path") Assisted-by: Claude:claude-opus-4-8 Assisted-by: Claude:claude-fable-5 Signed-off-by: Karl Mehltretter --- include/linux/hrtimer_rearm.h | 18 ++++++++++++++++-- kernel/sched/core.c | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/linux/hrtimer_rearm.h b/include/linux/hrtimer_rearm.h index a6f2e5d5e1c7..b95687529c2e 100644 --- a/include/linux/hrtimer_rearm.h +++ b/include/linux/hrtimer_rearm.h @@ -3,10 +3,23 @@ #define _LINUX_HRTIMER_REARM_H #ifdef CONFIG_HRTIMER_REARM_DEFERRED +#include #include void __hrtimer_rearm_deferred(void); +/* + * Pause outside __hrtimer_rearm_deferred() to suppress its entry coverage. + * Call sites where task KCOV can be active are uninstrumented. + */ +static __always_inline void hrtimer_rearm_deferred_paused(void) +{ + unsigned int kcov_paused = kcov_pause(current); + + __hrtimer_rearm_deferred(); + kcov_resume(current, kcov_paused); +} + /* * This is purely CPU local, so check the TIF bit first to avoid the overhead of * the atomic test_and_clear_bit() operation for the common case where the bit @@ -38,7 +51,7 @@ hrtimer_rearm_deferred_user_irq(unsigned long *tif_work, const unsigned long tif */ if (unlikely((*tif_work & TIF_REARM_MASK) == _TIF_HRTIMER_REARM)) { clear_thread_flag(TIF_HRTIMER_REARM); - __hrtimer_rearm_deferred(); + hrtimer_rearm_deferred_paused(); /* Don't go into the loop if HRTIMER_REARM was the only flag */ *tif_work &= ~TIF_HRTIMER_REARM; return !*tif_work; @@ -50,7 +63,7 @@ hrtimer_rearm_deferred_user_irq(unsigned long *tif_work, const unsigned long tif static __always_inline void hrtimer_rearm_deferred_tif(unsigned long tif_work) { if (hrtimer_test_and_clear_rearm_deferred_tif(tif_work)) - __hrtimer_rearm_deferred(); + hrtimer_rearm_deferred_paused(); } /* @@ -73,6 +86,7 @@ static __always_inline bool hrtimer_test_and_clear_rearm_deferred(void) #else /* CONFIG_HRTIMER_REARM_DEFERRED */ static __always_inline void __hrtimer_rearm_deferred(void) { } +static __always_inline void hrtimer_rearm_deferred_paused(void) { } static __always_inline void hrtimer_rearm_deferred(void) { } static __always_inline void hrtimer_rearm_deferred_tif(unsigned long tif_work) { } static __always_inline bool diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 96226707c2f6..b6a8fbbdd538 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -1010,7 +1010,7 @@ static inline void hrtick_schedule_exit(struct rq *rq) } if (rq->hrtick_sched & HRTICK_SCHED_REARM_HRTIMER) - __hrtimer_rearm_deferred(); + hrtimer_rearm_deferred_paused(); rq->hrtick_sched = HRTICK_SCHED_NONE; } -- 2.53.0