From patchwork Mon Nov 18 21:45:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Westphal X-Patchwork-Id: 1197001 X-Patchwork-Delegate: matthieu.baerts@tessares.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.01.org (client-ip=198.145.21.10; helo=ml01.01.org; envelope-from=mptcp-bounces@lists.01.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=strlen.de Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47H2bQ5KyXz9s4Y for ; Tue, 19 Nov 2019 08:46:42 +1100 (AEDT) Received: from new-ml01.vlan13.01.org (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8152E100DC2A8; Mon, 18 Nov 2019 13:47:36 -0800 (PST) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=2a0a:51c0:0:12e:520::1; helo=chamillionaire.breakpoint.cc; envelope-from=fw@breakpoint.cc; receiver= Received: from Chamillionaire.breakpoint.cc (Chamillionaire.breakpoint.cc [IPv6:2a0a:51c0:0:12e:520::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CE52B100DC2A6 for ; Mon, 18 Nov 2019 13:47:33 -0800 (PST) Received: from fw by Chamillionaire.breakpoint.cc with local (Exim 4.92) (envelope-from ) id 1iWoqy-0008It-Hm; Mon, 18 Nov 2019 22:46:36 +0100 From: Florian Westphal To: Cc: Florian Westphal Date: Mon, 18 Nov 2019 22:45:37 +0100 Message-Id: <20191118214538.21931-13-fw@strlen.de> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191118214538.21931-1-fw@strlen.de> References: <20191118214538.21931-1-fw@strlen.de> MIME-Version: 1.0 Message-ID-Hash: WRGYJKIKBVE6CJV2K7E3PJU3F4PRYRTU X-Message-ID-Hash: WRGYJKIKBVE6CJV2K7E3PJU3F4PRYRTU X-MailFrom: fw@breakpoint.cc X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.1.1 Precedence: list Subject: [MPTCP] [PATCH v2 12/13] mptcp_poll: don't consider subflow socket state anymore List-Id: Discussions regarding MPTCP upstreaming Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: After previous patch, we do not need to call __tcp_poll anymore, we can use msk->flags instead to see if we have data available on a socket. SEND_SPACE flag indicates when a subflow has enough space to accept more data, it gets cleared on mptcp_sendmsg() return in case ssk runs below the free watermark. The commit "net: tcp: add __tcp_poll helper" can now be removed. Signed-off-by: Florian Westphal --- net/mptcp/protocol.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 9f2cbf2b89fb..b36d1b89cb34 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -189,7 +189,10 @@ static void mptcp_clean_una(struct sock *sk) if (cleaned) { sk_mem_reclaim_partial(sk); - sk_stream_write_space(sk); + + /* Only wake up writers if a subflow is ready */ + if (test_bit(MPTCP_SEND_SPACE, &msk->flags)) + sk_stream_write_space(sk); } } @@ -837,6 +840,7 @@ static int __mptcp_init_sock(struct sock *sk) INIT_LIST_HEAD(&msk->rtx_queue); INIT_WORK(&msk->rtx_work, mptcp_worker); + __set_bit(MPTCP_SEND_SPACE, &msk->flags); /* re-use the csk retrans timer for MPTCP-level retrans */ timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_retransmit_timer, 0); @@ -1401,39 +1405,35 @@ static int mptcp_stream_accept(struct socket *sock, struct socket *newsock, static __poll_t mptcp_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait) { - struct mptcp_subflow_context *subflow; const struct mptcp_sock *msk; struct sock *sk = sock->sk; struct socket *ssock; - __poll_t ret = 0; + __poll_t mask = 0; msk = mptcp_sk(sk); lock_sock(sk); ssock = __mptcp_fallback_get_ref(msk); if (ssock) { release_sock(sk); - ret = ssock->ops->poll(file, ssock, wait); + mask = ssock->ops->poll(file, ssock, wait); sock_put(ssock->sk); - return ret; + return mask; } release_sock(sk); sock_poll_wait(file, sock, wait); lock_sock(sk); - mptcp_for_each_subflow(msk, subflow) { - struct socket *tcp_sock; - - tcp_sock = mptcp_subflow_tcp_socket(subflow); - ret |= __tcp_poll(tcp_sock->sk); - } - - if (!sk_stream_is_writeable(sk)) - ret &= ~(EPOLLOUT|EPOLLWRNORM); + if (test_bit(MPTCP_DATA_READY, &msk->flags)) + mask = EPOLLIN | EPOLLRDNORM; + if (sk_stream_is_writeable(sk) && test_bit(MPTCP_SEND_SPACE, &msk->flags)) + mask |= EPOLLOUT | EPOLLWRNORM; + if (sk->sk_shutdown & RCV_SHUTDOWN) + mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP; release_sock(sk); - return ret; + return mask; } static int mptcp_shutdown(struct socket *sock, int how)