OSDN Git Service

mptcp: do not wakeup listener for MPJ subflows
authorPaolo Abeni <pabeni@redhat.com>
Fri, 19 Feb 2021 17:35:40 +0000 (18:35 +0100)
committerJakub Kicinski <kuba@kernel.org>
Tue, 23 Feb 2021 02:54:59 +0000 (18:54 -0800)
commit52557dbc7538ecceb27ef2206719a47a8039a335
treef408921b80f8f4659198c29569f578d99d153428
parentad98dd37051e14fa8c785609430d907fcfd518ba
mptcp: do not wakeup listener for MPJ subflows

MPJ subflows are not exposed as fds to user spaces. As such,
incoming MPJ subflows are removed from the accept queue by
tcp_check_req()/tcp_get_cookie_sock().

Later tcp_child_process() invokes subflow_data_ready() on the
parent socket regardless of the subflow kind, leading to poll
wakeups even if the later accept will block.

Address the issue by double-checking the queue state before
waking the user-space.

Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/164
Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Fixes: f296234c98a8 ("mptcp: Add handling of incoming MP_JOIN requests")
Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/mptcp/subflow.c