hamza.kesraoui/sst-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mptcp: update misleading comments.

Browse Source 
The MPTCP data path is quite complex and hard to understend even
without some foggy comments referring to modified code and/or
completely misleading from the beginning.

Update a few of them to more accurately describing the current
status.

Reviewed-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Paolo Abeni 2022-09-30 08:59:34 -07:00 committed by David S. Miller
parent 6bf41020b7
commit d89e3ed76b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/mptcp/protocol.c
View File

@ -662,9 +662,9 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
skb = skb_peek(&ssk->sk_receive_queue); skb = skb_peek(&ssk->sk_receive_queue);
if (!skb) { if (!skb) {
/* if no data is found, a racing workqueue/recvmsg /* With racing move_skbs_to_msk() and __mptcp_move_skbs(),
* already processed the new data, stop here or we * a different CPU can have already processed the pending
* can enter an infinite loop * data, stop here or we can enter an infinite loop
*/ */
if (!moved) if (!moved)
done = true; done = true;
@ -672,9 +672,9 @@ static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
} }
if (__mptcp_check_fallback(msk)) { if (__mptcp_check_fallback(msk)) {
/* if we are running under the workqueue, TCP could have /* Under fallback skbs have no MPTCP extension and TCP could
* collapsed skbs between dummy map creation and now * collapse them between the dummy map creation and the
* be sure to adjust the size * current dequeue. Be sure to adjust the map size.
*/ */
map_remaining = skb->len; map_remaining = skb->len;
subflow->map_data_len = skb->len; subflow->map_data_len = skb->len;
@ -3768,7 +3768,7 @@ static __poll_t mptcp_poll(struct file *file, struct socket *sock,
if (sk->sk_shutdown & RCV_SHUTDOWN) if (sk->sk_shutdown & RCV_SHUTDOWN)
mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP; mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
/* This barrier is coupled with smp_wmb() in tcp_reset() */ /* This barrier is coupled with smp_wmb() in __mptcp_error_report() */
smp_rmb(); smp_rmb();
if (sk->sk_err) if (sk->sk_err)
mask |= EPOLLERR; mask |= EPOLLERR;