2020-01-22 00:56:15 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
/* Multipath TCP
|
|
|
|
*
|
|
|
|
* Copyright (c) 2017 - 2019, Intel Corporation.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define pr_fmt(fmt) "MPTCP: " fmt
|
|
|
|
|
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/netdevice.h>
|
2020-01-22 00:56:26 +00:00
|
|
|
#include <linux/sched/signal.h>
|
|
|
|
#include <linux/atomic.h>
|
2020-01-22 00:56:15 +00:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/inet_common.h>
|
|
|
|
#include <net/inet_hashtables.h>
|
|
|
|
#include <net/protocol.h>
|
2020-07-28 22:12:03 +00:00
|
|
|
#include <net/tcp_states.h>
|
2020-01-22 00:56:19 +00:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
#include <net/transp_v6.h>
|
|
|
|
#endif
|
2020-01-22 00:56:15 +00:00
|
|
|
#include <net/mptcp.h>
|
2024-04-29 13:40:21 +00:00
|
|
|
#include <net/hotdata.h>
|
2020-11-16 09:48:09 +00:00
|
|
|
#include <net/xfrm.h>
|
2021-12-03 22:35:34 +00:00
|
|
|
#include <asm/ioctls.h>
|
2020-01-22 00:56:15 +00:00
|
|
|
#include "protocol.h"
|
2020-03-27 21:48:50 +00:00
|
|
|
#include "mib.h"
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2021-04-16 22:38:04 +00:00
|
|
|
#define CREATE_TRACE_POINTS
|
|
|
|
#include <trace/events/mptcp.h>
|
|
|
|
|
2020-02-05 23:39:37 +00:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
struct mptcp6_sock {
|
|
|
|
struct mptcp_sock msk;
|
|
|
|
struct ipv6_pinfo np;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2021-06-03 23:24:32 +00:00
|
|
|
enum {
|
|
|
|
MPTCP_CMSG_TS = BIT(0),
|
2021-12-03 22:35:32 +00:00
|
|
|
MPTCP_CMSG_INQ = BIT(1),
|
2021-06-03 23:24:32 +00:00
|
|
|
};
|
|
|
|
|
2021-11-15 19:02:39 +00:00
|
|
|
static struct percpu_counter mptcp_sockets_allocated ____cacheline_aligned_in_smp;
|
2020-03-27 21:48:45 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
static void __mptcp_destroy_sock(struct sock *sk);
|
2023-06-20 16:24:21 +00:00
|
|
|
static void mptcp_check_send_data_fin(struct sock *sk);
|
2020-11-16 09:48:09 +00:00
|
|
|
|
2021-01-20 14:39:14 +00:00
|
|
|
DEFINE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions);
|
|
|
|
static struct net_device mptcp_napi_dev;
|
|
|
|
|
2020-11-16 09:48:13 +00:00
|
|
|
/* Returns end sequence number of the receiver's advertised window */
|
|
|
|
static u64 mptcp_wnd_end(const struct mptcp_sock *msk)
|
|
|
|
{
|
2020-11-27 10:10:26 +00:00
|
|
|
return READ_ONCE(msk->wnd_end);
|
2020-11-16 09:48:13 +00:00
|
|
|
}
|
|
|
|
|
2023-12-19 21:31:04 +00:00
|
|
|
static const struct proto_ops *mptcp_fallback_tcp_ops(const struct sock *sk)
|
2020-04-02 11:44:51 +00:00
|
|
|
{
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
2023-12-19 21:31:04 +00:00
|
|
|
if (sk->sk_prot == &tcpv6_prot)
|
|
|
|
return &inet6_stream_ops;
|
2020-04-02 11:44:51 +00:00
|
|
|
#endif
|
2023-12-19 21:31:04 +00:00
|
|
|
WARN_ON_ONCE(sk->sk_prot != &tcp_prot);
|
|
|
|
return &inet_stream_ops;
|
2020-04-02 11:44:51 +00:00
|
|
|
}
|
|
|
|
|
2020-06-29 20:26:23 +00:00
|
|
|
static int __mptcp_socket_create(struct mptcp_sock *msk)
|
2020-01-22 00:56:17 +00:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
struct socket *ssock;
|
|
|
|
int err;
|
|
|
|
|
2023-01-12 17:42:51 +00:00
|
|
|
err = mptcp_subflow_create_socket(sk, sk->sk_family, &ssock);
|
2020-01-22 00:56:17 +00:00
|
|
|
if (err)
|
2020-06-29 20:26:23 +00:00
|
|
|
return err;
|
2020-01-22 00:56:17 +00:00
|
|
|
|
2023-07-20 18:47:50 +00:00
|
|
|
msk->scaling_ratio = tcp_sk(ssock->sk)->scaling_ratio;
|
2023-05-31 19:37:06 +00:00
|
|
|
WRITE_ONCE(msk->first, ssock->sk);
|
2020-01-22 00:56:17 +00:00
|
|
|
subflow = mptcp_subflow_ctx(ssock->sk);
|
2020-01-22 00:56:18 +00:00
|
|
|
list_add(&subflow->node, &msk->conn_list);
|
2020-11-16 09:48:09 +00:00
|
|
|
sock_hold(ssock->sk);
|
2020-01-22 00:56:17 +00:00
|
|
|
subflow->request_mptcp = 1;
|
2023-06-20 16:30:17 +00:00
|
|
|
subflow->subflow_id = msk->subflow_id++;
|
2022-03-07 20:44:37 +00:00
|
|
|
|
|
|
|
/* This is the first subflow, always with id 0 */
|
2024-02-15 18:25:31 +00:00
|
|
|
WRITE_ONCE(subflow->local_id, 0);
|
2021-01-20 14:39:10 +00:00
|
|
|
mptcp_sock_graft(msk->first, sk->sk_socket);
|
2023-08-11 15:57:26 +00:00
|
|
|
iput(SOCK_INODE(ssock));
|
2020-06-29 20:26:20 +00:00
|
|
|
|
2020-06-29 20:26:23 +00:00
|
|
|
return 0;
|
2020-01-22 00:56:17 +00:00
|
|
|
}
|
|
|
|
|
2023-04-14 14:08:03 +00:00
|
|
|
/* If the MPC handshake is not started, returns the first subflow,
|
|
|
|
* eventually allocating it.
|
|
|
|
*/
|
2023-08-11 15:57:25 +00:00
|
|
|
struct sock *__mptcp_nmpc_sk(struct mptcp_sock *msk)
|
2023-04-14 14:08:03 +00:00
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!((1 << sk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)))
|
|
|
|
return ERR_PTR(-EINVAL);
|
|
|
|
|
2023-08-11 15:57:25 +00:00
|
|
|
if (!msk->first) {
|
2023-04-14 14:08:03 +00:00
|
|
|
ret = __mptcp_socket_create(msk);
|
|
|
|
if (ret)
|
|
|
|
return ERR_PTR(ret);
|
|
|
|
}
|
|
|
|
|
2023-08-11 15:57:25 +00:00
|
|
|
return msk->first;
|
2023-04-14 14:08:03 +00:00
|
|
|
}
|
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
static void mptcp_drop(struct sock *sk, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
sk_drops_add(sk, skb);
|
|
|
|
__kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
2023-08-31 13:52:10 +00:00
|
|
|
static void mptcp_rmem_fwd_alloc_add(struct sock *sk, int size)
|
|
|
|
{
|
|
|
|
WRITE_ONCE(mptcp_sk(sk)->rmem_fwd_alloc,
|
|
|
|
mptcp_sk(sk)->rmem_fwd_alloc + size);
|
|
|
|
}
|
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
static void mptcp_rmem_charge(struct sock *sk, int size)
|
|
|
|
{
|
2023-08-31 13:52:10 +00:00
|
|
|
mptcp_rmem_fwd_alloc_add(sk, -size);
|
2021-10-26 23:29:15 +00:00
|
|
|
}
|
|
|
|
|
2020-09-14 08:01:11 +00:00
|
|
|
static bool mptcp_try_coalesce(struct sock *sk, struct sk_buff *to,
|
|
|
|
struct sk_buff *from)
|
|
|
|
{
|
|
|
|
bool fragstolen;
|
|
|
|
int delta;
|
|
|
|
|
|
|
|
if (MPTCP_SKB_CB(from)->offset ||
|
|
|
|
!skb_try_coalesce(to, from, &fragstolen, &delta))
|
|
|
|
return false;
|
|
|
|
|
2020-09-14 08:01:14 +00:00
|
|
|
pr_debug("colesced seq %llx into %llx new len %d new end seq %llx",
|
|
|
|
MPTCP_SKB_CB(from)->map_seq, MPTCP_SKB_CB(to)->map_seq,
|
|
|
|
to->len, MPTCP_SKB_CB(from)->end_seq);
|
2020-09-14 08:01:12 +00:00
|
|
|
MPTCP_SKB_CB(to)->end_seq = MPTCP_SKB_CB(from)->end_seq;
|
2022-09-06 18:04:01 +00:00
|
|
|
|
|
|
|
/* note the fwd memory can reach a negative value after accounting
|
|
|
|
* for the delta, but the later skb free will restore a non
|
|
|
|
* negative one
|
|
|
|
*/
|
2020-09-14 08:01:11 +00:00
|
|
|
atomic_add(delta, &sk->sk_rmem_alloc);
|
2021-10-26 23:29:15 +00:00
|
|
|
mptcp_rmem_charge(sk, delta);
|
2022-09-06 18:04:01 +00:00
|
|
|
kfree_skb_partial(from, fragstolen);
|
|
|
|
|
2020-09-14 08:01:11 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
static bool mptcp_ooo_try_coalesce(struct mptcp_sock *msk, struct sk_buff *to,
|
|
|
|
struct sk_buff *from)
|
|
|
|
{
|
|
|
|
if (MPTCP_SKB_CB(from)->map_seq != MPTCP_SKB_CB(to)->end_seq)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return mptcp_try_coalesce((struct sock *)msk, to, from);
|
|
|
|
}
|
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
static void __mptcp_rmem_reclaim(struct sock *sk, int amount)
|
|
|
|
{
|
2022-06-09 06:34:07 +00:00
|
|
|
amount >>= PAGE_SHIFT;
|
2023-08-31 13:52:10 +00:00
|
|
|
mptcp_rmem_charge(sk, amount << PAGE_SHIFT);
|
2021-10-26 23:29:15 +00:00
|
|
|
__sk_mem_reduce_allocated(sk, amount);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_rmem_uncharge(struct sock *sk, int size)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
int reclaimable;
|
|
|
|
|
2023-08-31 13:52:10 +00:00
|
|
|
mptcp_rmem_fwd_alloc_add(sk, size);
|
2021-10-26 23:29:15 +00:00
|
|
|
reclaimable = msk->rmem_fwd_alloc - sk_unused_reserved_mem(sk);
|
|
|
|
|
|
|
|
/* see sk_mem_uncharge() for the rationale behind the following schema */
|
2022-06-30 22:17:55 +00:00
|
|
|
if (unlikely(reclaimable >= PAGE_SIZE))
|
|
|
|
__mptcp_rmem_reclaim(sk, reclaimable);
|
2021-10-26 23:29:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_rfree(struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
unsigned int len = skb->truesize;
|
|
|
|
struct sock *sk = skb->sk;
|
|
|
|
|
|
|
|
atomic_sub(len, &sk->sk_rmem_alloc);
|
|
|
|
mptcp_rmem_uncharge(sk, len);
|
|
|
|
}
|
|
|
|
|
2022-11-25 22:29:51 +00:00
|
|
|
void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk)
|
2021-10-26 23:29:15 +00:00
|
|
|
{
|
|
|
|
skb_orphan(skb);
|
|
|
|
skb->sk = sk;
|
|
|
|
skb->destructor = mptcp_rfree;
|
|
|
|
atomic_add(skb->truesize, &sk->sk_rmem_alloc);
|
|
|
|
mptcp_rmem_charge(sk, skb->truesize);
|
|
|
|
}
|
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
/* "inspired" by tcp_data_queue_ofo(), main differences:
|
|
|
|
* - use mptcp seqs
|
|
|
|
* - don't cope with sacks
|
|
|
|
*/
|
|
|
|
static void mptcp_data_queue_ofo(struct mptcp_sock *msk, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
struct rb_node **p, *parent;
|
|
|
|
u64 seq, end_seq, max_seq;
|
|
|
|
struct sk_buff *skb1;
|
|
|
|
|
|
|
|
seq = MPTCP_SKB_CB(skb)->map_seq;
|
|
|
|
end_seq = MPTCP_SKB_CB(skb)->end_seq;
|
2022-05-04 21:54:07 +00:00
|
|
|
max_seq = atomic64_read(&msk->rcv_wnd_sent);
|
2020-09-14 08:01:12 +00:00
|
|
|
|
2020-09-14 08:01:14 +00:00
|
|
|
pr_debug("msk=%p seq=%llx limit=%llx empty=%d", msk, seq, max_seq,
|
|
|
|
RB_EMPTY_ROOT(&msk->out_of_order_queue));
|
2020-11-19 19:46:02 +00:00
|
|
|
if (after64(end_seq, max_seq)) {
|
2020-09-14 08:01:12 +00:00
|
|
|
/* out of window */
|
|
|
|
mptcp_drop(sk, skb);
|
2020-11-19 19:46:02 +00:00
|
|
|
pr_debug("oow by %lld, rcv_wnd_sent %llu\n",
|
|
|
|
(unsigned long long)end_seq - (unsigned long)max_seq,
|
2022-05-04 21:54:07 +00:00
|
|
|
(unsigned long long)atomic64_read(&msk->rcv_wnd_sent));
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_NODSSWINDOW);
|
2020-09-14 08:01:12 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = &msk->out_of_order_queue.rb_node;
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOQUEUE);
|
2020-09-14 08:01:12 +00:00
|
|
|
if (RB_EMPTY_ROOT(&msk->out_of_order_queue)) {
|
|
|
|
rb_link_node(&skb->rbnode, NULL, p);
|
|
|
|
rb_insert_color(&skb->rbnode, &msk->out_of_order_queue);
|
|
|
|
msk->ooo_last_skb = skb;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* with 2 subflows, adding at end of ooo queue is quite likely
|
|
|
|
* Use of ooo_last_skb avoids the O(Log(N)) rbtree lookup.
|
|
|
|
*/
|
2020-09-14 08:01:14 +00:00
|
|
|
if (mptcp_ooo_try_coalesce(msk, msk->ooo_last_skb, skb)) {
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOMERGE);
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOQUEUETAIL);
|
2020-09-14 08:01:12 +00:00
|
|
|
return;
|
2020-09-14 08:01:14 +00:00
|
|
|
}
|
2020-09-14 08:01:12 +00:00
|
|
|
|
|
|
|
/* Can avoid an rbtree lookup if we are adding skb after ooo_last_skb */
|
|
|
|
if (!before64(seq, MPTCP_SKB_CB(msk->ooo_last_skb)->end_seq)) {
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOQUEUETAIL);
|
2020-09-14 08:01:12 +00:00
|
|
|
parent = &msk->ooo_last_skb->rbnode;
|
|
|
|
p = &parent->rb_right;
|
|
|
|
goto insert;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Find place to insert this segment. Handle overlaps on the way. */
|
|
|
|
parent = NULL;
|
|
|
|
while (*p) {
|
|
|
|
parent = *p;
|
|
|
|
skb1 = rb_to_skb(parent);
|
|
|
|
if (before64(seq, MPTCP_SKB_CB(skb1)->map_seq)) {
|
|
|
|
p = &parent->rb_left;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (before64(seq, MPTCP_SKB_CB(skb1)->end_seq)) {
|
|
|
|
if (!after64(end_seq, MPTCP_SKB_CB(skb1)->end_seq)) {
|
|
|
|
/* All the bits are present. Drop. */
|
|
|
|
mptcp_drop(sk, skb);
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 08:01:12 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
if (after64(seq, MPTCP_SKB_CB(skb1)->map_seq)) {
|
|
|
|
/* partial overlap:
|
|
|
|
* | skb |
|
|
|
|
* | skb1 |
|
|
|
|
* continue traversing
|
|
|
|
*/
|
|
|
|
} else {
|
|
|
|
/* skb's seq == skb1's seq and skb covers skb1.
|
|
|
|
* Replace skb1 with skb.
|
|
|
|
*/
|
|
|
|
rb_replace_node(&skb1->rbnode, &skb->rbnode,
|
|
|
|
&msk->out_of_order_queue);
|
|
|
|
mptcp_drop(sk, skb1);
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 08:01:12 +00:00
|
|
|
goto merge_right;
|
|
|
|
}
|
|
|
|
} else if (mptcp_ooo_try_coalesce(msk, skb1, skb)) {
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOMERGE);
|
2020-09-14 08:01:12 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
p = &parent->rb_right;
|
|
|
|
}
|
2020-09-14 08:01:14 +00:00
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
insert:
|
|
|
|
/* Insert segment into RB tree. */
|
|
|
|
rb_link_node(&skb->rbnode, parent, p);
|
|
|
|
rb_insert_color(&skb->rbnode, &msk->out_of_order_queue);
|
|
|
|
|
|
|
|
merge_right:
|
|
|
|
/* Remove other segments covered by skb. */
|
|
|
|
while ((skb1 = skb_rb_next(skb)) != NULL) {
|
|
|
|
if (before64(end_seq, MPTCP_SKB_CB(skb1)->end_seq))
|
|
|
|
break;
|
|
|
|
rb_erase(&skb1->rbnode, &msk->out_of_order_queue);
|
|
|
|
mptcp_drop(sk, skb1);
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 08:01:12 +00:00
|
|
|
}
|
|
|
|
/* If there is no skb after us, we are the last_skb ! */
|
|
|
|
if (!skb1)
|
|
|
|
msk->ooo_last_skb = skb;
|
|
|
|
|
|
|
|
end:
|
|
|
|
skb_condense(skb);
|
2021-10-26 23:29:15 +00:00
|
|
|
mptcp_set_owner_r(skb, sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_rmem_schedule(struct sock *sk, struct sock *ssk, int size)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
int amt, amount;
|
|
|
|
|
2022-06-30 22:17:56 +00:00
|
|
|
if (size <= msk->rmem_fwd_alloc)
|
2021-10-26 23:29:15 +00:00
|
|
|
return true;
|
|
|
|
|
2022-06-30 22:17:56 +00:00
|
|
|
size -= msk->rmem_fwd_alloc;
|
2021-10-26 23:29:15 +00:00
|
|
|
amt = sk_mem_pages(size);
|
2022-06-09 06:34:07 +00:00
|
|
|
amount = amt << PAGE_SHIFT;
|
2022-06-30 22:17:54 +00:00
|
|
|
if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV))
|
|
|
|
return false;
|
2021-10-26 23:29:15 +00:00
|
|
|
|
2023-08-31 13:52:10 +00:00
|
|
|
mptcp_rmem_fwd_alloc_add(sk, amount);
|
2021-10-26 23:29:15 +00:00
|
|
|
return true;
|
2020-09-14 08:01:12 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk,
|
|
|
|
struct sk_buff *skb, unsigned int offset,
|
|
|
|
size_t copy_len)
|
2020-02-26 09:14:48 +00:00
|
|
|
{
|
2020-09-14 08:01:12 +00:00
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-02-26 09:14:48 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-05-25 21:41:13 +00:00
|
|
|
struct sk_buff *tail;
|
2021-06-03 23:24:32 +00:00
|
|
|
bool has_rxtstamp;
|
2020-02-26 09:14:48 +00:00
|
|
|
|
|
|
|
__skb_unlink(skb, &ssk->sk_receive_queue);
|
|
|
|
|
2020-05-25 21:41:13 +00:00
|
|
|
skb_ext_reset(skb);
|
|
|
|
skb_orphan(skb);
|
2020-09-14 08:01:12 +00:00
|
|
|
|
2020-10-27 14:59:14 +00:00
|
|
|
/* try to fetch required memory from subflow */
|
2024-07-31 10:10:14 +00:00
|
|
|
if (!mptcp_rmem_schedule(sk, ssk, skb->truesize)) {
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED);
|
2021-10-26 23:29:15 +00:00
|
|
|
goto drop;
|
2024-07-31 10:10:14 +00:00
|
|
|
}
|
2020-10-27 14:59:14 +00:00
|
|
|
|
2021-06-03 23:24:32 +00:00
|
|
|
has_rxtstamp = TCP_SKB_CB(skb)->has_rxtstamp;
|
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
/* the skb map_seq accounts for the skb offset:
|
|
|
|
* mptcp_subflow_get_mapped_dsn() is based on the current tp->copied_seq
|
|
|
|
* value
|
|
|
|
*/
|
|
|
|
MPTCP_SKB_CB(skb)->map_seq = mptcp_subflow_get_mapped_dsn(subflow);
|
|
|
|
MPTCP_SKB_CB(skb)->end_seq = MPTCP_SKB_CB(skb)->map_seq + copy_len;
|
2020-09-14 08:01:11 +00:00
|
|
|
MPTCP_SKB_CB(skb)->offset = offset;
|
2021-06-03 23:24:32 +00:00
|
|
|
MPTCP_SKB_CB(skb)->has_rxtstamp = has_rxtstamp;
|
2020-05-25 21:41:13 +00:00
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
if (MPTCP_SKB_CB(skb)->map_seq == msk->ack_seq) {
|
|
|
|
/* in sequence */
|
2023-06-20 16:30:15 +00:00
|
|
|
msk->bytes_received += copy_len;
|
2020-10-06 00:33:26 +00:00
|
|
|
WRITE_ONCE(msk->ack_seq, msk->ack_seq + copy_len);
|
2020-09-14 08:01:12 +00:00
|
|
|
tail = skb_peek_tail(&sk->sk_receive_queue);
|
|
|
|
if (tail && mptcp_try_coalesce(sk, tail, skb))
|
|
|
|
return true;
|
2020-05-25 21:41:13 +00:00
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
mptcp_set_owner_r(skb, sk);
|
2020-09-14 08:01:12 +00:00
|
|
|
__skb_queue_tail(&sk->sk_receive_queue, skb);
|
|
|
|
return true;
|
|
|
|
} else if (after64(MPTCP_SKB_CB(skb)->map_seq, msk->ack_seq)) {
|
|
|
|
mptcp_data_queue_ofo(msk, skb);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* old data, keep it simple and drop the whole pkt, sender
|
|
|
|
* will retransmit as needed, if needed.
|
|
|
|
*/
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-10-27 14:59:14 +00:00
|
|
|
drop:
|
2020-09-14 08:01:12 +00:00
|
|
|
mptcp_drop(sk, skb);
|
|
|
|
return false;
|
2020-02-26 09:14:48 +00:00
|
|
|
}
|
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
static void mptcp_stop_rtx_timer(struct sock *sk)
|
2020-07-28 22:12:05 +00:00
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
|
|
|
sk_stop_timer(sk, &icsk->icsk_retransmit_timer);
|
|
|
|
mptcp_sk(sk)->timer_ival = 0;
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
static void mptcp_close_wake_up(struct sock *sk)
|
|
|
|
{
|
|
|
|
if (sock_flag(sk, SOCK_DEAD))
|
|
|
|
return;
|
|
|
|
|
|
|
|
sk->sk_state_change(sk);
|
|
|
|
if (sk->sk_shutdown == SHUTDOWN_MASK ||
|
|
|
|
sk->sk_state == TCP_CLOSE)
|
|
|
|
sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_HUP);
|
|
|
|
else
|
|
|
|
sk_wake_async(sk, SOCK_WAKE_WAITD, POLL_IN);
|
|
|
|
}
|
|
|
|
|
2024-02-02 11:40:09 +00:00
|
|
|
/* called under the msk socket lock */
|
2020-11-27 10:10:27 +00:00
|
|
|
static bool mptcp_pending_data_fin_ack(struct sock *sk)
|
2020-07-28 22:12:05 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2023-06-20 16:24:21 +00:00
|
|
|
return ((1 << sk->sk_state) &
|
2020-11-27 10:10:27 +00:00
|
|
|
(TCPF_FIN_WAIT1 | TCPF_CLOSING | TCPF_LAST_ACK)) &&
|
|
|
|
msk->write_seq == READ_ONCE(msk->snd_una);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_check_data_fin_ack(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-07-28 22:12:05 +00:00
|
|
|
|
|
|
|
/* Look for an acknowledged DATA_FIN */
|
2020-11-27 10:10:27 +00:00
|
|
|
if (mptcp_pending_data_fin_ack(sk)) {
|
2020-07-28 22:12:05 +00:00
|
|
|
WRITE_ONCE(msk->snd_data_fin_enable, 0);
|
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_FIN_WAIT1:
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_FIN_WAIT2);
|
2020-07-28 22:12:05 +00:00
|
|
|
break;
|
|
|
|
case TCP_CLOSING:
|
|
|
|
case TCP_LAST_ACK:
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2020-07-28 22:12:05 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
mptcp_close_wake_up(sk);
|
2020-07-28 22:12:05 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2024-02-02 11:40:09 +00:00
|
|
|
/* can be called with no lock acquired */
|
2020-07-28 22:12:03 +00:00
|
|
|
static bool mptcp_pending_data_fin(struct sock *sk, u64 *seq)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
if (READ_ONCE(msk->rcv_data_fin) &&
|
2024-02-02 11:40:09 +00:00
|
|
|
((1 << inet_sk_state_load(sk)) &
|
2020-07-28 22:12:03 +00:00
|
|
|
(TCPF_ESTABLISHED | TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2))) {
|
|
|
|
u64 rcv_data_fin_seq = READ_ONCE(msk->rcv_data_fin_seq);
|
|
|
|
|
2024-02-02 11:40:09 +00:00
|
|
|
if (READ_ONCE(msk->ack_seq) == rcv_data_fin_seq) {
|
2020-07-28 22:12:03 +00:00
|
|
|
if (seq)
|
|
|
|
*seq = rcv_data_fin_seq;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2023-03-17 15:55:38 +00:00
|
|
|
static void mptcp_set_datafin_timeout(struct sock *sk)
|
2021-04-23 16:40:33 +00:00
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2022-02-25 00:52:59 +00:00
|
|
|
u32 retransmits;
|
2021-04-23 16:40:33 +00:00
|
|
|
|
2022-02-25 00:52:59 +00:00
|
|
|
retransmits = min_t(u32, icsk->icsk_retransmits,
|
|
|
|
ilog2(TCP_RTO_MAX / TCP_RTO_MIN));
|
|
|
|
|
|
|
|
mptcp_sk(sk)->timer_ival = TCP_RTO_MIN << retransmits;
|
2021-04-23 16:40:33 +00:00
|
|
|
}
|
|
|
|
|
2021-08-13 22:15:41 +00:00
|
|
|
static void __mptcp_set_timeout(struct sock *sk, long tout)
|
2020-07-28 22:12:03 +00:00
|
|
|
{
|
|
|
|
mptcp_sk(sk)->timer_ival = tout > 0 ? tout : TCP_RTO_MIN;
|
|
|
|
}
|
|
|
|
|
2021-08-13 22:15:41 +00:00
|
|
|
static long mptcp_timeout_from_subflow(const struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
|
|
|
const struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
2021-08-13 22:15:42 +00:00
|
|
|
return inet_csk(ssk)->icsk_pending && !subflow->stale_count ?
|
|
|
|
inet_csk(ssk)->icsk_timeout - jiffies : 0;
|
2021-08-13 22:15:41 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_set_timeout(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
long tout = 0;
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(mptcp_sk(sk), subflow)
|
|
|
|
tout = max(tout, mptcp_timeout_from_subflow(subflow));
|
|
|
|
__mptcp_set_timeout(sk, tout);
|
|
|
|
}
|
|
|
|
|
2022-06-28 01:02:37 +00:00
|
|
|
static inline bool tcp_can_send_ack(const struct sock *ssk)
|
2020-11-24 21:51:24 +00:00
|
|
|
{
|
|
|
|
return !((1 << inet_sk_state_load(ssk)) &
|
2021-01-12 17:25:23 +00:00
|
|
|
(TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCPF_LISTEN));
|
2020-11-24 21:51:24 +00:00
|
|
|
}
|
|
|
|
|
2022-07-05 21:32:13 +00:00
|
|
|
void __mptcp_subflow_send_ack(struct sock *ssk)
|
|
|
|
{
|
|
|
|
if (tcp_can_send_ack(ssk))
|
|
|
|
tcp_send_ack(ssk);
|
|
|
|
}
|
|
|
|
|
2022-07-11 19:16:29 +00:00
|
|
|
static void mptcp_subflow_send_ack(struct sock *ssk)
|
2021-09-02 18:51:19 +00:00
|
|
|
{
|
|
|
|
bool slow;
|
|
|
|
|
|
|
|
slow = lock_sock_fast(ssk);
|
2022-07-05 21:32:13 +00:00
|
|
|
__mptcp_subflow_send_ack(ssk);
|
2021-09-02 18:51:19 +00:00
|
|
|
unlock_sock_fast(ssk, slow);
|
|
|
|
}
|
|
|
|
|
2020-11-24 21:51:24 +00:00
|
|
|
static void mptcp_send_ack(struct mptcp_sock *msk)
|
2020-11-16 09:48:14 +00:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
|
2021-09-02 18:51:19 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow)
|
|
|
|
mptcp_subflow_send_ack(mptcp_subflow_tcp_sock(subflow));
|
2020-11-24 21:51:24 +00:00
|
|
|
}
|
|
|
|
|
2021-06-22 19:25:23 +00:00
|
|
|
static void mptcp_subflow_cleanup_rbuf(struct sock *ssk)
|
2020-11-24 21:51:24 +00:00
|
|
|
{
|
2021-06-21 22:54:34 +00:00
|
|
|
bool slow;
|
2020-11-24 21:51:24 +00:00
|
|
|
|
2021-06-21 22:54:34 +00:00
|
|
|
slow = lock_sock_fast(ssk);
|
2021-06-22 19:25:23 +00:00
|
|
|
if (tcp_can_send_ack(ssk))
|
2020-11-24 21:51:24 +00:00
|
|
|
tcp_cleanup_rbuf(ssk, 1);
|
2021-06-21 22:54:34 +00:00
|
|
|
unlock_sock_fast(ssk, slow);
|
2021-06-22 19:25:23 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_subflow_could_cleanup(const struct sock *ssk, bool rx_empty)
|
|
|
|
{
|
|
|
|
const struct inet_connection_sock *icsk = inet_csk(ssk);
|
2021-06-25 21:25:22 +00:00
|
|
|
u8 ack_pending = READ_ONCE(icsk->icsk_ack.pending);
|
2021-06-22 19:25:23 +00:00
|
|
|
const struct tcp_sock *tp = tcp_sk(ssk);
|
|
|
|
|
|
|
|
return (ack_pending & ICSK_ACK_SCHED) &&
|
|
|
|
((READ_ONCE(tp->rcv_nxt) - READ_ONCE(tp->rcv_wup) >
|
|
|
|
READ_ONCE(icsk->icsk_ack.rcv_mss)) ||
|
|
|
|
(rx_empty && ack_pending &
|
|
|
|
(ICSK_ACK_PUSHED2 | ICSK_ACK_PUSHED)));
|
2020-11-24 21:51:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_cleanup_rbuf(struct mptcp_sock *msk)
|
|
|
|
{
|
2021-02-11 23:30:41 +00:00
|
|
|
int old_space = READ_ONCE(msk->old_wspace);
|
2020-11-24 21:51:24 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-02-11 23:30:41 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2021-06-22 19:25:23 +00:00
|
|
|
int space = __mptcp_space(sk);
|
|
|
|
bool cleanup, rx_empty;
|
2021-02-11 23:30:41 +00:00
|
|
|
|
2021-06-22 19:25:23 +00:00
|
|
|
cleanup = (space > 0) && (space >= (old_space << 1));
|
2021-07-10 00:20:51 +00:00
|
|
|
rx_empty = !__mptcp_rmem(sk);
|
2020-11-24 21:51:24 +00:00
|
|
|
|
2021-06-22 19:25:23 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
2020-11-24 21:51:24 +00:00
|
|
|
|
2021-06-22 19:25:23 +00:00
|
|
|
if (cleanup || mptcp_subflow_could_cleanup(ssk, rx_empty))
|
|
|
|
mptcp_subflow_cleanup_rbuf(ssk);
|
2020-11-16 09:48:14 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_check_data_fin(struct sock *sk)
|
2020-07-28 22:12:03 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
u64 rcv_data_fin_seq;
|
2020-11-16 09:48:14 +00:00
|
|
|
bool ret = false;
|
2020-07-28 22:12:03 +00:00
|
|
|
|
|
|
|
/* Need to ack a DATA_FIN received from a peer while this side
|
|
|
|
* of the connection is in ESTABLISHED, FIN_WAIT1, or FIN_WAIT2.
|
|
|
|
* msk->rcv_data_fin was set when parsing the incoming options
|
|
|
|
* at the subflow level and the msk lock was not held, so this
|
|
|
|
* is the first opportunity to act on the DATA_FIN and change
|
|
|
|
* the msk state.
|
|
|
|
*
|
|
|
|
* If we are caught up to the sequence number of the incoming
|
|
|
|
* DATA_FIN, send the DATA_ACK now and do state transition. If
|
|
|
|
* not caught up, do nothing and let the recv code send DATA_ACK
|
|
|
|
* when catching up.
|
|
|
|
*/
|
|
|
|
|
|
|
|
if (mptcp_pending_data_fin(sk, &rcv_data_fin_seq)) {
|
2020-09-29 22:08:19 +00:00
|
|
|
WRITE_ONCE(msk->ack_seq, msk->ack_seq + 1);
|
2020-07-28 22:12:03 +00:00
|
|
|
WRITE_ONCE(msk->rcv_data_fin, 0);
|
|
|
|
|
2023-05-31 19:37:07 +00:00
|
|
|
WRITE_ONCE(sk->sk_shutdown, sk->sk_shutdown | RCV_SHUTDOWN);
|
2020-07-28 22:12:05 +00:00
|
|
|
smp_mb__before_atomic(); /* SHUTDOWN must be visible first */
|
2020-07-28 22:12:03 +00:00
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_ESTABLISHED:
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE_WAIT);
|
2020-07-28 22:12:03 +00:00
|
|
|
break;
|
|
|
|
case TCP_FIN_WAIT1:
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSING);
|
2020-07-28 22:12:03 +00:00
|
|
|
break;
|
|
|
|
case TCP_FIN_WAIT2:
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2020-07-28 22:12:03 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Other states not expected */
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:14 +00:00
|
|
|
ret = true;
|
2023-06-20 16:24:21 +00:00
|
|
|
if (!__mptcp_check_fallback(msk))
|
|
|
|
mptcp_send_ack(msk);
|
2020-11-16 09:48:09 +00:00
|
|
|
mptcp_close_wake_up(sk);
|
2020-07-28 22:12:03 +00:00
|
|
|
}
|
2020-11-16 09:48:14 +00:00
|
|
|
return ret;
|
2020-07-28 22:12:03 +00:00
|
|
|
}
|
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
static bool __mptcp_move_skbs_from_subflow(struct mptcp_sock *msk,
|
|
|
|
struct sock *ssk,
|
|
|
|
unsigned int *bytes)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-02-26 09:14:49 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-02-26 09:14:48 +00:00
|
|
|
unsigned int moved = 0;
|
|
|
|
bool more_data_avail;
|
|
|
|
struct tcp_sock *tp;
|
|
|
|
bool done = false;
|
2020-11-03 19:05:03 +00:00
|
|
|
int sk_rbuf;
|
|
|
|
|
|
|
|
sk_rbuf = READ_ONCE(sk->sk_rcvbuf);
|
|
|
|
|
|
|
|
if (!(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
|
|
|
|
int ssk_rbuf = READ_ONCE(ssk->sk_rcvbuf);
|
|
|
|
|
|
|
|
if (unlikely(ssk_rbuf > sk_rbuf)) {
|
|
|
|
WRITE_ONCE(sk->sk_rcvbuf, ssk_rbuf);
|
|
|
|
sk_rbuf = ssk_rbuf;
|
|
|
|
}
|
|
|
|
}
|
2020-02-26 09:14:49 +00:00
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
pr_debug("msk=%p ssk=%p", msk, ssk);
|
2020-02-26 09:14:48 +00:00
|
|
|
tp = tcp_sk(ssk);
|
|
|
|
do {
|
|
|
|
u32 map_remaining, offset;
|
|
|
|
u32 seq = tp->copied_seq;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
bool fin;
|
|
|
|
|
|
|
|
/* try to move as much data as available */
|
|
|
|
map_remaining = subflow->map_data_len -
|
|
|
|
mptcp_subflow_get_map_offset(subflow);
|
|
|
|
|
|
|
|
skb = skb_peek(&ssk->sk_receive_queue);
|
2020-10-06 06:27:34 +00:00
|
|
|
if (!skb) {
|
2022-09-30 15:59:34 +00:00
|
|
|
/* With racing move_skbs_to_msk() and __mptcp_move_skbs(),
|
|
|
|
* a different CPU can have already processed the pending
|
|
|
|
* data, stop here or we can enter an infinite loop
|
2020-10-06 06:27:34 +00:00
|
|
|
*/
|
|
|
|
if (!moved)
|
|
|
|
done = true;
|
2020-02-26 09:14:48 +00:00
|
|
|
break;
|
2020-10-06 06:27:34 +00:00
|
|
|
}
|
2020-02-26 09:14:48 +00:00
|
|
|
|
2020-06-29 20:26:20 +00:00
|
|
|
if (__mptcp_check_fallback(msk)) {
|
2022-09-30 15:59:34 +00:00
|
|
|
/* Under fallback skbs have no MPTCP extension and TCP could
|
|
|
|
* collapse them between the dummy map creation and the
|
|
|
|
* current dequeue. Be sure to adjust the map size.
|
2020-06-29 20:26:20 +00:00
|
|
|
*/
|
|
|
|
map_remaining = skb->len;
|
|
|
|
subflow->map_data_len = skb->len;
|
|
|
|
}
|
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
offset = seq - TCP_SKB_CB(skb)->seq;
|
|
|
|
fin = TCP_SKB_CB(skb)->tcp_flags & TCPHDR_FIN;
|
|
|
|
if (fin) {
|
|
|
|
done = true;
|
|
|
|
seq++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (offset < skb->len) {
|
|
|
|
size_t len = skb->len - offset;
|
|
|
|
|
|
|
|
if (tp->urg_data)
|
|
|
|
done = true;
|
|
|
|
|
2020-09-14 08:01:12 +00:00
|
|
|
if (__mptcp_move_skb(msk, ssk, skb, offset, len))
|
|
|
|
moved += len;
|
2020-02-26 09:14:48 +00:00
|
|
|
seq += len;
|
|
|
|
|
|
|
|
if (WARN_ON_ONCE(map_remaining < len))
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
WARN_ON_ONCE(!fin);
|
|
|
|
sk_eat_skb(ssk, skb);
|
|
|
|
done = true;
|
|
|
|
}
|
|
|
|
|
|
|
|
WRITE_ONCE(tp->copied_seq, seq);
|
|
|
|
more_data_avail = mptcp_subflow_data_available(ssk);
|
2020-02-26 09:14:49 +00:00
|
|
|
|
2020-11-03 19:05:03 +00:00
|
|
|
if (atomic_read(&sk->sk_rmem_alloc) > sk_rbuf) {
|
2020-02-26 09:14:49 +00:00
|
|
|
done = true;
|
|
|
|
break;
|
|
|
|
}
|
2020-02-26 09:14:48 +00:00
|
|
|
} while (more_data_avail);
|
|
|
|
|
mptcp: add last time fields in mptcp_info
This patch adds "last time" fields last_data_sent, last_data_recv and
last_ack_recv in struct mptcp_sock to record the last time data_sent,
data_recv and ack_recv happened. They all are initialized as
tcp_jiffies32 in __mptcp_init_sock(), and updated as tcp_jiffies32 too
when data is sent in __subflow_push_pending(), data is received in
__mptcp_move_skbs_from_subflow(), and ack is received in ack_update_msk().
Similar to tcpi_last_data_sent, tcpi_last_data_recv and tcpi_last_ack_recv
exposed with TCP, this patch exposes the last time "an action happened" for
MPTCP in mptcp_info, named mptcpi_last_data_sent, mptcpi_last_data_recv and
mptcpi_last_ack_recv, calculated in mptcp_diag_fill_info() as the time
deltas between now and the newly added last time fields in mptcp_sock.
Since msk->last_ack_recv needs to be protected by mptcp_data_lock/unlock,
and lock_sock_fast can sleep and be quite slow, move the entire
mptcp_data_lock/unlock block after the lock/unlock_sock_fast block.
Then mptcpi_last_data_sent and mptcpi_last_data_recv are set in
lock/unlock_sock_fast block, while mptcpi_last_ack_recv is set in
mptcp_data_lock/unlock block, which is protected by a spinlock and
should not block for too long.
Also add three reserved bytes in struct mptcp_info not to have holes in
this structure exposed to userspace.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/446
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240410-upstream-net-next-20240405-mptcp-last-time-info-v2-1-f95bd6b33e51@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-04-10 09:48:24 +00:00
|
|
|
if (moved > 0)
|
|
|
|
msk->last_data_recv = tcp_jiffies32;
|
2020-09-14 08:01:09 +00:00
|
|
|
*bytes += moved;
|
2020-02-26 09:14:48 +00:00
|
|
|
return done;
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
static bool __mptcp_ofo_queue(struct mptcp_sock *msk)
|
2020-09-14 08:01:12 +00:00
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
struct sk_buff *skb, *tail;
|
|
|
|
bool moved = false;
|
|
|
|
struct rb_node *p;
|
|
|
|
u64 end_seq;
|
|
|
|
|
|
|
|
p = rb_first(&msk->out_of_order_queue);
|
2020-09-14 08:01:14 +00:00
|
|
|
pr_debug("msk=%p empty=%d", msk, RB_EMPTY_ROOT(&msk->out_of_order_queue));
|
2020-09-14 08:01:12 +00:00
|
|
|
while (p) {
|
|
|
|
skb = rb_to_skb(p);
|
|
|
|
if (after64(MPTCP_SKB_CB(skb)->map_seq, msk->ack_seq))
|
|
|
|
break;
|
|
|
|
|
|
|
|
p = rb_next(p);
|
|
|
|
rb_erase(&skb->rbnode, &msk->out_of_order_queue);
|
|
|
|
|
|
|
|
if (unlikely(!after64(MPTCP_SKB_CB(skb)->end_seq,
|
|
|
|
msk->ack_seq))) {
|
|
|
|
mptcp_drop(sk, skb);
|
2020-09-14 08:01:14 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 08:01:12 +00:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
end_seq = MPTCP_SKB_CB(skb)->end_seq;
|
|
|
|
tail = skb_peek_tail(&sk->sk_receive_queue);
|
|
|
|
if (!tail || !mptcp_ooo_try_coalesce(msk, tail, skb)) {
|
|
|
|
int delta = msk->ack_seq - MPTCP_SKB_CB(skb)->map_seq;
|
|
|
|
|
|
|
|
/* skip overlapping data, if any */
|
2020-09-14 08:01:14 +00:00
|
|
|
pr_debug("uncoalesced seq=%llx ack seq=%llx delta=%d",
|
|
|
|
MPTCP_SKB_CB(skb)->map_seq, msk->ack_seq,
|
|
|
|
delta);
|
2020-09-14 08:01:12 +00:00
|
|
|
MPTCP_SKB_CB(skb)->offset += delta;
|
2021-12-03 22:35:32 +00:00
|
|
|
MPTCP_SKB_CB(skb)->map_seq += delta;
|
2020-09-14 08:01:12 +00:00
|
|
|
__skb_queue_tail(&sk->sk_receive_queue, skb);
|
|
|
|
}
|
2023-06-20 16:30:15 +00:00
|
|
|
msk->bytes_received += end_seq - msk->ack_seq;
|
2024-02-02 11:40:09 +00:00
|
|
|
WRITE_ONCE(msk->ack_seq, end_seq);
|
2020-09-14 08:01:12 +00:00
|
|
|
moved = true;
|
|
|
|
}
|
|
|
|
return moved;
|
|
|
|
}
|
|
|
|
|
2023-09-16 10:52:47 +00:00
|
|
|
static bool __mptcp_subflow_error_report(struct sock *sk, struct sock *ssk)
|
2023-09-16 10:52:46 +00:00
|
|
|
{
|
2023-09-16 10:52:47 +00:00
|
|
|
int err = sock_error(ssk);
|
|
|
|
int ssk_state;
|
2023-09-16 10:52:46 +00:00
|
|
|
|
2023-09-16 10:52:47 +00:00
|
|
|
if (!err)
|
|
|
|
return false;
|
2023-09-16 10:52:46 +00:00
|
|
|
|
2023-09-16 10:52:47 +00:00
|
|
|
/* only propagate errors on fallen-back sockets or
|
|
|
|
* on MPC connect
|
|
|
|
*/
|
|
|
|
if (sk->sk_state != TCP_SYN_SENT && !__mptcp_check_fallback(mptcp_sk(sk)))
|
|
|
|
return false;
|
2023-09-16 10:52:46 +00:00
|
|
|
|
2023-09-16 10:52:47 +00:00
|
|
|
/* We need to propagate only transition to CLOSE state.
|
|
|
|
* Orphaned socket will see such state change via
|
|
|
|
* subflow_sched_work_if_closed() and that path will properly
|
|
|
|
* destroy the msk as needed.
|
|
|
|
*/
|
|
|
|
ssk_state = inet_sk_state_load(ssk);
|
|
|
|
if (ssk_state == TCP_CLOSE && !sock_flag(sk, SOCK_DEAD))
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, ssk_state);
|
2023-09-16 10:52:47 +00:00
|
|
|
WRITE_ONCE(sk->sk_err, -err);
|
|
|
|
|
|
|
|
/* This barrier is coupled with smp_rmb() in mptcp_poll() */
|
|
|
|
smp_wmb();
|
|
|
|
sk_error_report(sk);
|
|
|
|
return true;
|
|
|
|
}
|
2023-09-16 10:52:46 +00:00
|
|
|
|
2023-09-16 10:52:47 +00:00
|
|
|
void __mptcp_error_report(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow)
|
|
|
|
if (__mptcp_subflow_error_report(sk, mptcp_subflow_tcp_sock(subflow)))
|
|
|
|
break;
|
2023-09-16 10:52:46 +00:00
|
|
|
}
|
|
|
|
|
2020-02-26 09:14:51 +00:00
|
|
|
/* In most cases we will be able to lock the mptcp socket. If its already
|
|
|
|
* owned, we need to defer to the work queue to avoid ABBA deadlock.
|
|
|
|
*/
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk)
|
2020-02-26 09:14:51 +00:00
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
unsigned int moved = 0;
|
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
__mptcp_move_skbs_from_subflow(msk, ssk, &moved);
|
|
|
|
__mptcp_ofo_queue(msk);
|
2021-06-10 22:59:44 +00:00
|
|
|
if (unlikely(ssk->sk_err)) {
|
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_error_report(sk);
|
|
|
|
else
|
2022-01-07 00:20:26 +00:00
|
|
|
__set_bit(MPTCP_ERROR_REPORT, &msk->cb_flags);
|
2021-06-10 22:59:44 +00:00
|
|
|
}
|
2020-02-26 09:14:51 +00:00
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
/* If the moves have caught up with the DATA_FIN sequence number
|
|
|
|
* it's time to ack the DATA_FIN and change socket state, but
|
|
|
|
* this is not a good place to change state. Let the workqueue
|
|
|
|
* do it.
|
|
|
|
*/
|
|
|
|
if (mptcp_pending_data_fin(sk, NULL))
|
|
|
|
mptcp_schedule_work(sk);
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
return moved > 0;
|
2020-02-26 09:14:51 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_data_ready(struct sock *sk, struct sock *ssk)
|
2020-02-26 09:14:46 +00:00
|
|
|
{
|
2020-09-14 08:01:09 +00:00
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-02-26 09:14:46 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-03 19:05:03 +00:00
|
|
|
int sk_rbuf, ssk_rbuf;
|
2020-02-26 09:14:46 +00:00
|
|
|
|
2020-12-09 11:03:31 +00:00
|
|
|
/* The peer can send data while we are shutting down this
|
|
|
|
* subflow at msk destruction time, but we must avoid enqueuing
|
|
|
|
* more data to the msk receive queue
|
|
|
|
*/
|
|
|
|
if (unlikely(subflow->disposable))
|
|
|
|
return;
|
|
|
|
|
2020-11-03 19:05:03 +00:00
|
|
|
ssk_rbuf = READ_ONCE(ssk->sk_rcvbuf);
|
|
|
|
sk_rbuf = READ_ONCE(sk->sk_rcvbuf);
|
|
|
|
if (unlikely(ssk_rbuf > sk_rbuf))
|
|
|
|
sk_rbuf = ssk_rbuf;
|
|
|
|
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
/* over limit? can't append more skbs to msk, Also, no need to wake-up*/
|
2024-07-31 10:10:14 +00:00
|
|
|
if (__mptcp_rmem(sk) > sk_rbuf)
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
return;
|
2020-02-26 09:14:49 +00:00
|
|
|
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
/* Wake-up the reader only for in-sequence data */
|
|
|
|
mptcp_data_lock(sk);
|
2023-10-23 20:44:38 +00:00
|
|
|
if (move_skbs_to_msk(msk, ssk) && mptcp_epollin_ready(sk))
|
2020-09-14 08:01:09 +00:00
|
|
|
sk->sk_data_ready(sk);
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
mptcp_data_unlock(sk);
|
2020-02-26 09:14:46 +00:00
|
|
|
}
|
|
|
|
|
2023-05-31 19:37:08 +00:00
|
|
|
static void mptcp_subflow_joined(struct mptcp_sock *msk, struct sock *ssk)
|
|
|
|
{
|
|
|
|
mptcp_subflow_ctx(ssk)->map_seq = READ_ONCE(msk->ack_seq);
|
|
|
|
WRITE_ONCE(msk->allow_infinite_fallback, false);
|
|
|
|
mptcp_event(MPTCP_EVENT_SUB_ESTABLISHED, msk, ssk, GFP_ATOMIC);
|
|
|
|
}
|
|
|
|
|
2022-01-07 00:20:25 +00:00
|
|
|
static bool __mptcp_finish_join(struct mptcp_sock *msk, struct sock *ssk)
|
2020-03-27 21:48:40 +00:00
|
|
|
{
|
2022-01-07 00:20:25 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2021-01-20 14:39:11 +00:00
|
|
|
|
2022-01-07 00:20:25 +00:00
|
|
|
if (sk->sk_state != TCP_ESTABLISHED)
|
2021-04-15 23:44:53 +00:00
|
|
|
return false;
|
2020-03-27 21:48:40 +00:00
|
|
|
|
2022-01-07 00:20:25 +00:00
|
|
|
/* attach to msk socket only after we are sure we will deal with it
|
|
|
|
* at close time
|
|
|
|
*/
|
|
|
|
if (sk->sk_socket && !ssk->sk_socket)
|
|
|
|
mptcp_sock_graft(ssk, sk->sk_socket);
|
2021-04-15 23:44:53 +00:00
|
|
|
|
2023-06-20 16:30:17 +00:00
|
|
|
mptcp_subflow_ctx(ssk)->subflow_id = msk->subflow_id++;
|
2022-01-07 00:20:25 +00:00
|
|
|
mptcp_sockopt_sync_locked(msk, ssk);
|
2023-05-31 19:37:08 +00:00
|
|
|
mptcp_subflow_joined(msk, ssk);
|
2023-09-16 10:52:49 +00:00
|
|
|
mptcp_stop_tout_timer(sk);
|
2023-10-23 20:44:42 +00:00
|
|
|
__mptcp_propagate_sndbuf(sk, ssk);
|
2022-01-07 00:20:25 +00:00
|
|
|
return true;
|
2021-04-15 23:44:53 +00:00
|
|
|
}
|
|
|
|
|
2023-06-20 16:24:20 +00:00
|
|
|
static void __mptcp_flush_join_list(struct sock *sk, struct list_head *join_list)
|
2021-04-15 23:44:53 +00:00
|
|
|
{
|
2022-01-07 00:20:25 +00:00
|
|
|
struct mptcp_subflow_context *tmp, *subflow;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2021-04-15 23:44:53 +00:00
|
|
|
|
2023-06-20 16:24:20 +00:00
|
|
|
list_for_each_entry_safe(subflow, tmp, join_list, node) {
|
2022-01-07 00:20:25 +00:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
bool slow = lock_sock_fast(ssk);
|
2021-04-15 23:44:53 +00:00
|
|
|
|
2022-01-07 00:20:25 +00:00
|
|
|
list_move_tail(&subflow->node, &msk->conn_list);
|
|
|
|
if (!__mptcp_finish_join(msk, ssk))
|
|
|
|
mptcp_subflow_reset(ssk);
|
|
|
|
unlock_sock_fast(ssk, slow);
|
|
|
|
}
|
2020-03-27 21:48:40 +00:00
|
|
|
}
|
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
static bool mptcp_rtx_timer_pending(struct sock *sk)
|
2020-03-27 21:48:44 +00:00
|
|
|
{
|
|
|
|
return timer_pending(&inet_csk(sk)->icsk_retransmit_timer);
|
|
|
|
}
|
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
static void mptcp_reset_rtx_timer(struct sock *sk)
|
2020-03-27 21:48:44 +00:00
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
unsigned long tout;
|
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
/* prevent rescheduling on close */
|
|
|
|
if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE))
|
|
|
|
return;
|
|
|
|
|
2021-08-13 22:15:41 +00:00
|
|
|
tout = mptcp_sk(sk)->timer_ival;
|
2020-03-27 21:48:44 +00:00
|
|
|
sk_reset_timer(sk, &icsk->icsk_retransmit_timer, jiffies + tout);
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:05 +00:00
|
|
|
bool mptcp_schedule_work(struct sock *sk)
|
|
|
|
{
|
|
|
|
if (inet_sk_state_load(sk) != TCP_CLOSE &&
|
|
|
|
schedule_work(&mptcp_sk(sk)->work)) {
|
|
|
|
/* each subflow already holds a reference to the sk, and the
|
|
|
|
* workqueue is invoked by a subflow, so sk can't go away here.
|
|
|
|
*/
|
|
|
|
sock_hold(sk);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:26 +00:00
|
|
|
static struct sock *mptcp_subflow_recv_lookup(const struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
|
2023-01-06 18:57:17 +00:00
|
|
|
msk_owned_by_me(msk);
|
2020-01-22 00:56:26 +00:00
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
mptcp: wake-up readers only for in sequence data
Currently we rely on the subflow->data_avail field, which is subject to
races:
ssk1
skb len = 500 DSS(seq=1, len=1000, off=0)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk2
skb len = 500 DSS(seq = 501, len=1000)
# data_avail == MPTCP_SUBFLOW_DATA_AVAIL
ssk1
skb len = 500 DSS(seq = 1, len=1000, off =500)
# still data_avail == MPTCP_SUBFLOW_DATA_AVAIL,
# as the skb is covered by a pre-existing map,
# which was in-sequence at reception time.
Instead we can explicitly check if some has been received in-sequence,
propagating the info from __mptcp_move_skbs_from_subflow().
Additionally add the 'ONCE' annotation to the 'data_avail' memory
access, as msk will read it outside the subflow socket lock.
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
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>
2021-06-10 22:59:41 +00:00
|
|
|
if (READ_ONCE(subflow->data_avail))
|
2020-01-22 00:56:26 +00:00
|
|
|
return mptcp_subflow_tcp_sock(subflow);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:47 +00:00
|
|
|
static bool mptcp_skb_can_collapse_to(u64 write_seq,
|
|
|
|
const struct sk_buff *skb,
|
|
|
|
const struct mptcp_ext *mpext)
|
2020-01-22 00:56:27 +00:00
|
|
|
{
|
|
|
|
if (!tcp_skb_can_collapse_to(skb))
|
|
|
|
return false;
|
|
|
|
|
2020-11-03 19:05:05 +00:00
|
|
|
/* can collapse only if MPTCP level sequence is in order and this
|
|
|
|
* mapping has not been xmitted yet
|
|
|
|
*/
|
|
|
|
return mpext && mpext->data_seq + mpext->data_len == write_seq &&
|
|
|
|
!mpext->frozen;
|
2020-01-22 00:56:27 +00:00
|
|
|
}
|
|
|
|
|
2021-05-11 17:13:51 +00:00
|
|
|
/* we can append data to the given data frag if:
|
|
|
|
* - there is space available in the backing page_frag
|
|
|
|
* - the data frag tail matches the current page_frag free offset
|
|
|
|
* - the data frag end sequence number matches the current write seq
|
|
|
|
*/
|
2020-03-27 21:48:43 +00:00
|
|
|
static bool mptcp_frag_can_collapse_to(const struct mptcp_sock *msk,
|
|
|
|
const struct page_frag *pfrag,
|
|
|
|
const struct mptcp_data_frag *df)
|
|
|
|
{
|
|
|
|
return df && pfrag->page == df->page &&
|
2020-11-16 09:48:10 +00:00
|
|
|
pfrag->size - pfrag->offset > 0 &&
|
2021-05-11 17:13:51 +00:00
|
|
|
pfrag->offset == (df->offset + df->data_len) &&
|
2020-03-27 21:48:43 +00:00
|
|
|
df->data_seq + df->data_len == msk->write_seq;
|
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:45 +00:00
|
|
|
static void dfrag_uncharge(struct sock *sk, int len)
|
|
|
|
{
|
|
|
|
sk_mem_uncharge(sk, len);
|
2020-03-27 21:48:46 +00:00
|
|
|
sk_wmem_queued_add(sk, -len);
|
2020-03-27 21:48:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dfrag_clear(struct sock *sk, struct mptcp_data_frag *dfrag)
|
2020-03-27 21:48:43 +00:00
|
|
|
{
|
2020-03-27 21:48:45 +00:00
|
|
|
int len = dfrag->data_len + dfrag->overhead;
|
|
|
|
|
2020-03-27 21:48:43 +00:00
|
|
|
list_del(&dfrag->list);
|
2020-03-27 21:48:45 +00:00
|
|
|
dfrag_uncharge(sk, len);
|
2020-03-27 21:48:43 +00:00
|
|
|
put_page(dfrag->page);
|
|
|
|
}
|
|
|
|
|
2024-02-02 11:40:09 +00:00
|
|
|
/* called under both the msk socket lock and the data lock */
|
2020-11-27 10:10:27 +00:00
|
|
|
static void __mptcp_clean_una(struct sock *sk)
|
2020-03-27 21:48:43 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
struct mptcp_data_frag *dtmp, *dfrag;
|
2020-06-29 20:26:20 +00:00
|
|
|
u64 snd_una;
|
|
|
|
|
2020-11-27 10:10:26 +00:00
|
|
|
snd_una = msk->snd_una;
|
2020-03-27 21:48:43 +00:00
|
|
|
list_for_each_entry_safe(dfrag, dtmp, &msk->rtx_queue, list) {
|
|
|
|
if (after64(dfrag->data_seq + dfrag->data_len, snd_una))
|
|
|
|
break;
|
|
|
|
|
2021-08-13 22:15:43 +00:00
|
|
|
if (unlikely(dfrag == msk->first_pending)) {
|
|
|
|
/* in recovery mode can see ack after the current snd head */
|
|
|
|
if (WARN_ON_ONCE(!msk->recovery))
|
|
|
|
break;
|
|
|
|
|
|
|
|
WRITE_ONCE(msk->first_pending, mptcp_send_next(sk));
|
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:45 +00:00
|
|
|
dfrag_clear(sk, dfrag);
|
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:46 +00:00
|
|
|
dfrag = mptcp_rtx_head(sk);
|
|
|
|
if (dfrag && after64(snd_una, dfrag->data_seq)) {
|
2020-07-23 11:02:30 +00:00
|
|
|
u64 delta = snd_una - dfrag->data_seq;
|
|
|
|
|
2021-08-13 22:15:43 +00:00
|
|
|
/* prevent wrap around in recovery mode */
|
|
|
|
if (unlikely(delta > dfrag->already_sent)) {
|
|
|
|
if (WARN_ON_ONCE(!msk->recovery))
|
|
|
|
goto out;
|
|
|
|
if (WARN_ON_ONCE(delta > dfrag->data_len))
|
|
|
|
goto out;
|
|
|
|
dfrag->already_sent += delta - dfrag->already_sent;
|
|
|
|
}
|
2020-03-27 21:48:46 +00:00
|
|
|
|
|
|
|
dfrag->data_seq += delta;
|
2020-07-23 11:02:30 +00:00
|
|
|
dfrag->offset += delta;
|
2020-03-27 21:48:46 +00:00
|
|
|
dfrag->data_len -= delta;
|
2020-11-16 09:48:10 +00:00
|
|
|
dfrag->already_sent -= delta;
|
2020-03-27 21:48:46 +00:00
|
|
|
|
|
|
|
dfrag_uncharge(sk, delta);
|
|
|
|
}
|
|
|
|
|
2021-08-13 22:15:43 +00:00
|
|
|
/* all retransmitted data acked, recovery completed */
|
|
|
|
if (unlikely(msk->recovery) && after64(msk->snd_una, msk->recovery_snd_nxt))
|
|
|
|
msk->recovery = false;
|
|
|
|
|
2020-07-23 11:02:30 +00:00
|
|
|
out:
|
2024-02-02 11:40:08 +00:00
|
|
|
if (snd_una == msk->snd_nxt && snd_una == msk->write_seq) {
|
2023-09-16 10:52:48 +00:00
|
|
|
if (mptcp_rtx_timer_pending(sk) && !mptcp_data_fin_enabled(msk))
|
|
|
|
mptcp_stop_rtx_timer(sk);
|
2020-11-27 10:10:27 +00:00
|
|
|
} else {
|
2023-09-16 10:52:48 +00:00
|
|
|
mptcp_reset_rtx_timer(sk);
|
2020-03-27 21:48:43 +00:00
|
|
|
}
|
2024-02-02 11:40:08 +00:00
|
|
|
|
|
|
|
if (mptcp_pending_data_fin_ack(sk))
|
|
|
|
mptcp_schedule_work(sk);
|
2020-03-27 21:48:43 +00:00
|
|
|
}
|
|
|
|
|
2021-03-04 21:32:15 +00:00
|
|
|
static void __mptcp_clean_una_wakeup(struct sock *sk)
|
|
|
|
{
|
2021-09-24 21:12:36 +00:00
|
|
|
lockdep_assert_held_once(&sk->sk_lock.slock);
|
|
|
|
|
2021-03-04 21:32:15 +00:00
|
|
|
__mptcp_clean_una(sk);
|
|
|
|
mptcp_write_space(sk);
|
|
|
|
}
|
|
|
|
|
2021-05-27 23:31:37 +00:00
|
|
|
static void mptcp_clean_una_wakeup(struct sock *sk)
|
|
|
|
{
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
__mptcp_clean_una_wakeup(sk);
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:25 +00:00
|
|
|
static void mptcp_enter_memory_pressure(struct sock *sk)
|
2020-03-27 21:48:43 +00:00
|
|
|
{
|
2020-11-16 09:48:10 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
bool first = true;
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
if (first)
|
|
|
|
tcp_enter_memory_pressure(ssk);
|
|
|
|
sk_stream_moderate_sndbuf(ssk);
|
2023-10-23 20:44:42 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
first = false;
|
|
|
|
}
|
2023-10-23 20:44:42 +00:00
|
|
|
__mptcp_sync_sndbuf(sk);
|
2020-11-27 10:10:25 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* ensure we get enough memory for the frag hdr, beyond some minimal amount of
|
|
|
|
* data
|
|
|
|
*/
|
|
|
|
static bool mptcp_page_frag_refill(struct sock *sk, struct page_frag *pfrag)
|
|
|
|
{
|
|
|
|
if (likely(skb_page_frag_refill(32U + sizeof(struct mptcp_data_frag),
|
|
|
|
pfrag, sk->sk_allocation)))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
mptcp_enter_memory_pressure(sk);
|
2020-03-27 21:48:43 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct mptcp_data_frag *
|
|
|
|
mptcp_carve_data_frag(const struct mptcp_sock *msk, struct page_frag *pfrag,
|
|
|
|
int orig_offset)
|
|
|
|
{
|
|
|
|
int offset = ALIGN(orig_offset, sizeof(long));
|
|
|
|
struct mptcp_data_frag *dfrag;
|
|
|
|
|
|
|
|
dfrag = (struct mptcp_data_frag *)(page_to_virt(pfrag->page) + offset);
|
|
|
|
dfrag->data_len = 0;
|
|
|
|
dfrag->data_seq = msk->write_seq;
|
|
|
|
dfrag->overhead = offset - orig_offset + sizeof(struct mptcp_data_frag);
|
|
|
|
dfrag->offset = offset + sizeof(struct mptcp_data_frag);
|
2020-11-16 09:48:10 +00:00
|
|
|
dfrag->already_sent = 0;
|
2020-03-27 21:48:43 +00:00
|
|
|
dfrag->page = pfrag->page;
|
|
|
|
|
|
|
|
return dfrag;
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:06 +00:00
|
|
|
struct mptcp_sendmsg_info {
|
|
|
|
int mss_now;
|
|
|
|
int size_goal;
|
2020-11-16 09:48:10 +00:00
|
|
|
u16 limit;
|
|
|
|
u16 sent;
|
|
|
|
unsigned int flags;
|
2021-09-01 17:15:36 +00:00
|
|
|
bool data_lock_held;
|
2020-11-16 09:48:06 +00:00
|
|
|
};
|
|
|
|
|
2022-05-04 21:54:04 +00:00
|
|
|
static int mptcp_check_allowed_size(const struct mptcp_sock *msk, struct sock *ssk,
|
|
|
|
u64 data_seq, int avail_size)
|
2020-11-16 09:48:13 +00:00
|
|
|
{
|
|
|
|
u64 window_end = mptcp_wnd_end(msk);
|
2022-05-04 21:54:04 +00:00
|
|
|
u64 mptcp_snd_wnd;
|
2020-11-16 09:48:13 +00:00
|
|
|
|
|
|
|
if (__mptcp_check_fallback(msk))
|
|
|
|
return avail_size;
|
|
|
|
|
2022-05-04 21:54:04 +00:00
|
|
|
mptcp_snd_wnd = window_end - data_seq;
|
|
|
|
avail_size = min_t(unsigned int, mptcp_snd_wnd, avail_size);
|
2020-11-16 09:48:13 +00:00
|
|
|
|
2022-05-04 21:54:05 +00:00
|
|
|
if (unlikely(tcp_sk(ssk)->snd_wnd < mptcp_snd_wnd)) {
|
2022-05-04 21:54:04 +00:00
|
|
|
tcp_sk(ssk)->snd_wnd = min_t(u64, U32_MAX, mptcp_snd_wnd);
|
2022-05-04 21:54:05 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_SNDWNDSHARED);
|
|
|
|
}
|
2020-11-16 09:48:13 +00:00
|
|
|
|
|
|
|
return avail_size;
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:25 +00:00
|
|
|
static bool __mptcp_add_ext(struct sk_buff *skb, gfp_t gfp)
|
|
|
|
{
|
|
|
|
struct skb_ext *mpext = __skb_ext_alloc(gfp);
|
|
|
|
|
|
|
|
if (!mpext)
|
|
|
|
return false;
|
|
|
|
__skb_ext_set(skb, SKB_EXT_MPTCP, mpext);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
static struct sk_buff *__mptcp_do_alloc_tx_skb(struct sock *sk, gfp_t gfp)
|
2020-11-27 10:10:25 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
skb = alloc_skb_fclone(MAX_TCP_HEADER, gfp);
|
2020-11-27 10:10:25 +00:00
|
|
|
if (likely(skb)) {
|
2020-11-27 10:10:27 +00:00
|
|
|
if (likely(__mptcp_add_ext(skb, gfp))) {
|
2020-11-27 10:10:25 +00:00
|
|
|
skb_reserve(skb, MAX_TCP_HEADER);
|
2021-10-27 20:19:21 +00:00
|
|
|
skb->ip_summed = CHECKSUM_PARTIAL;
|
2021-09-22 17:26:41 +00:00
|
|
|
INIT_LIST_HEAD(&skb->tcp_tsorted_anchor);
|
2020-11-27 10:10:25 +00:00
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
__kfree_skb(skb);
|
|
|
|
} else {
|
|
|
|
mptcp_enter_memory_pressure(sk);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
static struct sk_buff *__mptcp_alloc_tx_skb(struct sock *sk, struct sock *ssk, gfp_t gfp)
|
2020-11-27 10:10:25 +00:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
skb = __mptcp_do_alloc_tx_skb(sk, gfp);
|
2020-11-27 10:10:25 +00:00
|
|
|
if (!skb)
|
2021-09-22 17:26:41 +00:00
|
|
|
return NULL;
|
2020-11-27 10:10:25 +00:00
|
|
|
|
|
|
|
if (likely(sk_wmem_schedule(ssk, skb->truesize))) {
|
2021-09-22 17:26:41 +00:00
|
|
|
tcp_skb_entail(ssk, skb);
|
|
|
|
return skb;
|
2020-11-27 10:10:25 +00:00
|
|
|
}
|
2022-03-17 22:09:53 +00:00
|
|
|
tcp_skb_tsorted_anchor_cleanup(skb);
|
2020-11-27 10:10:25 +00:00
|
|
|
kfree_skb(skb);
|
2021-09-22 17:26:41 +00:00
|
|
|
return NULL;
|
2020-11-27 10:10:25 +00:00
|
|
|
}
|
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
static struct sk_buff *mptcp_alloc_tx_skb(struct sock *sk, struct sock *ssk, bool data_lock_held)
|
2020-11-27 10:10:25 +00:00
|
|
|
{
|
2021-09-01 17:15:36 +00:00
|
|
|
gfp_t gfp = data_lock_held ? GFP_ATOMIC : sk->sk_allocation;
|
2020-11-27 10:10:25 +00:00
|
|
|
|
2021-09-01 17:15:36 +00:00
|
|
|
return __mptcp_alloc_tx_skb(sk, ssk, gfp);
|
2020-11-27 10:10:25 +00:00
|
|
|
}
|
|
|
|
|
2021-06-17 23:46:08 +00:00
|
|
|
/* note: this always recompute the csum on the whole skb, even
|
|
|
|
* if we just appended a single frag. More status info needed
|
|
|
|
*/
|
|
|
|
static void mptcp_update_data_checksum(struct sk_buff *skb, int added)
|
|
|
|
{
|
|
|
|
struct mptcp_ext *mpext = mptcp_get_ext(skb);
|
|
|
|
__wsum csum = ~csum_unfold(mpext->csum);
|
|
|
|
int offset = skb->len - added;
|
|
|
|
|
|
|
|
mpext->csum = csum_fold(csum_block_add(csum, skb_checksum(skb, offset, added, 0), offset));
|
|
|
|
}
|
|
|
|
|
2022-04-22 21:55:39 +00:00
|
|
|
static void mptcp_update_infinite_map(struct mptcp_sock *msk,
|
|
|
|
struct sock *ssk,
|
|
|
|
struct mptcp_ext *mpext)
|
|
|
|
{
|
|
|
|
if (!mpext)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mpext->infinite_map = 1;
|
|
|
|
mpext->data_len = 0;
|
|
|
|
|
2022-04-22 21:55:41 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_INFINITEMAPTX);
|
2022-04-22 21:55:39 +00:00
|
|
|
mptcp_subflow_ctx(ssk)->send_infinite_map = 0;
|
|
|
|
pr_fallback(msk);
|
2022-06-28 01:02:38 +00:00
|
|
|
mptcp_do_fallback(ssk);
|
2022-04-22 21:55:39 +00:00
|
|
|
}
|
|
|
|
|
2023-11-13 23:16:13 +00:00
|
|
|
#define MPTCP_MAX_GSO_SIZE (GSO_LEGACY_MAX_SIZE - (MAX_TCP_HEADER + 1))
|
|
|
|
|
2020-01-22 00:56:23 +00:00
|
|
|
static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
|
2020-11-16 09:48:10 +00:00
|
|
|
struct mptcp_data_frag *dfrag,
|
2020-11-16 09:48:06 +00:00
|
|
|
struct mptcp_sendmsg_info *info)
|
2020-01-22 00:56:23 +00:00
|
|
|
{
|
2020-11-16 09:48:10 +00:00
|
|
|
u64 data_seq = dfrag->data_seq + info->sent;
|
2021-09-22 17:26:41 +00:00
|
|
|
int offset = dfrag->offset + info->sent;
|
2020-01-22 00:56:23 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-16 09:48:13 +00:00
|
|
|
bool zero_window_probe = false;
|
2020-01-22 00:56:23 +00:00
|
|
|
struct mptcp_ext *mpext = NULL;
|
2021-09-22 17:26:41 +00:00
|
|
|
bool can_coalesce = false;
|
|
|
|
bool reuse_skb = true;
|
|
|
|
struct sk_buff *skb;
|
|
|
|
size_t copy;
|
|
|
|
int i;
|
2020-01-22 00:56:23 +00:00
|
|
|
|
2021-04-16 22:38:02 +00:00
|
|
|
pr_debug("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u",
|
2020-11-16 09:48:10 +00:00
|
|
|
msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent);
|
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
if (WARN_ON_ONCE(info->sent > info->limit ||
|
|
|
|
info->limit > dfrag->data_len))
|
|
|
|
return 0;
|
|
|
|
|
2022-08-05 00:21:26 +00:00
|
|
|
if (unlikely(!__tcp_can_send(ssk)))
|
|
|
|
return -EAGAIN;
|
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
/* compute send limit */
|
2023-11-13 23:16:13 +00:00
|
|
|
if (unlikely(ssk->sk_gso_max_size > MPTCP_MAX_GSO_SIZE))
|
|
|
|
ssk->sk_gso_max_size = MPTCP_MAX_GSO_SIZE;
|
2020-11-16 09:48:10 +00:00
|
|
|
info->mss_now = tcp_send_mss(ssk, &info->size_goal, info->flags);
|
2021-09-22 17:26:41 +00:00
|
|
|
copy = info->size_goal;
|
|
|
|
|
2020-01-22 00:56:27 +00:00
|
|
|
skb = tcp_write_queue_tail(ssk);
|
2021-09-22 17:26:41 +00:00
|
|
|
if (skb && copy > skb->len) {
|
2020-01-22 00:56:27 +00:00
|
|
|
/* Limit the write to the size available in the
|
|
|
|
* current skb, if any, so that we create at most a new skb.
|
|
|
|
* Explicitly tells TCP internals to avoid collapsing on later
|
|
|
|
* queue management operation, to avoid breaking the ext <->
|
|
|
|
* SSN association set here
|
|
|
|
*/
|
2023-10-25 23:37:07 +00:00
|
|
|
mpext = mptcp_get_ext(skb);
|
2021-09-01 17:15:36 +00:00
|
|
|
if (!mptcp_skb_can_collapse_to(data_seq, skb, mpext)) {
|
2020-01-22 00:56:27 +00:00
|
|
|
TCP_SKB_CB(skb)->eor = 1;
|
2024-02-23 16:14:14 +00:00
|
|
|
tcp_mark_push(tcp_sk(ssk), skb);
|
2021-09-01 17:15:36 +00:00
|
|
|
goto alloc_skb;
|
|
|
|
}
|
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
i = skb_shinfo(skb)->nr_frags;
|
|
|
|
can_coalesce = skb_can_coalesce(skb, i, dfrag->page, offset);
|
2024-04-29 13:40:21 +00:00
|
|
|
if (!can_coalesce && i >= READ_ONCE(net_hotdata.sysctl_max_skb_frags)) {
|
2021-09-22 17:26:41 +00:00
|
|
|
tcp_mark_push(tcp_sk(ssk), skb);
|
|
|
|
goto alloc_skb;
|
2020-12-10 22:25:06 +00:00
|
|
|
}
|
2020-03-27 21:48:43 +00:00
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
copy -= skb->len;
|
|
|
|
} else {
|
2021-09-01 17:15:36 +00:00
|
|
|
alloc_skb:
|
2021-09-22 17:26:41 +00:00
|
|
|
skb = mptcp_alloc_tx_skb(sk, ssk, info->data_lock_held);
|
|
|
|
if (!skb)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
i = skb_shinfo(skb)->nr_frags;
|
|
|
|
reuse_skb = false;
|
2023-10-25 23:37:07 +00:00
|
|
|
mpext = mptcp_get_ext(skb);
|
2021-09-22 17:26:41 +00:00
|
|
|
}
|
2021-09-01 17:15:36 +00:00
|
|
|
|
2020-11-16 09:48:13 +00:00
|
|
|
/* Zero window and all data acked? Probe. */
|
2022-05-04 21:54:04 +00:00
|
|
|
copy = mptcp_check_allowed_size(msk, ssk, data_seq, copy);
|
2021-09-22 17:26:41 +00:00
|
|
|
if (copy == 0) {
|
2020-11-27 10:10:26 +00:00
|
|
|
u64 snd_una = READ_ONCE(msk->snd_una);
|
|
|
|
|
2023-10-18 18:23:54 +00:00
|
|
|
if (snd_una != msk->snd_nxt || tcp_write_queue_tail(ssk)) {
|
2021-10-27 20:19:18 +00:00
|
|
|
tcp_remove_empty_skb(ssk);
|
2020-11-16 09:48:13 +00:00
|
|
|
return 0;
|
2021-09-22 17:26:41 +00:00
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:13 +00:00
|
|
|
zero_window_probe = true;
|
2020-11-27 10:10:26 +00:00
|
|
|
data_seq = snd_una - 1;
|
2021-09-22 17:26:41 +00:00
|
|
|
copy = 1;
|
|
|
|
}
|
2020-03-27 21:48:45 +00:00
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
copy = min_t(size_t, copy, info->limit - info->sent);
|
|
|
|
if (!sk_wmem_schedule(ssk, copy)) {
|
2021-10-27 20:19:18 +00:00
|
|
|
tcp_remove_empty_skb(ssk);
|
2020-11-16 09:48:03 +00:00
|
|
|
return -ENOMEM;
|
2020-08-14 13:56:34 +00:00
|
|
|
}
|
2020-03-27 21:48:43 +00:00
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
if (can_coalesce) {
|
|
|
|
skb_frag_size_add(&skb_shinfo(skb)->frags[i - 1], copy);
|
|
|
|
} else {
|
|
|
|
get_page(dfrag->page);
|
|
|
|
skb_fill_page_desc(skb, i, dfrag->page, offset, copy);
|
2020-01-22 00:56:27 +00:00
|
|
|
}
|
|
|
|
|
2021-09-22 17:26:41 +00:00
|
|
|
skb->len += copy;
|
|
|
|
skb->data_len += copy;
|
|
|
|
skb->truesize += copy;
|
|
|
|
sk_wmem_queued_add(ssk, copy);
|
|
|
|
sk_mem_charge(ssk, copy);
|
|
|
|
WRITE_ONCE(tcp_sk(ssk)->write_seq, tcp_sk(ssk)->write_seq + copy);
|
|
|
|
TCP_SKB_CB(skb)->end_seq += copy;
|
|
|
|
tcp_skb_pcount_set(skb, 0);
|
|
|
|
|
|
|
|
/* on skb reuse we just need to update the DSS len */
|
|
|
|
if (reuse_skb) {
|
|
|
|
TCP_SKB_CB(skb)->tcp_flags &= ~TCPHDR_PSH;
|
|
|
|
mpext->data_len += copy;
|
|
|
|
goto out;
|
2020-11-27 10:10:25 +00:00
|
|
|
}
|
2020-01-22 00:56:23 +00:00
|
|
|
|
|
|
|
memset(mpext, 0, sizeof(*mpext));
|
2020-11-16 09:48:10 +00:00
|
|
|
mpext->data_seq = data_seq;
|
2020-01-22 00:56:23 +00:00
|
|
|
mpext->subflow_seq = mptcp_subflow_ctx(ssk)->rel_write_seq;
|
2021-09-22 17:26:41 +00:00
|
|
|
mpext->data_len = copy;
|
2020-01-22 00:56:23 +00:00
|
|
|
mpext->use_map = 1;
|
|
|
|
mpext->dsn64 = 1;
|
|
|
|
|
|
|
|
pr_debug("data_seq=%llu subflow_seq=%u data_len=%u dsn64=%d",
|
|
|
|
mpext->data_seq, mpext->subflow_seq, mpext->data_len,
|
|
|
|
mpext->dsn64);
|
|
|
|
|
2020-11-16 09:48:13 +00:00
|
|
|
if (zero_window_probe) {
|
2021-09-22 17:26:41 +00:00
|
|
|
mptcp_subflow_ctx(ssk)->rel_write_seq += copy;
|
2020-11-16 09:48:13 +00:00
|
|
|
mpext->frozen = 1;
|
2021-06-17 23:46:08 +00:00
|
|
|
if (READ_ONCE(msk->csum_enabled))
|
2021-09-22 17:26:41 +00:00
|
|
|
mptcp_update_data_checksum(skb, copy);
|
2020-11-16 09:48:13 +00:00
|
|
|
tcp_push_pending_frames(ssk);
|
2021-06-17 23:46:08 +00:00
|
|
|
return 0;
|
2020-11-16 09:48:13 +00:00
|
|
|
}
|
2020-01-22 00:56:27 +00:00
|
|
|
out:
|
2021-06-17 23:46:08 +00:00
|
|
|
if (READ_ONCE(msk->csum_enabled))
|
2021-09-22 17:26:41 +00:00
|
|
|
mptcp_update_data_checksum(skb, copy);
|
2022-04-22 21:55:39 +00:00
|
|
|
if (mptcp_subflow_ctx(ssk)->send_infinite_map)
|
|
|
|
mptcp_update_infinite_map(msk, ssk, mpext);
|
2022-03-07 20:44:31 +00:00
|
|
|
trace_mptcp_sendmsg_frag(mpext);
|
2021-09-22 17:26:41 +00:00
|
|
|
mptcp_subflow_ctx(ssk)->rel_write_seq += copy;
|
|
|
|
return copy;
|
2020-01-22 00:56:23 +00:00
|
|
|
}
|
|
|
|
|
2020-09-14 08:01:17 +00:00
|
|
|
#define MPTCP_SEND_BURST_SIZE ((1 << 16) - \
|
|
|
|
sizeof(struct tcphdr) - \
|
|
|
|
MAX_TCP_OPTION_SPACE - \
|
|
|
|
sizeof(struct ipv6hdr) - \
|
|
|
|
sizeof(struct frag_hdr))
|
|
|
|
|
|
|
|
struct subflow_send_info {
|
|
|
|
struct sock *ssk;
|
2021-12-17 23:37:00 +00:00
|
|
|
u64 linger_time;
|
2020-09-14 08:01:17 +00:00
|
|
|
};
|
|
|
|
|
2021-08-13 22:15:45 +00:00
|
|
|
void mptcp_subflow_set_active(struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
|
|
|
if (!subflow->stale)
|
|
|
|
return;
|
|
|
|
|
|
|
|
subflow->stale = 0;
|
2021-08-13 22:15:46 +00:00
|
|
|
MPTCP_INC_STATS(sock_net(mptcp_subflow_tcp_sock(subflow)), MPTCP_MIB_SUBFLOWRECOVER);
|
2021-08-13 22:15:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
bool mptcp_subflow_active(struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
|
|
|
if (unlikely(subflow->stale)) {
|
|
|
|
u32 rcv_tstamp = READ_ONCE(tcp_sk(mptcp_subflow_tcp_sock(subflow))->rcv_tstamp);
|
|
|
|
|
|
|
|
if (subflow->stale_rcv_tstamp == rcv_tstamp)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
mptcp_subflow_set_active(subflow);
|
|
|
|
}
|
|
|
|
return __mptcp_subflow_active(subflow);
|
|
|
|
}
|
|
|
|
|
2021-12-17 23:37:00 +00:00
|
|
|
#define SSK_MODE_ACTIVE 0
|
|
|
|
#define SSK_MODE_BACKUP 1
|
|
|
|
#define SSK_MODE_MAX 2
|
|
|
|
|
2021-08-13 22:15:41 +00:00
|
|
|
/* implement the mptcp packet scheduler;
|
|
|
|
* returns the subflow that will transmit the next DSS
|
|
|
|
* additionally updates the rtx timeout
|
|
|
|
*/
|
2023-08-21 22:25:18 +00:00
|
|
|
struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk)
|
2020-03-27 21:48:39 +00:00
|
|
|
{
|
2021-12-17 23:37:00 +00:00
|
|
|
struct subflow_send_info send_info[SSK_MODE_MAX];
|
2020-03-27 21:48:39 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-08-13 22:15:41 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2021-12-17 23:37:00 +00:00
|
|
|
u32 pace, burst, wmem;
|
2020-09-14 08:01:17 +00:00
|
|
|
int i, nr_active = 0;
|
|
|
|
struct sock *ssk;
|
2021-12-17 23:37:00 +00:00
|
|
|
u64 linger_time;
|
2021-08-13 22:15:41 +00:00
|
|
|
long tout = 0;
|
2020-03-27 21:48:39 +00:00
|
|
|
|
2020-09-14 08:01:17 +00:00
|
|
|
/* pick the subflow with the lower wmem/wspace ratio */
|
2021-12-17 23:37:00 +00:00
|
|
|
for (i = 0; i < SSK_MODE_MAX; ++i) {
|
2020-09-14 08:01:17 +00:00
|
|
|
send_info[i].ssk = NULL;
|
2021-12-17 23:37:00 +00:00
|
|
|
send_info[i].linger_time = -1;
|
2020-09-14 08:01:17 +00:00
|
|
|
}
|
2021-12-17 23:37:00 +00:00
|
|
|
|
2020-09-14 08:01:17 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
2024-07-27 10:01:23 +00:00
|
|
|
bool backup = subflow->backup || subflow->request_bkup;
|
|
|
|
|
2021-04-16 22:38:04 +00:00
|
|
|
trace_mptcp_subflow_get_send(subflow);
|
2020-09-14 08:01:17 +00:00
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
if (!mptcp_subflow_active(subflow))
|
|
|
|
continue;
|
|
|
|
|
2021-08-13 22:15:41 +00:00
|
|
|
tout = max(tout, mptcp_timeout_from_subflow(subflow));
|
2024-07-27 10:01:23 +00:00
|
|
|
nr_active += !backup;
|
2021-12-17 23:37:00 +00:00
|
|
|
pace = subflow->avg_pacing_rate;
|
|
|
|
if (unlikely(!pace)) {
|
|
|
|
/* init pacing rate from socket */
|
|
|
|
subflow->avg_pacing_rate = READ_ONCE(ssk->sk_pacing_rate);
|
|
|
|
pace = subflow->avg_pacing_rate;
|
|
|
|
if (!pace)
|
|
|
|
continue;
|
|
|
|
}
|
2020-03-27 21:48:39 +00:00
|
|
|
|
2021-12-17 23:37:00 +00:00
|
|
|
linger_time = div_u64((u64)READ_ONCE(ssk->sk_wmem_queued) << 32, pace);
|
2024-07-27 10:01:23 +00:00
|
|
|
if (linger_time < send_info[backup].linger_time) {
|
|
|
|
send_info[backup].ssk = ssk;
|
|
|
|
send_info[backup].linger_time = linger_time;
|
2020-09-14 08:01:17 +00:00
|
|
|
}
|
2020-03-27 21:48:39 +00:00
|
|
|
}
|
2021-08-13 22:15:41 +00:00
|
|
|
__mptcp_set_timeout(sk, tout);
|
2020-03-27 21:48:39 +00:00
|
|
|
|
2020-09-14 08:01:17 +00:00
|
|
|
/* pick the best backup if no other subflow is active */
|
|
|
|
if (!nr_active)
|
2021-12-17 23:37:00 +00:00
|
|
|
send_info[SSK_MODE_ACTIVE].ssk = send_info[SSK_MODE_BACKUP].ssk;
|
|
|
|
|
|
|
|
/* According to the blest algorithm, to avoid HoL blocking for the
|
|
|
|
* faster flow, we need to:
|
|
|
|
* - estimate the faster flow linger time
|
|
|
|
* - use the above to estimate the amount of byte transferred
|
|
|
|
* by the faster flow
|
|
|
|
* - check that the amount of queued data is greter than the above,
|
|
|
|
* otherwise do not use the picked, slower, subflow
|
|
|
|
* We select the subflow with the shorter estimated time to flush
|
|
|
|
* the queued mem, which basically ensure the above. We just need
|
|
|
|
* to check that subflow has a non empty cwin.
|
|
|
|
*/
|
|
|
|
ssk = send_info[SSK_MODE_ACTIVE].ssk;
|
2022-05-04 21:54:04 +00:00
|
|
|
if (!ssk || !sk_stream_memory_free(ssk))
|
2021-12-17 23:37:00 +00:00
|
|
|
return NULL;
|
2021-01-20 14:39:11 +00:00
|
|
|
|
2022-05-04 21:54:04 +00:00
|
|
|
burst = min_t(int, MPTCP_SEND_BURST_SIZE, mptcp_wnd_end(msk) - msk->snd_nxt);
|
2021-12-17 23:37:00 +00:00
|
|
|
wmem = READ_ONCE(ssk->sk_wmem_queued);
|
2023-08-21 22:25:13 +00:00
|
|
|
if (!burst)
|
2022-05-04 21:54:04 +00:00
|
|
|
return ssk;
|
|
|
|
|
2021-12-17 23:37:00 +00:00
|
|
|
subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
subflow->avg_pacing_rate = div_u64((u64)subflow->avg_pacing_rate * wmem +
|
|
|
|
READ_ONCE(ssk->sk_pacing_rate) * burst,
|
|
|
|
burst + wmem);
|
|
|
|
msk->snd_burst = burst;
|
|
|
|
return ssk;
|
2020-03-27 21:48:39 +00:00
|
|
|
}
|
|
|
|
|
2021-10-26 23:29:16 +00:00
|
|
|
static void mptcp_push_release(struct sock *ssk, struct mptcp_sendmsg_info *info)
|
2020-11-16 09:48:10 +00:00
|
|
|
{
|
|
|
|
tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle, info->size_goal);
|
|
|
|
release_sock(ssk);
|
|
|
|
}
|
|
|
|
|
2021-09-24 21:12:34 +00:00
|
|
|
static void mptcp_update_post_push(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_data_frag *dfrag,
|
|
|
|
u32 sent)
|
|
|
|
{
|
|
|
|
u64 snd_nxt_new = dfrag->data_seq;
|
|
|
|
|
|
|
|
dfrag->already_sent += sent;
|
|
|
|
|
|
|
|
msk->snd_burst -= sent;
|
|
|
|
|
|
|
|
snd_nxt_new += dfrag->already_sent;
|
|
|
|
|
|
|
|
/* snd_nxt_new can be smaller than snd_nxt in case mptcp
|
|
|
|
* is recovering after a failover. In that event, this re-sends
|
|
|
|
* old segments.
|
|
|
|
*
|
|
|
|
* Thus compute snd_nxt_new candidate based on
|
|
|
|
* the dfrag->data_seq that was sent and the data
|
|
|
|
* that has been handed to the subflow for transmission
|
|
|
|
* and skip update in case it was old dfrag.
|
|
|
|
*/
|
2023-06-20 16:30:15 +00:00
|
|
|
if (likely(after64(snd_nxt_new, msk->snd_nxt))) {
|
|
|
|
msk->bytes_sent += snd_nxt_new - msk->snd_nxt;
|
2024-02-02 11:40:08 +00:00
|
|
|
WRITE_ONCE(msk->snd_nxt, snd_nxt_new);
|
2023-06-20 16:30:15 +00:00
|
|
|
}
|
2021-09-24 21:12:34 +00:00
|
|
|
}
|
|
|
|
|
2021-12-03 22:35:40 +00:00
|
|
|
void mptcp_check_and_set_pending(struct sock *sk)
|
2021-09-24 21:12:38 +00:00
|
|
|
{
|
2024-02-08 18:03:49 +00:00
|
|
|
if (mptcp_send_head(sk)) {
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
mptcp_sk(sk)->cb_flags |= BIT(MPTCP_PUSH_PENDING);
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
}
|
2021-09-24 21:12:38 +00:00
|
|
|
}
|
|
|
|
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
static int __subflow_push_pending(struct sock *sk, struct sock *ssk,
|
|
|
|
struct mptcp_sendmsg_info *info)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-16 09:48:10 +00:00
|
|
|
struct mptcp_data_frag *dfrag;
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
int len, copied = 0, err = 0;
|
2020-11-16 09:48:10 +00:00
|
|
|
|
|
|
|
while ((dfrag = mptcp_send_head(sk))) {
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
info->sent = dfrag->already_sent;
|
|
|
|
info->limit = dfrag->data_len;
|
2020-11-16 09:48:10 +00:00
|
|
|
len = dfrag->data_len - dfrag->already_sent;
|
|
|
|
while (len > 0) {
|
|
|
|
int ret = 0;
|
|
|
|
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
ret = mptcp_sendmsg_frag(sk, ssk, dfrag, info);
|
2020-11-16 09:48:10 +00:00
|
|
|
if (ret <= 0) {
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
err = copied ? : ret;
|
2020-11-16 09:48:10 +00:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
info->sent += ret;
|
|
|
|
copied += ret;
|
2020-11-16 09:48:10 +00:00
|
|
|
len -= ret;
|
2021-09-24 21:12:34 +00:00
|
|
|
|
|
|
|
mptcp_update_post_push(msk, dfrag, ret);
|
2020-11-16 09:48:10 +00:00
|
|
|
}
|
|
|
|
WRITE_ONCE(msk->first_pending, mptcp_send_next(sk));
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
|
|
|
|
if (msk->snd_burst <= 0 ||
|
|
|
|
!sk_stream_memory_free(ssk) ||
|
|
|
|
!mptcp_subflow_active(mptcp_subflow_ctx(ssk))) {
|
|
|
|
err = copied;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
mptcp_set_timeout(sk);
|
|
|
|
}
|
|
|
|
err = copied;
|
|
|
|
|
|
|
|
out:
|
mptcp: add last time fields in mptcp_info
This patch adds "last time" fields last_data_sent, last_data_recv and
last_ack_recv in struct mptcp_sock to record the last time data_sent,
data_recv and ack_recv happened. They all are initialized as
tcp_jiffies32 in __mptcp_init_sock(), and updated as tcp_jiffies32 too
when data is sent in __subflow_push_pending(), data is received in
__mptcp_move_skbs_from_subflow(), and ack is received in ack_update_msk().
Similar to tcpi_last_data_sent, tcpi_last_data_recv and tcpi_last_ack_recv
exposed with TCP, this patch exposes the last time "an action happened" for
MPTCP in mptcp_info, named mptcpi_last_data_sent, mptcpi_last_data_recv and
mptcpi_last_ack_recv, calculated in mptcp_diag_fill_info() as the time
deltas between now and the newly added last time fields in mptcp_sock.
Since msk->last_ack_recv needs to be protected by mptcp_data_lock/unlock,
and lock_sock_fast can sleep and be quite slow, move the entire
mptcp_data_lock/unlock block after the lock/unlock_sock_fast block.
Then mptcpi_last_data_sent and mptcpi_last_data_recv are set in
lock/unlock_sock_fast block, while mptcpi_last_ack_recv is set in
mptcp_data_lock/unlock block, which is protected by a spinlock and
should not block for too long.
Also add three reserved bytes in struct mptcp_info not to have holes in
this structure exposed to userspace.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/446
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240410-upstream-net-next-20240405-mptcp-last-time-info-v2-1-f95bd6b33e51@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-04-10 09:48:24 +00:00
|
|
|
if (err > 0)
|
|
|
|
msk->last_data_sent = tcp_jiffies32;
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __mptcp_push_pending(struct sock *sk, unsigned int flags)
|
|
|
|
{
|
|
|
|
struct sock *prev_ssk = NULL, *ssk = NULL;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
struct mptcp_sendmsg_info info = {
|
|
|
|
.flags = flags,
|
|
|
|
};
|
|
|
|
bool do_check_data_fin = false;
|
2023-08-21 22:25:19 +00:00
|
|
|
int push_count = 1;
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
|
2023-08-21 22:25:19 +00:00
|
|
|
while (mptcp_send_head(sk) && (push_count > 0)) {
|
|
|
|
struct mptcp_subflow_context *subflow;
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
int ret = 0;
|
|
|
|
|
2023-08-21 22:25:19 +00:00
|
|
|
if (mptcp_sched_get_send(msk))
|
|
|
|
break;
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
|
2023-08-21 22:25:19 +00:00
|
|
|
push_count = 0;
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
if (READ_ONCE(subflow->scheduled)) {
|
|
|
|
mptcp_subflow_set_scheduled(subflow, false);
|
|
|
|
|
|
|
|
prev_ssk = ssk;
|
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
if (ssk != prev_ssk) {
|
|
|
|
/* First check. If the ssk has changed since
|
|
|
|
* the last round, release prev_ssk
|
|
|
|
*/
|
|
|
|
if (prev_ssk)
|
|
|
|
mptcp_push_release(prev_ssk, &info);
|
|
|
|
|
|
|
|
/* Need to lock the new subflow only if different
|
|
|
|
* from the previous one, otherwise we are still
|
|
|
|
* helding the relevant lock
|
|
|
|
*/
|
|
|
|
lock_sock(ssk);
|
|
|
|
}
|
|
|
|
|
|
|
|
push_count++;
|
|
|
|
|
|
|
|
ret = __subflow_push_pending(sk, ssk, &info);
|
|
|
|
if (ret <= 0) {
|
|
|
|
if (ret != -EAGAIN ||
|
|
|
|
(1 << ssk->sk_state) &
|
|
|
|
(TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2 | TCPF_CLOSE))
|
|
|
|
push_count--;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
do_check_data_fin = true;
|
|
|
|
}
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
}
|
2020-11-16 09:48:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* at this point we held the socket lock for the last subflow we used */
|
|
|
|
if (ssk)
|
2021-10-26 23:29:16 +00:00
|
|
|
mptcp_push_release(ssk, &info);
|
2020-11-16 09:48:10 +00:00
|
|
|
|
2021-08-13 22:15:41 +00:00
|
|
|
/* ensure the rtx timer is running */
|
2023-09-16 10:52:48 +00:00
|
|
|
if (!mptcp_rtx_timer_pending(sk))
|
|
|
|
mptcp_reset_rtx_timer(sk);
|
2022-09-06 20:55:41 +00:00
|
|
|
if (do_check_data_fin)
|
2023-06-20 16:24:21 +00:00
|
|
|
mptcp_check_send_data_fin(sk);
|
2020-11-16 09:48:10 +00:00
|
|
|
}
|
|
|
|
|
2022-11-10 23:23:19 +00:00
|
|
|
static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk, bool first)
|
2020-11-27 10:10:27 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2021-09-01 17:15:36 +00:00
|
|
|
struct mptcp_sendmsg_info info = {
|
|
|
|
.data_lock_held = true,
|
|
|
|
};
|
2023-08-21 22:25:19 +00:00
|
|
|
bool keep_pushing = true;
|
2021-01-20 14:39:14 +00:00
|
|
|
struct sock *xmit_ssk;
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
int copied = 0;
|
2020-11-27 10:10:27 +00:00
|
|
|
|
|
|
|
info.flags = 0;
|
2023-08-21 22:25:19 +00:00
|
|
|
while (mptcp_send_head(sk) && keep_pushing) {
|
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
int ret = 0;
|
2021-01-20 14:39:14 +00:00
|
|
|
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
/* check for a different subflow usage only after
|
|
|
|
* spooling the first chunk of data
|
|
|
|
*/
|
2023-08-21 22:25:19 +00:00
|
|
|
if (first) {
|
|
|
|
mptcp_subflow_set_scheduled(subflow, false);
|
|
|
|
ret = __subflow_push_pending(sk, ssk, &info);
|
|
|
|
first = false;
|
|
|
|
if (ret <= 0)
|
|
|
|
break;
|
|
|
|
copied += ret;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mptcp_sched_get_send(msk))
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
goto out;
|
2023-08-21 22:25:19 +00:00
|
|
|
|
|
|
|
if (READ_ONCE(subflow->scheduled)) {
|
|
|
|
mptcp_subflow_set_scheduled(subflow, false);
|
|
|
|
ret = __subflow_push_pending(sk, ssk, &info);
|
|
|
|
if (ret <= 0)
|
|
|
|
keep_pushing = false;
|
|
|
|
copied += ret;
|
2020-11-27 10:10:27 +00:00
|
|
|
}
|
mptcp: refactor push_pending logic
To support redundant package schedulers more easily, this patch refactors
__mptcp_push_pending() logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Push/release on final subflow
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Update subflow locks (push/release/acquire as needed)
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Push/release on final subflow
Refactors __mptcp_subflow_push_pending logic from:
For each dfrag:
While sends succeed:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
Update dfrag->already_sent, msk->snd_nxt, msk->snd_burst
Update msk->first_pending
->
While first_pending isn't empty:
Call the scheduler (selects subflow and msk->snd_burst)
Send the dfrag data with mptcp_subflow_delegate(), break
Send the dfrag data with mptcp_sendmsg_frag()
For each pending dfrag:
While sends succeed:
Send the dfrag data with mptcp_sendmsg_frag()
Update already_sent, snd_nxt, snd_burst
Update msk->first_pending
Break if required by msk->snd_burst / etc
Move the duplicate code from __mptcp_push_pending() and
__mptcp_subflow_push_pending() into a new helper function, named
__subflow_push_pending(). Simplify __mptcp_push_pending() and
__mptcp_subflow_push_pending() by invoking this helper.
Also move the burst check conditions out of the function
mptcp_subflow_get_send(), check them in __subflow_push_pending() in
the inner "for each pending dfrag" loop.
Reviewed-by: Mat Martineau <martineau@kernel.org>
Signed-off-by: Geliang Tang <geliang.tang@suse.com>
Signed-off-by: Mat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20230821-upstream-net-next-20230818-v1-1-0c860fb256a8@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-08-21 22:25:12 +00:00
|
|
|
|
2023-08-21 22:25:19 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
if (READ_ONCE(subflow->scheduled)) {
|
|
|
|
xmit_ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
if (xmit_ssk != ssk) {
|
|
|
|
mptcp_subflow_delegate(subflow,
|
|
|
|
MPTCP_DELEGATE_SEND);
|
|
|
|
keep_pushing = false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2020-11-27 10:10:27 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
/* __mptcp_alloc_tx_skb could have released some wmem and we are
|
|
|
|
* not going to flush it via release_sock()
|
|
|
|
*/
|
|
|
|
if (copied) {
|
|
|
|
tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,
|
|
|
|
info.size_goal);
|
2023-09-16 10:52:48 +00:00
|
|
|
if (!mptcp_rtx_timer_pending(sk))
|
|
|
|
mptcp_reset_rtx_timer(sk);
|
2021-02-11 23:30:42 +00:00
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
if (msk->snd_data_fin_enable &&
|
|
|
|
msk->snd_nxt + 1 == msk->write_seq)
|
|
|
|
mptcp_schedule_work(sk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-12-20 19:52:14 +00:00
|
|
|
static int mptcp_disconnect(struct sock *sk, int flags);
|
|
|
|
|
2023-04-14 14:08:02 +00:00
|
|
|
static int mptcp_sendmsg_fastopen(struct sock *sk, struct msghdr *msg,
|
2022-10-21 22:58:56 +00:00
|
|
|
size_t len, int *copied_syn)
|
|
|
|
{
|
|
|
|
unsigned int saved_flags = msg->msg_flags;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2023-04-14 14:08:02 +00:00
|
|
|
struct sock *ssk;
|
2022-10-21 22:58:56 +00:00
|
|
|
int ret;
|
|
|
|
|
2023-04-14 14:08:02 +00:00
|
|
|
/* on flags based fastopen the mptcp is supposed to create the
|
|
|
|
* first subflow right now. Otherwise we are in the defer_connect
|
|
|
|
* path, and the first subflow must be already present.
|
|
|
|
* Since the defer_connect flag is cleared after the first succsful
|
|
|
|
* fastopen attempt, no need to check for additional subflow status.
|
|
|
|
*/
|
2023-04-14 14:08:03 +00:00
|
|
|
if (msg->msg_flags & MSG_FASTOPEN) {
|
2023-08-11 15:57:25 +00:00
|
|
|
ssk = __mptcp_nmpc_sk(msk);
|
|
|
|
if (IS_ERR(ssk))
|
|
|
|
return PTR_ERR(ssk);
|
2023-04-14 14:08:03 +00:00
|
|
|
}
|
2023-04-14 14:08:02 +00:00
|
|
|
if (!msk->first)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
ssk = msk->first;
|
|
|
|
|
2022-10-21 22:58:56 +00:00
|
|
|
lock_sock(ssk);
|
|
|
|
msg->msg_flags |= MSG_DONTWAIT;
|
2022-12-20 19:52:14 +00:00
|
|
|
msk->fastopening = 1;
|
2022-10-21 22:58:56 +00:00
|
|
|
ret = tcp_sendmsg_fastopen(ssk, msg, copied_syn, len, NULL);
|
2022-12-20 19:52:14 +00:00
|
|
|
msk->fastopening = 0;
|
2022-10-21 22:58:56 +00:00
|
|
|
msg->msg_flags = saved_flags;
|
|
|
|
release_sock(ssk);
|
|
|
|
|
|
|
|
/* do the blocking bits of inet_stream_connect outside the ssk socket lock */
|
|
|
|
if (ret == -EINPROGRESS && !(msg->msg_flags & MSG_DONTWAIT)) {
|
|
|
|
ret = __inet_stream_connect(sk->sk_socket, msg->msg_name,
|
|
|
|
msg->msg_namelen, msg->msg_flags, 1);
|
|
|
|
|
|
|
|
/* Keep the same behaviour of plain TCP: zero the copied bytes in
|
|
|
|
* case of any error, except timeout or signal
|
|
|
|
*/
|
|
|
|
if (ret && ret != -EINPROGRESS && ret != -ERESTARTSYS && ret != -EINTR)
|
|
|
|
*copied_syn = 0;
|
2022-12-20 19:52:14 +00:00
|
|
|
} else if (ret && ret != -EINPROGRESS) {
|
2023-06-20 16:24:18 +00:00
|
|
|
/* The disconnect() op called by tcp_sendmsg_fastopen()/
|
|
|
|
* __inet_stream_connect() can fail, due to looking check,
|
|
|
|
* see mptcp_disconnect().
|
|
|
|
* Attempt it again outside the problematic scope.
|
|
|
|
*/
|
|
|
|
if (!mptcp_disconnect(sk, 0))
|
|
|
|
sk->sk_socket->state = SS_UNCONNECTED;
|
2022-10-21 22:58:56 +00:00
|
|
|
}
|
2023-08-16 08:15:45 +00:00
|
|
|
inet_clear_bit(DEFER_CONNECT, sk);
|
2022-10-21 22:58:56 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2023-10-23 20:44:39 +00:00
|
|
|
static int do_copy_data_nocache(struct sock *sk, int copy,
|
|
|
|
struct iov_iter *from, char *to)
|
|
|
|
{
|
|
|
|
if (sk->sk_route_caps & NETIF_F_NOCACHE_COPY) {
|
|
|
|
if (!copy_from_iter_full_nocache(to, copy, from))
|
|
|
|
return -EFAULT;
|
|
|
|
} else if (!copy_from_iter_full(to, copy, from)) {
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2024-03-01 17:43:46 +00:00
|
|
|
/* open-code sk_stream_memory_free() plus sent limit computation to
|
|
|
|
* avoid indirect calls in fast-path.
|
|
|
|
* Called under the msk socket lock, so we can avoid a bunch of ONCE
|
|
|
|
* annotations.
|
|
|
|
*/
|
|
|
|
static u32 mptcp_send_limit(const struct sock *sk)
|
|
|
|
{
|
|
|
|
const struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
u32 limit, not_sent;
|
|
|
|
|
|
|
|
if (sk->sk_wmem_queued >= READ_ONCE(sk->sk_sndbuf))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
limit = mptcp_notsent_lowat(sk);
|
|
|
|
if (limit == UINT_MAX)
|
|
|
|
return UINT_MAX;
|
|
|
|
|
|
|
|
not_sent = msk->write_seq - msk->snd_nxt;
|
|
|
|
if (not_sent >= limit)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
return limit - not_sent;
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-05-16 08:46:21 +00:00
|
|
|
struct page_frag *pfrag;
|
2020-01-22 00:56:23 +00:00
|
|
|
size_t copied = 0;
|
2020-11-16 09:48:06 +00:00
|
|
|
int ret = 0;
|
2020-01-22 00:56:23 +00:00
|
|
|
long timeo;
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2021-04-23 18:17:07 +00:00
|
|
|
/* silently ignore everything else */
|
2022-11-25 22:29:47 +00:00
|
|
|
msg->msg_flags &= MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL | MSG_FASTOPEN;
|
2021-04-23 18:17:07 +00:00
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
lock_sock(sk);
|
2020-02-28 23:47:39 +00:00
|
|
|
|
2023-08-16 08:15:45 +00:00
|
|
|
if (unlikely(inet_test_bit(DEFER_CONNECT, sk) ||
|
|
|
|
msg->msg_flags & MSG_FASTOPEN)) {
|
2022-09-26 23:27:38 +00:00
|
|
|
int copied_syn = 0;
|
|
|
|
|
2023-04-14 14:08:02 +00:00
|
|
|
ret = mptcp_sendmsg_fastopen(sk, msg, len, &copied_syn);
|
2022-09-26 23:27:38 +00:00
|
|
|
copied += copied_syn;
|
2022-10-21 22:58:56 +00:00
|
|
|
if (ret == -EINPROGRESS && copied_syn > 0)
|
2022-09-26 23:27:38 +00:00
|
|
|
goto out;
|
2022-10-21 22:58:56 +00:00
|
|
|
else if (ret)
|
2022-09-30 15:59:31 +00:00
|
|
|
goto do_error;
|
2022-09-26 23:27:38 +00:00
|
|
|
}
|
|
|
|
|
2020-02-28 23:47:39 +00:00
|
|
|
timeo = sock_sndtimeo(sk, msg->msg_flags & MSG_DONTWAIT);
|
|
|
|
|
|
|
|
if ((1 << sk->sk_state) & ~(TCPF_ESTABLISHED | TCPF_CLOSE_WAIT)) {
|
|
|
|
ret = sk_stream_wait_connect(sk, &timeo);
|
|
|
|
if (ret)
|
2022-09-30 15:59:31 +00:00
|
|
|
goto do_error;
|
2020-02-28 23:47:39 +00:00
|
|
|
}
|
|
|
|
|
2022-09-30 15:59:31 +00:00
|
|
|
ret = -EPIPE;
|
|
|
|
if (unlikely(sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)))
|
|
|
|
goto do_error;
|
|
|
|
|
2020-05-16 08:46:21 +00:00
|
|
|
pfrag = sk_page_frag(sk);
|
2020-03-27 21:48:43 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
while (msg_data_left(msg)) {
|
2020-11-27 10:10:25 +00:00
|
|
|
int total_ts, frag_truesize = 0;
|
2020-11-16 09:48:10 +00:00
|
|
|
struct mptcp_data_frag *dfrag;
|
|
|
|
bool dfrag_collapsed;
|
|
|
|
size_t psize, offset;
|
2024-03-01 17:43:46 +00:00
|
|
|
u32 copy_limit;
|
|
|
|
|
|
|
|
/* ensure fitting the notsent_lowat() constraint */
|
|
|
|
copy_limit = mptcp_send_limit(sk);
|
|
|
|
if (!copy_limit)
|
|
|
|
goto wait_for_memory;
|
2020-03-27 21:48:43 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
/* reuse tail pfrag, if possible, or carve a new one from the
|
|
|
|
* page allocator
|
|
|
|
*/
|
|
|
|
dfrag = mptcp_pending_tail(sk);
|
|
|
|
dfrag_collapsed = mptcp_frag_can_collapse_to(msk, pfrag, dfrag);
|
|
|
|
if (!dfrag_collapsed) {
|
|
|
|
if (!mptcp_page_frag_refill(sk, pfrag))
|
|
|
|
goto wait_for_memory;
|
|
|
|
|
|
|
|
dfrag = mptcp_carve_data_frag(msk, pfrag, pfrag->offset);
|
|
|
|
frag_truesize = dfrag->overhead;
|
2020-05-16 08:46:19 +00:00
|
|
|
}
|
2020-01-22 00:56:23 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
/* we do not bound vs wspace, to allow a single packet.
|
|
|
|
* memory accounting will prevent execessive memory usage
|
|
|
|
* anyway
|
2020-09-14 08:01:17 +00:00
|
|
|
*/
|
2020-11-16 09:48:10 +00:00
|
|
|
offset = dfrag->offset + dfrag->data_len;
|
|
|
|
psize = pfrag->size - offset;
|
|
|
|
psize = min_t(size_t, psize, msg_data_left(msg));
|
2024-03-01 17:43:46 +00:00
|
|
|
psize = min_t(size_t, psize, copy_limit);
|
2020-11-27 10:10:25 +00:00
|
|
|
total_ts = psize + frag_truesize;
|
2020-11-16 09:48:10 +00:00
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
if (!sk_wmem_schedule(sk, total_ts))
|
2020-11-27 10:10:25 +00:00
|
|
|
goto wait_for_memory;
|
|
|
|
|
2023-10-23 20:44:39 +00:00
|
|
|
ret = do_copy_data_nocache(sk, psize, &msg->msg_iter,
|
|
|
|
page_address(dfrag->page) + offset);
|
|
|
|
if (ret)
|
2022-09-30 15:59:31 +00:00
|
|
|
goto do_error;
|
2020-05-16 08:46:19 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
/* data successfully copied into the write queue */
|
2023-08-31 13:52:09 +00:00
|
|
|
sk_forward_alloc_add(sk, -total_ts);
|
2020-11-16 09:48:10 +00:00
|
|
|
copied += psize;
|
|
|
|
dfrag->data_len += psize;
|
|
|
|
frag_truesize += psize;
|
|
|
|
pfrag->offset += frag_truesize;
|
|
|
|
WRITE_ONCE(msk->write_seq, msk->write_seq + psize);
|
|
|
|
|
|
|
|
/* charge data on mptcp pending queue to the msk socket
|
|
|
|
* Note: we charge such data both to sk and ssk
|
2020-05-16 08:46:18 +00:00
|
|
|
*/
|
2020-11-16 09:48:10 +00:00
|
|
|
sk_wmem_queued_add(sk, frag_truesize);
|
|
|
|
if (!dfrag_collapsed) {
|
|
|
|
get_page(dfrag->page);
|
|
|
|
list_add_tail(&dfrag->list, &msk->rtx_queue);
|
|
|
|
if (!msk->first_pending)
|
|
|
|
WRITE_ONCE(msk->first_pending, dfrag);
|
2020-05-16 08:46:18 +00:00
|
|
|
}
|
2021-04-16 22:38:02 +00:00
|
|
|
pr_debug("msk=%p dfrag at seq=%llu len=%u sent=%u new=%d", msk,
|
2020-11-16 09:48:10 +00:00
|
|
|
dfrag->data_seq, dfrag->data_len, dfrag->already_sent,
|
|
|
|
!dfrag_collapsed);
|
2020-01-22 00:56:23 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
continue;
|
2020-03-27 21:48:44 +00:00
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
wait_for_memory:
|
2024-03-01 17:43:44 +00:00
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
2021-03-04 21:32:14 +00:00
|
|
|
__mptcp_push_pending(sk, msg->msg_flags);
|
2020-11-16 09:48:10 +00:00
|
|
|
ret = sk_stream_wait_memory(sk, &timeo);
|
|
|
|
if (ret)
|
2022-09-30 15:59:31 +00:00
|
|
|
goto do_error;
|
2020-01-22 00:56:27 +00:00
|
|
|
}
|
2020-01-22 00:56:23 +00:00
|
|
|
|
2020-12-16 11:48:35 +00:00
|
|
|
if (copied)
|
2021-03-04 21:32:14 +00:00
|
|
|
__mptcp_push_pending(sk, msg->msg_flags);
|
2020-11-16 09:48:10 +00:00
|
|
|
|
2020-02-28 23:47:39 +00:00
|
|
|
out:
|
2020-01-22 00:56:18 +00:00
|
|
|
release_sock(sk);
|
2022-09-30 15:59:31 +00:00
|
|
|
return copied;
|
|
|
|
|
|
|
|
do_error:
|
|
|
|
if (copied)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
copied = sk_stream_error(sk, msg->msg_flags, ret);
|
|
|
|
goto out;
|
2020-01-22 00:56:15 +00:00
|
|
|
}
|
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
|
|
|
|
struct msghdr *msg,
|
2021-06-03 23:24:32 +00:00
|
|
|
size_t len, int flags,
|
|
|
|
struct scm_timestamping_internal *tss,
|
|
|
|
int *cmsg_flags)
|
2020-02-26 09:14:48 +00:00
|
|
|
{
|
2021-04-23 18:17:08 +00:00
|
|
|
struct sk_buff *skb, *tmp;
|
2020-02-26 09:14:48 +00:00
|
|
|
int copied = 0;
|
|
|
|
|
2021-04-23 18:17:08 +00:00
|
|
|
skb_queue_walk_safe(&msk->receive_queue, skb, tmp) {
|
2020-02-26 09:14:48 +00:00
|
|
|
u32 offset = MPTCP_SKB_CB(skb)->offset;
|
|
|
|
u32 data_len = skb->len - offset;
|
|
|
|
u32 count = min_t(size_t, len - copied, data_len);
|
|
|
|
int err;
|
|
|
|
|
2021-04-23 18:17:06 +00:00
|
|
|
if (!(flags & MSG_TRUNC)) {
|
|
|
|
err = skb_copy_datagram_msg(skb, offset, msg, count);
|
|
|
|
if (unlikely(err < 0)) {
|
|
|
|
if (!copied)
|
|
|
|
return err;
|
|
|
|
break;
|
|
|
|
}
|
2020-02-26 09:14:48 +00:00
|
|
|
}
|
|
|
|
|
2021-06-03 23:24:32 +00:00
|
|
|
if (MPTCP_SKB_CB(skb)->has_rxtstamp) {
|
|
|
|
tcp_update_recv_tstamps(skb, tss);
|
|
|
|
*cmsg_flags |= MPTCP_CMSG_TS;
|
|
|
|
}
|
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
copied += count;
|
|
|
|
|
|
|
|
if (count < data_len) {
|
2021-12-03 22:35:32 +00:00
|
|
|
if (!(flags & MSG_PEEK)) {
|
2021-04-23 18:17:08 +00:00
|
|
|
MPTCP_SKB_CB(skb)->offset += count;
|
2021-12-03 22:35:32 +00:00
|
|
|
MPTCP_SKB_CB(skb)->map_seq += count;
|
2023-10-23 20:44:38 +00:00
|
|
|
msk->bytes_consumed += count;
|
2021-12-03 22:35:32 +00:00
|
|
|
}
|
2020-02-26 09:14:48 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2021-04-23 18:17:08 +00:00
|
|
|
if (!(flags & MSG_PEEK)) {
|
|
|
|
/* we will bulk release the skb memory later */
|
|
|
|
skb->destructor = NULL;
|
2021-07-10 00:20:51 +00:00
|
|
|
WRITE_ONCE(msk->rmem_released, msk->rmem_released + skb->truesize);
|
2021-04-23 18:17:08 +00:00
|
|
|
__skb_unlink(skb, &msk->receive_queue);
|
|
|
|
__kfree_skb(skb);
|
2023-10-23 20:44:38 +00:00
|
|
|
msk->bytes_consumed += count;
|
2021-04-23 18:17:08 +00:00
|
|
|
}
|
2020-02-26 09:14:48 +00:00
|
|
|
|
|
|
|
if (copied >= len)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
2020-06-30 19:24:45 +00:00
|
|
|
/* receive buffer autotuning. See tcp_rcv_space_adjust for more information.
|
|
|
|
*
|
|
|
|
* Only difference: Use highest rtt estimate of the subflows in use.
|
|
|
|
*/
|
|
|
|
static void mptcp_rcv_space_adjust(struct mptcp_sock *msk, int copied)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
2023-07-20 18:47:50 +00:00
|
|
|
u8 scaling_ratio = U8_MAX;
|
2020-06-30 19:24:45 +00:00
|
|
|
u32 time, advmss = 1;
|
|
|
|
u64 rtt_us, mstamp;
|
|
|
|
|
2023-01-06 18:57:17 +00:00
|
|
|
msk_owned_by_me(msk);
|
2020-06-30 19:24:45 +00:00
|
|
|
|
|
|
|
if (copied <= 0)
|
|
|
|
return;
|
|
|
|
|
2024-02-08 18:03:50 +00:00
|
|
|
if (!msk->rcvspace_init)
|
|
|
|
mptcp_rcv_space_init(msk, msk->first);
|
|
|
|
|
2020-06-30 19:24:45 +00:00
|
|
|
msk->rcvq_space.copied += copied;
|
|
|
|
|
|
|
|
mstamp = div_u64(tcp_clock_ns(), NSEC_PER_USEC);
|
|
|
|
time = tcp_stamp_us_delta(mstamp, msk->rcvq_space.time);
|
|
|
|
|
|
|
|
rtt_us = msk->rcvq_space.rtt_us;
|
|
|
|
if (rtt_us && time < (rtt_us >> 3))
|
|
|
|
return;
|
|
|
|
|
|
|
|
rtt_us = 0;
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
const struct tcp_sock *tp;
|
|
|
|
u64 sf_rtt_us;
|
|
|
|
u32 sf_advmss;
|
|
|
|
|
|
|
|
tp = tcp_sk(mptcp_subflow_tcp_sock(subflow));
|
|
|
|
|
|
|
|
sf_rtt_us = READ_ONCE(tp->rcv_rtt_est.rtt_us);
|
|
|
|
sf_advmss = READ_ONCE(tp->advmss);
|
|
|
|
|
|
|
|
rtt_us = max(sf_rtt_us, rtt_us);
|
|
|
|
advmss = max(sf_advmss, advmss);
|
2023-07-20 18:47:50 +00:00
|
|
|
scaling_ratio = min(tp->scaling_ratio, scaling_ratio);
|
2020-06-30 19:24:45 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
msk->rcvq_space.rtt_us = rtt_us;
|
2023-07-20 18:47:50 +00:00
|
|
|
msk->scaling_ratio = scaling_ratio;
|
2020-06-30 19:24:45 +00:00
|
|
|
if (time < (rtt_us >> 3) || rtt_us == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (msk->rcvq_space.copied <= msk->rcvq_space.space)
|
|
|
|
goto new_measure;
|
|
|
|
|
2022-07-20 16:50:18 +00:00
|
|
|
if (READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf) &&
|
2020-06-30 19:24:45 +00:00
|
|
|
!(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
|
|
|
|
u64 rcvwin, grow;
|
2023-07-20 18:47:50 +00:00
|
|
|
int rcvbuf;
|
2020-06-30 19:24:45 +00:00
|
|
|
|
|
|
|
rcvwin = ((u64)msk->rcvq_space.copied << 1) + 16 * advmss;
|
|
|
|
|
|
|
|
grow = rcvwin * (msk->rcvq_space.copied - msk->rcvq_space.space);
|
|
|
|
|
|
|
|
do_div(grow, msk->rcvq_space.space);
|
|
|
|
rcvwin += (grow << 1);
|
|
|
|
|
2024-06-05 07:15:41 +00:00
|
|
|
rcvbuf = min_t(u64, mptcp_space_from_win(sk, rcvwin),
|
2022-07-22 18:22:00 +00:00
|
|
|
READ_ONCE(sock_net(sk)->ipv4.sysctl_tcp_rmem[2]));
|
2020-06-30 19:24:45 +00:00
|
|
|
|
|
|
|
if (rcvbuf > sk->sk_rcvbuf) {
|
|
|
|
u32 window_clamp;
|
|
|
|
|
2024-06-05 07:15:40 +00:00
|
|
|
window_clamp = mptcp_win_from_space(sk, rcvbuf);
|
2020-06-30 19:24:45 +00:00
|
|
|
WRITE_ONCE(sk->sk_rcvbuf, rcvbuf);
|
|
|
|
|
|
|
|
/* Make subflows follow along. If we do not do this, we
|
|
|
|
* get drops at subflow level if skbs can't be moved to
|
|
|
|
* the mptcp rx queue fast enough (announced rcv_win can
|
|
|
|
* exceed ssk->sk_rcvbuf).
|
|
|
|
*/
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk;
|
2020-09-14 08:01:18 +00:00
|
|
|
bool slow;
|
2020-06-30 19:24:45 +00:00
|
|
|
|
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
2020-09-14 08:01:18 +00:00
|
|
|
slow = lock_sock_fast(ssk);
|
2020-06-30 19:24:45 +00:00
|
|
|
WRITE_ONCE(ssk->sk_rcvbuf, rcvbuf);
|
2024-04-04 11:42:31 +00:00
|
|
|
WRITE_ONCE(tcp_sk(ssk)->window_clamp, window_clamp);
|
2020-09-14 08:01:18 +00:00
|
|
|
tcp_cleanup_rbuf(ssk, 1);
|
|
|
|
unlock_sock_fast(ssk, slow);
|
2020-06-30 19:24:45 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
msk->rcvq_space.space = msk->rcvq_space.copied;
|
|
|
|
new_measure:
|
|
|
|
msk->rcvq_space.copied = 0;
|
|
|
|
msk->rcvq_space.time = mstamp;
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
static void __mptcp_update_rmem(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
if (!msk->rmem_released)
|
|
|
|
return;
|
|
|
|
|
|
|
|
atomic_sub(msk->rmem_released, &sk->sk_rmem_alloc);
|
2021-10-26 23:29:15 +00:00
|
|
|
mptcp_rmem_uncharge(sk, msk->rmem_released);
|
2021-07-10 00:20:51 +00:00
|
|
|
WRITE_ONCE(msk->rmem_released, 0);
|
2020-11-27 10:10:24 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __mptcp_splice_receive_queue(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
skb_queue_splice_tail_init(&sk->sk_receive_queue, &msk->receive_queue);
|
|
|
|
}
|
|
|
|
|
2021-02-11 23:30:41 +00:00
|
|
|
static bool __mptcp_move_skbs(struct mptcp_sock *msk)
|
2020-02-26 09:14:48 +00:00
|
|
|
{
|
2020-11-27 10:10:24 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-02-26 09:14:48 +00:00
|
|
|
unsigned int moved = 0;
|
2020-11-27 10:10:24 +00:00
|
|
|
bool ret, done;
|
2020-09-14 08:01:17 +00:00
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
do {
|
|
|
|
struct sock *ssk = mptcp_subflow_recv_lookup(msk);
|
2020-11-03 19:05:04 +00:00
|
|
|
bool slowpath;
|
2020-02-26 09:14:48 +00:00
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
/* we can have data pending in the subflows only if the msk
|
|
|
|
* receive buffer was full at subflow_data_ready() time,
|
|
|
|
* that is an unlikely slow path.
|
|
|
|
*/
|
|
|
|
if (likely(!ssk))
|
2020-02-26 09:14:48 +00:00
|
|
|
break;
|
|
|
|
|
2020-11-03 19:05:04 +00:00
|
|
|
slowpath = lock_sock_fast(ssk);
|
2020-11-27 10:10:24 +00:00
|
|
|
mptcp_data_lock(sk);
|
2021-02-11 23:30:41 +00:00
|
|
|
__mptcp_update_rmem(sk);
|
2020-02-26 09:14:48 +00:00
|
|
|
done = __mptcp_move_skbs_from_subflow(msk, ssk, &moved);
|
2020-11-27 10:10:24 +00:00
|
|
|
mptcp_data_unlock(sk);
|
2021-06-10 22:59:44 +00:00
|
|
|
|
|
|
|
if (unlikely(ssk->sk_err))
|
|
|
|
__mptcp_error_report(sk);
|
2020-11-03 19:05:04 +00:00
|
|
|
unlock_sock_fast(ssk, slowpath);
|
2020-02-26 09:14:48 +00:00
|
|
|
} while (!done);
|
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
/* acquire the data lock only if some input data is pending */
|
|
|
|
ret = moved > 0;
|
|
|
|
if (!RB_EMPTY_ROOT(&msk->out_of_order_queue) ||
|
|
|
|
!skb_queue_empty_lockless(&sk->sk_receive_queue)) {
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
__mptcp_update_rmem(sk);
|
|
|
|
ret |= __mptcp_ofo_queue(msk);
|
|
|
|
__mptcp_splice_receive_queue(sk);
|
|
|
|
mptcp_data_unlock(sk);
|
2020-09-14 08:01:12 +00:00
|
|
|
}
|
2020-11-27 10:10:24 +00:00
|
|
|
if (ret)
|
|
|
|
mptcp_check_data_fin((struct sock *)msk);
|
|
|
|
return !skb_queue_empty(&msk->receive_queue);
|
2020-02-26 09:14:48 +00:00
|
|
|
}
|
|
|
|
|
2021-12-03 22:35:32 +00:00
|
|
|
static unsigned int mptcp_inq_hint(const struct sock *sk)
|
|
|
|
{
|
|
|
|
const struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
const struct sk_buff *skb;
|
|
|
|
|
|
|
|
skb = skb_peek(&msk->receive_queue);
|
|
|
|
if (skb) {
|
2024-02-02 11:40:09 +00:00
|
|
|
u64 hint_val = READ_ONCE(msk->ack_seq) - MPTCP_SKB_CB(skb)->map_seq;
|
2021-12-03 22:35:32 +00:00
|
|
|
|
|
|
|
if (hint_val >= INT_MAX)
|
|
|
|
return INT_MAX;
|
|
|
|
|
|
|
|
return (unsigned int)hint_val;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_CLOSE || (sk->sk_shutdown & RCV_SHUTDOWN))
|
|
|
|
return 1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:15 +00:00
|
|
|
static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
|
net: remove noblock parameter from recvmsg() entities
The internal recvmsg() functions have two parameters 'flags' and 'noblock'
that were merged inside skb_recv_datagram(). As a follow up patch to commit
f4b41f062c42 ("net: remove noblock parameter from skb_recv_datagram()")
this patch removes the separate 'noblock' parameter for recvmsg().
Analogue to the referenced patch for skb_recv_datagram() the 'flags' and
'noblock' parameters are unnecessarily split up with e.g.
err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
flags & ~MSG_DONTWAIT, &addr_len);
or in
err = INDIRECT_CALL_2(sk->sk_prot->recvmsg, tcp_recvmsg, udp_recvmsg,
sk, msg, size, flags & MSG_DONTWAIT,
flags & ~MSG_DONTWAIT, &addr_len);
instead of simply using only flags all the time and check for MSG_DONTWAIT
where needed (to preserve for the formerly separated no(n)block condition).
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 12:49:55 +00:00
|
|
|
int flags, int *addr_len)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2021-06-03 23:24:32 +00:00
|
|
|
struct scm_timestamping_internal tss;
|
|
|
|
int copied = 0, cmsg_flags = 0;
|
2020-01-22 00:56:26 +00:00
|
|
|
int target;
|
|
|
|
long timeo;
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2021-04-23 18:17:05 +00:00
|
|
|
/* MSG_ERRQUEUE is really a no-op till we support IP_RECVERR */
|
|
|
|
if (unlikely(flags & MSG_ERRQUEUE))
|
|
|
|
return inet_recv_error(sk, msg, len, addr_len);
|
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
lock_sock(sk);
|
2020-11-24 21:51:24 +00:00
|
|
|
if (unlikely(sk->sk_state == TCP_LISTEN)) {
|
|
|
|
copied = -ENOTCONN;
|
|
|
|
goto out_err;
|
|
|
|
}
|
|
|
|
|
net: remove noblock parameter from recvmsg() entities
The internal recvmsg() functions have two parameters 'flags' and 'noblock'
that were merged inside skb_recv_datagram(). As a follow up patch to commit
f4b41f062c42 ("net: remove noblock parameter from skb_recv_datagram()")
this patch removes the separate 'noblock' parameter for recvmsg().
Analogue to the referenced patch for skb_recv_datagram() the 'flags' and
'noblock' parameters are unnecessarily split up with e.g.
err = sk->sk_prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
flags & ~MSG_DONTWAIT, &addr_len);
or in
err = INDIRECT_CALL_2(sk->sk_prot->recvmsg, tcp_recvmsg, udp_recvmsg,
sk, msg, size, flags & MSG_DONTWAIT,
flags & ~MSG_DONTWAIT, &addr_len);
instead of simply using only flags all the time and check for MSG_DONTWAIT
where needed (to preserve for the formerly separated no(n)block condition).
Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Link: https://lore.kernel.org/r/20220411124955.154876-1-socketcan@hartkopp.net
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
2022-04-11 12:49:55 +00:00
|
|
|
timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT);
|
2020-01-22 00:56:26 +00:00
|
|
|
|
|
|
|
len = min_t(size_t, len, INT_MAX);
|
|
|
|
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
|
|
|
|
|
2021-12-03 22:35:32 +00:00
|
|
|
if (unlikely(msk->recvmsg_inq))
|
|
|
|
cmsg_flags = MPTCP_CMSG_INQ;
|
|
|
|
|
2020-12-02 17:16:57 +00:00
|
|
|
while (copied < len) {
|
2021-02-11 23:30:41 +00:00
|
|
|
int bytes_read;
|
2020-01-22 00:56:26 +00:00
|
|
|
|
2021-06-03 23:24:32 +00:00
|
|
|
bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied, flags, &tss, &cmsg_flags);
|
2020-02-26 09:14:48 +00:00
|
|
|
if (unlikely(bytes_read < 0)) {
|
|
|
|
if (!copied)
|
|
|
|
copied = bytes_read;
|
|
|
|
goto out_err;
|
|
|
|
}
|
2020-01-22 00:56:26 +00:00
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
copied += bytes_read;
|
2020-01-22 00:56:26 +00:00
|
|
|
|
2020-11-19 19:46:03 +00:00
|
|
|
/* be sure to advertise window change */
|
2021-02-11 23:30:41 +00:00
|
|
|
mptcp_cleanup_rbuf(msk);
|
|
|
|
|
|
|
|
if (skb_queue_empty(&msk->receive_queue) && __mptcp_move_skbs(msk))
|
|
|
|
continue;
|
2020-11-19 19:46:03 +00:00
|
|
|
|
2024-06-05 07:15:42 +00:00
|
|
|
/* only the MPTCP socket status is relevant here. The exit
|
2020-01-22 00:56:26 +00:00
|
|
|
* conditions mirror closely tcp_recvmsg()
|
|
|
|
*/
|
|
|
|
if (copied >= target)
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (copied) {
|
|
|
|
if (sk->sk_err ||
|
|
|
|
sk->sk_state == TCP_CLOSE ||
|
|
|
|
(sk->sk_shutdown & RCV_SHUTDOWN) ||
|
|
|
|
!timeo ||
|
|
|
|
signal_pending(current))
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
if (sk->sk_err) {
|
|
|
|
copied = sock_error(sk);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
if (sk->sk_shutdown & RCV_SHUTDOWN) {
|
|
|
|
/* race breaker: the shutdown could be after the
|
|
|
|
* previous receive queue check
|
|
|
|
*/
|
2021-02-11 23:30:41 +00:00
|
|
|
if (__mptcp_move_skbs(msk))
|
2020-11-27 10:10:24 +00:00
|
|
|
continue;
|
2020-01-22 00:56:26 +00:00
|
|
|
break;
|
2020-11-27 10:10:24 +00:00
|
|
|
}
|
2020-01-22 00:56:26 +00:00
|
|
|
|
|
|
|
if (sk->sk_state == TCP_CLOSE) {
|
|
|
|
copied = -ENOTCONN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!timeo) {
|
|
|
|
copied = -EAGAIN;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (signal_pending(current)) {
|
|
|
|
copied = sock_intr_errno(timeo);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pr_debug("block timeout %ld", timeo);
|
2021-10-07 22:05:00 +00:00
|
|
|
sk_wait_data(sk, &timeo, NULL);
|
2020-01-22 00:56:26 +00:00
|
|
|
}
|
2021-06-21 22:54:35 +00:00
|
|
|
|
2020-02-26 09:14:48 +00:00
|
|
|
out_err:
|
2021-06-03 23:24:32 +00:00
|
|
|
if (cmsg_flags && copied >= 0) {
|
|
|
|
if (cmsg_flags & MPTCP_CMSG_TS)
|
|
|
|
tcp_recv_timestamp(msg, sk, &tss);
|
2021-12-03 22:35:32 +00:00
|
|
|
|
|
|
|
if (cmsg_flags & MPTCP_CMSG_INQ) {
|
|
|
|
unsigned int inq = mptcp_inq_hint(sk);
|
|
|
|
|
|
|
|
put_cmsg(msg, SOL_TCP, TCP_CM_INQ, sizeof(inq), &inq);
|
|
|
|
}
|
2021-06-03 23:24:32 +00:00
|
|
|
}
|
|
|
|
|
2021-10-07 22:05:00 +00:00
|
|
|
pr_debug("msk=%p rx queue empty=%d:%d copied=%d",
|
|
|
|
msk, skb_queue_empty_lockless(&sk->sk_receive_queue),
|
|
|
|
skb_queue_empty(&msk->receive_queue), copied);
|
2021-04-23 18:17:08 +00:00
|
|
|
if (!(flags & MSG_PEEK))
|
|
|
|
mptcp_rcv_space_adjust(msk, copied);
|
2020-06-30 19:24:45 +00:00
|
|
|
|
2020-01-22 00:56:26 +00:00
|
|
|
release_sock(sk);
|
2020-01-22 00:56:18 +00:00
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:44 +00:00
|
|
|
static void mptcp_retransmit_timer(struct timer_list *t)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = from_timer(icsk, t,
|
|
|
|
icsk_retransmit_timer);
|
|
|
|
struct sock *sk = &icsk->icsk_inet.sk;
|
2021-03-26 18:26:30 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-03-27 21:48:44 +00:00
|
|
|
|
|
|
|
bh_lock_sock(sk);
|
|
|
|
if (!sock_owned_by_user(sk)) {
|
2021-03-26 18:26:30 +00:00
|
|
|
/* we need a process context to retransmit */
|
|
|
|
if (!test_and_set_bit(MPTCP_WORK_RTX, &msk->flags))
|
|
|
|
mptcp_schedule_work(sk);
|
2020-03-27 21:48:44 +00:00
|
|
|
} else {
|
|
|
|
/* delegate our work to tcp_release_cb() */
|
2022-01-07 00:20:26 +00:00
|
|
|
__set_bit(MPTCP_RETRANSMIT, &msk->cb_flags);
|
2020-03-27 21:48:44 +00:00
|
|
|
}
|
|
|
|
bh_unlock_sock(sk);
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
static void mptcp_tout_timer(struct timer_list *t)
|
2020-11-16 09:48:09 +00:00
|
|
|
{
|
|
|
|
struct sock *sk = from_timer(sk, t, sk_timer);
|
|
|
|
|
|
|
|
mptcp_schedule_work(sk);
|
2020-11-24 16:24:46 +00:00
|
|
|
sock_put(sk);
|
2020-11-16 09:48:09 +00:00
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:48 +00:00
|
|
|
/* Find an idle subflow. Return NULL if there is unacked data at tcp
|
|
|
|
* level.
|
|
|
|
*
|
|
|
|
* A backup subflow is returned only if that is the only kind available.
|
|
|
|
*/
|
2023-08-21 22:25:18 +00:00
|
|
|
struct sock *mptcp_subflow_get_retrans(struct mptcp_sock *msk)
|
2020-03-27 21:48:48 +00:00
|
|
|
{
|
2021-08-13 22:15:42 +00:00
|
|
|
struct sock *backup = NULL, *pick = NULL;
|
2020-03-27 21:48:48 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-08-13 22:15:42 +00:00
|
|
|
int min_stale_count = INT_MAX;
|
2020-03-27 21:48:48 +00:00
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
2021-08-13 22:15:45 +00:00
|
|
|
if (!__mptcp_subflow_active(subflow))
|
2020-09-14 08:01:17 +00:00
|
|
|
continue;
|
|
|
|
|
2021-08-13 22:15:42 +00:00
|
|
|
/* still data outstanding at TCP level? skip this */
|
|
|
|
if (!tcp_rtx_and_write_queues_empty(ssk)) {
|
|
|
|
mptcp_pm_subflow_chk_stale(msk, ssk);
|
|
|
|
min_stale_count = min_t(int, min_stale_count, subflow->stale_count);
|
|
|
|
continue;
|
2020-11-19 19:45:56 +00:00
|
|
|
}
|
2020-03-27 21:48:48 +00:00
|
|
|
|
|
|
|
if (subflow->backup) {
|
|
|
|
if (!backup)
|
|
|
|
backup = ssk;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2021-08-13 22:15:42 +00:00
|
|
|
if (!pick)
|
|
|
|
pick = ssk;
|
2020-03-27 21:48:48 +00:00
|
|
|
}
|
|
|
|
|
2021-08-13 22:15:42 +00:00
|
|
|
if (pick)
|
|
|
|
return pick;
|
|
|
|
|
|
|
|
/* use backup only if there are no progresses anywhere */
|
|
|
|
return min_stale_count > 1 ? backup : NULL;
|
2020-03-27 21:48:48 +00:00
|
|
|
}
|
|
|
|
|
2021-08-13 22:15:43 +00:00
|
|
|
bool __mptcp_retransmit_pending_data(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_data_frag *cur, *rtx_head;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2022-11-10 23:23:18 +00:00
|
|
|
if (__mptcp_check_fallback(msk))
|
2021-08-13 22:15:43 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
/* the closing socket has some data untransmitted and/or unacked:
|
|
|
|
* some data in the mptcp rtx queue has not really xmitted yet.
|
|
|
|
* keep it simple and re-inject the whole mptcp level rtx queue
|
|
|
|
*/
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
__mptcp_clean_una_wakeup(sk);
|
|
|
|
rtx_head = mptcp_rtx_head(sk);
|
|
|
|
if (!rtx_head) {
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2021-09-24 21:12:34 +00:00
|
|
|
msk->recovery_snd_nxt = msk->snd_nxt;
|
2021-08-13 22:15:43 +00:00
|
|
|
msk->recovery = true;
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
|
|
|
|
msk->first_pending = rtx_head;
|
|
|
|
msk->snd_burst = 0;
|
|
|
|
|
|
|
|
/* be sure to clear the "sent status" on all re-injected fragments */
|
|
|
|
list_for_each_entry(cur, &msk->rtx_queue, list) {
|
|
|
|
if (!cur->already_sent)
|
|
|
|
break;
|
|
|
|
cur->already_sent = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2022-01-07 00:20:16 +00:00
|
|
|
/* flags for __mptcp_close_ssk() */
|
|
|
|
#define MPTCP_CF_PUSH BIT(1)
|
|
|
|
#define MPTCP_CF_FASTCLOSE BIT(2)
|
|
|
|
|
2023-10-18 18:23:55 +00:00
|
|
|
/* be sure to send a reset only if the caller asked for it, also
|
|
|
|
* clean completely the subflow status when the subflow reaches
|
|
|
|
* TCP_CLOSE state
|
|
|
|
*/
|
|
|
|
static void __mptcp_subflow_disconnect(struct sock *ssk,
|
|
|
|
struct mptcp_subflow_context *subflow,
|
|
|
|
unsigned int flags)
|
|
|
|
{
|
|
|
|
if (((1 << ssk->sk_state) & (TCPF_CLOSE | TCPF_LISTEN)) ||
|
|
|
|
(flags & MPTCP_CF_FASTCLOSE)) {
|
|
|
|
/* The MPTCP code never wait on the subflow sockets, TCP-level
|
|
|
|
* disconnect should never fail
|
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(tcp_disconnect(ssk, 0));
|
|
|
|
mptcp_subflow_ctx_reset(subflow);
|
|
|
|
} else {
|
|
|
|
tcp_shutdown(ssk, SEND_SHUTDOWN);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:18 +00:00
|
|
|
/* subflow sockets can be either outgoing (connect) or incoming
|
|
|
|
* (accept).
|
|
|
|
*
|
|
|
|
* Outgoing subflows use in-kernel sockets.
|
|
|
|
* Incoming subflows do not have their own 'struct socket' allocated,
|
|
|
|
* so we need to use tcp_close() after detaching them from the mptcp
|
|
|
|
* parent socket.
|
|
|
|
*/
|
2021-02-12 23:59:55 +00:00
|
|
|
static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
|
2022-01-07 00:20:16 +00:00
|
|
|
struct mptcp_subflow_context *subflow,
|
|
|
|
unsigned int flags)
|
2020-01-22 00:56:18 +00:00
|
|
|
{
|
2021-03-04 21:32:08 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2023-04-17 14:00:41 +00:00
|
|
|
bool dispose_it, need_push = false;
|
|
|
|
|
|
|
|
/* If the first subflow moved to a close state before accept, e.g. due
|
2023-09-16 10:52:49 +00:00
|
|
|
* to an incoming reset or listener shutdown, the subflow socket is
|
|
|
|
* already deleted by inet_child_forget() and the mptcp socket can't
|
|
|
|
* survive too.
|
2023-04-17 14:00:41 +00:00
|
|
|
*/
|
2023-09-16 10:52:49 +00:00
|
|
|
if (msk->in_accept_queue && msk->first == ssk &&
|
|
|
|
(sock_flag(sk, SOCK_DEAD) || sock_flag(ssk, SOCK_DEAD))) {
|
2023-04-17 14:00:41 +00:00
|
|
|
/* ensure later check in mptcp_worker() will dispose the msk */
|
|
|
|
sock_set_flag(sk, SOCK_DEAD);
|
2023-10-23 20:44:34 +00:00
|
|
|
mptcp_set_close_tout(sk, tcp_jiffies32 - (mptcp_close_timeout(sk) + 1));
|
2023-04-17 14:00:41 +00:00
|
|
|
lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
|
|
|
|
mptcp_subflow_drop_ctx(ssk);
|
|
|
|
goto out_release;
|
|
|
|
}
|
2021-03-04 21:32:08 +00:00
|
|
|
|
2023-08-11 15:57:26 +00:00
|
|
|
dispose_it = msk->free_first || ssk != msk->first;
|
2022-01-07 00:20:16 +00:00
|
|
|
if (dispose_it)
|
|
|
|
list_del(&subflow->node);
|
2020-01-22 00:56:18 +00:00
|
|
|
|
2020-12-16 11:48:33 +00:00
|
|
|
lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
|
2020-11-16 09:48:09 +00:00
|
|
|
|
2023-08-03 16:27:29 +00:00
|
|
|
if ((flags & MPTCP_CF_FASTCLOSE) && !__mptcp_check_fallback(msk)) {
|
2023-10-18 18:23:55 +00:00
|
|
|
/* be sure to force the tcp_close path
|
2022-09-30 15:59:32 +00:00
|
|
|
* to generate the egress reset
|
|
|
|
*/
|
|
|
|
ssk->sk_lingertime = 0;
|
|
|
|
sock_set_flag(ssk, SOCK_LINGER);
|
2022-01-07 00:20:16 +00:00
|
|
|
subflow->send_fastclose = 1;
|
2022-09-30 15:59:32 +00:00
|
|
|
}
|
2022-01-07 00:20:16 +00:00
|
|
|
|
|
|
|
need_push = (flags & MPTCP_CF_PUSH) && __mptcp_retransmit_pending_data(sk);
|
|
|
|
if (!dispose_it) {
|
2023-10-18 18:23:55 +00:00
|
|
|
__mptcp_subflow_disconnect(ssk, subflow, flags);
|
2022-01-07 00:20:16 +00:00
|
|
|
release_sock(ssk);
|
|
|
|
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-12-09 11:03:31 +00:00
|
|
|
subflow->disposable = 1;
|
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
/* if ssk hit tcp_done(), tcp_cleanup_ulp() cleared the related ops
|
|
|
|
* the ssk has been already destroyed, we just need to release the
|
|
|
|
* reference owned by msk;
|
|
|
|
*/
|
|
|
|
if (!inet_csk(ssk)->icsk_ulp_ops) {
|
2023-03-09 14:49:59 +00:00
|
|
|
WARN_ON_ONCE(!sock_flag(ssk, SOCK_DEAD));
|
2020-11-16 09:48:09 +00:00
|
|
|
kfree_rcu(subflow, rcu);
|
2020-01-22 00:56:18 +00:00
|
|
|
} else {
|
2020-12-09 11:03:31 +00:00
|
|
|
/* otherwise tcp will dispose of the ssk and subflow ctx */
|
2020-11-16 09:48:09 +00:00
|
|
|
__tcp_close(ssk, 0);
|
|
|
|
|
|
|
|
/* close acquired an extra ref */
|
|
|
|
__sock_put(ssk);
|
2020-01-22 00:56:18 +00:00
|
|
|
}
|
2023-04-17 14:00:41 +00:00
|
|
|
|
|
|
|
out_release:
|
2023-09-16 10:52:47 +00:00
|
|
|
__mptcp_subflow_error_report(sk, ssk);
|
2020-11-16 09:48:09 +00:00
|
|
|
release_sock(ssk);
|
|
|
|
|
|
|
|
sock_put(ssk);
|
2021-03-04 21:32:08 +00:00
|
|
|
|
2021-03-04 21:32:12 +00:00
|
|
|
if (ssk == msk->first)
|
2023-05-31 19:37:06 +00:00
|
|
|
WRITE_ONCE(msk->first, NULL);
|
2021-03-04 21:32:12 +00:00
|
|
|
|
2022-01-07 00:20:16 +00:00
|
|
|
out:
|
2023-10-23 20:44:42 +00:00
|
|
|
__mptcp_sync_sndbuf(sk);
|
2021-08-13 22:15:43 +00:00
|
|
|
if (need_push)
|
|
|
|
__mptcp_push_pending(sk, 0);
|
2023-09-16 10:52:49 +00:00
|
|
|
|
|
|
|
/* Catch every 'all subflows closed' scenario, including peers silently
|
|
|
|
* closing them, e.g. due to timeout.
|
|
|
|
* For established sockets, allow an additional timeout before closing,
|
|
|
|
* as the protocol can still create more subflows.
|
|
|
|
*/
|
|
|
|
if (list_is_singular(&msk->conn_list) && msk->first &&
|
|
|
|
inet_sk_state_load(msk->first) == TCP_CLOSE) {
|
|
|
|
if (sk->sk_state != TCP_ESTABLISHED ||
|
|
|
|
msk->in_accept_queue || sock_flag(sk, SOCK_DEAD)) {
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2023-09-16 10:52:49 +00:00
|
|
|
mptcp_close_wake_up(sk);
|
|
|
|
} else {
|
|
|
|
mptcp_start_tout_timer(sk);
|
|
|
|
}
|
|
|
|
}
|
2020-01-22 00:56:15 +00:00
|
|
|
}
|
|
|
|
|
2021-02-12 23:59:55 +00:00
|
|
|
void mptcp_close_ssk(struct sock *sk, struct sock *ssk,
|
|
|
|
struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
2021-02-13 00:00:01 +00:00
|
|
|
if (sk->sk_state == TCP_ESTABLISHED)
|
|
|
|
mptcp_event(MPTCP_EVENT_SUB_CLOSED, mptcp_sk(sk), ssk, GFP_KERNEL);
|
2022-01-07 00:20:23 +00:00
|
|
|
|
|
|
|
/* subflow aborted before reaching the fully_established status
|
|
|
|
* attempt the creation of the next subflow
|
|
|
|
*/
|
2023-10-25 23:37:05 +00:00
|
|
|
mptcp_pm_subflow_check_next(mptcp_sk(sk), subflow);
|
2022-01-07 00:20:23 +00:00
|
|
|
|
2022-01-07 00:20:16 +00:00
|
|
|
__mptcp_close_ssk(sk, ssk, subflow, MPTCP_CF_PUSH);
|
2021-02-12 23:59:55 +00:00
|
|
|
}
|
|
|
|
|
2020-02-26 11:19:03 +00:00
|
|
|
static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2023-03-09 14:49:59 +00:00
|
|
|
static void __mptcp_close_subflow(struct sock *sk)
|
2020-10-09 17:00:01 +00:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
2023-03-09 14:49:59 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-10-09 17:00:01 +00:00
|
|
|
|
2021-02-04 23:23:30 +00:00
|
|
|
might_sleep();
|
|
|
|
|
2022-09-06 20:55:39 +00:00
|
|
|
mptcp_for_each_subflow_safe(msk, subflow, tmp) {
|
2020-10-09 17:00:01 +00:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
if (inet_sk_state_load(ssk) != TCP_CLOSE)
|
|
|
|
continue;
|
|
|
|
|
2021-02-12 23:59:56 +00:00
|
|
|
/* 'subflow_data_ready' will re-sched once rx queue is empty */
|
|
|
|
if (!skb_queue_empty_lockless(&ssk->sk_receive_queue))
|
|
|
|
continue;
|
|
|
|
|
2023-03-09 14:49:59 +00:00
|
|
|
mptcp_close_ssk(sk, ssk, subflow);
|
|
|
|
}
|
|
|
|
|
2020-10-09 17:00:01 +00:00
|
|
|
}
|
|
|
|
|
2023-09-16 10:52:49 +00:00
|
|
|
static bool mptcp_close_tout_expired(const struct sock *sk)
|
2020-11-16 09:48:09 +00:00
|
|
|
{
|
2023-09-16 10:52:49 +00:00
|
|
|
if (!inet_csk(sk)->icsk_mtup.probe_timestamp ||
|
|
|
|
sk->sk_state == TCP_CLOSE)
|
|
|
|
return false;
|
2020-11-16 09:48:09 +00:00
|
|
|
|
2023-09-16 10:52:49 +00:00
|
|
|
return time_after32(tcp_jiffies32,
|
2023-10-23 20:44:34 +00:00
|
|
|
inet_csk(sk)->icsk_mtup.probe_timestamp + mptcp_close_timeout(sk));
|
2020-11-16 09:48:09 +00:00
|
|
|
}
|
|
|
|
|
2020-12-10 22:25:04 +00:00
|
|
|
static void mptcp_check_fastclose(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
2022-11-10 23:23:20 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-12-10 22:25:04 +00:00
|
|
|
|
|
|
|
if (likely(!READ_ONCE(msk->rcv_fastclose)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
mptcp_token_destroy(msk);
|
|
|
|
|
2022-09-06 20:55:39 +00:00
|
|
|
mptcp_for_each_subflow_safe(msk, subflow, tmp) {
|
2020-12-10 22:25:04 +00:00
|
|
|
struct sock *tcp_sk = mptcp_subflow_tcp_sock(subflow);
|
2021-06-21 22:54:34 +00:00
|
|
|
bool slow;
|
2020-12-10 22:25:04 +00:00
|
|
|
|
2021-06-21 22:54:34 +00:00
|
|
|
slow = lock_sock_fast(tcp_sk);
|
2020-12-10 22:25:04 +00:00
|
|
|
if (tcp_sk->sk_state != TCP_CLOSE) {
|
2024-04-25 03:13:39 +00:00
|
|
|
mptcp_send_active_reset_reason(tcp_sk);
|
2020-12-10 22:25:04 +00:00
|
|
|
tcp_set_state(tcp_sk, TCP_CLOSE);
|
|
|
|
}
|
2021-06-21 22:54:34 +00:00
|
|
|
unlock_sock_fast(tcp_sk, slow);
|
2020-12-10 22:25:04 +00:00
|
|
|
}
|
|
|
|
|
2022-09-30 15:59:31 +00:00
|
|
|
/* Mirror the tcp_reset() error propagation */
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_SYN_SENT:
|
2023-03-15 20:57:45 +00:00
|
|
|
WRITE_ONCE(sk->sk_err, ECONNREFUSED);
|
2022-09-30 15:59:31 +00:00
|
|
|
break;
|
|
|
|
case TCP_CLOSE_WAIT:
|
2023-03-15 20:57:45 +00:00
|
|
|
WRITE_ONCE(sk->sk_err, EPIPE);
|
2022-09-30 15:59:31 +00:00
|
|
|
break;
|
|
|
|
case TCP_CLOSE:
|
|
|
|
return;
|
|
|
|
default:
|
2023-03-15 20:57:45 +00:00
|
|
|
WRITE_ONCE(sk->sk_err, ECONNRESET);
|
2022-09-30 15:59:31 +00:00
|
|
|
}
|
|
|
|
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2023-05-31 19:37:07 +00:00
|
|
|
WRITE_ONCE(sk->sk_shutdown, SHUTDOWN_MASK);
|
2020-12-10 22:25:04 +00:00
|
|
|
smp_mb__before_atomic(); /* SHUTDOWN must be visible first */
|
|
|
|
set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags);
|
|
|
|
|
2022-09-30 15:59:31 +00:00
|
|
|
/* the calling mptcp_worker will properly destroy the socket */
|
|
|
|
if (sock_flag(sk, SOCK_DEAD))
|
|
|
|
return;
|
|
|
|
|
|
|
|
sk->sk_state_change(sk);
|
|
|
|
sk_error_report(sk);
|
2020-12-10 22:25:04 +00:00
|
|
|
}
|
|
|
|
|
2021-03-04 21:32:13 +00:00
|
|
|
static void __mptcp_retrans(struct sock *sk)
|
2020-02-26 09:14:47 +00:00
|
|
|
{
|
2021-03-04 21:32:13 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2023-08-21 22:25:20 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2020-11-16 09:48:06 +00:00
|
|
|
struct mptcp_sendmsg_info info = {};
|
2020-03-27 21:48:48 +00:00
|
|
|
struct mptcp_data_frag *dfrag;
|
2021-03-04 21:32:13 +00:00
|
|
|
struct sock *ssk;
|
2023-08-21 22:25:20 +00:00
|
|
|
int ret, err;
|
|
|
|
u16 len = 0;
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2021-05-27 23:31:37 +00:00
|
|
|
mptcp_clean_una_wakeup(sk);
|
2021-09-24 21:12:38 +00:00
|
|
|
|
|
|
|
/* first check ssk: need to kick "stale" logic */
|
2023-08-21 22:25:20 +00:00
|
|
|
err = mptcp_sched_get_retrans(msk);
|
2020-03-27 21:48:48 +00:00
|
|
|
dfrag = mptcp_rtx_head(sk);
|
2021-04-23 16:40:33 +00:00
|
|
|
if (!dfrag) {
|
|
|
|
if (mptcp_data_fin_enabled(msk)) {
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
|
|
|
icsk->icsk_retransmits++;
|
|
|
|
mptcp_set_datafin_timeout(sk);
|
|
|
|
mptcp_send_ack(msk);
|
|
|
|
|
|
|
|
goto reset_timer;
|
|
|
|
}
|
|
|
|
|
2021-09-24 21:12:38 +00:00
|
|
|
if (!mptcp_send_head(sk))
|
|
|
|
return;
|
|
|
|
|
|
|
|
goto reset_timer;
|
2021-04-23 16:40:33 +00:00
|
|
|
}
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2023-08-21 22:25:20 +00:00
|
|
|
if (err)
|
2021-03-04 21:32:13 +00:00
|
|
|
goto reset_timer;
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2023-08-21 22:25:20 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
if (READ_ONCE(subflow->scheduled)) {
|
|
|
|
u16 copied = 0;
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2023-08-21 22:25:20 +00:00
|
|
|
mptcp_subflow_set_scheduled(subflow, false);
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2023-08-21 22:25:20 +00:00
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
lock_sock(ssk);
|
|
|
|
|
|
|
|
/* limit retransmission to the bytes already sent on some subflows */
|
|
|
|
info.sent = 0;
|
|
|
|
info.limit = READ_ONCE(msk->csum_enabled) ? dfrag->data_len :
|
|
|
|
dfrag->already_sent;
|
|
|
|
while (info.sent < info.limit) {
|
|
|
|
ret = mptcp_sendmsg_frag(sk, ssk, dfrag, &info);
|
|
|
|
if (ret <= 0)
|
|
|
|
break;
|
|
|
|
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS);
|
|
|
|
copied += ret;
|
|
|
|
info.sent += ret;
|
|
|
|
}
|
|
|
|
if (copied) {
|
|
|
|
len = max(copied, len);
|
|
|
|
tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,
|
|
|
|
info.size_goal);
|
|
|
|
WRITE_ONCE(msk->allow_infinite_fallback, false);
|
|
|
|
}
|
|
|
|
|
|
|
|
release_sock(ssk);
|
|
|
|
}
|
2021-06-17 23:46:17 +00:00
|
|
|
}
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2023-08-21 22:25:20 +00:00
|
|
|
msk->bytes_retrans += len;
|
|
|
|
dfrag->already_sent = max(dfrag->already_sent, len);
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2021-03-04 21:32:13 +00:00
|
|
|
reset_timer:
|
2021-09-24 21:12:38 +00:00
|
|
|
mptcp_check_and_set_pending(sk);
|
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
if (!mptcp_rtx_timer_pending(sk))
|
|
|
|
mptcp_reset_rtx_timer(sk);
|
2021-03-04 21:32:13 +00:00
|
|
|
}
|
|
|
|
|
2022-06-28 01:02:37 +00:00
|
|
|
/* schedule the timeout timer for the relevant event: either close timeout
|
|
|
|
* or mp_fail timeout. The close timeout takes precedence on the mp_fail one
|
|
|
|
*/
|
2023-09-16 10:52:48 +00:00
|
|
|
void mptcp_reset_tout_timer(struct mptcp_sock *msk, unsigned long fail_tout)
|
2022-06-28 01:02:37 +00:00
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
unsigned long timeout, close_timeout;
|
|
|
|
|
2023-09-16 10:52:49 +00:00
|
|
|
if (!fail_tout && !inet_csk(sk)->icsk_mtup.probe_timestamp)
|
2022-06-28 01:02:37 +00:00
|
|
|
return;
|
|
|
|
|
2023-09-16 10:52:49 +00:00
|
|
|
close_timeout = inet_csk(sk)->icsk_mtup.probe_timestamp - tcp_jiffies32 + jiffies +
|
2023-10-23 20:44:34 +00:00
|
|
|
mptcp_close_timeout(sk);
|
2022-06-28 01:02:37 +00:00
|
|
|
|
|
|
|
/* the close timeout takes precedence on the fail one, and here at least one of
|
|
|
|
* them is active
|
|
|
|
*/
|
2023-09-16 10:52:49 +00:00
|
|
|
timeout = inet_csk(sk)->icsk_mtup.probe_timestamp ? close_timeout : fail_tout;
|
2022-06-28 01:02:37 +00:00
|
|
|
|
|
|
|
sk_reset_timer(sk, &sk->sk_timer, timeout);
|
|
|
|
}
|
|
|
|
|
2022-04-26 21:57:15 +00:00
|
|
|
static void mptcp_mp_fail_no_response(struct mptcp_sock *msk)
|
|
|
|
{
|
2022-06-28 01:02:37 +00:00
|
|
|
struct sock *ssk = msk->first;
|
2022-04-26 21:57:15 +00:00
|
|
|
bool slow;
|
|
|
|
|
2022-06-28 01:02:37 +00:00
|
|
|
if (!ssk)
|
|
|
|
return;
|
2022-04-26 21:57:15 +00:00
|
|
|
|
2022-06-28 01:02:37 +00:00
|
|
|
pr_debug("MP_FAIL doesn't respond, reset the subflow");
|
|
|
|
|
|
|
|
slow = lock_sock_fast(ssk);
|
|
|
|
mptcp_subflow_reset(ssk);
|
|
|
|
WRITE_ONCE(mptcp_subflow_ctx(ssk)->fail_tout, 0);
|
|
|
|
unlock_sock_fast(ssk, slow);
|
2022-04-26 21:57:15 +00:00
|
|
|
}
|
|
|
|
|
2022-09-30 15:59:32 +00:00
|
|
|
static void mptcp_do_fastclose(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2022-09-30 15:59:32 +00:00
|
|
|
mptcp_for_each_subflow_safe(msk, subflow, tmp)
|
|
|
|
__mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow),
|
|
|
|
subflow, MPTCP_CF_FASTCLOSE);
|
|
|
|
}
|
|
|
|
|
2021-03-04 21:32:13 +00:00
|
|
|
static void mptcp_worker(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);
|
2022-11-10 23:23:20 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2022-06-28 01:02:37 +00:00
|
|
|
unsigned long fail_tout;
|
2021-03-04 21:32:13 +00:00
|
|
|
int state;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
state = sk->sk_state;
|
2023-04-11 20:42:10 +00:00
|
|
|
if (unlikely((1 << state) & (TCPF_CLOSE | TCPF_LISTEN)))
|
2021-03-04 21:32:13 +00:00
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
mptcp_check_fastclose(msk);
|
|
|
|
|
2022-01-07 00:20:22 +00:00
|
|
|
mptcp_pm_nl_work(msk);
|
2021-03-04 21:32:13 +00:00
|
|
|
|
2023-06-20 16:24:21 +00:00
|
|
|
mptcp_check_send_data_fin(sk);
|
|
|
|
mptcp_check_data_fin_ack(sk);
|
2021-03-04 21:32:13 +00:00
|
|
|
mptcp_check_data_fin(sk);
|
|
|
|
|
2023-03-09 14:49:59 +00:00
|
|
|
if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))
|
|
|
|
__mptcp_close_subflow(sk);
|
|
|
|
|
2023-09-16 10:52:49 +00:00
|
|
|
if (mptcp_close_tout_expired(sk)) {
|
|
|
|
mptcp_do_fastclose(sk);
|
|
|
|
mptcp_close_wake_up(sk);
|
|
|
|
}
|
2023-06-20 16:30:21 +00:00
|
|
|
|
2023-09-16 10:52:49 +00:00
|
|
|
if (sock_flag(sk, SOCK_DEAD) && sk->sk_state == TCP_CLOSE) {
|
|
|
|
__mptcp_destroy_sock(sk);
|
|
|
|
goto unlock;
|
2021-03-04 21:32:13 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if (test_and_clear_bit(MPTCP_WORK_RTX, &msk->flags))
|
|
|
|
__mptcp_retrans(sk);
|
2020-03-27 21:48:48 +00:00
|
|
|
|
2022-06-28 01:02:37 +00:00
|
|
|
fail_tout = msk->first ? READ_ONCE(mptcp_subflow_ctx(msk->first)->fail_tout) : 0;
|
|
|
|
if (fail_tout && time_after(jiffies, fail_tout))
|
|
|
|
mptcp_mp_fail_no_response(msk);
|
2022-04-26 21:57:15 +00:00
|
|
|
|
2020-03-27 21:48:48 +00:00
|
|
|
unlock:
|
2020-02-26 09:14:47 +00:00
|
|
|
release_sock(sk);
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
2023-08-11 15:57:27 +00:00
|
|
|
static void __mptcp_init_sock(struct sock *sk)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
2020-01-22 00:56:18 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&msk->conn_list);
|
2020-03-27 21:48:40 +00:00
|
|
|
INIT_LIST_HEAD(&msk->join_list);
|
2020-03-27 21:48:43 +00:00
|
|
|
INIT_LIST_HEAD(&msk->rtx_queue);
|
2020-02-26 09:14:47 +00:00
|
|
|
INIT_WORK(&msk->work, mptcp_worker);
|
2020-11-27 10:10:24 +00:00
|
|
|
__skb_queue_head_init(&msk->receive_queue);
|
2020-09-14 08:01:12 +00:00
|
|
|
msk->out_of_order_queue = RB_ROOT;
|
2020-11-16 09:48:07 +00:00
|
|
|
msk->first_pending = NULL;
|
2024-02-02 11:40:09 +00:00
|
|
|
WRITE_ONCE(msk->rmem_fwd_alloc, 0);
|
2021-07-10 00:20:51 +00:00
|
|
|
WRITE_ONCE(msk->rmem_released, 0);
|
2021-08-13 22:15:41 +00:00
|
|
|
msk->timer_ival = TCP_RTO_MIN;
|
2023-10-23 20:44:38 +00:00
|
|
|
msk->scaling_ratio = TCP_DEFAULT_SCALING_RATIO;
|
2020-01-22 00:56:18 +00:00
|
|
|
|
2023-05-31 19:37:06 +00:00
|
|
|
WRITE_ONCE(msk->first, NULL);
|
2020-02-26 11:19:03 +00:00
|
|
|
inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss;
|
2021-06-17 23:46:07 +00:00
|
|
|
WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));
|
2022-04-22 21:55:38 +00:00
|
|
|
WRITE_ONCE(msk->allow_infinite_fallback, true);
|
2021-08-13 22:15:43 +00:00
|
|
|
msk->recovery = false;
|
2023-06-20 16:30:17 +00:00
|
|
|
msk->subflow_id = 1;
|
mptcp: add last time fields in mptcp_info
This patch adds "last time" fields last_data_sent, last_data_recv and
last_ack_recv in struct mptcp_sock to record the last time data_sent,
data_recv and ack_recv happened. They all are initialized as
tcp_jiffies32 in __mptcp_init_sock(), and updated as tcp_jiffies32 too
when data is sent in __subflow_push_pending(), data is received in
__mptcp_move_skbs_from_subflow(), and ack is received in ack_update_msk().
Similar to tcpi_last_data_sent, tcpi_last_data_recv and tcpi_last_ack_recv
exposed with TCP, this patch exposes the last time "an action happened" for
MPTCP in mptcp_info, named mptcpi_last_data_sent, mptcpi_last_data_recv and
mptcpi_last_ack_recv, calculated in mptcp_diag_fill_info() as the time
deltas between now and the newly added last time fields in mptcp_sock.
Since msk->last_ack_recv needs to be protected by mptcp_data_lock/unlock,
and lock_sock_fast can sleep and be quite slow, move the entire
mptcp_data_lock/unlock block after the lock/unlock_sock_fast block.
Then mptcpi_last_data_sent and mptcpi_last_data_recv are set in
lock/unlock_sock_fast block, while mptcpi_last_ack_recv is set in
mptcp_data_lock/unlock block, which is protected by a spinlock and
should not block for too long.
Also add three reserved bytes in struct mptcp_info not to have holes in
this structure exposed to userspace.
Closes: https://github.com/multipath-tcp/mptcp_net-next/issues/446
Signed-off-by: Geliang Tang <tanggeliang@kylinos.cn>
Reviewed-by: Mat Martineau <martineau@kernel.org>
Reviewed-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Signed-off-by: Matthieu Baerts (NGI0) <matttbe@kernel.org>
Link: https://lore.kernel.org/r/20240410-upstream-net-next-20240405-mptcp-last-time-info-v2-1-f95bd6b33e51@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2024-04-10 09:48:24 +00:00
|
|
|
msk->last_data_sent = tcp_jiffies32;
|
|
|
|
msk->last_data_recv = tcp_jiffies32;
|
|
|
|
msk->last_ack_recv = tcp_jiffies32;
|
mptcp: cope with later TCP fallback
With MPTCP v1, passive connections can fallback to TCP after the
subflow becomes established:
syn + MP_CAPABLE ->
<- syn, ack + MP_CAPABLE
ack, seq = 3 ->
// OoO packet is accepted because in-sequence
// passive socket is created, is in ESTABLISHED
// status and tentatively as MP_CAPABLE
ack, seq = 2 ->
// no MP_CAPABLE opt, subflow should fallback to TCP
We can't use the 'subflow' socket fallback, as we don't have
it available for passive connection.
Instead, when the fallback is detected, replace the mptcp
socket with the underlying TCP subflow. Beyond covering
the above scenario, it makes a TCP fallback socket as efficient
as plain TCP ones.
Co-developed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Christoph Paasch <cpaasch@apple.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-01-22 00:56:33 +00:00
|
|
|
|
2020-03-27 21:48:38 +00:00
|
|
|
mptcp_pm_data_init(msk);
|
|
|
|
|
2020-03-27 21:48:44 +00:00
|
|
|
/* re-use the csk retrans timer for MPTCP-level retrans */
|
|
|
|
timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_retransmit_timer, 0);
|
2023-09-16 10:52:48 +00:00
|
|
|
timer_setup(&sk->sk_timer, mptcp_tout_timer, 0);
|
2020-01-22 00:56:15 +00:00
|
|
|
}
|
|
|
|
|
2022-01-07 00:20:16 +00:00
|
|
|
static void mptcp_ca_reset(struct sock *sk)
|
2020-01-22 00:56:28 +00:00
|
|
|
{
|
2021-05-25 21:23:10 +00:00
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2022-01-07 00:20:16 +00:00
|
|
|
|
|
|
|
tcp_assign_congestion_control(sk);
|
2024-05-14 01:13:29 +00:00
|
|
|
strscpy(mptcp_sk(sk)->ca_name, icsk->icsk_ca_ops->name,
|
|
|
|
sizeof(mptcp_sk(sk)->ca_name));
|
2022-01-07 00:20:16 +00:00
|
|
|
|
|
|
|
/* no need to keep a reference to the ops, the name will suffice */
|
|
|
|
tcp_cleanup_congestion_control(sk);
|
|
|
|
icsk->icsk_ca_ops = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_init_sock(struct sock *sk)
|
|
|
|
{
|
2020-03-27 21:48:50 +00:00
|
|
|
struct net *net = sock_net(sk);
|
2023-08-21 22:25:16 +00:00
|
|
|
int ret;
|
2020-03-27 21:48:43 +00:00
|
|
|
|
2023-08-11 15:57:27 +00:00
|
|
|
__mptcp_init_sock(sk);
|
2020-09-24 00:29:54 +00:00
|
|
|
|
2020-03-27 21:48:50 +00:00
|
|
|
if (!mptcp_is_enabled(net))
|
|
|
|
return -ENOPROTOOPT;
|
|
|
|
|
|
|
|
if (unlikely(!net->mib.mptcp_statistics) && !mptcp_mib_alloc(net))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2023-08-21 22:25:16 +00:00
|
|
|
ret = mptcp_init_sched(mptcp_sk(sk),
|
|
|
|
mptcp_sched_find(mptcp_get_scheduler(net)));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2022-10-20 17:48:51 +00:00
|
|
|
set_bit(SOCK_CUSTOM_SOCKOPT, &sk->sk_socket->flags);
|
|
|
|
|
2021-05-25 21:23:10 +00:00
|
|
|
/* fetch the ca name; do it outside __mptcp_init_sock(), so that clone will
|
|
|
|
* propagate the correct value
|
|
|
|
*/
|
2022-01-07 00:20:16 +00:00
|
|
|
mptcp_ca_reset(sk);
|
2021-05-25 21:23:10 +00:00
|
|
|
|
2020-03-27 21:48:45 +00:00
|
|
|
sk_sockets_allocated_inc(sk);
|
2023-01-06 18:57:18 +00:00
|
|
|
sk->sk_rcvbuf = READ_ONCE(net->ipv4.sysctl_tcp_rmem[1]);
|
|
|
|
sk->sk_sndbuf = READ_ONCE(net->ipv4.sysctl_tcp_wmem[1]);
|
2020-03-27 21:48:45 +00:00
|
|
|
|
2020-03-27 21:48:43 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __mptcp_clear_xmit(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
struct mptcp_data_frag *dtmp, *dfrag;
|
|
|
|
|
2020-11-16 09:48:10 +00:00
|
|
|
WRITE_ONCE(msk->first_pending, NULL);
|
2020-03-27 21:48:43 +00:00
|
|
|
list_for_each_entry_safe(dfrag, dtmp, &msk->rtx_queue, list)
|
2020-03-27 21:48:45 +00:00
|
|
|
dfrag_clear(sk, dfrag);
|
2020-01-22 00:56:28 +00:00
|
|
|
}
|
|
|
|
|
mptcp: fix unreleased socket in accept queue
The mptcp socket and its subflow sockets in accept queue can't be
released after the process exit.
While the release of a mptcp socket in listening state, the
corresponding tcp socket will be released too. Meanwhile, the tcp
socket in the unaccept queue will be released too. However, only init
subflow is in the unaccept queue, and the joined subflow is not in the
unaccept queue, which makes the joined subflow won't be released, and
therefore the corresponding unaccepted mptcp socket will not be released
to.
This can be reproduced easily with following steps:
1. create 2 namespace and veth:
$ ip netns add mptcp-client
$ ip netns add mptcp-server
$ sysctl -w net.ipv4.conf.all.rp_filter=0
$ ip netns exec mptcp-client sysctl -w net.mptcp.enabled=1
$ ip netns exec mptcp-server sysctl -w net.mptcp.enabled=1
$ ip link add red-client netns mptcp-client type veth peer red-server \
netns mptcp-server
$ ip -n mptcp-server address add 10.0.0.1/24 dev red-server
$ ip -n mptcp-server address add 192.168.0.1/24 dev red-server
$ ip -n mptcp-client address add 10.0.0.2/24 dev red-client
$ ip -n mptcp-client address add 192.168.0.2/24 dev red-client
$ ip -n mptcp-server link set red-server up
$ ip -n mptcp-client link set red-client up
2. configure the endpoint and limit for client and server:
$ ip -n mptcp-server mptcp endpoint flush
$ ip -n mptcp-server mptcp limits set subflow 2 add_addr_accepted 2
$ ip -n mptcp-client mptcp endpoint flush
$ ip -n mptcp-client mptcp limits set subflow 2 add_addr_accepted 2
$ ip -n mptcp-client mptcp endpoint add 192.168.0.2 dev red-client id \
1 subflow
3. listen and accept on a port, such as 9999. The nc command we used
here is modified, which makes it use mptcp protocol by default.
$ ip netns exec mptcp-server nc -l -k -p 9999
4. open another *two* terminal and use each of them to connect to the
server with the following command:
$ ip netns exec mptcp-client nc 10.0.0.1 9999
Input something after connect to trigger the connection of the second
subflow. So that there are two established mptcp connections, with the
second one still unaccepted.
5. exit all the nc command, and check the tcp socket in server namespace.
And you will find that there is one tcp socket in CLOSE_WAIT state
and can't release forever.
Fix this by closing all of the unaccepted mptcp socket in
mptcp_subflow_queue_clean() with __mptcp_close().
Now, we can ensure that all unaccepted mptcp sockets will be cleaned by
__mptcp_close() before they are released, so mptcp_sock_destruct(), which
is used to clean the unaccepted mptcp socket, is not needed anymore.
The selftests for mptcp is ran for this commit, and no new failures.
Fixes: f296234c98a8 ("mptcp: Add handling of incoming MP_JOIN requests")
Fixes: 6aeed9045071 ("mptcp: fix race on unaccepted mptcp sockets")
Cc: stable@vger.kernel.org
Reviewed-by: Jiang Biao <benbjiang@tencent.com>
Reviewed-by: Mengen Sun <mengensun@tencent.com>
Acked-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
Signed-off-by: Mat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-09-27 19:31:58 +00:00
|
|
|
void mptcp_cancel_work(struct sock *sk)
|
2020-02-26 09:14:47 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-11-19 19:45:54 +00:00
|
|
|
if (cancel_work_sync(&msk->work))
|
2020-11-16 09:48:09 +00:00
|
|
|
__sock_put(sk);
|
2020-02-26 09:14:47 +00:00
|
|
|
}
|
|
|
|
|
2020-09-24 00:29:49 +00:00
|
|
|
void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how)
|
2020-01-22 00:56:21 +00:00
|
|
|
{
|
|
|
|
lock_sock(ssk);
|
|
|
|
|
|
|
|
switch (ssk->sk_state) {
|
|
|
|
case TCP_LISTEN:
|
|
|
|
if (!(how & RCV_SHUTDOWN))
|
|
|
|
break;
|
2020-08-23 22:36:59 +00:00
|
|
|
fallthrough;
|
2020-01-22 00:56:21 +00:00
|
|
|
case TCP_SYN_SENT:
|
2023-06-20 16:24:18 +00:00
|
|
|
WARN_ON_ONCE(tcp_disconnect(ssk, O_NONBLOCK));
|
2020-01-22 00:56:21 +00:00
|
|
|
break;
|
|
|
|
default:
|
2020-07-28 22:12:06 +00:00
|
|
|
if (__mptcp_check_fallback(mptcp_sk(sk))) {
|
|
|
|
pr_debug("Fallback");
|
|
|
|
ssk->sk_shutdown |= how;
|
|
|
|
tcp_shutdown(ssk, how);
|
2023-06-20 16:24:21 +00:00
|
|
|
|
|
|
|
/* simulate the data_fin ack reception to let the state
|
|
|
|
* machine move forward
|
|
|
|
*/
|
|
|
|
WRITE_ONCE(mptcp_sk(sk)->snd_una, mptcp_sk(sk)->snd_nxt);
|
|
|
|
mptcp_schedule_work(sk);
|
2020-07-28 22:12:06 +00:00
|
|
|
} else {
|
|
|
|
pr_debug("Sending DATA_FIN on subflow %p", ssk);
|
|
|
|
tcp_send_ack(ssk);
|
2023-09-16 10:52:48 +00:00
|
|
|
if (!mptcp_rtx_timer_pending(sk))
|
|
|
|
mptcp_reset_rtx_timer(sk);
|
2020-07-28 22:12:06 +00:00
|
|
|
}
|
2020-01-22 00:56:21 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
release_sock(ssk);
|
|
|
|
}
|
|
|
|
|
2023-12-22 12:47:22 +00:00
|
|
|
void mptcp_set_state(struct sock *sk, int state)
|
|
|
|
{
|
|
|
|
int oldstate = sk->sk_state;
|
|
|
|
|
|
|
|
switch (state) {
|
|
|
|
case TCP_ESTABLISHED:
|
|
|
|
if (oldstate != TCP_ESTABLISHED)
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_CURRESTAB);
|
|
|
|
break;
|
2024-06-03 17:02:17 +00:00
|
|
|
case TCP_CLOSE_WAIT:
|
|
|
|
/* Unlike TCP, MPTCP sk would not have the TCP_SYN_RECV state:
|
|
|
|
* MPTCP "accepted" sockets will be created later on. So no
|
|
|
|
* transition from TCP_SYN_RECV to TCP_CLOSE_WAIT.
|
|
|
|
*/
|
|
|
|
break;
|
2023-12-22 12:47:22 +00:00
|
|
|
default:
|
2024-06-03 17:02:17 +00:00
|
|
|
if (oldstate == TCP_ESTABLISHED || oldstate == TCP_CLOSE_WAIT)
|
2023-12-22 12:47:22 +00:00
|
|
|
MPTCP_DEC_STATS(sock_net(sk), MPTCP_MIB_CURRESTAB);
|
|
|
|
}
|
|
|
|
|
|
|
|
inet_sk_state_store(sk, state);
|
|
|
|
}
|
|
|
|
|
2020-07-28 22:12:04 +00:00
|
|
|
static const unsigned char new_state[16] = {
|
|
|
|
/* current state: new state: action: */
|
|
|
|
[0 /* (Invalid) */] = TCP_CLOSE,
|
|
|
|
[TCP_ESTABLISHED] = TCP_FIN_WAIT1 | TCP_ACTION_FIN,
|
|
|
|
[TCP_SYN_SENT] = TCP_CLOSE,
|
|
|
|
[TCP_SYN_RECV] = TCP_FIN_WAIT1 | TCP_ACTION_FIN,
|
|
|
|
[TCP_FIN_WAIT1] = TCP_FIN_WAIT1,
|
|
|
|
[TCP_FIN_WAIT2] = TCP_FIN_WAIT2,
|
|
|
|
[TCP_TIME_WAIT] = TCP_CLOSE, /* should not happen ! */
|
|
|
|
[TCP_CLOSE] = TCP_CLOSE,
|
|
|
|
[TCP_CLOSE_WAIT] = TCP_LAST_ACK | TCP_ACTION_FIN,
|
|
|
|
[TCP_LAST_ACK] = TCP_LAST_ACK,
|
|
|
|
[TCP_LISTEN] = TCP_CLOSE,
|
|
|
|
[TCP_CLOSING] = TCP_CLOSING,
|
|
|
|
[TCP_NEW_SYN_RECV] = TCP_CLOSE, /* should not happen ! */
|
|
|
|
};
|
|
|
|
|
|
|
|
static int mptcp_close_state(struct sock *sk)
|
|
|
|
{
|
|
|
|
int next = (int)new_state[sk->sk_state];
|
|
|
|
int ns = next & TCP_STATE_MASK;
|
|
|
|
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, ns);
|
2020-07-28 22:12:04 +00:00
|
|
|
|
|
|
|
return next & TCP_ACTION_FIN;
|
|
|
|
}
|
|
|
|
|
2023-06-20 16:24:21 +00:00
|
|
|
static void mptcp_check_send_data_fin(struct sock *sk)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
2020-11-16 09:48:09 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2020-01-22 00:56:15 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
pr_debug("msk=%p snd_data_fin_enable=%d pending=%d snd_nxt=%llu write_seq=%llu",
|
|
|
|
msk, msk->snd_data_fin_enable, !!mptcp_send_head(sk),
|
|
|
|
msk->snd_nxt, msk->write_seq);
|
2020-07-28 22:12:06 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
/* we still need to enqueue subflows or not really shutting down,
|
|
|
|
* skip this
|
|
|
|
*/
|
|
|
|
if (!msk->snd_data_fin_enable || msk->snd_nxt + 1 != msk->write_seq ||
|
|
|
|
mptcp_send_head(sk))
|
|
|
|
return;
|
|
|
|
|
|
|
|
WRITE_ONCE(msk->snd_nxt, msk->write_seq);
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *tcp_sk = mptcp_subflow_tcp_sock(subflow);
|
2020-07-28 22:12:06 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
mptcp_subflow_shutdown(sk, tcp_sk, SEND_SHUTDOWN);
|
2020-07-28 22:12:06 +00:00
|
|
|
}
|
2020-11-16 09:48:09 +00:00
|
|
|
}
|
2020-02-04 17:12:30 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
static void __mptcp_wr_shutdown(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-07-28 22:12:06 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
pr_debug("msk=%p snd_data_fin_enable=%d shutdown=%x state=%d pending=%d",
|
|
|
|
msk, msk->snd_data_fin_enable, sk->sk_shutdown, sk->sk_state,
|
|
|
|
!!mptcp_send_head(sk));
|
|
|
|
|
|
|
|
/* will be ignored by fallback sockets */
|
|
|
|
WRITE_ONCE(msk->write_seq, msk->write_seq + 1);
|
|
|
|
WRITE_ONCE(msk->snd_data_fin_enable, 1);
|
|
|
|
|
2023-06-20 16:24:21 +00:00
|
|
|
mptcp_check_send_data_fin(sk);
|
2020-11-16 09:48:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __mptcp_destroy_sock(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
pr_debug("msk=%p", msk);
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2021-02-04 23:23:30 +00:00
|
|
|
might_sleep();
|
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
mptcp_stop_rtx_timer(sk);
|
2020-11-16 09:48:09 +00:00
|
|
|
sk_stop_timer(sk, &sk->sk_timer);
|
|
|
|
msk->pm.status = 0;
|
2023-08-21 22:25:16 +00:00
|
|
|
mptcp_release_sched(msk);
|
mptcp: avoid a lockdep splat when mcast group was joined
syzbot triggered following lockdep splat:
ffffffff82d2cd40 (rtnl_mutex){+.+.}, at: ip_mc_drop_socket+0x52/0x180
but task is already holding lock:
ffff8881187a2310 (sk_lock-AF_INET){+.+.}, at: mptcp_close+0x18/0x30
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #1 (sk_lock-AF_INET){+.+.}:
lock_acquire+0xee/0x230
lock_sock_nested+0x89/0xc0
do_ip_setsockopt.isra.0+0x335/0x22f0
ip_setsockopt+0x35/0x60
tcp_setsockopt+0x5d/0x90
__sys_setsockopt+0xf3/0x190
__x64_sys_setsockopt+0x61/0x70
do_syscall_64+0x72/0x300
entry_SYSCALL_64_after_hwframe+0x49/0xbe
-> #0 (rtnl_mutex){+.+.}:
check_prevs_add+0x2b7/0x1210
__lock_acquire+0x10b6/0x1400
lock_acquire+0xee/0x230
__mutex_lock+0x120/0xc70
ip_mc_drop_socket+0x52/0x180
inet_release+0x36/0xe0
__sock_release+0xfd/0x130
__mptcp_close+0xa8/0x1f0
inet_release+0x7f/0xe0
__sock_release+0x69/0x130
sock_close+0x18/0x20
__fput+0x179/0x400
task_work_run+0xd5/0x110
do_exit+0x685/0x1510
do_group_exit+0x7e/0x170
__x64_sys_exit_group+0x28/0x30
do_syscall_64+0x72/0x300
entry_SYSCALL_64_after_hwframe+0x49/0xbe
The trigger is:
socket(AF_INET, SOCK_STREAM, 0x106 /* IPPROTO_MPTCP */) = 4
setsockopt(4, SOL_IP, MCAST_JOIN_GROUP, {gr_interface=7, gr_group={sa_family=AF_INET, sin_port=htons(20003), sin_addr=inet_addr("224.0.0.2")}}, 136) = 0
exit(0)
Which results in a call to rtnl_lock while we are holding
the parent mptcp socket lock via
mptcp_close -> lock_sock(msk) -> inet_release -> ip_mc_drop_socket -> rtnl_lock().
>From lockdep point of view we thus have both
'rtnl_lock; lock_sock' and 'lock_sock; rtnl_lock'.
Fix this by stealing the msk conn_list and doing the subflow close
without holding the msk lock.
Fixes: cec37a6e41aae7bf ("mptcp: Handle MP_CAPABLE options for outgoing connections")
Reported-by: Christoph Paasch <cpaasch@apple.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-01-29 14:54:45 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
sk->sk_prot->destroy(sk);
|
2020-02-26 09:14:47 +00:00
|
|
|
|
2024-02-02 11:40:09 +00:00
|
|
|
WARN_ON_ONCE(READ_ONCE(msk->rmem_fwd_alloc));
|
2020-11-27 10:10:24 +00:00
|
|
|
WARN_ON_ONCE(msk->rmem_released);
|
2020-11-16 09:48:09 +00:00
|
|
|
sk_stream_kill_queues(sk);
|
|
|
|
xfrm_sk_free_policy(sk);
|
2021-04-15 23:45:01 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
2023-04-17 14:00:41 +00:00
|
|
|
void __mptcp_unaccepted_force_close(struct sock *sk)
|
|
|
|
{
|
|
|
|
sock_set_flag(sk, SOCK_DEAD);
|
|
|
|
mptcp_do_fastclose(sk);
|
|
|
|
__mptcp_destroy_sock(sk);
|
|
|
|
}
|
|
|
|
|
2023-10-23 20:44:38 +00:00
|
|
|
static __poll_t mptcp_check_readable(struct sock *sk)
|
2022-09-30 15:59:32 +00:00
|
|
|
{
|
2023-10-23 20:44:38 +00:00
|
|
|
return mptcp_epollin_ready(sk) ? EPOLLIN | EPOLLRDNORM : 0;
|
2022-09-30 15:59:32 +00:00
|
|
|
}
|
|
|
|
|
2023-06-20 16:24:23 +00:00
|
|
|
static void mptcp_check_listen_stop(struct sock *sk)
|
2023-01-06 18:57:23 +00:00
|
|
|
{
|
2023-06-20 16:24:23 +00:00
|
|
|
struct sock *ssk;
|
|
|
|
|
|
|
|
if (inet_sk_state_load(sk) != TCP_LISTEN)
|
|
|
|
return;
|
|
|
|
|
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, -1);
|
|
|
|
ssk = mptcp_sk(sk)->first;
|
|
|
|
if (WARN_ON_ONCE(!ssk || inet_sk_state_load(ssk) != TCP_LISTEN))
|
|
|
|
return;
|
|
|
|
|
|
|
|
lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
|
2023-07-04 20:44:33 +00:00
|
|
|
tcp_set_state(ssk, TCP_CLOSE);
|
2023-06-20 16:24:23 +00:00
|
|
|
mptcp_subflow_queue_clean(sk, ssk);
|
|
|
|
inet_csk_listen_stop(ssk);
|
|
|
|
mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CLOSED);
|
|
|
|
release_sock(ssk);
|
2023-01-06 18:57:23 +00:00
|
|
|
}
|
|
|
|
|
2022-09-27 19:31:57 +00:00
|
|
|
bool __mptcp_close(struct sock *sk, long timeout)
|
2020-11-16 09:48:09 +00:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
2022-06-28 01:02:37 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-16 09:48:09 +00:00
|
|
|
bool do_cancel_work = false;
|
2023-02-07 13:04:13 +00:00
|
|
|
int subflows_alive = 0;
|
2020-11-16 09:48:09 +00:00
|
|
|
|
2023-05-31 19:37:07 +00:00
|
|
|
WRITE_ONCE(sk->sk_shutdown, SHUTDOWN_MASK);
|
2020-11-16 09:48:09 +00:00
|
|
|
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) {
|
2023-06-20 16:24:23 +00:00
|
|
|
mptcp_check_listen_stop(sk);
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2020-11-16 09:48:09 +00:00
|
|
|
goto cleanup;
|
|
|
|
}
|
2020-02-26 09:14:48 +00:00
|
|
|
|
2023-10-23 20:44:38 +00:00
|
|
|
if (mptcp_data_avail(msk) || timeout < 0) {
|
2023-04-14 14:08:04 +00:00
|
|
|
/* If the msk has read data, or the caller explicitly ask it,
|
|
|
|
* do the MPTCP equivalent of TCP reset, aka MPTCP fastclose
|
|
|
|
*/
|
2022-09-30 15:59:32 +00:00
|
|
|
mptcp_do_fastclose(sk);
|
2023-04-14 14:08:04 +00:00
|
|
|
timeout = 0;
|
2022-09-30 15:59:32 +00:00
|
|
|
} else if (mptcp_close_state(sk)) {
|
2020-11-16 09:48:09 +00:00
|
|
|
__mptcp_wr_shutdown(sk);
|
2022-09-30 15:59:32 +00:00
|
|
|
}
|
2020-11-16 09:48:09 +00:00
|
|
|
|
|
|
|
sk_stream_wait_close(sk, timeout);
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
/* orphan all the subflows */
|
2022-06-28 01:02:37 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
2020-11-16 09:48:09 +00:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
net: introduce and use lock_sock_fast_nested()
Syzkaller reported a false positive deadlock involving
the nl socket lock and the subflow socket lock:
MPTCP: kernel_bind error, err=-98
============================================
WARNING: possible recursive locking detected
5.15.0-rc1-syzkaller #0 Not tainted
--------------------------------------------
syz-executor998/6520 is trying to acquire lock:
ffff8880795718a0 (k-sk_lock-AF_INET){+.+.}-{0:0}, at: mptcp_close+0x267/0x7b0 net/mptcp/protocol.c:2738
but task is already holding lock:
ffff8880787c8c60 (k-sk_lock-AF_INET){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1612 [inline]
ffff8880787c8c60 (k-sk_lock-AF_INET){+.+.}-{0:0}, at: mptcp_close+0x23/0x7b0 net/mptcp/protocol.c:2720
other info that might help us debug this:
Possible unsafe locking scenario:
CPU0
----
lock(k-sk_lock-AF_INET);
lock(k-sk_lock-AF_INET);
*** DEADLOCK ***
May be due to missing lock nesting notation
3 locks held by syz-executor998/6520:
#0: ffffffff8d176c50 (cb_lock){++++}-{3:3}, at: genl_rcv+0x15/0x40 net/netlink/genetlink.c:802
#1: ffffffff8d176d08 (genl_mutex){+.+.}-{3:3}, at: genl_lock net/netlink/genetlink.c:33 [inline]
#1: ffffffff8d176d08 (genl_mutex){+.+.}-{3:3}, at: genl_rcv_msg+0x3e0/0x580 net/netlink/genetlink.c:790
#2: ffff8880787c8c60 (k-sk_lock-AF_INET){+.+.}-{0:0}, at: lock_sock include/net/sock.h:1612 [inline]
#2: ffff8880787c8c60 (k-sk_lock-AF_INET){+.+.}-{0:0}, at: mptcp_close+0x23/0x7b0 net/mptcp/protocol.c:2720
stack backtrace:
CPU: 1 PID: 6520 Comm: syz-executor998 Not tainted 5.15.0-rc1-syzkaller #0
Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011
Call Trace:
__dump_stack lib/dump_stack.c:88 [inline]
dump_stack_lvl+0xcd/0x134 lib/dump_stack.c:106
print_deadlock_bug kernel/locking/lockdep.c:2944 [inline]
check_deadlock kernel/locking/lockdep.c:2987 [inline]
validate_chain kernel/locking/lockdep.c:3776 [inline]
__lock_acquire.cold+0x149/0x3ab kernel/locking/lockdep.c:5015
lock_acquire kernel/locking/lockdep.c:5625 [inline]
lock_acquire+0x1ab/0x510 kernel/locking/lockdep.c:5590
lock_sock_fast+0x36/0x100 net/core/sock.c:3229
mptcp_close+0x267/0x7b0 net/mptcp/protocol.c:2738
inet_release+0x12e/0x280 net/ipv4/af_inet.c:431
__sock_release net/socket.c:649 [inline]
sock_release+0x87/0x1b0 net/socket.c:677
mptcp_pm_nl_create_listen_socket+0x238/0x2c0 net/mptcp/pm_netlink.c:900
mptcp_nl_cmd_add_addr+0x359/0x930 net/mptcp/pm_netlink.c:1170
genl_family_rcv_msg_doit+0x228/0x320 net/netlink/genetlink.c:731
genl_family_rcv_msg net/netlink/genetlink.c:775 [inline]
genl_rcv_msg+0x328/0x580 net/netlink/genetlink.c:792
netlink_rcv_skb+0x153/0x420 net/netlink/af_netlink.c:2504
genl_rcv+0x24/0x40 net/netlink/genetlink.c:803
netlink_unicast_kernel net/netlink/af_netlink.c:1314 [inline]
netlink_unicast+0x533/0x7d0 net/netlink/af_netlink.c:1340
netlink_sendmsg+0x86d/0xdb0 net/netlink/af_netlink.c:1929
sock_sendmsg_nosec net/socket.c:704 [inline]
sock_sendmsg+0xcf/0x120 net/socket.c:724
sock_no_sendpage+0x101/0x150 net/core/sock.c:2980
kernel_sendpage.part.0+0x1a0/0x340 net/socket.c:3504
kernel_sendpage net/socket.c:3501 [inline]
sock_sendpage+0xe5/0x140 net/socket.c:1003
pipe_to_sendpage+0x2ad/0x380 fs/splice.c:364
splice_from_pipe_feed fs/splice.c:418 [inline]
__splice_from_pipe+0x43e/0x8a0 fs/splice.c:562
splice_from_pipe fs/splice.c:597 [inline]
generic_splice_sendpage+0xd4/0x140 fs/splice.c:746
do_splice_from fs/splice.c:767 [inline]
direct_splice_actor+0x110/0x180 fs/splice.c:936
splice_direct_to_actor+0x34b/0x8c0 fs/splice.c:891
do_splice_direct+0x1b3/0x280 fs/splice.c:979
do_sendfile+0xae9/0x1240 fs/read_write.c:1249
__do_sys_sendfile64 fs/read_write.c:1314 [inline]
__se_sys_sendfile64 fs/read_write.c:1300 [inline]
__x64_sys_sendfile64+0x1cc/0x210 fs/read_write.c:1300
do_syscall_x64 arch/x86/entry/common.c:50 [inline]
do_syscall_64+0x35/0xb0 arch/x86/entry/common.c:80
entry_SYSCALL_64_after_hwframe+0x44/0xae
RIP: 0033:0x7f215cb69969
Code: 28 00 00 00 75 05 48 83 c4 28 c3 e8 e1 14 00 00 90 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 c0 ff ff ff f7 d8 64 89 01 48
RSP: 002b:00007ffc96bb3868 EFLAGS: 00000246 ORIG_RAX: 0000000000000028
RAX: ffffffffffffffda RBX: 00007f215cbad072 RCX: 00007f215cb69969
RDX: 0000000000000000 RSI: 0000000000000004 RDI: 0000000000000005
RBP: 0000000000000000 R08: 00007ffc96bb3a08 R09: 00007ffc96bb3a08
R10: 0000000100000002 R11: 0000000000000246 R12: 00007ffc96bb387c
R13: 431bde82d7b634db R14: 0000000000000000 R15: 0000000000000000
the problem originates from uncorrect lock annotation in the mptcp
code and is only visible since commit 2dcb96bacce3 ("net: core: Correct
the sock::sk_lock.owned lockdep annotations"), but is present since
the port-based endpoint support initial implementation.
This patch addresses the issue introducing a nested variant of
lock_sock_fast() and using it in the relevant code path.
Fixes: 1729cf186d8a ("mptcp: create the listening socket for new port")
Fixes: 2dcb96bacce3 ("net: core: Correct the sock::sk_lock.owned lockdep annotations")
Suggested-by: Thomas Gleixner <tglx@linutronix.de>
Reported-and-tested-by: syzbot+1dd53f7a89b299d59eaf@syzkaller.appspotmail.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Reviewed-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
2021-09-29 09:59:17 +00:00
|
|
|
bool slow = lock_sock_fast_nested(ssk);
|
2020-11-16 09:48:09 +00:00
|
|
|
|
2023-02-07 13:04:13 +00:00
|
|
|
subflows_alive += ssk->sk_state != TCP_CLOSE;
|
|
|
|
|
2022-06-28 01:02:37 +00:00
|
|
|
/* since the close timeout takes precedence on the fail one,
|
|
|
|
* cancel the latter
|
|
|
|
*/
|
|
|
|
if (ssk == msk->first)
|
|
|
|
subflow->fail_tout = 0;
|
|
|
|
|
mptcp: don't orphan ssk in mptcp_close()
All of the subflows of a msk will be orphaned in mptcp_close(), which
means the subflows are in DEAD state. After then, DATA_FIN will be sent,
and the other side will response with a DATA_ACK for this DATA_FIN.
However, if the other side still has pending data, the data that received
on these subflows will not be passed to the msk, as they are DEAD and
subflow_data_ready() will not be called in tcp_data_ready(). Therefore,
these data can't be acked, and they will be retransmitted again and again,
until timeout.
Fix this by setting ssk->sk_socket and ssk->sk_wq to 'NULL', instead of
orphaning the subflows in __mptcp_close(), as Paolo suggested.
Fixes: e16163b6e2b7 ("mptcp: refactor shutdown and close")
Reviewed-by: Biao Jiang <benbjiang@tencent.com>
Reviewed-by: Mengen Sun <mengensun@tencent.com>
Signed-off-by: Menglong Dong <imagedong@tencent.com>
Reviewed-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Matthieu Baerts <matthieu.baerts@tessares.net>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2022-11-28 15:42:37 +00:00
|
|
|
/* detach from the parent socket, but allow data_ready to
|
|
|
|
* push incoming data into the mptcp stack, to properly ack it
|
|
|
|
*/
|
|
|
|
ssk->sk_socket = NULL;
|
|
|
|
ssk->sk_wq = NULL;
|
2020-11-16 09:48:09 +00:00
|
|
|
unlock_sock_fast(ssk, slow);
|
|
|
|
}
|
|
|
|
sock_orphan(sk);
|
|
|
|
|
2023-02-07 13:04:13 +00:00
|
|
|
/* all the subflows are closed, only timeout can change the msk
|
|
|
|
* state, let's not keep resources busy for no reasons
|
|
|
|
*/
|
|
|
|
if (subflows_alive == 0)
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2023-02-07 13:04:13 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
sock_hold(sk);
|
|
|
|
pr_debug("msk=%p state=%d", sk, sk->sk_state);
|
2022-11-10 23:23:18 +00:00
|
|
|
if (msk->token)
|
2022-06-28 01:02:37 +00:00
|
|
|
mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);
|
2022-01-07 00:20:16 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
if (sk->sk_state == TCP_CLOSE) {
|
|
|
|
__mptcp_destroy_sock(sk);
|
|
|
|
do_cancel_work = true;
|
|
|
|
} else {
|
2023-09-16 10:52:49 +00:00
|
|
|
mptcp_start_tout_timer(sk);
|
2020-11-16 09:48:09 +00:00
|
|
|
}
|
2022-09-27 19:31:57 +00:00
|
|
|
|
|
|
|
return do_cancel_work;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_close(struct sock *sk, long timeout)
|
|
|
|
{
|
|
|
|
bool do_cancel_work;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
|
|
|
|
do_cancel_work = __mptcp_close(sk, timeout);
|
2020-11-16 09:48:09 +00:00
|
|
|
release_sock(sk);
|
|
|
|
if (do_cancel_work)
|
|
|
|
mptcp_cancel_work(sk);
|
2021-02-13 00:00:01 +00:00
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
sock_put(sk);
|
2020-01-22 00:56:15 +00:00
|
|
|
}
|
|
|
|
|
2023-05-31 19:37:05 +00:00
|
|
|
static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)
|
2020-01-22 00:56:19 +00:00
|
|
|
{
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
const struct ipv6_pinfo *ssk6 = inet6_sk(ssk);
|
|
|
|
struct ipv6_pinfo *msk6 = inet6_sk(msk);
|
|
|
|
|
|
|
|
msk->sk_v6_daddr = ssk->sk_v6_daddr;
|
|
|
|
msk->sk_v6_rcv_saddr = ssk->sk_v6_rcv_saddr;
|
|
|
|
|
|
|
|
if (msk6 && ssk6) {
|
|
|
|
msk6->saddr = ssk6->saddr;
|
|
|
|
msk6->flow_label = ssk6->flow_label;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
inet_sk(msk)->inet_num = inet_sk(ssk)->inet_num;
|
|
|
|
inet_sk(msk)->inet_dport = inet_sk(ssk)->inet_dport;
|
|
|
|
inet_sk(msk)->inet_sport = inet_sk(ssk)->inet_sport;
|
|
|
|
inet_sk(msk)->inet_daddr = inet_sk(ssk)->inet_daddr;
|
|
|
|
inet_sk(msk)->inet_saddr = inet_sk(ssk)->inet_saddr;
|
|
|
|
inet_sk(msk)->inet_rcv_saddr = inet_sk(ssk)->inet_rcv_saddr;
|
|
|
|
}
|
|
|
|
|
2020-03-27 21:48:43 +00:00
|
|
|
static int mptcp_disconnect(struct sock *sk, int flags)
|
|
|
|
{
|
2021-01-12 17:25:24 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2022-12-20 19:52:14 +00:00
|
|
|
/* We are on the fastopen error path. We can't call straight into the
|
|
|
|
* subflows cleanup code due to lock nesting (we are already under
|
2023-06-20 16:24:18 +00:00
|
|
|
* msk->firstsocket lock).
|
2022-12-20 19:52:14 +00:00
|
|
|
*/
|
|
|
|
if (msk->fastopening)
|
2023-06-20 16:24:18 +00:00
|
|
|
return -EBUSY;
|
2022-12-20 19:52:14 +00:00
|
|
|
|
2023-06-20 16:24:23 +00:00
|
|
|
mptcp_check_listen_stop(sk);
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2022-01-07 00:20:16 +00:00
|
|
|
|
2023-09-16 10:52:48 +00:00
|
|
|
mptcp_stop_rtx_timer(sk);
|
2023-09-16 10:52:49 +00:00
|
|
|
mptcp_stop_tout_timer(sk);
|
2022-01-07 00:20:16 +00:00
|
|
|
|
2022-11-10 23:23:18 +00:00
|
|
|
if (msk->token)
|
|
|
|
mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL);
|
2022-01-07 00:20:16 +00:00
|
|
|
|
2022-08-05 00:21:25 +00:00
|
|
|
/* msk->subflow is still intact, the following will not free the first
|
|
|
|
* subflow
|
|
|
|
*/
|
|
|
|
mptcp_destroy_common(msk, MPTCP_CF_FASTCLOSE);
|
2022-01-07 00:20:26 +00:00
|
|
|
WRITE_ONCE(msk->flags, 0);
|
|
|
|
msk->cb_flags = 0;
|
2022-01-07 00:20:16 +00:00
|
|
|
msk->recovery = false;
|
2024-02-02 11:40:11 +00:00
|
|
|
WRITE_ONCE(msk->can_ack, false);
|
|
|
|
WRITE_ONCE(msk->fully_established, false);
|
|
|
|
WRITE_ONCE(msk->rcv_data_fin, false);
|
|
|
|
WRITE_ONCE(msk->snd_data_fin_enable, false);
|
|
|
|
WRITE_ONCE(msk->rcv_fastclose, false);
|
|
|
|
WRITE_ONCE(msk->use_64bit_ack, false);
|
2022-01-07 00:20:16 +00:00
|
|
|
WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk)));
|
|
|
|
mptcp_pm_data_reset(msk);
|
|
|
|
mptcp_ca_reset(sk);
|
2024-02-02 11:40:11 +00:00
|
|
|
msk->bytes_consumed = 0;
|
2023-06-20 16:30:15 +00:00
|
|
|
msk->bytes_acked = 0;
|
|
|
|
msk->bytes_received = 0;
|
|
|
|
msk->bytes_sent = 0;
|
|
|
|
msk->bytes_retrans = 0;
|
2024-02-08 18:03:50 +00:00
|
|
|
msk->rcvspace_init = 0;
|
2022-01-07 00:20:16 +00:00
|
|
|
|
2023-05-31 19:37:07 +00:00
|
|
|
WRITE_ONCE(sk->sk_shutdown, 0);
|
2022-01-07 00:20:16 +00:00
|
|
|
sk_error_report(sk);
|
2020-04-29 18:43:20 +00:00
|
|
|
return 0;
|
2020-03-27 21:48:43 +00:00
|
|
|
}
|
|
|
|
|
2020-02-05 23:39:37 +00:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
static struct ipv6_pinfo *mptcp_inet6_sk(const struct sock *sk)
|
|
|
|
{
|
|
|
|
unsigned int offset = sizeof(struct mptcp6_sock) - sizeof(struct ipv6_pinfo);
|
|
|
|
|
|
|
|
return (struct ipv6_pinfo *)(((u8 *)sk) + offset);
|
|
|
|
}
|
2024-02-23 16:14:18 +00:00
|
|
|
|
|
|
|
static void mptcp_copy_ip6_options(struct sock *newsk, const struct sock *sk)
|
|
|
|
{
|
|
|
|
const struct ipv6_pinfo *np = inet6_sk(sk);
|
|
|
|
struct ipv6_txoptions *opt;
|
|
|
|
struct ipv6_pinfo *newnp;
|
|
|
|
|
|
|
|
newnp = inet6_sk(newsk);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
opt = rcu_dereference(np->opt);
|
|
|
|
if (opt) {
|
|
|
|
opt = ipv6_dup_options(newsk, opt);
|
|
|
|
if (!opt)
|
|
|
|
net_warn_ratelimited("%s: Failed to copy ip6 options\n", __func__);
|
|
|
|
}
|
|
|
|
RCU_INIT_POINTER(newnp->opt, opt);
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
2020-02-05 23:39:37 +00:00
|
|
|
#endif
|
|
|
|
|
2024-02-23 16:14:18 +00:00
|
|
|
static void mptcp_copy_ip_options(struct sock *newsk, const struct sock *sk)
|
|
|
|
{
|
|
|
|
struct ip_options_rcu *inet_opt, *newopt = NULL;
|
|
|
|
const struct inet_sock *inet = inet_sk(sk);
|
|
|
|
struct inet_sock *newinet;
|
|
|
|
|
|
|
|
newinet = inet_sk(newsk);
|
|
|
|
|
|
|
|
rcu_read_lock();
|
|
|
|
inet_opt = rcu_dereference(inet->inet_opt);
|
|
|
|
if (inet_opt) {
|
|
|
|
newopt = sock_kmalloc(newsk, sizeof(*inet_opt) +
|
|
|
|
inet_opt->opt.optlen, GFP_ATOMIC);
|
|
|
|
if (newopt)
|
|
|
|
memcpy(newopt, inet_opt, sizeof(*inet_opt) +
|
|
|
|
inet_opt->opt.optlen);
|
|
|
|
else
|
|
|
|
net_warn_ratelimited("%s: Failed to copy ip options\n", __func__);
|
|
|
|
}
|
|
|
|
RCU_INIT_POINTER(newinet->inet_opt, newopt);
|
|
|
|
rcu_read_unlock();
|
|
|
|
}
|
|
|
|
|
2023-05-31 19:37:05 +00:00
|
|
|
struct sock *mptcp_sk_clone_init(const struct sock *sk,
|
|
|
|
const struct mptcp_options_received *mp_opt,
|
|
|
|
struct sock *ssk,
|
|
|
|
struct request_sock *req)
|
2020-02-05 23:39:37 +00:00
|
|
|
{
|
2020-03-13 15:52:41 +00:00
|
|
|
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
|
2020-02-05 23:39:37 +00:00
|
|
|
struct sock *nsk = sk_clone_lock(sk, GFP_ATOMIC);
|
2024-02-08 18:03:52 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2020-03-13 15:52:41 +00:00
|
|
|
struct mptcp_sock *msk;
|
2020-02-05 23:39:37 +00:00
|
|
|
|
|
|
|
if (!nsk)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
if (nsk->sk_family == AF_INET6)
|
|
|
|
inet_sk(nsk)->pinet6 = mptcp_inet6_sk(nsk);
|
|
|
|
#endif
|
|
|
|
|
2020-03-13 15:52:41 +00:00
|
|
|
__mptcp_init_sock(nsk);
|
|
|
|
|
2024-02-23 16:14:18 +00:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
if (nsk->sk_family == AF_INET6)
|
|
|
|
mptcp_copy_ip6_options(nsk, sk);
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
mptcp_copy_ip_options(nsk, sk);
|
|
|
|
|
2020-03-13 15:52:41 +00:00
|
|
|
msk = mptcp_sk(nsk);
|
2024-02-02 11:40:07 +00:00
|
|
|
WRITE_ONCE(msk->local_key, subflow_req->local_key);
|
2024-02-02 11:40:10 +00:00
|
|
|
WRITE_ONCE(msk->token, subflow_req->token);
|
2023-03-09 14:49:59 +00:00
|
|
|
msk->in_accept_queue = 1;
|
2020-07-23 11:02:32 +00:00
|
|
|
WRITE_ONCE(msk->fully_established, false);
|
2021-08-27 00:44:52 +00:00
|
|
|
if (mp_opt->suboptions & OPTION_MPTCP_CSUMREQD)
|
2021-06-17 23:46:13 +00:00
|
|
|
WRITE_ONCE(msk->csum_enabled, true);
|
2020-03-13 15:52:41 +00:00
|
|
|
|
2024-02-02 11:40:08 +00:00
|
|
|
WRITE_ONCE(msk->write_seq, subflow_req->idsn + 1);
|
|
|
|
WRITE_ONCE(msk->snd_nxt, msk->write_seq);
|
2024-02-02 11:40:09 +00:00
|
|
|
WRITE_ONCE(msk->snd_una, msk->write_seq);
|
2024-02-29 22:17:54 +00:00
|
|
|
WRITE_ONCE(msk->wnd_end, msk->snd_nxt + tcp_sk(ssk)->snd_wnd);
|
2021-04-15 23:44:54 +00:00
|
|
|
msk->setsockopt_seq = mptcp_sk(sk)->setsockopt_seq;
|
2023-08-21 22:25:16 +00:00
|
|
|
mptcp_init_sched(msk, mptcp_sk(sk)->sched);
|
2020-11-16 09:48:13 +00:00
|
|
|
|
2023-06-20 16:30:17 +00:00
|
|
|
/* passive msk is created after the first/MPC subflow */
|
|
|
|
msk->subflow_id = 2;
|
|
|
|
|
2020-04-20 14:25:04 +00:00
|
|
|
sock_reset_flag(nsk, SOCK_RCU_FREE);
|
2020-12-16 11:48:32 +00:00
|
|
|
security_inet_csk_clone(nsk, req);
|
2023-05-31 19:37:05 +00:00
|
|
|
|
|
|
|
/* this can't race with mptcp_close(), as the msk is
|
|
|
|
* not yet exposted to user-space
|
|
|
|
*/
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(nsk, TCP_ESTABLISHED);
|
2023-05-31 19:37:05 +00:00
|
|
|
|
|
|
|
/* The msk maintain a ref to each subflow in the connections list */
|
|
|
|
WRITE_ONCE(msk->first, ssk);
|
2024-02-08 18:03:52 +00:00
|
|
|
subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
list_add(&subflow->node, &msk->conn_list);
|
2023-05-31 19:37:05 +00:00
|
|
|
sock_hold(ssk);
|
|
|
|
|
|
|
|
/* new mpc subflow takes ownership of the newly
|
|
|
|
* created mptcp socket
|
|
|
|
*/
|
|
|
|
mptcp_token_accept(subflow_req, msk);
|
|
|
|
|
|
|
|
/* set msk addresses early to ensure mptcp_pm_get_local_id()
|
|
|
|
* uses the correct data
|
|
|
|
*/
|
|
|
|
mptcp_copy_inaddrs(nsk, ssk);
|
2023-10-23 20:44:42 +00:00
|
|
|
__mptcp_propagate_sndbuf(nsk, ssk);
|
2023-05-31 19:37:05 +00:00
|
|
|
|
|
|
|
mptcp_rcv_space_init(msk, ssk);
|
2024-02-08 18:03:52 +00:00
|
|
|
|
|
|
|
if (mp_opt->suboptions & OPTION_MPTCP_MPC_ACK)
|
|
|
|
__mptcp_subflow_fully_established(msk, subflow, mp_opt);
|
2020-03-13 15:52:41 +00:00
|
|
|
bh_unlock_sock(nsk);
|
|
|
|
|
2023-03-09 14:49:59 +00:00
|
|
|
/* note: the newly allocated socket refcount is 2 now */
|
2020-02-05 23:39:37 +00:00
|
|
|
return nsk;
|
|
|
|
}
|
|
|
|
|
2020-06-30 19:24:45 +00:00
|
|
|
void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk)
|
|
|
|
{
|
|
|
|
const struct tcp_sock *tp = tcp_sk(ssk);
|
|
|
|
|
2024-02-08 18:03:50 +00:00
|
|
|
msk->rcvspace_init = 1;
|
2020-06-30 19:24:45 +00:00
|
|
|
msk->rcvq_space.copied = 0;
|
|
|
|
msk->rcvq_space.rtt_us = 0;
|
|
|
|
|
|
|
|
msk->rcvq_space.time = tp->tcp_mstamp;
|
|
|
|
|
|
|
|
/* initial rcv_space offering made to peer */
|
|
|
|
msk->rcvq_space.space = min_t(u32, tp->rcv_wnd,
|
|
|
|
TCP_INIT_CWND * tp->advmss);
|
|
|
|
if (msk->rcvq_space.space == 0)
|
|
|
|
msk->rcvq_space.space = TCP_INIT_CWND * TCP_MSS_DEFAULT;
|
|
|
|
}
|
|
|
|
|
2022-08-05 00:21:25 +00:00
|
|
|
void mptcp_destroy_common(struct mptcp_sock *msk, unsigned int flags)
|
2020-09-24 00:29:57 +00:00
|
|
|
{
|
2022-08-05 00:21:25 +00:00
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
2020-11-27 10:10:24 +00:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
__mptcp_clear_xmit(sk);
|
|
|
|
|
2022-08-05 00:21:25 +00:00
|
|
|
/* join list will be eventually flushed (with rst) at sock lock release time */
|
2022-09-06 20:55:39 +00:00
|
|
|
mptcp_for_each_subflow_safe(msk, subflow, tmp)
|
2022-08-05 00:21:25 +00:00
|
|
|
__mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, flags);
|
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
/* move to sk_receive_queue, sk_stream_kill_queues will purge it */
|
2022-01-07 00:20:16 +00:00
|
|
|
mptcp_data_lock(sk);
|
2020-11-27 10:10:24 +00:00
|
|
|
skb_queue_splice_tail_init(&msk->receive_queue, &sk->sk_receive_queue);
|
2021-10-26 23:29:15 +00:00
|
|
|
__skb_queue_purge(&sk->sk_receive_queue);
|
2020-09-24 00:29:57 +00:00
|
|
|
skb_rbtree_purge(&msk->out_of_order_queue);
|
2022-01-07 00:20:16 +00:00
|
|
|
mptcp_data_unlock(sk);
|
2021-10-26 23:29:15 +00:00
|
|
|
|
|
|
|
/* move all the rx fwd alloc into the sk_mem_reclaim_final in
|
|
|
|
* inet_sock_destruct() will dispose it
|
|
|
|
*/
|
2023-08-31 13:52:09 +00:00
|
|
|
sk_forward_alloc_add(sk, msk->rmem_fwd_alloc);
|
2023-08-31 13:52:10 +00:00
|
|
|
WRITE_ONCE(msk->rmem_fwd_alloc, 0);
|
2020-09-24 00:29:57 +00:00
|
|
|
mptcp_token_destroy(msk);
|
|
|
|
mptcp_pm_free_anno_list(msk);
|
2022-05-04 02:38:49 +00:00
|
|
|
mptcp_free_local_addr_list(msk);
|
2020-09-24 00:29:57 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:20 +00:00
|
|
|
static void mptcp_destroy(struct sock *sk)
|
|
|
|
{
|
2020-01-29 14:54:43 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2023-08-11 15:57:26 +00:00
|
|
|
/* allow the following to close even the initial subflow */
|
|
|
|
msk->free_first = 1;
|
2022-08-05 00:21:25 +00:00
|
|
|
mptcp_destroy_common(msk, 0);
|
2020-03-27 21:48:45 +00:00
|
|
|
sk_sockets_allocated_dec(sk);
|
2020-01-22 00:56:20 +00:00
|
|
|
}
|
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
void __mptcp_data_acked(struct sock *sk)
|
|
|
|
{
|
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_clean_una(sk);
|
|
|
|
else
|
2022-01-07 00:20:26 +00:00
|
|
|
__set_bit(MPTCP_CLEAN_UNA, &mptcp_sk(sk)->cb_flags);
|
2020-11-27 10:10:27 +00:00
|
|
|
}
|
|
|
|
|
2020-12-16 11:48:34 +00:00
|
|
|
void __mptcp_check_push(struct sock *sk, struct sock *ssk)
|
2020-11-27 10:10:27 +00:00
|
|
|
{
|
|
|
|
if (!mptcp_send_head(sk))
|
|
|
|
return;
|
|
|
|
|
2022-11-10 23:23:19 +00:00
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_subflow_push_pending(sk, ssk, false);
|
|
|
|
else
|
2022-01-07 00:20:26 +00:00
|
|
|
__set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags);
|
2020-11-27 10:10:27 +00:00
|
|
|
}
|
|
|
|
|
2022-01-07 00:20:26 +00:00
|
|
|
#define MPTCP_FLAGS_PROCESS_CTX_NEED (BIT(MPTCP_PUSH_PENDING) | \
|
|
|
|
BIT(MPTCP_RETRANSMIT) | \
|
|
|
|
BIT(MPTCP_FLUSH_JOIN_LIST))
|
|
|
|
|
2020-11-27 10:10:23 +00:00
|
|
|
/* processes deferred events and flush wmem */
|
2020-02-26 09:14:52 +00:00
|
|
|
static void mptcp_release_cb(struct sock *sk)
|
2022-01-07 00:20:26 +00:00
|
|
|
__must_hold(&sk->sk_lock.slock)
|
2020-02-26 09:14:52 +00:00
|
|
|
{
|
2022-01-07 00:20:26 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2021-03-04 21:32:14 +00:00
|
|
|
for (;;) {
|
2024-02-08 18:03:49 +00:00
|
|
|
unsigned long flags = (msk->cb_flags & MPTCP_FLAGS_PROCESS_CTX_NEED);
|
2023-06-20 16:24:20 +00:00
|
|
|
struct list_head join_list;
|
|
|
|
|
2021-03-04 21:32:14 +00:00
|
|
|
if (!flags)
|
|
|
|
break;
|
|
|
|
|
2023-06-20 16:24:20 +00:00
|
|
|
INIT_LIST_HEAD(&join_list);
|
|
|
|
list_splice_init(&msk->join_list, &join_list);
|
|
|
|
|
2021-03-04 21:32:14 +00:00
|
|
|
/* the following actions acquire the subflow socket lock
|
2020-11-27 10:10:27 +00:00
|
|
|
*
|
|
|
|
* 1) can't be invoked in atomic scope
|
|
|
|
* 2) must avoid ABBA deadlock with msk socket spinlock: the RX
|
|
|
|
* datapath acquires the msk socket spinlock while helding
|
|
|
|
* the subflow socket lock
|
|
|
|
*/
|
2022-01-07 00:20:26 +00:00
|
|
|
msk->cb_flags &= ~flags;
|
2020-11-27 10:10:27 +00:00
|
|
|
spin_unlock_bh(&sk->sk_lock.slock);
|
2023-06-20 16:24:20 +00:00
|
|
|
|
2022-01-07 00:20:25 +00:00
|
|
|
if (flags & BIT(MPTCP_FLUSH_JOIN_LIST))
|
2023-06-20 16:24:20 +00:00
|
|
|
__mptcp_flush_join_list(sk, &join_list);
|
2021-03-12 07:41:12 +00:00
|
|
|
if (flags & BIT(MPTCP_PUSH_PENDING))
|
2021-03-04 21:32:14 +00:00
|
|
|
__mptcp_push_pending(sk, 0);
|
2021-03-26 18:26:30 +00:00
|
|
|
if (flags & BIT(MPTCP_RETRANSMIT))
|
|
|
|
__mptcp_retrans(sk);
|
2021-03-04 21:32:14 +00:00
|
|
|
|
|
|
|
cond_resched();
|
2020-11-27 10:10:27 +00:00
|
|
|
spin_lock_bh(&sk->sk_lock.slock);
|
|
|
|
}
|
2021-03-04 21:32:14 +00:00
|
|
|
|
2022-01-07 00:20:26 +00:00
|
|
|
if (__test_and_clear_bit(MPTCP_CLEAN_UNA, &msk->cb_flags))
|
2021-03-04 21:32:15 +00:00
|
|
|
__mptcp_clean_una_wakeup(sk);
|
2023-08-03 07:24:38 +00:00
|
|
|
if (unlikely(msk->cb_flags)) {
|
2023-12-15 16:04:25 +00:00
|
|
|
/* be sure to sync the msk state before taking actions
|
2023-11-13 23:16:14 +00:00
|
|
|
* depending on sk_state (MPTCP_ERROR_REPORT)
|
|
|
|
* On sk release avoid actions depending on the first subflow
|
2022-04-08 19:45:54 +00:00
|
|
|
*/
|
2023-12-15 16:04:25 +00:00
|
|
|
if (__test_and_clear_bit(MPTCP_SYNC_STATE, &msk->cb_flags) && msk->first)
|
|
|
|
__mptcp_sync_state(sk, msk->pending_state);
|
2022-04-08 19:45:54 +00:00
|
|
|
if (__test_and_clear_bit(MPTCP_ERROR_REPORT, &msk->cb_flags))
|
|
|
|
__mptcp_error_report(sk);
|
2023-10-23 20:44:42 +00:00
|
|
|
if (__test_and_clear_bit(MPTCP_SYNC_SNDBUF, &msk->cb_flags))
|
|
|
|
__mptcp_sync_sndbuf(sk);
|
2022-04-08 19:45:54 +00:00
|
|
|
}
|
2020-11-27 10:10:27 +00:00
|
|
|
|
2020-11-27 10:10:24 +00:00
|
|
|
__mptcp_update_rmem(sk);
|
2020-02-26 09:14:52 +00:00
|
|
|
}
|
|
|
|
|
2021-11-19 14:27:55 +00:00
|
|
|
/* MP_JOIN client subflow must wait for 4th ack before sending any data:
|
|
|
|
* TCP can't schedule delack timer before the subflow is fully established.
|
|
|
|
* MPTCP uses the delack timer to do 3rd ack retransmissions
|
|
|
|
*/
|
|
|
|
static void schedule_3rdack_retransmission(struct sock *ssk)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(ssk);
|
|
|
|
struct tcp_sock *tp = tcp_sk(ssk);
|
|
|
|
unsigned long timeout;
|
|
|
|
|
|
|
|
if (mptcp_subflow_ctx(ssk)->fully_established)
|
|
|
|
return;
|
|
|
|
|
|
|
|
/* reschedule with a timeout above RTT, as we must look only for drop */
|
|
|
|
if (tp->srtt_us)
|
|
|
|
timeout = usecs_to_jiffies(tp->srtt_us >> (3 - 1));
|
|
|
|
else
|
|
|
|
timeout = TCP_TIMEOUT_INIT;
|
|
|
|
timeout += jiffies;
|
|
|
|
|
|
|
|
WARN_ON_ONCE(icsk->icsk_ack.pending & ICSK_ACK_TIMER);
|
|
|
|
icsk->icsk_ack.pending |= ICSK_ACK_SCHED | ICSK_ACK_TIMER;
|
|
|
|
icsk->icsk_ack.timeout = timeout;
|
|
|
|
sk_reset_timer(ssk, &icsk->icsk_delack_timer, timeout);
|
|
|
|
}
|
|
|
|
|
2023-10-04 20:38:11 +00:00
|
|
|
void mptcp_subflow_process_delegated(struct sock *ssk, long status)
|
2021-01-20 14:39:14 +00:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
struct sock *sk = subflow->conn;
|
|
|
|
|
2023-10-04 20:38:11 +00:00
|
|
|
if (status & BIT(MPTCP_DELEGATE_SEND)) {
|
2021-11-19 14:27:55 +00:00
|
|
|
mptcp_data_lock(sk);
|
|
|
|
if (!sock_owned_by_user(sk))
|
2022-11-10 23:23:19 +00:00
|
|
|
__mptcp_subflow_push_pending(sk, ssk, true);
|
2021-11-19 14:27:55 +00:00
|
|
|
else
|
2022-01-07 00:20:26 +00:00
|
|
|
__set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags);
|
2021-11-19 14:27:55 +00:00
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
}
|
2023-10-23 20:44:42 +00:00
|
|
|
if (status & BIT(MPTCP_DELEGATE_SNDBUF)) {
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_sync_sndbuf(sk);
|
|
|
|
else
|
|
|
|
__set_bit(MPTCP_SYNC_SNDBUF, &mptcp_sk(sk)->cb_flags);
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
}
|
2023-10-04 20:38:11 +00:00
|
|
|
if (status & BIT(MPTCP_DELEGATE_ACK))
|
2021-11-19 14:27:55 +00:00
|
|
|
schedule_3rdack_retransmission(ssk);
|
2021-01-20 14:39:14 +00:00
|
|
|
}
|
|
|
|
|
2020-06-26 17:30:00 +00:00
|
|
|
static int mptcp_hash(struct sock *sk)
|
|
|
|
{
|
|
|
|
/* should never be called,
|
2024-06-05 07:15:42 +00:00
|
|
|
* we hash the TCP subflows not the MPTCP socket
|
2020-06-26 17:30:00 +00:00
|
|
|
*/
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_unhash(struct sock *sk)
|
|
|
|
{
|
|
|
|
/* called from sk_common_release(), but nothing to do here */
|
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:18 +00:00
|
|
|
static int mptcp_get_port(struct sock *sk, unsigned short snum)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2023-08-11 15:57:16 +00:00
|
|
|
pr_debug("msk=%p, ssk=%p", msk, msk->first);
|
|
|
|
if (WARN_ON_ONCE(!msk->first))
|
2020-01-22 00:56:18 +00:00
|
|
|
return -EINVAL;
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2023-08-11 15:57:16 +00:00
|
|
|
return inet_csk_get_port(msk->first, snum);
|
2020-01-22 00:56:18 +00:00
|
|
|
}
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2020-01-22 00:56:18 +00:00
|
|
|
void mptcp_finish_connect(struct sock *ssk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk;
|
|
|
|
struct sock *sk;
|
2020-01-22 00:56:15 +00:00
|
|
|
|
2020-01-22 00:56:18 +00:00
|
|
|
subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
sk = subflow->conn;
|
|
|
|
msk = mptcp_sk(sk);
|
|
|
|
|
2020-01-22 00:56:24 +00:00
|
|
|
pr_debug("msk=%p, token=%u", sk, subflow->token);
|
|
|
|
|
2022-11-25 22:29:49 +00:00
|
|
|
subflow->map_seq = subflow->iasn;
|
2020-01-22 00:56:24 +00:00
|
|
|
subflow->map_subflow_seq = 1;
|
2020-01-22 00:56:23 +00:00
|
|
|
|
2020-01-22 00:56:18 +00:00
|
|
|
/* the socket is not connected yet, no msk/subflow ops can access/race
|
|
|
|
* accessing the field below
|
|
|
|
*/
|
|
|
|
WRITE_ONCE(msk->local_key, subflow->local_key);
|
2020-03-27 21:48:38 +00:00
|
|
|
|
2021-02-12 23:59:58 +00:00
|
|
|
mptcp_pm_new_connection(msk, ssk, 0);
|
2020-01-22 00:56:15 +00:00
|
|
|
}
|
|
|
|
|
2021-01-20 14:39:10 +00:00
|
|
|
void mptcp_sock_graft(struct sock *sk, struct socket *parent)
|
2020-01-22 00:56:19 +00:00
|
|
|
{
|
|
|
|
write_lock_bh(&sk->sk_callback_lock);
|
|
|
|
rcu_assign_pointer(sk->sk_wq, &parent->wq);
|
|
|
|
sk_set_socket(sk, parent);
|
|
|
|
sk->sk_uid = SOCK_INODE(parent)->i_uid;
|
|
|
|
write_unlock_bh(&sk->sk_callback_lock);
|
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:09 +00:00
|
|
|
bool mptcp_finish_join(struct sock *ssk)
|
2020-03-27 21:48:39 +00:00
|
|
|
{
|
2020-11-16 09:48:09 +00:00
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-03-27 21:48:39 +00:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(subflow->conn);
|
|
|
|
struct sock *parent = (void *)msk;
|
2022-01-07 00:20:25 +00:00
|
|
|
bool ret = true;
|
2020-03-27 21:48:39 +00:00
|
|
|
|
|
|
|
pr_debug("msk=%p, subflow=%p", msk, subflow);
|
|
|
|
|
|
|
|
/* mptcp socket already closing? */
|
2021-04-01 23:19:44 +00:00
|
|
|
if (!mptcp_is_fully_established(parent)) {
|
|
|
|
subflow->reset_reason = MPTCP_RST_EMPTCP;
|
2020-03-27 21:48:39 +00:00
|
|
|
return false;
|
2021-04-01 23:19:44 +00:00
|
|
|
}
|
2020-03-27 21:48:39 +00:00
|
|
|
|
2023-05-31 19:37:08 +00:00
|
|
|
/* active subflow, already present inside the conn_list */
|
|
|
|
if (!list_empty(&subflow->node)) {
|
|
|
|
mptcp_subflow_joined(msk, ssk);
|
2023-10-23 20:44:42 +00:00
|
|
|
mptcp_propagate_sndbuf(parent, ssk);
|
2023-05-31 19:37:08 +00:00
|
|
|
return true;
|
|
|
|
}
|
2020-03-27 21:48:39 +00:00
|
|
|
|
2022-01-07 00:20:25 +00:00
|
|
|
if (!mptcp_pm_allow_new_subflow(msk))
|
|
|
|
goto err_prohibited;
|
2020-05-29 15:43:30 +00:00
|
|
|
|
2023-05-31 19:37:08 +00:00
|
|
|
/* If we can't acquire msk socket lock here, let the release callback
|
2022-01-07 00:20:25 +00:00
|
|
|
* handle it
|
2020-05-29 15:43:30 +00:00
|
|
|
*/
|
2022-01-07 00:20:25 +00:00
|
|
|
mptcp_data_lock(parent);
|
|
|
|
if (!sock_owned_by_user(parent)) {
|
|
|
|
ret = __mptcp_finish_join(msk, ssk);
|
|
|
|
if (ret) {
|
|
|
|
sock_hold(ssk);
|
|
|
|
list_add_tail(&subflow->node, &msk->conn_list);
|
|
|
|
}
|
|
|
|
} else {
|
2020-11-16 09:48:09 +00:00
|
|
|
sock_hold(ssk);
|
2022-01-07 00:20:25 +00:00
|
|
|
list_add_tail(&subflow->node, &msk->join_list);
|
2022-01-07 00:20:26 +00:00
|
|
|
__set_bit(MPTCP_FLUSH_JOIN_LIST, &msk->cb_flags);
|
2020-11-16 09:48:09 +00:00
|
|
|
}
|
2022-01-07 00:20:25 +00:00
|
|
|
mptcp_data_unlock(parent);
|
|
|
|
|
2021-04-01 23:19:44 +00:00
|
|
|
if (!ret) {
|
2022-01-07 00:20:25 +00:00
|
|
|
err_prohibited:
|
2021-04-01 23:19:44 +00:00
|
|
|
subflow->reset_reason = MPTCP_RST_EPROHIBIT;
|
2020-05-29 15:43:30 +00:00
|
|
|
return false;
|
2021-04-01 23:19:44 +00:00
|
|
|
}
|
2020-05-29 15:43:30 +00:00
|
|
|
|
|
|
|
return true;
|
2020-03-27 21:48:39 +00:00
|
|
|
}
|
|
|
|
|
2021-01-12 17:25:24 +00:00
|
|
|
static void mptcp_shutdown(struct sock *sk, int how)
|
|
|
|
{
|
|
|
|
pr_debug("sk=%p, how=%d", sk, how);
|
|
|
|
|
|
|
|
if ((how & SEND_SHUTDOWN) && mptcp_close_state(sk))
|
|
|
|
__mptcp_wr_shutdown(sk);
|
|
|
|
}
|
|
|
|
|
2021-10-26 23:29:15 +00:00
|
|
|
static int mptcp_forward_alloc_get(const struct sock *sk)
|
|
|
|
{
|
2023-08-31 13:52:10 +00:00
|
|
|
return READ_ONCE(sk->sk_forward_alloc) +
|
|
|
|
READ_ONCE(mptcp_sk(sk)->rmem_fwd_alloc);
|
2021-10-26 23:29:15 +00:00
|
|
|
}
|
|
|
|
|
2021-12-03 22:35:34 +00:00
|
|
|
static int mptcp_ioctl_outq(const struct mptcp_sock *msk, u64 v)
|
|
|
|
{
|
|
|
|
const struct sock *sk = (void *)msk;
|
|
|
|
u64 delta;
|
|
|
|
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
delta = msk->write_seq - v;
|
2022-02-25 00:52:57 +00:00
|
|
|
if (__mptcp_check_fallback(msk) && msk->first) {
|
|
|
|
struct tcp_sock *tp = tcp_sk(msk->first);
|
|
|
|
|
|
|
|
/* the first subflow is disconnected after close - see
|
|
|
|
* __mptcp_close_ssk(). tcp_disconnect() moves the write_seq
|
|
|
|
* so ignore that status, too.
|
|
|
|
*/
|
|
|
|
if (!((1 << msk->first->sk_state) &
|
|
|
|
(TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_CLOSE)))
|
|
|
|
delta += READ_ONCE(tp->write_seq) - tp->snd_una;
|
|
|
|
}
|
2021-12-03 22:35:34 +00:00
|
|
|
if (delta > INT_MAX)
|
|
|
|
delta = INT_MAX;
|
|
|
|
|
|
|
|
return (int)delta;
|
|
|
|
}
|
|
|
|
|
net: ioctl: Use kernel memory on protocol ioctl callbacks
Most of the ioctls to net protocols operates directly on userspace
argument (arg). Usually doing get_user()/put_user() directly in the
ioctl callback. This is not flexible, because it is hard to reuse these
functions without passing userspace buffers.
Change the "struct proto" ioctls to avoid touching userspace memory and
operate on kernel buffers, i.e., all protocol's ioctl callbacks is
adapted to operate on a kernel memory other than on userspace (so, no
more {put,get}_user() and friends being called in the ioctl callback).
This changes the "struct proto" ioctl format in the following way:
int (*ioctl)(struct sock *sk, int cmd,
- unsigned long arg);
+ int *karg);
(Important to say that this patch does not touch the "struct proto_ops"
protocols)
So, the "karg" argument, which is passed to the ioctl callback, is a
pointer allocated to kernel space memory (inside a function wrapper).
This buffer (karg) may contain input argument (copied from userspace in
a prep function) and it might return a value/buffer, which is copied
back to userspace if necessary. There is not one-size-fits-all format
(that is I am using 'may' above), but basically, there are three type of
ioctls:
1) Do not read from userspace, returns a result to userspace
2) Read an input parameter from userspace, and does not return anything
to userspace
3) Read an input from userspace, and return a buffer to userspace.
The default case (1) (where no input parameter is given, and an "int" is
returned to userspace) encompasses more than 90% of the cases, but there
are two other exceptions. Here is a list of exceptions:
* Protocol RAW:
* cmd = SIOCGETVIFCNT:
* input and output = struct sioc_vif_req
* cmd = SIOCGETSGCNT
* input and output = struct sioc_sg_req
* Explanation: for the SIOCGETVIFCNT case, userspace passes the input
argument, which is struct sioc_vif_req. Then the callback populates
the struct, which is copied back to userspace.
* Protocol RAW6:
* cmd = SIOCGETMIFCNT_IN6
* input and output = struct sioc_mif_req6
* cmd = SIOCGETSGCNT_IN6
* input and output = struct sioc_sg_req6
* Protocol PHONET:
* cmd == SIOCPNADDRESOURCE | SIOCPNDELRESOURCE
* input int (4 bytes)
* Nothing is copied back to userspace.
For the exception cases, functions sock_sk_ioctl_inout() will
copy the userspace input, and copy it back to kernel space.
The wrapper that prepare the buffer and put the buffer back to user is
sk_ioctl(), so, instead of calling sk->sk_prot->ioctl(), the callee now
calls sk_ioctl(), which will handle all cases.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230609152800.830401-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-09 15:27:42 +00:00
|
|
|
static int mptcp_ioctl(struct sock *sk, int cmd, int *karg)
|
2021-12-03 22:35:34 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
bool slow;
|
|
|
|
|
|
|
|
switch (cmd) {
|
|
|
|
case SIOCINQ:
|
|
|
|
if (sk->sk_state == TCP_LISTEN)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
__mptcp_move_skbs(msk);
|
net: ioctl: Use kernel memory on protocol ioctl callbacks
Most of the ioctls to net protocols operates directly on userspace
argument (arg). Usually doing get_user()/put_user() directly in the
ioctl callback. This is not flexible, because it is hard to reuse these
functions without passing userspace buffers.
Change the "struct proto" ioctls to avoid touching userspace memory and
operate on kernel buffers, i.e., all protocol's ioctl callbacks is
adapted to operate on a kernel memory other than on userspace (so, no
more {put,get}_user() and friends being called in the ioctl callback).
This changes the "struct proto" ioctl format in the following way:
int (*ioctl)(struct sock *sk, int cmd,
- unsigned long arg);
+ int *karg);
(Important to say that this patch does not touch the "struct proto_ops"
protocols)
So, the "karg" argument, which is passed to the ioctl callback, is a
pointer allocated to kernel space memory (inside a function wrapper).
This buffer (karg) may contain input argument (copied from userspace in
a prep function) and it might return a value/buffer, which is copied
back to userspace if necessary. There is not one-size-fits-all format
(that is I am using 'may' above), but basically, there are three type of
ioctls:
1) Do not read from userspace, returns a result to userspace
2) Read an input parameter from userspace, and does not return anything
to userspace
3) Read an input from userspace, and return a buffer to userspace.
The default case (1) (where no input parameter is given, and an "int" is
returned to userspace) encompasses more than 90% of the cases, but there
are two other exceptions. Here is a list of exceptions:
* Protocol RAW:
* cmd = SIOCGETVIFCNT:
* input and output = struct sioc_vif_req
* cmd = SIOCGETSGCNT
* input and output = struct sioc_sg_req
* Explanation: for the SIOCGETVIFCNT case, userspace passes the input
argument, which is struct sioc_vif_req. Then the callback populates
the struct, which is copied back to userspace.
* Protocol RAW6:
* cmd = SIOCGETMIFCNT_IN6
* input and output = struct sioc_mif_req6
* cmd = SIOCGETSGCNT_IN6
* input and output = struct sioc_sg_req6
* Protocol PHONET:
* cmd == SIOCPNADDRESOURCE | SIOCPNDELRESOURCE
* input int (4 bytes)
* Nothing is copied back to userspace.
For the exception cases, functions sock_sk_ioctl_inout() will
copy the userspace input, and copy it back to kernel space.
The wrapper that prepare the buffer and put the buffer back to user is
sk_ioctl(), so, instead of calling sk->sk_prot->ioctl(), the callee now
calls sk_ioctl(), which will handle all cases.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230609152800.830401-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-09 15:27:42 +00:00
|
|
|
*karg = mptcp_inq_hint(sk);
|
2021-12-03 22:35:34 +00:00
|
|
|
release_sock(sk);
|
|
|
|
break;
|
|
|
|
case SIOCOUTQ:
|
|
|
|
slow = lock_sock_fast(sk);
|
net: ioctl: Use kernel memory on protocol ioctl callbacks
Most of the ioctls to net protocols operates directly on userspace
argument (arg). Usually doing get_user()/put_user() directly in the
ioctl callback. This is not flexible, because it is hard to reuse these
functions without passing userspace buffers.
Change the "struct proto" ioctls to avoid touching userspace memory and
operate on kernel buffers, i.e., all protocol's ioctl callbacks is
adapted to operate on a kernel memory other than on userspace (so, no
more {put,get}_user() and friends being called in the ioctl callback).
This changes the "struct proto" ioctl format in the following way:
int (*ioctl)(struct sock *sk, int cmd,
- unsigned long arg);
+ int *karg);
(Important to say that this patch does not touch the "struct proto_ops"
protocols)
So, the "karg" argument, which is passed to the ioctl callback, is a
pointer allocated to kernel space memory (inside a function wrapper).
This buffer (karg) may contain input argument (copied from userspace in
a prep function) and it might return a value/buffer, which is copied
back to userspace if necessary. There is not one-size-fits-all format
(that is I am using 'may' above), but basically, there are three type of
ioctls:
1) Do not read from userspace, returns a result to userspace
2) Read an input parameter from userspace, and does not return anything
to userspace
3) Read an input from userspace, and return a buffer to userspace.
The default case (1) (where no input parameter is given, and an "int" is
returned to userspace) encompasses more than 90% of the cases, but there
are two other exceptions. Here is a list of exceptions:
* Protocol RAW:
* cmd = SIOCGETVIFCNT:
* input and output = struct sioc_vif_req
* cmd = SIOCGETSGCNT
* input and output = struct sioc_sg_req
* Explanation: for the SIOCGETVIFCNT case, userspace passes the input
argument, which is struct sioc_vif_req. Then the callback populates
the struct, which is copied back to userspace.
* Protocol RAW6:
* cmd = SIOCGETMIFCNT_IN6
* input and output = struct sioc_mif_req6
* cmd = SIOCGETSGCNT_IN6
* input and output = struct sioc_sg_req6
* Protocol PHONET:
* cmd == SIOCPNADDRESOURCE | SIOCPNDELRESOURCE
* input int (4 bytes)
* Nothing is copied back to userspace.
For the exception cases, functions sock_sk_ioctl_inout() will
copy the userspace input, and copy it back to kernel space.
The wrapper that prepare the buffer and put the buffer back to user is
sk_ioctl(), so, instead of calling sk->sk_prot->ioctl(), the callee now
calls sk_ioctl(), which will handle all cases.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230609152800.830401-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-09 15:27:42 +00:00
|
|
|
*karg = mptcp_ioctl_outq(msk, READ_ONCE(msk->snd_una));
|
2021-12-03 22:35:34 +00:00
|
|
|
unlock_sock_fast(sk, slow);
|
|
|
|
break;
|
|
|
|
case SIOCOUTQNSD:
|
|
|
|
slow = lock_sock_fast(sk);
|
net: ioctl: Use kernel memory on protocol ioctl callbacks
Most of the ioctls to net protocols operates directly on userspace
argument (arg). Usually doing get_user()/put_user() directly in the
ioctl callback. This is not flexible, because it is hard to reuse these
functions without passing userspace buffers.
Change the "struct proto" ioctls to avoid touching userspace memory and
operate on kernel buffers, i.e., all protocol's ioctl callbacks is
adapted to operate on a kernel memory other than on userspace (so, no
more {put,get}_user() and friends being called in the ioctl callback).
This changes the "struct proto" ioctl format in the following way:
int (*ioctl)(struct sock *sk, int cmd,
- unsigned long arg);
+ int *karg);
(Important to say that this patch does not touch the "struct proto_ops"
protocols)
So, the "karg" argument, which is passed to the ioctl callback, is a
pointer allocated to kernel space memory (inside a function wrapper).
This buffer (karg) may contain input argument (copied from userspace in
a prep function) and it might return a value/buffer, which is copied
back to userspace if necessary. There is not one-size-fits-all format
(that is I am using 'may' above), but basically, there are three type of
ioctls:
1) Do not read from userspace, returns a result to userspace
2) Read an input parameter from userspace, and does not return anything
to userspace
3) Read an input from userspace, and return a buffer to userspace.
The default case (1) (where no input parameter is given, and an "int" is
returned to userspace) encompasses more than 90% of the cases, but there
are two other exceptions. Here is a list of exceptions:
* Protocol RAW:
* cmd = SIOCGETVIFCNT:
* input and output = struct sioc_vif_req
* cmd = SIOCGETSGCNT
* input and output = struct sioc_sg_req
* Explanation: for the SIOCGETVIFCNT case, userspace passes the input
argument, which is struct sioc_vif_req. Then the callback populates
the struct, which is copied back to userspace.
* Protocol RAW6:
* cmd = SIOCGETMIFCNT_IN6
* input and output = struct sioc_mif_req6
* cmd = SIOCGETSGCNT_IN6
* input and output = struct sioc_sg_req6
* Protocol PHONET:
* cmd == SIOCPNADDRESOURCE | SIOCPNDELRESOURCE
* input int (4 bytes)
* Nothing is copied back to userspace.
For the exception cases, functions sock_sk_ioctl_inout() will
copy the userspace input, and copy it back to kernel space.
The wrapper that prepare the buffer and put the buffer back to user is
sk_ioctl(), so, instead of calling sk->sk_prot->ioctl(), the callee now
calls sk_ioctl(), which will handle all cases.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230609152800.830401-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-09 15:27:42 +00:00
|
|
|
*karg = mptcp_ioctl_outq(msk, msk->snd_nxt);
|
2021-12-03 22:35:34 +00:00
|
|
|
unlock_sock_fast(sk, slow);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -ENOIOCTLCMD;
|
|
|
|
}
|
|
|
|
|
net: ioctl: Use kernel memory on protocol ioctl callbacks
Most of the ioctls to net protocols operates directly on userspace
argument (arg). Usually doing get_user()/put_user() directly in the
ioctl callback. This is not flexible, because it is hard to reuse these
functions without passing userspace buffers.
Change the "struct proto" ioctls to avoid touching userspace memory and
operate on kernel buffers, i.e., all protocol's ioctl callbacks is
adapted to operate on a kernel memory other than on userspace (so, no
more {put,get}_user() and friends being called in the ioctl callback).
This changes the "struct proto" ioctl format in the following way:
int (*ioctl)(struct sock *sk, int cmd,
- unsigned long arg);
+ int *karg);
(Important to say that this patch does not touch the "struct proto_ops"
protocols)
So, the "karg" argument, which is passed to the ioctl callback, is a
pointer allocated to kernel space memory (inside a function wrapper).
This buffer (karg) may contain input argument (copied from userspace in
a prep function) and it might return a value/buffer, which is copied
back to userspace if necessary. There is not one-size-fits-all format
(that is I am using 'may' above), but basically, there are three type of
ioctls:
1) Do not read from userspace, returns a result to userspace
2) Read an input parameter from userspace, and does not return anything
to userspace
3) Read an input from userspace, and return a buffer to userspace.
The default case (1) (where no input parameter is given, and an "int" is
returned to userspace) encompasses more than 90% of the cases, but there
are two other exceptions. Here is a list of exceptions:
* Protocol RAW:
* cmd = SIOCGETVIFCNT:
* input and output = struct sioc_vif_req
* cmd = SIOCGETSGCNT
* input and output = struct sioc_sg_req
* Explanation: for the SIOCGETVIFCNT case, userspace passes the input
argument, which is struct sioc_vif_req. Then the callback populates
the struct, which is copied back to userspace.
* Protocol RAW6:
* cmd = SIOCGETMIFCNT_IN6
* input and output = struct sioc_mif_req6
* cmd = SIOCGETSGCNT_IN6
* input and output = struct sioc_sg_req6
* Protocol PHONET:
* cmd == SIOCPNADDRESOURCE | SIOCPNDELRESOURCE
* input int (4 bytes)
* Nothing is copied back to userspace.
For the exception cases, functions sock_sk_ioctl_inout() will
copy the userspace input, and copy it back to kernel space.
The wrapper that prepare the buffer and put the buffer back to user is
sk_ioctl(), so, instead of calling sk->sk_prot->ioctl(), the callee now
calls sk_ioctl(), which will handle all cases.
Signed-off-by: Breno Leitao <leitao@debian.org>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Reviewed-by: David Ahern <dsahern@kernel.org>
Reviewed-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Link: https://lore.kernel.org/r/20230609152800.830401-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2023-06-09 15:27:42 +00:00
|
|
|
return 0;
|
2021-12-03 22:35:34 +00:00
|
|
|
}
|
|
|
|
|
2022-10-21 22:58:55 +00:00
|
|
|
static void mptcp_subflow_early_fallback(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
|
|
|
subflow->request_mptcp = 0;
|
|
|
|
__mptcp_do_fallback(msk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
int err = -EINVAL;
|
2023-08-11 15:57:15 +00:00
|
|
|
struct sock *ssk;
|
2022-10-21 22:58:55 +00:00
|
|
|
|
2023-08-11 15:57:25 +00:00
|
|
|
ssk = __mptcp_nmpc_sk(msk);
|
|
|
|
if (IS_ERR(ssk))
|
|
|
|
return PTR_ERR(ssk);
|
2022-10-21 22:58:55 +00:00
|
|
|
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_SYN_SENT);
|
2023-08-11 15:57:15 +00:00
|
|
|
subflow = mptcp_subflow_ctx(ssk);
|
2022-10-21 22:58:55 +00:00
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
|
/* no MPTCP if MD5SIG is enabled on this socket or we may run out of
|
|
|
|
* TCP option space.
|
|
|
|
*/
|
2023-08-11 15:57:15 +00:00
|
|
|
if (rcu_access_pointer(tcp_sk(ssk)->md5sig_info))
|
2022-10-21 22:58:55 +00:00
|
|
|
mptcp_subflow_early_fallback(msk, subflow);
|
|
|
|
#endif
|
2023-08-11 15:57:15 +00:00
|
|
|
if (subflow->request_mptcp && mptcp_token_new_connect(ssk)) {
|
|
|
|
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_TOKENFALLBACKINIT);
|
2022-10-21 22:58:55 +00:00
|
|
|
mptcp_subflow_early_fallback(msk, subflow);
|
|
|
|
}
|
2024-04-29 18:00:31 +00:00
|
|
|
|
|
|
|
WRITE_ONCE(msk->write_seq, subflow->idsn);
|
|
|
|
WRITE_ONCE(msk->snd_nxt, subflow->idsn);
|
2024-06-07 15:01:48 +00:00
|
|
|
WRITE_ONCE(msk->snd_una, subflow->idsn);
|
2022-10-21 22:58:55 +00:00
|
|
|
if (likely(!__mptcp_check_fallback(msk)))
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEACTIVE);
|
|
|
|
|
|
|
|
/* if reaching here via the fastopen/sendmsg path, the caller already
|
|
|
|
* acquired the subflow socket lock, too.
|
|
|
|
*/
|
2023-08-11 15:57:15 +00:00
|
|
|
if (!msk->fastopening)
|
|
|
|
lock_sock(ssk);
|
|
|
|
|
|
|
|
/* the following mirrors closely a very small chunk of code from
|
|
|
|
* __inet_stream_connect()
|
|
|
|
*/
|
|
|
|
if (ssk->sk_state != TCP_CLOSE)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (BPF_CGROUP_PRE_CONNECT_ENABLED(ssk)) {
|
|
|
|
err = ssk->sk_prot->pre_connect(ssk, uaddr, addr_len);
|
|
|
|
if (err)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = ssk->sk_prot->connect(ssk, uaddr, addr_len);
|
|
|
|
if (err < 0)
|
|
|
|
goto out;
|
|
|
|
|
2023-08-16 08:15:45 +00:00
|
|
|
inet_assign_bit(DEFER_CONNECT, sk, inet_test_bit(DEFER_CONNECT, ssk));
|
2023-08-11 15:57:15 +00:00
|
|
|
|
|
|
|
out:
|
|
|
|
if (!msk->fastopening)
|
|
|
|
release_sock(ssk);
|
2022-10-21 22:58:55 +00:00
|
|
|
|
|
|
|
/* on successful connect, the msk state will be moved to established by
|
|
|
|
* subflow_finish_connect()
|
|
|
|
*/
|
2023-08-11 15:57:15 +00:00
|
|
|
if (unlikely(err)) {
|
2023-08-11 15:57:14 +00:00
|
|
|
/* avoid leaving a dangling token in an unconnected socket */
|
|
|
|
mptcp_token_destroy(msk);
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_CLOSE);
|
2022-10-21 22:58:55 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2023-08-11 15:57:15 +00:00
|
|
|
mptcp_copy_inaddrs(sk, ssk);
|
2023-05-31 19:37:03 +00:00
|
|
|
return 0;
|
2022-10-21 22:58:55 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:15 +00:00
|
|
|
static struct proto mptcp_prot = {
|
|
|
|
.name = "MPTCP",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.init = mptcp_init_sock,
|
2022-10-21 22:58:55 +00:00
|
|
|
.connect = mptcp_connect,
|
2020-03-27 21:48:43 +00:00
|
|
|
.disconnect = mptcp_disconnect,
|
2020-01-22 00:56:15 +00:00
|
|
|
.close = mptcp_close,
|
2020-01-22 00:56:22 +00:00
|
|
|
.setsockopt = mptcp_setsockopt,
|
|
|
|
.getsockopt = mptcp_getsockopt,
|
2021-01-12 17:25:24 +00:00
|
|
|
.shutdown = mptcp_shutdown,
|
2020-01-22 00:56:20 +00:00
|
|
|
.destroy = mptcp_destroy,
|
2020-01-22 00:56:15 +00:00
|
|
|
.sendmsg = mptcp_sendmsg,
|
2021-12-03 22:35:34 +00:00
|
|
|
.ioctl = mptcp_ioctl,
|
2020-01-22 00:56:15 +00:00
|
|
|
.recvmsg = mptcp_recvmsg,
|
2020-02-26 09:14:52 +00:00
|
|
|
.release_cb = mptcp_release_cb,
|
2020-06-26 17:30:00 +00:00
|
|
|
.hash = mptcp_hash,
|
|
|
|
.unhash = mptcp_unhash,
|
2020-01-22 00:56:18 +00:00
|
|
|
.get_port = mptcp_get_port,
|
2021-10-26 23:29:15 +00:00
|
|
|
.forward_alloc_get = mptcp_forward_alloc_get,
|
2024-03-01 17:43:46 +00:00
|
|
|
.stream_memory_free = mptcp_stream_memory_free,
|
2020-03-27 21:48:45 +00:00
|
|
|
.sockets_allocated = &mptcp_sockets_allocated,
|
2022-06-09 06:34:08 +00:00
|
|
|
|
2020-03-27 21:48:45 +00:00
|
|
|
.memory_allocated = &tcp_memory_allocated,
|
2022-06-09 06:34:08 +00:00
|
|
|
.per_cpu_fw_alloc = &tcp_memory_per_cpu_fw_alloc,
|
|
|
|
|
2020-03-27 21:48:45 +00:00
|
|
|
.memory_pressure = &tcp_memory_pressure,
|
|
|
|
.sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_tcp_wmem),
|
2020-11-08 18:49:59 +00:00
|
|
|
.sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_tcp_rmem),
|
2020-03-27 21:48:45 +00:00
|
|
|
.sysctl_mem = sysctl_tcp_mem,
|
2020-01-22 00:56:15 +00:00
|
|
|
.obj_size = sizeof(struct mptcp_sock),
|
2020-06-26 17:30:00 +00:00
|
|
|
.slab_flags = SLAB_TYPESAFE_BY_RCU,
|
2020-01-22 00:56:15 +00:00
|
|
|
.no_autobind = true,
|
|
|
|
};
|
|
|
|
|
2020-01-22 00:56:17 +00:00
|
|
|
static int mptcp_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
2023-08-11 15:57:18 +00:00
|
|
|
struct sock *ssk, *sk = sock->sk;
|
|
|
|
int err = -EINVAL;
|
2020-01-22 00:56:17 +00:00
|
|
|
|
2023-08-11 15:57:18 +00:00
|
|
|
lock_sock(sk);
|
2023-08-11 15:57:25 +00:00
|
|
|
ssk = __mptcp_nmpc_sk(msk);
|
|
|
|
if (IS_ERR(ssk)) {
|
|
|
|
err = PTR_ERR(ssk);
|
2020-01-22 00:56:17 +00:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2023-08-11 15:57:18 +00:00
|
|
|
if (sk->sk_family == AF_INET)
|
|
|
|
err = inet_bind_sk(ssk, uaddr, addr_len);
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
else if (sk->sk_family == AF_INET6)
|
|
|
|
err = inet6_bind_sk(ssk, uaddr, addr_len);
|
|
|
|
#endif
|
2020-01-22 00:56:19 +00:00
|
|
|
if (!err)
|
2023-08-11 15:57:18 +00:00
|
|
|
mptcp_copy_inaddrs(sk, ssk);
|
2020-01-22 00:56:17 +00:00
|
|
|
|
|
|
|
unlock:
|
2023-08-11 15:57:18 +00:00
|
|
|
release_sock(sk);
|
2020-01-22 00:56:17 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:19 +00:00
|
|
|
static int mptcp_listen(struct socket *sock, int backlog)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
2023-01-06 18:57:20 +00:00
|
|
|
struct sock *sk = sock->sk;
|
2023-08-11 15:57:20 +00:00
|
|
|
struct sock *ssk;
|
2020-01-22 00:56:19 +00:00
|
|
|
int err;
|
|
|
|
|
|
|
|
pr_debug("msk=%p", msk);
|
|
|
|
|
2023-01-06 18:57:20 +00:00
|
|
|
lock_sock(sk);
|
2023-07-04 20:44:34 +00:00
|
|
|
|
|
|
|
err = -EINVAL;
|
|
|
|
if (sock->state != SS_UNCONNECTED || sock->type != SOCK_STREAM)
|
|
|
|
goto unlock;
|
|
|
|
|
2023-08-11 15:57:25 +00:00
|
|
|
ssk = __mptcp_nmpc_sk(msk);
|
|
|
|
if (IS_ERR(ssk)) {
|
|
|
|
err = PTR_ERR(ssk);
|
2020-01-22 00:56:19 +00:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, TCP_LISTEN);
|
2023-01-06 18:57:20 +00:00
|
|
|
sock_set_flag(sk, SOCK_RCU_FREE);
|
2020-04-20 14:25:04 +00:00
|
|
|
|
2023-08-11 15:57:20 +00:00
|
|
|
lock_sock(ssk);
|
|
|
|
err = __inet_listen_sk(ssk, backlog);
|
|
|
|
release_sock(ssk);
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(sk, inet_sk_state_load(ssk));
|
2023-08-11 15:57:20 +00:00
|
|
|
|
2023-01-06 18:57:23 +00:00
|
|
|
if (!err) {
|
|
|
|
sock_prot_inuse_add(sock_net(sk), sk->sk_prot, 1);
|
2023-08-11 15:57:20 +00:00
|
|
|
mptcp_copy_inaddrs(sk, ssk);
|
|
|
|
mptcp_event_pm_listener(ssk, MPTCP_EVENT_LISTENER_CREATED);
|
2023-01-06 18:57:23 +00:00
|
|
|
}
|
2020-01-22 00:56:19 +00:00
|
|
|
|
|
|
|
unlock:
|
2023-01-06 18:57:20 +00:00
|
|
|
release_sock(sk);
|
2020-01-22 00:56:19 +00:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
|
2024-05-09 15:20:08 +00:00
|
|
|
struct proto_accept_arg *arg)
|
2020-01-22 00:56:19 +00:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
2023-08-11 15:57:22 +00:00
|
|
|
struct sock *ssk, *newsk;
|
2020-01-22 00:56:19 +00:00
|
|
|
|
|
|
|
pr_debug("msk=%p", msk);
|
|
|
|
|
2023-05-31 19:37:04 +00:00
|
|
|
/* Buggy applications can call accept on socket states other then LISTEN
|
2023-04-14 14:08:01 +00:00
|
|
|
* but no need to allocate the first subflow just to error out.
|
|
|
|
*/
|
2023-08-11 15:57:22 +00:00
|
|
|
ssk = READ_ONCE(msk->first);
|
|
|
|
if (!ssk)
|
2022-01-07 00:20:17 +00:00
|
|
|
return -EINVAL;
|
2020-01-22 00:56:19 +00:00
|
|
|
|
2023-12-19 21:31:04 +00:00
|
|
|
pr_debug("ssk=%p, listener=%p", ssk, mptcp_subflow_ctx(ssk));
|
2024-05-09 15:20:08 +00:00
|
|
|
newsk = inet_csk_accept(ssk, arg);
|
2023-05-17 19:16:15 +00:00
|
|
|
if (!newsk)
|
2024-05-09 15:20:08 +00:00
|
|
|
return arg->err;
|
2023-05-17 19:16:15 +00:00
|
|
|
|
2023-12-19 21:31:04 +00:00
|
|
|
pr_debug("newsk=%p, subflow is mptcp=%d", newsk, sk_is_mptcp(newsk));
|
|
|
|
if (sk_is_mptcp(newsk)) {
|
2020-01-22 00:56:19 +00:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2023-12-19 21:31:04 +00:00
|
|
|
struct sock *new_mptcp_sock;
|
|
|
|
|
|
|
|
subflow = mptcp_subflow_ctx(newsk);
|
|
|
|
new_mptcp_sock = subflow->conn;
|
|
|
|
|
|
|
|
/* is_mptcp should be false if subflow->conn is missing, see
|
|
|
|
* subflow_syn_recv_sock()
|
|
|
|
*/
|
|
|
|
if (WARN_ON_ONCE(!new_mptcp_sock)) {
|
|
|
|
tcp_sk(newsk)->is_mptcp = 0;
|
|
|
|
goto tcpfallback;
|
|
|
|
}
|
|
|
|
|
|
|
|
newsk = new_mptcp_sock;
|
|
|
|
MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_MPCAPABLEPASSIVEACK);
|
|
|
|
|
2024-05-09 15:20:08 +00:00
|
|
|
newsk->sk_kern_sock = arg->kern;
|
2023-12-19 21:31:04 +00:00
|
|
|
lock_sock(newsk);
|
|
|
|
__inet_accept(sock, newsock, newsk);
|
2020-11-19 19:45:58 +00:00
|
|
|
|
2022-10-20 17:48:51 +00:00
|
|
|
set_bit(SOCK_CUSTOM_SOCKOPT, &newsock->flags);
|
2023-12-19 21:31:04 +00:00
|
|
|
msk = mptcp_sk(newsk);
|
2023-03-09 14:49:59 +00:00
|
|
|
msk->in_accept_queue = 0;
|
2022-10-20 17:48:51 +00:00
|
|
|
|
2020-01-22 00:56:19 +00:00
|
|
|
/* set ssk->sk_socket of accept()ed flows to mptcp socket.
|
|
|
|
* This is needed so NOSPACE flag can be set from tcp stack.
|
|
|
|
*/
|
2020-08-03 13:00:44 +00:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
2020-01-22 00:56:19 +00:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
if (!ssk->sk_socket)
|
|
|
|
mptcp_sock_graft(ssk, newsock);
|
|
|
|
}
|
2023-04-17 14:00:41 +00:00
|
|
|
|
|
|
|
/* Do late cleanup for the first subflow as necessary. Also
|
|
|
|
* deal with bad peers not doing a complete shutdown.
|
|
|
|
*/
|
2023-08-11 15:57:26 +00:00
|
|
|
if (unlikely(inet_sk_state_load(msk->first) == TCP_CLOSE)) {
|
2023-04-17 14:00:41 +00:00
|
|
|
__mptcp_close_ssk(newsk, msk->first,
|
|
|
|
mptcp_subflow_ctx(msk->first), 0);
|
2023-08-11 15:57:26 +00:00
|
|
|
if (unlikely(list_is_singular(&msk->conn_list)))
|
2023-12-22 12:47:23 +00:00
|
|
|
mptcp_set_state(newsk, TCP_CLOSE);
|
2023-04-17 14:00:41 +00:00
|
|
|
}
|
2023-12-19 21:31:04 +00:00
|
|
|
} else {
|
|
|
|
tcpfallback:
|
2024-05-09 15:20:08 +00:00
|
|
|
newsk->sk_kern_sock = arg->kern;
|
2023-12-19 21:31:04 +00:00
|
|
|
lock_sock(newsk);
|
|
|
|
__inet_accept(sock, newsock, newsk);
|
|
|
|
/* we are being invoked after accepting a non-mp-capable
|
|
|
|
* flow: sk is a tcp_sk, not an mptcp one.
|
|
|
|
*
|
|
|
|
* Hand the socket over to tcp so all further socket ops
|
|
|
|
* bypass mptcp.
|
|
|
|
*/
|
|
|
|
WRITE_ONCE(newsock->sk->sk_socket->ops,
|
|
|
|
mptcp_fallback_tcp_ops(newsock->sk));
|
2020-01-22 00:56:19 +00:00
|
|
|
}
|
2023-05-17 19:16:15 +00:00
|
|
|
release_sock(newsk);
|
2020-01-22 00:56:19 +00:00
|
|
|
|
2023-05-17 19:16:15 +00:00
|
|
|
return 0;
|
2020-01-22 00:56:19 +00:00
|
|
|
}
|
|
|
|
|
2020-11-16 09:48:12 +00:00
|
|
|
static __poll_t mptcp_check_writeable(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
2024-03-01 17:43:46 +00:00
|
|
|
if (__mptcp_stream_is_writeable(sk, 1))
|
2020-11-16 09:48:12 +00:00
|
|
|
return EPOLLOUT | EPOLLWRNORM;
|
|
|
|
|
2024-03-01 17:43:44 +00:00
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
smp_mb__after_atomic(); /* NOSPACE is changed by mptcp_write_space() */
|
2024-03-01 17:43:46 +00:00
|
|
|
if (__mptcp_stream_is_writeable(sk, 1))
|
2020-11-27 10:10:27 +00:00
|
|
|
return EPOLLOUT | EPOLLWRNORM;
|
2020-11-16 09:48:12 +00:00
|
|
|
|
2020-11-27 10:10:27 +00:00
|
|
|
return 0;
|
2020-11-16 09:48:12 +00:00
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:17 +00:00
|
|
|
static __poll_t mptcp_poll(struct file *file, struct socket *sock,
|
|
|
|
struct poll_table_struct *wait)
|
|
|
|
{
|
2020-01-22 00:56:25 +00:00
|
|
|
struct sock *sk = sock->sk;
|
mptcp: cope with later TCP fallback
With MPTCP v1, passive connections can fallback to TCP after the
subflow becomes established:
syn + MP_CAPABLE ->
<- syn, ack + MP_CAPABLE
ack, seq = 3 ->
// OoO packet is accepted because in-sequence
// passive socket is created, is in ESTABLISHED
// status and tentatively as MP_CAPABLE
ack, seq = 2 ->
// no MP_CAPABLE opt, subflow should fallback to TCP
We can't use the 'subflow' socket fallback, as we don't have
it available for passive connection.
Instead, when the fallback is detected, replace the mptcp
socket with the underlying TCP subflow. Beyond covering
the above scenario, it makes a TCP fallback socket as efficient
as plain TCP ones.
Co-developed-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Christoph Paasch <cpaasch@apple.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-01-22 00:56:33 +00:00
|
|
|
struct mptcp_sock *msk;
|
2020-01-22 00:56:17 +00:00
|
|
|
__poll_t mask = 0;
|
2023-05-31 19:37:07 +00:00
|
|
|
u8 shutdown;
|
2020-06-29 20:26:25 +00:00
|
|
|
int state;
|
2020-01-22 00:56:17 +00:00
|
|
|
|
2020-01-22 00:56:25 +00:00
|
|
|
msk = mptcp_sk(sk);
|
|
|
|
sock_poll_wait(file, sock, wait);
|
|
|
|
|
2020-06-29 20:26:25 +00:00
|
|
|
state = inet_sk_state_load(sk);
|
2020-09-14 08:01:09 +00:00
|
|
|
pr_debug("msk=%p state=%d flags=%lx", msk, state, msk->flags);
|
2022-01-07 00:20:17 +00:00
|
|
|
if (state == TCP_LISTEN) {
|
2023-08-11 15:57:21 +00:00
|
|
|
struct sock *ssk = READ_ONCE(msk->first);
|
2023-05-31 19:37:04 +00:00
|
|
|
|
2023-08-11 15:57:21 +00:00
|
|
|
if (WARN_ON_ONCE(!ssk))
|
2022-01-07 00:20:17 +00:00
|
|
|
return 0;
|
|
|
|
|
2023-08-11 15:57:21 +00:00
|
|
|
return inet_csk_listen_poll(ssk);
|
2022-01-07 00:20:17 +00:00
|
|
|
}
|
2020-06-29 20:26:25 +00:00
|
|
|
|
2023-05-31 19:37:07 +00:00
|
|
|
shutdown = READ_ONCE(sk->sk_shutdown);
|
|
|
|
if (shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)
|
|
|
|
mask |= EPOLLHUP;
|
|
|
|
if (shutdown & RCV_SHUTDOWN)
|
|
|
|
mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
|
|
|
|
|
2020-06-29 20:26:25 +00:00
|
|
|
if (state != TCP_SYN_SENT && state != TCP_SYN_RECV) {
|
2023-10-23 20:44:38 +00:00
|
|
|
mask |= mptcp_check_readable(sk);
|
2023-05-31 19:37:07 +00:00
|
|
|
if (shutdown & SEND_SHUTDOWN)
|
|
|
|
mask |= EPOLLOUT | EPOLLWRNORM;
|
|
|
|
else
|
|
|
|
mask |= mptcp_check_writeable(msk);
|
2023-08-16 08:15:45 +00:00
|
|
|
} else if (state == TCP_SYN_SENT &&
|
|
|
|
inet_test_bit(DEFER_CONNECT, sk)) {
|
2022-09-26 23:27:39 +00:00
|
|
|
/* cf tcp_poll() note about TFO */
|
|
|
|
mask |= EPOLLOUT | EPOLLWRNORM;
|
2020-06-29 20:26:25 +00:00
|
|
|
}
|
2020-01-22 00:56:25 +00:00
|
|
|
|
2022-09-30 15:59:34 +00:00
|
|
|
/* This barrier is coupled with smp_wmb() in __mptcp_error_report() */
|
2021-02-11 23:30:37 +00:00
|
|
|
smp_rmb();
|
2023-03-15 20:57:45 +00:00
|
|
|
if (READ_ONCE(sk->sk_err))
|
2021-02-11 23:30:37 +00:00
|
|
|
mask |= EPOLLERR;
|
|
|
|
|
2020-01-22 00:56:17 +00:00
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
2020-01-25 00:04:02 +00:00
|
|
|
static const struct proto_ops mptcp_stream_ops = {
|
|
|
|
.family = PF_INET,
|
|
|
|
.owner = THIS_MODULE,
|
2021-04-01 16:57:45 +00:00
|
|
|
.release = inet_release,
|
2020-01-25 00:04:02 +00:00
|
|
|
.bind = mptcp_bind,
|
2023-05-31 19:37:03 +00:00
|
|
|
.connect = inet_stream_connect,
|
2020-01-25 00:04:02 +00:00
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = mptcp_stream_accept,
|
2020-06-29 20:26:22 +00:00
|
|
|
.getname = inet_getname,
|
2020-01-25 00:04:02 +00:00
|
|
|
.poll = mptcp_poll,
|
|
|
|
.ioctl = inet_ioctl,
|
|
|
|
.gettstamp = sock_gettstamp,
|
|
|
|
.listen = mptcp_listen,
|
2021-01-12 17:25:24 +00:00
|
|
|
.shutdown = inet_shutdown,
|
2020-01-25 00:04:02 +00:00
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
|
|
|
.sendmsg = inet_sendmsg,
|
|
|
|
.recvmsg = inet_recvmsg,
|
|
|
|
.mmap = sock_no_mmap,
|
2023-10-23 20:44:38 +00:00
|
|
|
.set_rcvlowat = mptcp_set_rcvlowat,
|
2020-01-25 00:04:02 +00:00
|
|
|
};
|
2020-01-22 00:56:17 +00:00
|
|
|
|
2020-01-22 00:56:15 +00:00
|
|
|
static struct inet_protosw mptcp_protosw = {
|
|
|
|
.type = SOCK_STREAM,
|
|
|
|
.protocol = IPPROTO_MPTCP,
|
|
|
|
.prot = &mptcp_prot,
|
2020-01-22 00:56:17 +00:00
|
|
|
.ops = &mptcp_stream_ops,
|
|
|
|
.flags = INET_PROTOSW_ICSK,
|
2020-01-22 00:56:15 +00:00
|
|
|
};
|
|
|
|
|
2021-01-20 14:39:14 +00:00
|
|
|
static int mptcp_napi_poll(struct napi_struct *napi, int budget)
|
|
|
|
{
|
|
|
|
struct mptcp_delegated_action *delegated;
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
int work_done = 0;
|
|
|
|
|
|
|
|
delegated = container_of(napi, struct mptcp_delegated_action, napi);
|
|
|
|
while ((subflow = mptcp_subflow_delegated_next(delegated)) != NULL) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
bh_lock_sock_nested(ssk);
|
2023-10-04 20:38:11 +00:00
|
|
|
if (!sock_owned_by_user(ssk)) {
|
|
|
|
mptcp_subflow_process_delegated(ssk, xchg(&subflow->delegated_status, 0));
|
|
|
|
} else {
|
|
|
|
/* tcp_release_cb_override already processed
|
|
|
|
* the action or will do at next release_sock().
|
|
|
|
* In both case must dequeue the subflow here - on the same
|
|
|
|
* CPU that scheduled it.
|
|
|
|
*/
|
|
|
|
smp_wmb();
|
|
|
|
clear_bit(MPTCP_DELEGATE_SCHEDULED, &subflow->delegated_status);
|
|
|
|
}
|
2021-01-20 14:39:14 +00:00
|
|
|
bh_unlock_sock(ssk);
|
|
|
|
sock_put(ssk);
|
|
|
|
|
|
|
|
if (++work_done == budget)
|
|
|
|
return budget;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* always provide a 0 'work_done' argument, so that napi_complete_done
|
|
|
|
* will not try accessing the NULL napi->dev ptr
|
|
|
|
*/
|
|
|
|
napi_complete_done(napi, 0);
|
|
|
|
return work_done;
|
|
|
|
}
|
|
|
|
|
2020-06-26 17:29:59 +00:00
|
|
|
void __init mptcp_proto_init(void)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
2021-01-20 14:39:14 +00:00
|
|
|
struct mptcp_delegated_action *delegated;
|
|
|
|
int cpu;
|
|
|
|
|
2020-01-22 00:56:17 +00:00
|
|
|
mptcp_prot.h.hashinfo = tcp_prot.h.hashinfo;
|
|
|
|
|
2020-03-27 21:48:45 +00:00
|
|
|
if (percpu_counter_init(&mptcp_sockets_allocated, 0, GFP_KERNEL))
|
|
|
|
panic("Failed to allocate MPTCP pcpu counter\n");
|
|
|
|
|
2021-01-20 14:39:14 +00:00
|
|
|
init_dummy_netdev(&mptcp_napi_dev);
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
|
|
delegated = per_cpu_ptr(&mptcp_delegated_actions, cpu);
|
|
|
|
INIT_LIST_HEAD(&delegated->head);
|
2022-05-04 16:37:24 +00:00
|
|
|
netif_napi_add_tx(&mptcp_napi_dev, &delegated->napi,
|
|
|
|
mptcp_napi_poll);
|
2021-01-20 14:39:14 +00:00
|
|
|
napi_enable(&delegated->napi);
|
|
|
|
}
|
|
|
|
|
2020-01-22 00:56:17 +00:00
|
|
|
mptcp_subflow_init();
|
2020-03-27 21:48:38 +00:00
|
|
|
mptcp_pm_init();
|
2023-08-21 22:25:21 +00:00
|
|
|
mptcp_sched_init();
|
2020-06-26 17:30:00 +00:00
|
|
|
mptcp_token_init();
|
2020-01-22 00:56:17 +00:00
|
|
|
|
2020-01-22 00:56:15 +00:00
|
|
|
if (proto_register(&mptcp_prot, 1) != 0)
|
|
|
|
panic("Failed to register MPTCP proto.\n");
|
|
|
|
|
|
|
|
inet_register_protosw(&mptcp_protosw);
|
2020-02-26 09:14:48 +00:00
|
|
|
|
|
|
|
BUILD_BUG_ON(sizeof(struct mptcp_skb_cb) > sizeof_field(struct sk_buff, cb));
|
2020-01-22 00:56:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
2020-01-25 00:04:02 +00:00
|
|
|
static const struct proto_ops mptcp_v6_stream_ops = {
|
|
|
|
.family = PF_INET6,
|
|
|
|
.owner = THIS_MODULE,
|
2021-04-01 16:57:45 +00:00
|
|
|
.release = inet6_release,
|
2020-01-25 00:04:02 +00:00
|
|
|
.bind = mptcp_bind,
|
2023-05-31 19:37:03 +00:00
|
|
|
.connect = inet_stream_connect,
|
2020-01-25 00:04:02 +00:00
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = mptcp_stream_accept,
|
2020-06-29 20:26:22 +00:00
|
|
|
.getname = inet6_getname,
|
2020-01-25 00:04:02 +00:00
|
|
|
.poll = mptcp_poll,
|
|
|
|
.ioctl = inet6_ioctl,
|
|
|
|
.gettstamp = sock_gettstamp,
|
|
|
|
.listen = mptcp_listen,
|
2021-01-12 17:25:24 +00:00
|
|
|
.shutdown = inet_shutdown,
|
2020-01-25 00:04:02 +00:00
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
|
|
|
.sendmsg = inet6_sendmsg,
|
|
|
|
.recvmsg = inet6_recvmsg,
|
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
#ifdef CONFIG_COMPAT
|
2020-05-18 06:28:06 +00:00
|
|
|
.compat_ioctl = inet6_compat_ioctl,
|
2020-01-25 00:04:02 +00:00
|
|
|
#endif
|
2023-10-23 20:44:38 +00:00
|
|
|
.set_rcvlowat = mptcp_set_rcvlowat,
|
2020-01-25 00:04:02 +00:00
|
|
|
};
|
|
|
|
|
2020-01-22 00:56:15 +00:00
|
|
|
static struct proto mptcp_v6_prot;
|
|
|
|
|
|
|
|
static struct inet_protosw mptcp_v6_protosw = {
|
|
|
|
.type = SOCK_STREAM,
|
|
|
|
.protocol = IPPROTO_MPTCP,
|
|
|
|
.prot = &mptcp_v6_prot,
|
2020-01-22 00:56:17 +00:00
|
|
|
.ops = &mptcp_v6_stream_ops,
|
2020-01-22 00:56:15 +00:00
|
|
|
.flags = INET_PROTOSW_ICSK,
|
|
|
|
};
|
|
|
|
|
2020-06-26 17:29:59 +00:00
|
|
|
int __init mptcp_proto_v6_init(void)
|
2020-01-22 00:56:15 +00:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
mptcp_v6_prot = mptcp_prot;
|
2024-05-14 01:13:29 +00:00
|
|
|
strscpy(mptcp_v6_prot.name, "MPTCPv6", sizeof(mptcp_v6_prot.name));
|
2020-01-22 00:56:15 +00:00
|
|
|
mptcp_v6_prot.slab = NULL;
|
2020-02-05 23:39:37 +00:00
|
|
|
mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock);
|
2023-07-20 11:09:01 +00:00
|
|
|
mptcp_v6_prot.ipv6_pinfo_offset = offsetof(struct mptcp6_sock, np);
|
2020-01-22 00:56:15 +00:00
|
|
|
|
|
|
|
err = proto_register(&mptcp_v6_prot, 1);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
err = inet6_register_protosw(&mptcp_v6_protosw);
|
|
|
|
if (err)
|
|
|
|
proto_unregister(&mptcp_v6_prot);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
#endif
|