From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 91D84C4332F for ; Fri, 4 Nov 2022 14:59:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232348AbiKDO65 (ORCPT ); Fri, 4 Nov 2022 10:58:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232278AbiKDO6G (ORCPT ); Fri, 4 Nov 2022 10:58:06 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54E4E31DCE for ; Fri, 4 Nov 2022 07:58:00 -0700 (PDT) From: Anna-Maria Behnsen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1667573879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=og4Fmjqc4BhAa6zqoKeZ4IC2HuQC1SBhqBX9c57/ezA=; b=BG0dJQS/41uoSVCg4fsUBsZRj3FHe0a2pi920fPBprxNiIUtEzblTBMLbF1Y7v+G0+usMQ XF6HUNpzMCq32JKBMQn/f+i8Bqt5svsuKxSMp0wYHnryE3voSKYtuwCLK3BkQvhktjUMpH f4mtmQfjKU0PYYCSGXv/qYT9kbv3DzUCMgIIusxV/CxaXTV1lk2Sa9aMqOmRyVIUgsz+nk yJ6RKQKzyxfZpU3/Wdsfhh7VKTN5c32YVRfYkQ5a6o87lvc6iioImPEwXGKNdqTJEks0kf O0WoX4NUkeuiiJfES3D9HjP64NFDFwdLK2wkfyd0w01M9+YwiPGy1cDVweZ4ZA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1667573879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=og4Fmjqc4BhAa6zqoKeZ4IC2HuQC1SBhqBX9c57/ezA=; b=sHaIgiqK10fb5yXmKO+wxs2Y4tbS5fk61OmJgtwBTpBRAMibYAZqVws1dyIiungZE9HQuj jMvsK86yboVj15Bw== To: linux-kernel@vger.kernel.org Cc: Peter Zijlstra , John Stultz , Thomas Gleixner , Eric Dumazet , "Rafael J . Wysocki" , Arjan van de Ven , "Paul E . McKenney" , Frederic Weisbecker , Rik van Riel , Anna-Maria Behnsen Subject: [PATCH v4 12/16] timer: Check if timers base is handled already Date: Fri, 4 Nov 2022 15:57:33 +0100 Message-Id: <20221104145737.71236-13-anna-maria@linutronix.de> In-Reply-To: <20221104145737.71236-1-anna-maria@linutronix.de> References: <20221104145737.71236-1-anna-maria@linutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Due to the conversion of the NOHZ timer placement to a pull at expiry time model, the per CPU timer bases with non pinned timers are no longer handled only by the local CPU. In case a remote CPU already expires the non pinned timers base of the local cpu, nothing more needs to be done by the local CPU. A check at the begin of the expire timers routine is required, because timer base lock is dropped before executing the timer callback function. This is a preparatory work, but has no functional impact right now. Signed-off-by: Anna-Maria Behnsen --- kernel/time/timer.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 641e7284f0d7..f8b2065df79b 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1912,6 +1912,9 @@ static inline void __run_timers(struct timer_base *base) lockdep_assert_held(&base->lock); + if (!!base->running_timer) + return; + while (time_after_eq(jiffies, base->clk) && time_after_eq(jiffies, base->next_expiry)) { levels = collect_expired_timers(base, heads); -- 2.30.2