linux-rt-users.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Luis Claudio R. Goncalves" <lgoncalv@redhat.com>
To: linux-rt-users <linux-rt-users@vger.kernel.org>,
	stable-rt <stable-rt@vger.kernel.org>,
	Steven Rostedt <rostedt@goodmis.org>,
	Thomas Gleixner <tglx@linutronix.de>,
	Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
	Daniel Wagner <daniel.wagner@suse.com>,
	Mark Gross <markgross@kernel.org>,
	Luis Goncalves <lgoncalv@redhat.com>
Cc: "André Pribil" <Andre.Pribil@hms-networks.com>
Subject: [PATCH RT 1/3] rt: timers: use CONFIG_PREEMPT_RT_FULL instead of CONFIG_PREEMPT_RT
Date: Tue,  8 Aug 2023 13:35:18 -0300	[thread overview]
Message-ID: <20230808163520.305842-2-lgoncalv@redhat.com> (raw)
In-Reply-To: <20230808163520.305842-1-lgoncalv@redhat.com>

v4.14.320-rt152-rc1 stable review patch.
If anyone has any objections, please let me know.

-----------


Commit 095ff4885a17 ("timers: Prepare support for PREEMPT_RT") had references
to CONFIG_PREEMPT_RT, that does not exist in v4.14-rt.

André Pribil reported that a tcdrain() call from userspace was spinning
forever due to an endless loop in del_timer_sync(). He was able to fix the
problem by Replacing CONFIG_PREEMPT_RT with CONFIG_PREEMPT_RT_FULL in that
code.

Reported-by: André Pribil <Andre.Pribil@hms-networks.com>
Fixes: 095ff4885a17 ("timers: Prepare support for PREEMPT_RT")
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
---
 kernel/time/timer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/kernel/time/timer.c b/kernel/time/timer.c
index a3f229dc75ec..e1b5dfa260a4 100644
--- a/kernel/time/timer.c
+++ b/kernel/time/timer.c
@@ -198,7 +198,7 @@ EXPORT_SYMBOL(jiffies_64);
 struct timer_base {
 	raw_spinlock_t		lock;
 	struct timer_list	*running_timer;
-#ifdef CONFIG_PREEMPT_RT
+#ifdef CONFIG_PREEMPT_RT_FULL
 	spinlock_t		expiry_lock;
 	atomic_t		timer_waiters;
 #endif
@@ -1207,7 +1207,7 @@ int try_to_del_timer_sync(struct timer_list *timer)
 }
 EXPORT_SYMBOL(try_to_del_timer_sync);
 
-#ifdef CONFIG_PREEMPT_RT
+#ifdef CONFIG_PREEMPT_RT_FULL
 static __init void timer_base_init_expiry_lock(struct timer_base *base)
 {
 	spin_lock_init(&base->expiry_lock);
-- 
2.41.0


  reply	other threads:[~2023-08-08 18:44 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-08 16:35 [PATCH RT 0/3] Linux v4.14.320-rt152-rc1 Luis Claudio R. Goncalves
2023-08-08 16:35 ` Luis Claudio R. Goncalves [this message]
2023-08-08 16:35 ` [PATCH RT 2/3] rt: PREEMPT_RT safety net for backported patches Luis Claudio R. Goncalves
2023-08-08 16:35 ` [PATCH RT 3/3] Linux 4.14.320-rt152-rc1 Luis Claudio R. Goncalves
2023-08-09  8:17 ` [PATCH RT 0/3] Linux v4.14.320-rt152-rc1 Sebastian Andrzej Siewior
2023-08-09 13:50   ` Luis Claudio R. Goncalves
2023-08-09 14:10     ` Sebastian Andrzej Siewior

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=20230808163520.305842-2-lgoncalv@redhat.com \
    --to=lgoncalv@redhat.com \
    --cc=Andre.Pribil@hms-networks.com \
    --cc=bigeasy@linutronix.de \
    --cc=daniel.wagner@suse.com \
    --cc=linux-rt-users@vger.kernel.org \
    --cc=markgross@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=stable-rt@vger.kernel.org \
    --cc=tglx@linutronix.de \
    /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).