Commit d6c23bb3 authored by Peter Zijlstra's avatar Peter Zijlstra

sched: Add get_current_state()

Remove yet another few p->state accesses.
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWill Deacon <will@kernel.org>
Link: https://lore.kernel.org/r/20210611082838.347475156@infradead.org
parent 3ba9f93b
...@@ -3910,7 +3910,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin) ...@@ -3910,7 +3910,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin)
hctx->poll_considered++; hctx->poll_considered++;
state = current->state; state = get_current_state();
do { do {
int ret; int ret;
......
...@@ -213,6 +213,8 @@ struct task_group; ...@@ -213,6 +213,8 @@ struct task_group;
#endif #endif
#define get_current_state() READ_ONCE(current->state)
/* Task command name length: */ /* Task command name length: */
#define TASK_COMM_LEN 16 #define TASK_COMM_LEN 16
......
...@@ -58,7 +58,7 @@ bool __refrigerator(bool check_kthr_stop) ...@@ -58,7 +58,7 @@ bool __refrigerator(bool check_kthr_stop)
/* Hmm, should we be allowed to suspend when there are realtime /* Hmm, should we be allowed to suspend when there are realtime
processes around? */ processes around? */
bool was_frozen = false; bool was_frozen = false;
long save = current->state; unsigned int save = get_current_state();
pr_debug("%s entered refrigerator\n", current->comm); pr_debug("%s entered refrigerator\n", current->comm);
......
...@@ -9098,15 +9098,15 @@ static inline int preempt_count_equals(int preempt_offset) ...@@ -9098,15 +9098,15 @@ static inline int preempt_count_equals(int preempt_offset)
void __might_sleep(const char *file, int line, 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, * Blocking primitives will set (and therefore destroy) current->state,
* since we will exit with TASK_RUNNING make sure we enter with it, * since we will exit with TASK_RUNNING make sure we enter with it,
* otherwise we will destroy state. * 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; " "do not call blocking ops when !TASK_RUNNING; "
"state=%lx set at [<%p>] %pS\n", "state=%x set at [<%p>] %pS\n", state,
current->state,
(void *)current->task_state_change, (void *)current->task_state_change,
(void *)current->task_state_change); (void *)current->task_state_change);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment