linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Julia Cartwright <julia@ni.com>
To: linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org
Cc: Thomas Gleixner <tglx@linutronix.de>,
	Steven Rostedt <rostedt@goodmis.org>,
	Carsten Emde <C.Emde@osadl.org>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	John Kacur <jkacur@redhat.com>,
	Paul Gortmaker <paul.gortmaker@windriver.com>,
	Daniel Wagner <daniel.wagner@siemens.com>,
	tom.zanussi@linux.intel.com, stable-rt@vger.kernel.org
Subject: [PATCH RT 14/22] Revert "rt,ntp: Move call to schedule_delayed_work() to helper thread"
Date: Mon,  6 Aug 2018 04:17:30 -0500	[thread overview]
Message-ID: <b9699e9fe2effcc1e54e54e04d247f5b6cf1b294.1533540554.git.julia@ni.com> (raw)
In-Reply-To: <cover.1533540554.git.julia@ni.com>

From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>

4.9.115-rt94-rc1 stable review patch.
If you have any objection to the inclusion of this patch, let me know.

--- 8< --- 8< --- 8< ---
I've been looking at this in v3.10-RT where it got in. The patch
description says

|The ntp code for notify_cmos_timer() is called from a hard interrupt
|context.

I see only one caller of ntp_notify_cmos_timer() and that is
do_adjtimex() after "raw_spin_unlock_irqrestore()".
I see a few callers of do_adjtimex() which is SYS_adjtimex() (+compat)
and posix_clock_realtime_adj() which in turn is called by
SYS_clock_adjtime().

Reverting the patch.

Cc: stable-rt@vger.kernel.org
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
(cherry picked from commit 932c5783d4434250a1019f49ae81b80731dfd4cd)
Signed-off-by: Julia Cartwright <julia@ni.com>
---
 kernel/time/ntp.c | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
index 05b7391bf9bd..6df8927c58a5 100644
--- a/kernel/time/ntp.c
+++ b/kernel/time/ntp.c
@@ -17,7 +17,6 @@
 #include <linux/module.h>
 #include <linux/rtc.h>
 #include <linux/math64.h>
-#include <linux/swork.h>
 
 #include "ntp_internal.h"
 #include "timekeeping_internal.h"
@@ -569,35 +568,10 @@ static void sync_cmos_clock(struct work_struct *work)
 			   &sync_cmos_work, timespec64_to_jiffies(&next));
 }
 
-#ifdef CONFIG_PREEMPT_RT_FULL
-
-static void run_clock_set_delay(struct swork_event *event)
-{
-	queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
-}
-
-static struct swork_event ntp_cmos_swork;
-
-void ntp_notify_cmos_timer(void)
-{
-	swork_queue(&ntp_cmos_swork);
-}
-
-static __init int create_cmos_delay_thread(void)
-{
-	WARN_ON(swork_get());
-	INIT_SWORK(&ntp_cmos_swork, run_clock_set_delay);
-	return 0;
-}
-early_initcall(create_cmos_delay_thread);
-
-#else
-
 void ntp_notify_cmos_timer(void)
 {
 	queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
 }
-#endif /* CONFIG_PREEMPT_RT_FULL */
 
 #else
 void ntp_notify_cmos_timer(void) { }
-- 
2.18.0


  parent reply	other threads:[~2018-08-06  9:19 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-06  9:17 [PATCH RT 00/22] Linux 4.9.115-rt94-rc1 Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 01/22] futex: Fix pi_state->owner serialization Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 02/22] futex: Fix more put_pi_state() vs. exit_pi_state_list() races Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 03/22] futex: Avoid violating the 10th rule of futex Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 04/22] futex: Fix OWNER_DEAD fixup Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 05/22] rtmutex: Make rt_mutex_futex_unlock() safe for irq-off callsites Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 06/22] rcu: Do not include rtmutex_common.h unconditionally Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 07/22] rcu: Suppress lockdep false-positive ->boost_mtx complaints Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 08/22] sched, tracing: Fix trace_sched_pi_setprio() for deboosting Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 09/22] crypto: limit more FPU-enabled sections Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 10/22] arm*: disable NEON in kernel mode Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 11/22] mm/slub: close possible memory-leak in kmem_cache_alloc_bulk() Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 12/22] locking: add types.h Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 13/22] net: use task_struct instead of CPU number as the queue owner on -RT Julia Cartwright
2018-08-06  9:17 ` Julia Cartwright [this message]
2018-08-06  9:17 ` [PATCH RT 15/22] Revert "block: blk-mq: Use swait" Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 16/22] block: blk-mq: move blk_queue_usage_counter_release() into process context Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 17/22] alarmtimer: Prevent live lock in alarm_cancel() Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 18/22] posix-timers: move the rcu head out of the union Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 19/22] locallock: provide {get,put}_locked_ptr() variants Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 20/22] squashfs: make use of local lock in multi_cpu decompressor Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 21/22] seqlock: provide the same ordering semantics as mainline Julia Cartwright
2018-08-06  9:17 ` [PATCH RT 22/22] Linux 4.9.115-rt94-rc1 Julia Cartwright

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b9699e9fe2effcc1e54e54e04d247f5b6cf1b294.1533540554.git.julia@ni.com \
    --to=julia@ni.com \
    --cc=C.Emde@osadl.org \
    --cc=bigeasy@linutronix.de \
    --cc=daniel.wagner@siemens.com \
    --cc=jkacur@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=paul.gortmaker@windriver.com \
    --cc=rostedt@goodmis.org \
    --cc=stable-rt@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=tom.zanussi@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).