From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x225APOmFzuUarOETLLH3F1m26bCwa+Eo2ZmoJF/MPbEpLjib5/a5LDEI+L7IGCoAxt923OS/ ARC-Seal: i=1; a=rsa-sha256; t=1516611148; cv=none; d=google.com; s=arc-20160816; b=v8vPbgcp/Eg5eGhVxc9kMyb0T55GDo2642NuSDSQrR8/Nnjs9l7r1Y91MBZurbFrFe kWfSL11VhYAUshh3y1xfWrXwK5XsmBgffEu6Qfg3Y99JtcqSlPfXyL+2T13uZYspHFF1 Jglp0eUs3TCb7z7tW/M49wVNqFltYSmPJKetuYOUjK1J8/fLqBMFve8QJBI+uTfc781T bLUZDJRaVdF3nl7pOf00PEugfEAyX2PFudJHod4eqVGLCEK2Qwl/nwdA8Vu1gKFdXx6V g60146g1eV0ETTIaA+/zBX/BxoJdiS2PVg5qXh63BRpSuDjzJIBxGghrSxx+uU5jKcQy +fNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=TRFTAh2p5BBxB8y2p4QDSFqfDfwFcQuCLDIuwLFqtQg=; b=kIf8lt7jpGgViVCOalRbXgzpq6b01BdA+y4jz3Pv9VaJQP+6NSbqvFfzh8Gjgb5wnw V/kIDIxo0HYd2zh0Kr9dU9Rz2aGFrsnBladfesYw9/5NnhsJHW5FlZ53o0MtRDPyrvYU x19qtA3jFS8prmQmKKiYUVBiPlz75DHlhNf2APLN1jk/LziGrsxVNnNyrPaRW6KIISBz NoHeQEzoviomLudkpvT3YXAY/mXoIGufQAWgpQGup4r7jDyL9avWeaVo7TCQagD+GkL6 f8x/RJHxCUiGEB3BsYft1IjH7oWppI/hPC+3yf4YZHNLXfHHrQAsBhuQ0YUIhXhbSAa7 WojQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , Anna-Maria Gleixner , Frederic Weisbecker , Peter Zijlstra , Sebastian Siewior , Paul McKenney , rt@linutronix.de Subject: [PATCH 4.14 24/89] timers: Unconditionally check deferrable base Date: Mon, 22 Jan 2018 09:45:04 +0100 Message-Id: <20180122083957.086608776@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083954.683903493@linuxfoundation.org> References: <20180122083954.683903493@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590281803651105585?= X-GMAIL-MSGID: =?utf-8?q?1590282051501324348?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Thomas Gleixner commit ed4bbf7910b28ce3c691aef28d245585eaabda06 upstream. When the timer base is checked for expired timers then the deferrable base must be checked as well. This was missed when making the deferrable base independent of base::nohz_active. Fixes: ced6d5c11d3e ("timers: Use deferrable base independent of base::nohz_active") Signed-off-by: Thomas Gleixner Cc: Anna-Maria Gleixner Cc: Frederic Weisbecker Cc: Peter Zijlstra Cc: Sebastian Siewior Cc: Paul McKenney Cc: rt@linutronix.de Signed-off-by: Greg Kroah-Hartman --- kernel/time/timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1656,7 +1656,7 @@ void run_local_timers(void) hrtimer_run_queues(); /* Raise the softirq only if required. */ if (time_before(jiffies, base->clk)) { - if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active) + if (!IS_ENABLED(CONFIG_NO_HZ_COMMON)) return; /* CPU is awake, so check the deferrable base. */ base++;