Skip to content

Commit e8fe3f0

Browse files
oleg-nesterovmartinetd
authored andcommitted
9p/trans_fd: p9_fd_request: kick rx thread if EPOLLIN
p9_read_work() doesn't set Rworksched and doesn't do schedule_work(m->rq) if list_empty(&m->req_list). However, if the pipe is full, we need to read more data and this used to work prior to commit aaec5a9 ("pipe_read: don't wake up the writer if the pipe is still full"). p9_read_work() does p9_fd_read() -> ... -> anon_pipe_read() which (before the commit above) triggered the unnecessary wakeup. This wakeup calls p9_pollwake() which kicks p9_poll_workfn() -> p9_poll_mux(), p9_poll_mux() will notice EPOLLIN and schedule_work(&m->rq). This no longer happens after the optimization above, change p9_fd_request() to use p9_poll_mux() instead of only checking for EPOLLOUT. Reported-by: [email protected] Tested-by: [email protected] Closes: https://lore.kernel.org/all/[email protected]/ Link: https://lore.kernel.org/all/[email protected]/ Co-developed-by: K Prateek Nayak <[email protected]> Signed-off-by: K Prateek Nayak <[email protected]> Signed-off-by: Oleg Nesterov <[email protected]> Tested-by: K Prateek Nayak <[email protected]> Message-ID: <[email protected]> Signed-off-by: Dominique Martinet <[email protected]>
1 parent 674b56a commit e8fe3f0

1 file changed

Lines changed: 1 addition & 8 deletions

File tree

net/9p/trans_fd.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,6 @@ static void p9_poll_mux(struct p9_conn *m)
666666

667667
static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)
668668
{
669-
__poll_t n;
670669
int err;
671670
struct p9_trans_fd *ts = client->trans;
672671
struct p9_conn *m = &ts->conn;
@@ -686,13 +685,7 @@ static int p9_fd_request(struct p9_client *client, struct p9_req_t *req)
686685
list_add_tail(&req->req_list, &m->unsent_req_list);
687686
spin_unlock(&m->req_lock);
688687

689-
if (test_and_clear_bit(Wpending, &m->wsched))
690-
n = EPOLLOUT;
691-
else
692-
n = p9_fd_poll(m->client, NULL, NULL);
693-
694-
if (n & EPOLLOUT && !test_and_set_bit(Wworksched, &m->wsched))
695-
schedule_work(&m->wq);
688+
p9_poll_mux(m);
696689

697690
return 0;
698691
}

0 commit comments

Comments
 (0)