From: Juri Lelli <juri.lelli@redhat.com>
To: bigeasy@linutronix.de, tglx@linutronix.de
Cc: linux-rt-users@vger.kernel.org, peterz@infradead.org,
linux-kernel@vger.kernel.org, bristot@redhat.com,
Juri Lelli <juri.lelli@redhat.com>
Subject: [RFC PATCH RT v2 2/2] time/hrtimer: Embed hrtimer mode into hrtimer_sleeper
Date: Wed, 16 Jun 2021 09:17:05 +0200 [thread overview]
Message-ID: <20210616071705.166658-3-juri.lelli@redhat.com> (raw)
In-Reply-To: <20210616071705.166658-1-juri.lelli@redhat.com>
Changes to hrtimer mode (potentially made by __hrtimer_init_sleeper() on
PREEMPT_RT are not visible to do_nanosleep(), and thus not accounted for
by hrtimer_start_expires() call path.
Embed hrtimer mode into hrtimer_sleeper struct, so that the same mode is
used by code following hrtimer_sleeper initialization.
Signed-off-by: Juri Lelli <juri.lelli@redhat.com>
---
include/linux/hrtimer.h | 1 +
kernel/time/hrtimer.c | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index bca9402a1030..7573823d91d9 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -138,6 +138,7 @@ struct hrtimer {
struct hrtimer_sleeper {
struct hrtimer timer;
struct task_struct *task;
+ enum hrtimer_mode mode;
};
#ifdef CONFIG_64BIT
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index f64954d5c8f8..badcfb6e19aa 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1848,6 +1848,7 @@ static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
__hrtimer_init(&sl->timer, clock_id, mode);
sl->timer.function = hrtimer_wakeup;
sl->task = current;
+ sl->mode = mode;
}
/**
@@ -1884,19 +1885,19 @@ int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts)
return -ERESTART_RESTARTBLOCK;
}
-static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
+static int __sched do_nanosleep(struct hrtimer_sleeper *t)
{
struct restart_block *restart;
do {
set_current_state(TASK_INTERRUPTIBLE);
- hrtimer_sleeper_start_expires(t, mode);
+ hrtimer_sleeper_start_expires(t, t->mode);
if (likely(t->task))
freezable_schedule();
hrtimer_cancel(&t->timer);
- mode = HRTIMER_MODE_ABS;
+ t->mode = HRTIMER_MODE_ABS;
} while (t->task && !signal_pending(current));
@@ -1927,7 +1928,7 @@ static long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
hrtimer_init_sleeper_on_stack(&t, restart->nanosleep.clockid,
HRTIMER_MODE_ABS);
hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
- ret = do_nanosleep(&t, HRTIMER_MODE_ABS);
+ ret = do_nanosleep(&t);
destroy_hrtimer_on_stack(&t.timer);
return ret;
}
@@ -1946,7 +1947,7 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode,
hrtimer_init_sleeper_on_stack(&t, clockid, mode);
hrtimer_set_expires_range_ns(&t.timer, rqtp, slack);
- ret = do_nanosleep(&t, mode);
+ ret = do_nanosleep(&t);
if (ret != -ERESTART_RESTARTBLOCK)
goto out;
--
2.31.1
prev parent reply other threads:[~2021-06-16 7:17 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-16 7:17 [RFC PATCH RT v2 0/2] Add PINNED_HARD mode to hrtimers Juri Lelli
2021-06-16 7:17 ` [RFC PATCH RT v2 1/2] time/hrtimer: Add PINNED_HARD mode for realtime hrtimers Juri Lelli
2021-06-18 23:35 ` Thomas Gleixner
2021-06-19 7:56 ` Thomas Gleixner
2021-06-21 5:35 ` Juri Lelli
2021-06-16 7:17 ` Juri Lelli [this message]
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=20210616071705.166658-3-juri.lelli@redhat.com \
--to=juri.lelli@redhat.com \
--cc=bigeasy@linutronix.de \
--cc=bristot@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=peterz@infradead.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).