sched: Add get_current_state()

Remove yet another few p->state accesses.

Peter Zijlstra committed 5 years ago

Commit d6c23bb1 parent 3ba9f934 files · +7 −5Browse files

Unified · Split

4 files

@@ -3910,7 +3910,7 @@ int blk_poll(struct request_queue *q, blk_qc_t cookie, bool spin) · 3909 unmodified lines
3910		3910
3911	hctx->poll_considered++;	3911	hctx->poll_considered++;
3912		3912
3913	state = current->state;	3913	state = get_current_state();
3914	do {	3914	do {
3915	int ret;	3915	int ret;
3916		3916

@@ -213,6 +213,8 @@ struct task_group; · 212 unmodified lines
213		213
214	#endif	214	#endif
215		215
		216	#define get_current_state() READ_ONCE(current->state)
		217
216	/* Task command name length: */	218	/* Task command name length: */
217	#define TASK_COMM_LEN 16	219	#define TASK_COMM_LEN 16
218		220

@@ -58,7 +58,7 @@ bool __refrigerator(bool check_kthr_stop) · 57 unmodified lines
58	/* Hmm, should we be allowed to suspend when there are realtime	58	/* Hmm, should we be allowed to suspend when there are realtime
59	processes around? */	59	processes around? */
60	bool was_frozen = false;	60	bool was_frozen = false;
61	long save = current->state;	61	unsigned int save = get_current_state();
62		62
63	pr_debug("%s entered refrigerator\n", current->comm);	63	pr_debug("%s entered refrigerator\n", current->comm);
64		64

 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",
+			"state=%x set at [<%p>] %pS\n", state,
-			current->state,
 			(void *)current->task_state_change,
 			(void *)current->task_state_change);

Keyboard shortcuts