From: "tip-bot2 for Peter Zijlstra" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: "Peter Zijlstra (Intel)" <peterz@infradead.org>,
Will Deacon <will@kernel.org>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: sched/core] sched: Add get_current_state()
Date: Fri, 18 Jun 2021 11:24:03 -0000 [thread overview]
Message-ID: <162401544338.19906.292740293969092340.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210611082838.347475156@infradead.org>
The following commit has been merged into the sched/core branch of tip:
Commit-ID: d6c23bb3a2ad2f8f7dd46292b8bc54d27f2fb3f1
Gitweb: https://git.kernel.org/tip/d6c23bb3a2ad2f8f7dd46292b8bc54d27f2fb3f1
Author: Peter Zijlstra <peterz@infradead.org>
AuthorDate: Fri, 11 Jun 2021 10:28:14 +02:00
Committer: Peter Zijlstra <peterz@infradead.org>
CommitterDate: Fri, 18 Jun 2021 11:43:08 +02:00
sched: Add get_current_state()
Remove yet another few p->state accesses.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210611082838.347475156@infradead.org
---
block/blk-mq.c | 2 +-
include/linux/sched.h | 2 ++
kernel/freezer.c | 2 +-
kernel/sched/core.c | 6 +++---
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index 655db5f..56270bb 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -3910,7 +3910,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)
hctx->poll_considered++;
- state = current->state;
+ state = get_current_state();
do {
int ret;
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 2cd5635..395c890 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -213,6 +213,8 @@ struct task_group;
#endif
+#define get_current_state() READ_ONCE(current->state)
+
/* Task command name length: */
#define TASK_COMM_LEN 16
diff --git a/kernel/freezer.c b/kernel/freezer.c
index dc520f0..45ab36f 100644
--- a/kernel/freezer.c
+++ b/kernel/freezer.c
@@ -58,7 +58,7 @@ bool __refrigerator(bool check_kthr_stop)
/* Hmm, should we be allowed to suspend when there are realtime
processes around? */
bool was_frozen = false;
- long save = current->state;
+ unsigned int save = get_current_state();
pr_debug("%s entered refrigerator\n", current->comm);
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 618c2b5..45ebb3c 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -9098,15 +9098,15 @@ static inline int preempt_count_equals(int preempt_offset)
void __might_sleep(const char *file, int line, int preempt_offset)
{
+ unsigned int state = get_current_state();
/*
* Blocking primitives will set (and therefore destroy) current->state,
* since we will exit with TASK_RUNNING make sure we enter with it,
* otherwise we will destroy state.
*/
- WARN_ONCE(current->state != TASK_RUNNING && current->task_state_change,
+ WARN_ONCE(state != TASK_RUNNING && current->task_state_change,
"do not call blocking ops when !TASK_RUNNING; "
- "state=%lx set at [<%p>] %pS\n",
- current->state,
+ "state=%x set at [<%p>] %pS\n", state,
(void *)current->task_state_change,
(void *)current->task_state_change);
next prev parent reply other threads:[~2021-06-18 11:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-11 8:28 [PATCH v2 0/7] Cleanup task_struct::state Peter Zijlstra
2021-06-11 8:28 ` [PATCH v2 1/7] sched: Unbreak wakeups Peter Zijlstra
2021-06-18 11:24 ` [tip: sched/core] " tip-bot2 for Peter Zijlstra
2021-06-11 8:28 ` [PATCH v2 2/7] sched: Introduce task_is_running() Peter Zijlstra
2021-06-11 8:49 ` Geert Uytterhoeven
2021-06-11 9:13 ` Peter Zijlstra
2021-06-11 10:26 ` Will Deacon
2021-06-18 11:24 ` [tip: sched/core] " tip-bot2 for Peter Zijlstra
2021-06-11 8:28 ` [PATCH v2 3/7] sched,perf,kvm: Fix preemption condition Peter Zijlstra
2021-06-18 11:24 ` [tip: sched/core] " tip-bot2 for Peter Zijlstra
2021-06-11 8:28 ` [PATCH v2 4/7] sched: Add get_current_state() Peter Zijlstra
2021-06-18 11:24 ` tip-bot2 for Peter Zijlstra [this message]
2021-06-11 8:28 ` [PATCH v2 5/7] sched,timer: Use __set_current_state() Peter Zijlstra
2021-06-18 11:24 ` [tip: sched/core] " tip-bot2 for Peter Zijlstra
2021-06-11 8:28 ` [PATCH v2 6/7] sched,arch: Remove unused TASK_STATE offsets Peter Zijlstra
2021-06-18 11:24 ` [tip: sched/core] " tip-bot2 for Peter Zijlstra
2021-06-11 8:28 ` [PATCH v2 7/7] sched: Change task_struct::state Peter Zijlstra
2021-06-16 13:24 ` Daniel Bristot de Oliveira
2021-06-18 11:24 ` [tip: sched/core] " tip-bot2 for 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=162401544338.19906.292740293969092340.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
/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).