From: tip-bot for Thomas Gleixner <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, peterz@infradead.org, rostedt@goodmis.org,
hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org
Subject: [tip:timers/core] hrtimer: Remove task argument from hrtimer_init_sleeper()
Date: Tue, 30 Jul 2019 15:07:24 -0700 [thread overview]
Message-ID: <tip-b74494872555d1f7888dfd9225700a363f4a84fc@git.kernel.org> (raw)
In-Reply-To: <20190726185752.791885290@linutronix.de>
Commit-ID: b74494872555d1f7888dfd9225700a363f4a84fc
Gitweb: https://git.kernel.org/tip/b74494872555d1f7888dfd9225700a363f4a84fc
Author: Thomas Gleixner <tglx@linutronix.de>
AuthorDate: Fri, 26 Jul 2019 20:30:49 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 30 Jul 2019 23:57:51 +0200
hrtimer: Remove task argument from hrtimer_init_sleeper()
All callers hand in 'current' and that's the only task pointer which
actually makes sense. Remove the task argument and set current in the
function.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190726185752.791885290@linutronix.de
---
block/blk-mq.c | 2 +-
drivers/staging/android/vsoc.c | 2 +-
include/linux/hrtimer.h | 3 +--
include/linux/wait.h | 2 +-
kernel/futex.c | 2 +-
kernel/time/hrtimer.c | 8 ++++----
net/core/pktgen.c | 2 +-
7 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index b038ec680e84..5f647cb8c695 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3418,7 +3418,7 @@ static bool blk_mq_poll_hybrid_sleep(struct request_queue *q,
hrtimer_init_on_stack(&hs.timer, CLOCK_MONOTONIC, mode);
hrtimer_set_expires(&hs.timer, kt);
- hrtimer_init_sleeper(&hs, current);
+ hrtimer_init_sleeper(&hs);
do {
if (blk_mq_rq_state(rq) == MQ_RQ_COMPLETE)
break;
diff --git a/drivers/staging/android/vsoc.c b/drivers/staging/android/vsoc.c
index 00a1ec7b9154..ce480bcf20d2 100644
--- a/drivers/staging/android/vsoc.c
+++ b/drivers/staging/android/vsoc.c
@@ -442,7 +442,7 @@ static int handle_vsoc_cond_wait(struct file *filp, struct vsoc_cond_wait *arg)
hrtimer_set_expires_range_ns(&to->timer, wake_time,
current->timer_slack_ns);
- hrtimer_init_sleeper(to, current);
+ hrtimer_init_sleeper(to);
}
while (1) {
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 4971100a8cab..3c74f89367c4 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -463,8 +463,7 @@ extern long hrtimer_nanosleep(const struct timespec64 *rqtp,
const enum hrtimer_mode mode,
const clockid_t clockid);
-extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
- struct task_struct *tsk);
+extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl);
extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
const enum hrtimer_mode mode);
diff --git a/include/linux/wait.h b/include/linux/wait.h
index b6f77cf60dd7..d57832774ca6 100644
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
@@ -489,7 +489,7 @@ do { \
struct hrtimer_sleeper __t; \
\
hrtimer_init_on_stack(&__t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); \
- hrtimer_init_sleeper(&__t, current); \
+ hrtimer_init_sleeper(&__t); \
if ((timeout) != KTIME_MAX) \
hrtimer_start_range_ns(&__t.timer, timeout, \
current->timer_slack_ns, \
diff --git a/kernel/futex.c b/kernel/futex.c
index 6d50728ef2e7..5e9842ea4012 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -490,7 +490,7 @@ futex_setup_timer(ktime_t *time, struct hrtimer_sleeper *timeout,
hrtimer_init_on_stack(&timeout->timer, (flags & FLAGS_CLOCKRT) ?
CLOCK_REALTIME : CLOCK_MONOTONIC,
HRTIMER_MODE_ABS);
- hrtimer_init_sleeper(timeout, current);
+ hrtimer_init_sleeper(timeout);
/*
* If range_ns is 0, calling hrtimer_set_expires_range_ns() is
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index 5ee77f1a8a92..de895d86800c 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -1639,10 +1639,10 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
return HRTIMER_NORESTART;
}
-void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
+void hrtimer_init_sleeper(struct hrtimer_sleeper *sl)
{
sl->timer.function = hrtimer_wakeup;
- sl->task = task;
+ sl->task = current;
}
EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
@@ -1669,7 +1669,7 @@ static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mod
{
struct restart_block *restart;
- hrtimer_init_sleeper(t, current);
+ hrtimer_init_sleeper(t);
do {
set_current_state(TASK_INTERRUPTIBLE);
@@ -1930,7 +1930,7 @@ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,
hrtimer_init_on_stack(&t.timer, clock_id, mode);
hrtimer_set_expires_range_ns(&t.timer, *expires, delta);
- hrtimer_init_sleeper(&t, current);
+ hrtimer_init_sleeper(&t);
hrtimer_start_expires(&t.timer, mode);
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index bb9915291644..7f3cf2381f27 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -2171,7 +2171,7 @@ static void spin(struct pktgen_dev *pkt_dev, ktime_t spin_until)
} while (ktime_compare(end_time, spin_until) < 0);
} else {
/* see do_nanosleep */
- hrtimer_init_sleeper(&t, current);
+ hrtimer_init_sleeper(&t);
do {
set_current_state(TASK_INTERRUPTIBLE);
hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);
next prev parent reply other threads:[~2019-07-30 22:08 UTC|newest]
Thread overview: 61+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-26 18:30 [patch 00/12] (hr)timers: Prepare for PREEMPT_RT support Thomas Gleixner
2019-07-26 18:30 ` [patch 01/12] hrtimer: Remove task argument from hrtimer_init_sleeper() Thomas Gleixner
2019-07-26 19:57 ` Steven Rostedt
2019-07-26 20:01 ` Thomas Gleixner
2019-07-30 22:07 ` tip-bot for Thomas Gleixner [this message]
2019-07-26 18:30 ` [patch 02/12] hrtimer: Consolidate hrtimer_init() + hrtimer_init_sleeper() calls Thomas Gleixner
2019-07-30 22:08 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:49 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 03/12] hrtimer: Introduce HARD expiry mode Thomas Gleixner
2019-07-30 22:10 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:52 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 04/12] sched: Mark hrtimers to expire in hard interrupt context Thomas Gleixner
2019-07-30 22:11 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2019-08-01 15:53 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 18:58 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 05/12] perf/core: " Thomas Gleixner
2019-07-30 22:12 ` [tip:timers/core] " tip-bot for Thomas Gleixner
2019-08-01 15:54 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 18:59 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 06/12] watchdog: Mark watchdog_hrtimer " Thomas Gleixner
2019-07-30 22:13 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:55 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:00 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 07/12] KVM: LAPIC: Mark hrtimer " Thomas Gleixner
2019-07-26 19:41 ` Paolo Bonzini
2019-07-30 22:14 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:55 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:01 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 08/12] tick: Mark tick related hrtimers to expiry " Thomas Gleixner
2019-07-30 22:14 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:56 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:01 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 09/12] hrtimer: Move unmarked hrtimers to soft interrupt expiry on RT Thomas Gleixner
2019-07-30 22:15 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:57 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:02 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 10/12] hrtimer: Determine hard/soft expiry mode for hrtimer sleepers " Thomas Gleixner
2019-07-26 20:44 ` Steven Rostedt
2019-07-26 20:52 ` Thomas Gleixner
2019-07-26 20:56 ` Steven Rostedt
2019-07-26 21:16 ` Julia Cartwright
2019-07-26 21:30 ` Steven Rostedt
2019-07-26 21:35 ` Thomas Gleixner
2019-07-30 22:16 ` [tip:timers/core] " tip-bot for Sebastian Andrzej Siewior
2019-08-01 15:58 ` tip-bot for Sebastian Andrzej Siewior
2019-08-01 19:03 ` tip-bot for Sebastian Andrzej Siewior
2019-07-26 18:30 ` [patch 11/12] hrtimer: Prepare support for PREEMPT_RT Thomas Gleixner
2019-07-28 9:06 ` Juergen Gross
2019-07-29 15:08 ` Steven Rostedt
2019-07-29 17:30 ` Paolo Bonzini
2019-07-31 8:45 ` Juergen Gross
2019-07-30 22:17 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2019-08-01 15:58 ` tip-bot for Anna-Maria Gleixner
2019-08-01 19:04 ` tip-bot for Anna-Maria Gleixner
2019-08-20 13:26 ` Frederic Weisbecker
2019-08-23 2:12 ` [tip: timers/core] hrtimer: Improve comments on handling priority inversion against softirq kthread tip-bot2 for Frederic Weisbecker
2019-07-26 18:31 ` [patch 12/12] timers: Prepare support for PREEMPT_RT Thomas Gleixner
2019-07-30 22:17 ` [tip:timers/core] " tip-bot for Anna-Maria Gleixner
2019-08-01 15:59 ` tip-bot for Anna-Maria Gleixner
2019-08-01 19:04 ` tip-bot for Anna-Maria Gleixner
2019-07-29 19:45 ` [patch 00/12] (hr)timers: Prepare for PREEMPT_RT support Peter Zijlstra
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=tip-b74494872555d1f7888dfd9225700a363f4a84fc@git.kernel.org \
--to=tipbot@zytor.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.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).