[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20150804163334.GA31842@redhat.com>
Date: Tue, 4 Aug 2015 18:33:34 +0200
From: Oleg Nesterov <oleg@...hat.com>
To: "David S. Miller" <davem@...emloft.net>,
Huang Ying <ying.huang@...el.com>
Cc: Alexei Starovoitov <ast@...mgrid.com>,
Jan Stancek <jstancek@...hat.com>,
Jesper Brouer <brouer@...hat.com>,
Marcelo Leitner <mleitner@...hat.com>, netdev@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] net: pktgen: don't abuse current->state in
pktgen_thread_worker()
Commit 1fbe4b46caca "net: pktgen: kill the Wait for kthread_stop
code in pktgen_thread_worker()" removed (in particular) the final
__set_current_state(TASK_RUNNING) and I didn't notice the previous
set_current_state(TASK_INTERRUPTIBLE). This triggers the warning
in __might_sleep() after return.
Afaics, we can simply remove both set_current_state()'s, and we
could do this a long ago right after ef87979c273a2 "pktgen: better
scheduler friendliness" which changed pktgen_thread_worker() to
use wait_event_interruptible_timeout().
Reported-by: Huang Ying <ying.huang@...el.com>
Signed-off-by: Oleg Nesterov <oleg@...hat.com>
---
net/core/pktgen.c | 3 ---
1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 8e0181a..6717684 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -3432,8 +3432,6 @@ static int pktgen_thread_worker(void *arg)
set_freezable();
- __set_current_state(TASK_RUNNING);
-
while (!kthread_should_stop()) {
pkt_dev = next_to_run(t);
@@ -3478,7 +3476,6 @@ static int pktgen_thread_worker(void *arg)
try_to_freeze();
}
- set_current_state(TASK_INTERRUPTIBLE);
pr_debug("%s stopping all device\n", t->tsk->comm);
pktgen_stop(t);
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists