From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x227DKmmFGVUuJUzlecmR4pb3fUGO2BqfeIBVRjevrY1auzjee40skvytFisWoZHvX5KfyQZ3 ARC-Seal: i=1; a=rsa-sha256; t=1516610911; cv=none; d=google.com; s=arc-20160816; b=THdw+lZXmf3KRYB2Ti30SQA4Gm/SFMckd4DZC0qJkfv2mnksgVmKjDsa/GZmD9PUk1 zM32GOUE6X6nH92coz3gwERrEkY6/pnHsH+UzROY1JR2/ieK2Gmf7WUkKoMb0badES6f QGrAfs1fWBkZX/3fqPQxYiBBda+Xr4p7VBWPdps2cRAnZRe1FcbIS5sUGfO0ANsMpxNs c2WOW5fikq837VBwgqOeumz8R8PAHkWTUtBYVY+og+j8jj+kRsuF1NPnBP+m0rsTLFhk EWL/ytt8lAcSAfhfcXj7SjPHj94fGhXdCLfTYCQ/CstVGiNIwlu1XBnI+dtPBxp+SNQ2 XGzg== 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=e7DiN3sif1pzzynR+YySzuSuJvHNeE9y6aai4zHOyhc=; b=Lmw4bvch1tM4SXwg2hXVn2ijEozFcoIugp1wus5wSKMHMxItoMYaLE5BBsKm2dF8pE jMzi8zeIJ2p1x17AoWe/Sro/Xj7nX9hCvh1XRGLFnH4NvmE8kxLv2iPLYTVUzUTrDP6D 56JWq1F+2Vmiv2Ro6I23IlJfr+UF6wuHNepNxV0EIWc6UfsAFDRjRZv84IGtpyQEMrkz eMvVdW/benfjjXKO2n9tOOYRtsl6uEAx94SIJ+y9hW4rPuxfqCOy02/OPAU3rFI4AQac XyjgNtntgMV9NKMu+VP9DG1kqIDDqYLmWXf4NnWWJl8m0evzmvH3cmChqjLxQLnd9s1R 8dtg== 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.9 08/47] timers: Unconditionally check deferrable base Date: Mon, 22 Jan 2018 09:45:19 +0100 Message-Id: <20180122083926.135306349@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@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?1590281803651105585?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-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 @@ -1696,7 +1696,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++;