2020-01-22 08:56:15 +08: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 08:56:26 +08:00
|
|
|
#include <linux/sched/signal.h>
|
|
|
|
#include <linux/atomic.h>
|
2020-01-22 08:56:15 +08:00
|
|
|
#include <net/sock.h>
|
|
|
|
#include <net/inet_common.h>
|
|
|
|
#include <net/inet_hashtables.h>
|
|
|
|
#include <net/protocol.h>
|
|
|
|
#include <net/tcp.h>
|
2020-07-29 06:12:03 +08:00
|
|
|
#include <net/tcp_states.h>
|
2020-01-22 08:56:19 +08:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
#include <net/transp_v6.h>
|
|
|
|
#endif
|
2020-01-22 08:56:15 +08:00
|
|
|
#include <net/mptcp.h>
|
2020-11-16 17:48:09 +08:00
|
|
|
#include <net/xfrm.h>
|
2020-01-22 08:56:15 +08:00
|
|
|
#include "protocol.h"
|
2020-03-28 05:48:50 +08:00
|
|
|
#include "mib.h"
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2021-04-17 06:38:04 +08:00
|
|
|
#define CREATE_TRACE_POINTS
|
|
|
|
#include <trace/events/mptcp.h>
|
|
|
|
|
2020-02-06 07:39:37 +08:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
struct mptcp6_sock {
|
|
|
|
struct mptcp_sock msk;
|
|
|
|
struct ipv6_pinfo np;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
2020-02-26 17:14:48 +08:00
|
|
|
struct mptcp_skb_cb {
|
2020-09-14 16:01:12 +08:00
|
|
|
u64 map_seq;
|
|
|
|
u64 end_seq;
|
2020-02-26 17:14:48 +08:00
|
|
|
u32 offset;
|
2021-06-04 07:24:32 +08:00
|
|
|
u8 has_rxtstamp:1;
|
2020-02-26 17:14:48 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
#define MPTCP_SKB_CB(__skb) ((struct mptcp_skb_cb *)&((__skb)->cb[0]))
|
|
|
|
|
2021-06-04 07:24:32 +08:00
|
|
|
enum {
|
|
|
|
MPTCP_CMSG_TS = BIT(0),
|
|
|
|
};
|
|
|
|
|
2020-03-28 05:48:45 +08:00
|
|
|
static struct percpu_counter mptcp_sockets_allocated;
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
static void __mptcp_destroy_sock(struct sock *sk);
|
2020-11-16 17:48:10 +08:00
|
|
|
static void __mptcp_check_send_data_fin(struct sock *sk);
|
2020-11-16 17:48:09 +08:00
|
|
|
|
2021-01-20 22:39:14 +08:00
|
|
|
DEFINE_PER_CPU(struct mptcp_delegated_action, mptcp_delegated_actions);
|
|
|
|
static struct net_device mptcp_napi_dev;
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
/* If msk has an initial subflow socket, and the MP_CAPABLE handshake has not
|
|
|
|
* completed yet or has failed, return the subflow socket.
|
|
|
|
* Otherwise return NULL.
|
|
|
|
*/
|
2021-02-02 07:09:12 +08:00
|
|
|
struct socket *__mptcp_nmpc_socket(const struct mptcp_sock *msk)
|
2020-01-22 08:56:17 +08:00
|
|
|
{
|
2020-01-22 08:56:32 +08:00
|
|
|
if (!msk->subflow || READ_ONCE(msk->can_ack))
|
2020-01-22 08:56:17 +08:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return msk->subflow;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:13 +08:00
|
|
|
/* Returns end sequence number of the receiver's advertised window */
|
|
|
|
static u64 mptcp_wnd_end(const struct mptcp_sock *msk)
|
|
|
|
{
|
2020-11-27 18:10:26 +08:00
|
|
|
return READ_ONCE(msk->wnd_end);
|
2020-11-16 17:48:13 +08:00
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:22 +08:00
|
|
|
static bool mptcp_is_tcpsk(struct sock *sk)
|
2020-04-02 19:44:51 +08:00
|
|
|
{
|
|
|
|
struct socket *sock = sk->sk_socket;
|
|
|
|
|
|
|
|
if (unlikely(sk->sk_prot == &tcp_prot)) {
|
|
|
|
/* we are being invoked after mptcp_accept() has
|
|
|
|
* accepted 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.
|
|
|
|
*/
|
|
|
|
sock->ops = &inet_stream_ops;
|
2020-06-30 04:26:22 +08:00
|
|
|
return true;
|
2020-04-02 19:44:51 +08:00
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
|
|
|
} else if (unlikely(sk->sk_prot == &tcpv6_prot)) {
|
|
|
|
sock->ops = &inet6_stream_ops;
|
2020-06-30 04:26:22 +08:00
|
|
|
return true;
|
2020-04-02 19:44:51 +08:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:22 +08:00
|
|
|
return false;
|
2020-04-02 19:44:51 +08:00
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:23 +08:00
|
|
|
static int __mptcp_socket_create(struct mptcp_sock *msk)
|
2020-01-22 08:56:17 +08:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
struct socket *ssock;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = mptcp_subflow_create_socket(sk, &ssock);
|
|
|
|
if (err)
|
2020-06-30 04:26:23 +08:00
|
|
|
return err;
|
2020-01-22 08:56:17 +08:00
|
|
|
|
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 08:56:33 +08:00
|
|
|
msk->first = ssock->sk;
|
2020-01-22 08:56:17 +08:00
|
|
|
msk->subflow = ssock;
|
|
|
|
subflow = mptcp_subflow_ctx(ssock->sk);
|
2020-01-22 08:56:18 +08:00
|
|
|
list_add(&subflow->node, &msk->conn_list);
|
2020-11-16 17:48:09 +08:00
|
|
|
sock_hold(ssock->sk);
|
2020-01-22 08:56:17 +08:00
|
|
|
subflow->request_mptcp = 1;
|
2021-01-20 22:39:10 +08:00
|
|
|
mptcp_sock_graft(msk->first, sk->sk_socket);
|
2020-06-30 04:26:20 +08:00
|
|
|
|
2020-06-30 04:26:23 +08:00
|
|
|
return 0;
|
2020-01-22 08:56:17 +08:00
|
|
|
}
|
|
|
|
|
2020-09-14 16:01:12 +08:00
|
|
|
static void mptcp_drop(struct sock *sk, struct sk_buff *skb)
|
|
|
|
{
|
|
|
|
sk_drops_add(sk, skb);
|
|
|
|
__kfree_skb(skb);
|
|
|
|
}
|
|
|
|
|
2020-09-14 16:01:11 +08: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 16:01:14 +08: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 16:01:12 +08:00
|
|
|
MPTCP_SKB_CB(to)->end_seq = MPTCP_SKB_CB(from)->end_seq;
|
2020-09-14 16:01:11 +08:00
|
|
|
kfree_skb_partial(from, fragstolen);
|
|
|
|
atomic_add(delta, &sk->sk_rmem_alloc);
|
|
|
|
sk_mem_charge(sk, delta);
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-09-14 16:01:12 +08: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);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* "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;
|
2020-11-20 03:46:02 +08:00
|
|
|
max_seq = READ_ONCE(msk->rcv_wnd_sent);
|
2020-09-14 16:01:12 +08:00
|
|
|
|
2020-09-14 16:01:14 +08: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-20 03:46:02 +08:00
|
|
|
if (after64(end_seq, max_seq)) {
|
2020-09-14 16:01:12 +08:00
|
|
|
/* out of window */
|
|
|
|
mptcp_drop(sk, skb);
|
2020-11-20 03:46:02 +08:00
|
|
|
pr_debug("oow by %lld, rcv_wnd_sent %llu\n",
|
|
|
|
(unsigned long long)end_seq - (unsigned long)max_seq,
|
|
|
|
(unsigned long long)msk->rcv_wnd_sent);
|
2020-09-14 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_NODSSWINDOW);
|
2020-09-14 16:01:12 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
p = &msk->out_of_order_queue.rb_node;
|
2020-09-14 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOQUEUE);
|
2020-09-14 16:01:12 +08: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 16:01:14 +08: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 16:01:12 +08:00
|
|
|
return;
|
2020-09-14 16:01:14 +08:00
|
|
|
}
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOQUEUETAIL);
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 16:01:12 +08:00
|
|
|
goto merge_right;
|
|
|
|
}
|
|
|
|
} else if (mptcp_ooo_try_coalesce(msk, skb1, skb)) {
|
2020-09-14 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_OFOMERGE);
|
2020-09-14 16:01:12 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
p = &parent->rb_right;
|
|
|
|
}
|
2020-09-14 16:01:14 +08:00
|
|
|
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 16:01:12 +08:00
|
|
|
}
|
|
|
|
/* If there is no skb after us, we are the last_skb ! */
|
|
|
|
if (!skb1)
|
|
|
|
msk->ooo_last_skb = skb;
|
|
|
|
|
|
|
|
end:
|
|
|
|
skb_condense(skb);
|
|
|
|
skb_set_owner_r(skb, sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
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 17:14:48 +08:00
|
|
|
{
|
2020-09-14 16:01:12 +08:00
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-02-26 17:14:48 +08:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-05-26 05:41:13 +08:00
|
|
|
struct sk_buff *tail;
|
2021-06-04 07:24:32 +08:00
|
|
|
bool has_rxtstamp;
|
2020-02-26 17:14:48 +08:00
|
|
|
|
|
|
|
__skb_unlink(skb, &ssk->sk_receive_queue);
|
|
|
|
|
2020-05-26 05:41:13 +08:00
|
|
|
skb_ext_reset(skb);
|
|
|
|
skb_orphan(skb);
|
2020-09-14 16:01:12 +08:00
|
|
|
|
2020-10-27 22:59:14 +08:00
|
|
|
/* try to fetch required memory from subflow */
|
|
|
|
if (!sk_rmem_schedule(sk, skb, skb->truesize)) {
|
2021-06-11 06:59:40 +08:00
|
|
|
int amount = sk_mem_pages(skb->truesize) << SK_MEM_QUANTUM_SHIFT;
|
|
|
|
|
|
|
|
if (ssk->sk_forward_alloc < amount)
|
2020-10-27 22:59:14 +08:00
|
|
|
goto drop;
|
2021-06-11 06:59:40 +08:00
|
|
|
|
|
|
|
ssk->sk_forward_alloc -= amount;
|
|
|
|
sk->sk_forward_alloc += amount;
|
2020-10-27 22:59:14 +08:00
|
|
|
}
|
|
|
|
|
2021-06-04 07:24:32 +08:00
|
|
|
has_rxtstamp = TCP_SKB_CB(skb)->has_rxtstamp;
|
|
|
|
|
2020-09-14 16:01:12 +08: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 16:01:11 +08:00
|
|
|
MPTCP_SKB_CB(skb)->offset = offset;
|
2021-06-04 07:24:32 +08:00
|
|
|
MPTCP_SKB_CB(skb)->has_rxtstamp = has_rxtstamp;
|
2020-05-26 05:41:13 +08:00
|
|
|
|
2020-09-14 16:01:12 +08:00
|
|
|
if (MPTCP_SKB_CB(skb)->map_seq == msk->ack_seq) {
|
|
|
|
/* in sequence */
|
2020-10-06 08:33:26 +08:00
|
|
|
WRITE_ONCE(msk->ack_seq, msk->ack_seq + copy_len);
|
2020-09-14 16:01:12 +08:00
|
|
|
tail = skb_peek_tail(&sk->sk_receive_queue);
|
|
|
|
if (tail && mptcp_try_coalesce(sk, tail, skb))
|
|
|
|
return true;
|
2020-05-26 05:41:13 +08:00
|
|
|
|
2020-09-14 16:01:12 +08:00
|
|
|
skb_set_owner_r(skb, sk);
|
|
|
|
__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 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-10-27 22:59:14 +08:00
|
|
|
drop:
|
2020-09-14 16:01:12 +08:00
|
|
|
mptcp_drop(sk, skb);
|
|
|
|
return false;
|
2020-02-26 17:14:48 +08:00
|
|
|
}
|
|
|
|
|
2020-07-29 06:12:05 +08:00
|
|
|
static void mptcp_stop_timer(struct sock *sk)
|
|
|
|
{
|
|
|
|
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 17:48:09 +08: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);
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
static bool mptcp_pending_data_fin_ack(struct sock *sk)
|
2020-07-29 06:12:05 +08:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
return !__mptcp_check_fallback(msk) &&
|
|
|
|
((1 << sk->sk_state) &
|
|
|
|
(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-29 06:12:05 +08:00
|
|
|
|
|
|
|
/* Look for an acknowledged DATA_FIN */
|
2020-11-27 18:10:27 +08:00
|
|
|
if (mptcp_pending_data_fin_ack(sk)) {
|
2020-07-29 06:12:05 +08:00
|
|
|
WRITE_ONCE(msk->snd_data_fin_enable, 0);
|
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_FIN_WAIT1:
|
|
|
|
inet_sk_state_store(sk, TCP_FIN_WAIT2);
|
|
|
|
break;
|
|
|
|
case TCP_CLOSING:
|
|
|
|
case TCP_LAST_ACK:
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
mptcp_close_wake_up(sk);
|
2020-07-29 06:12:05 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-07-29 06:12:03 +08: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) &&
|
|
|
|
((1 << sk->sk_state) &
|
|
|
|
(TCPF_ESTABLISHED | TCPF_FIN_WAIT1 | TCPF_FIN_WAIT2))) {
|
|
|
|
u64 rcv_data_fin_seq = READ_ONCE(msk->rcv_data_fin_seq);
|
|
|
|
|
|
|
|
if (msk->ack_seq == rcv_data_fin_seq) {
|
|
|
|
if (seq)
|
|
|
|
*seq = rcv_data_fin_seq;
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2021-04-24 00:40:33 +08:00
|
|
|
static void mptcp_set_datafin_timeout(const struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
|
|
|
|
mptcp_sk(sk)->timer_ival = min(TCP_RTO_MAX,
|
|
|
|
TCP_RTO_MIN << icsk->icsk_retransmits);
|
|
|
|
}
|
|
|
|
|
2021-08-14 06:15:41 +08:00
|
|
|
static void __mptcp_set_timeout(struct sock *sk, long tout)
|
2020-07-29 06:12:03 +08:00
|
|
|
{
|
|
|
|
mptcp_sk(sk)->timer_ival = tout > 0 ? tout : TCP_RTO_MIN;
|
|
|
|
}
|
|
|
|
|
2021-08-14 06:15:41 +08:00
|
|
|
static long mptcp_timeout_from_subflow(const struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
|
|
|
const struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
2021-08-14 06:15:42 +08:00
|
|
|
return inet_csk(ssk)->icsk_pending && !subflow->stale_count ?
|
|
|
|
inet_csk(ssk)->icsk_timeout - jiffies : 0;
|
2021-08-14 06:15:41 +08: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);
|
|
|
|
}
|
|
|
|
|
2020-11-25 05:51:24 +08:00
|
|
|
static bool tcp_can_send_ack(const struct sock *ssk)
|
|
|
|
{
|
|
|
|
return !((1 << inet_sk_state_load(ssk)) &
|
2021-01-13 01:25:23 +08:00
|
|
|
(TCPF_SYN_SENT | TCPF_SYN_RECV | TCPF_TIME_WAIT | TCPF_CLOSE | TCPF_LISTEN));
|
2020-11-25 05:51:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_send_ack(struct mptcp_sock *msk)
|
2020-11-16 17:48:14 +08:00
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
2021-06-22 06:54:34 +08:00
|
|
|
bool slow;
|
2020-11-16 17:48:14 +08:00
|
|
|
|
2021-06-22 06:54:34 +08:00
|
|
|
slow = lock_sock_fast(ssk);
|
2020-11-25 05:51:24 +08:00
|
|
|
if (tcp_can_send_ack(ssk))
|
2020-11-20 03:46:03 +08:00
|
|
|
tcp_send_ack(ssk);
|
2021-06-22 06:54:34 +08:00
|
|
|
unlock_sock_fast(ssk, slow);
|
2020-11-20 03:46:03 +08:00
|
|
|
}
|
2020-11-25 05:51:24 +08:00
|
|
|
}
|
|
|
|
|
2021-06-23 03:25:23 +08:00
|
|
|
static void mptcp_subflow_cleanup_rbuf(struct sock *ssk)
|
2020-11-25 05:51:24 +08:00
|
|
|
{
|
2021-06-22 06:54:34 +08:00
|
|
|
bool slow;
|
2020-11-25 05:51:24 +08:00
|
|
|
|
2021-06-22 06:54:34 +08:00
|
|
|
slow = lock_sock_fast(ssk);
|
2021-06-23 03:25:23 +08:00
|
|
|
if (tcp_can_send_ack(ssk))
|
2020-11-25 05:51:24 +08:00
|
|
|
tcp_cleanup_rbuf(ssk, 1);
|
2021-06-22 06:54:34 +08:00
|
|
|
unlock_sock_fast(ssk, slow);
|
2021-06-23 03:25:23 +08: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-26 05:25:22 +08:00
|
|
|
u8 ack_pending = READ_ONCE(icsk->icsk_ack.pending);
|
2021-06-23 03:25:23 +08: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-25 05:51:24 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_cleanup_rbuf(struct mptcp_sock *msk)
|
|
|
|
{
|
2021-02-12 07:30:41 +08:00
|
|
|
int old_space = READ_ONCE(msk->old_wspace);
|
2020-11-25 05:51:24 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-02-12 07:30:41 +08:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2021-06-23 03:25:23 +08:00
|
|
|
int space = __mptcp_space(sk);
|
|
|
|
bool cleanup, rx_empty;
|
2021-02-12 07:30:41 +08:00
|
|
|
|
2021-06-23 03:25:23 +08:00
|
|
|
cleanup = (space > 0) && (space >= (old_space << 1));
|
2021-07-10 08:20:51 +08:00
|
|
|
rx_empty = !__mptcp_rmem(sk);
|
2020-11-25 05:51:24 +08:00
|
|
|
|
2021-06-23 03:25:23 +08:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
2020-11-25 05:51:24 +08:00
|
|
|
|
2021-06-23 03:25:23 +08:00
|
|
|
if (cleanup || mptcp_subflow_could_cleanup(ssk, rx_empty))
|
|
|
|
mptcp_subflow_cleanup_rbuf(ssk);
|
2020-11-16 17:48:14 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_check_data_fin(struct sock *sk)
|
2020-07-29 06:12:03 +08:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
u64 rcv_data_fin_seq;
|
2020-11-16 17:48:14 +08:00
|
|
|
bool ret = false;
|
2020-07-29 06:12:03 +08:00
|
|
|
|
2021-04-02 07:19:43 +08:00
|
|
|
if (__mptcp_check_fallback(msk))
|
2020-11-16 17:48:14 +08:00
|
|
|
return ret;
|
2020-07-29 06:12:03 +08: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-30 06:08:19 +08:00
|
|
|
WRITE_ONCE(msk->ack_seq, msk->ack_seq + 1);
|
2020-07-29 06:12:03 +08:00
|
|
|
WRITE_ONCE(msk->rcv_data_fin, 0);
|
|
|
|
|
|
|
|
sk->sk_shutdown |= RCV_SHUTDOWN;
|
2020-07-29 06:12:05 +08:00
|
|
|
smp_mb__before_atomic(); /* SHUTDOWN must be visible first */
|
|
|
|
set_bit(MPTCP_DATA_READY, &msk->flags);
|
2020-07-29 06:12:03 +08:00
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_ESTABLISHED:
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE_WAIT);
|
|
|
|
break;
|
|
|
|
case TCP_FIN_WAIT1:
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSING);
|
|
|
|
break;
|
|
|
|
case TCP_FIN_WAIT2:
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
/* Other states not expected */
|
|
|
|
WARN_ON_ONCE(1);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:14 +08:00
|
|
|
ret = true;
|
2020-11-25 05:51:24 +08:00
|
|
|
mptcp_send_ack(msk);
|
2020-11-16 17:48:09 +08:00
|
|
|
mptcp_close_wake_up(sk);
|
2020-07-29 06:12:03 +08:00
|
|
|
}
|
2020-11-16 17:48:14 +08:00
|
|
|
return ret;
|
2020-07-29 06:12:03 +08:00
|
|
|
}
|
|
|
|
|
2020-02-26 17:14:48 +08: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 17:14:49 +08:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-02-26 17:14:48 +08:00
|
|
|
unsigned int moved = 0;
|
|
|
|
bool more_data_avail;
|
|
|
|
struct tcp_sock *tp;
|
|
|
|
bool done = false;
|
2020-11-04 03:05:03 +08: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 17:14:49 +08:00
|
|
|
|
2020-09-14 16:01:12 +08:00
|
|
|
pr_debug("msk=%p ssk=%p", msk, ssk);
|
2020-02-26 17:14:48 +08: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 14:27:34 +08:00
|
|
|
if (!skb) {
|
|
|
|
/* if no data is found, a racing workqueue/recvmsg
|
|
|
|
* already processed the new data, stop here or we
|
|
|
|
* can enter an infinite loop
|
|
|
|
*/
|
|
|
|
if (!moved)
|
|
|
|
done = true;
|
2020-02-26 17:14:48 +08:00
|
|
|
break;
|
2020-10-06 14:27:34 +08:00
|
|
|
}
|
2020-02-26 17:14:48 +08:00
|
|
|
|
2020-06-30 04:26:20 +08:00
|
|
|
if (__mptcp_check_fallback(msk)) {
|
|
|
|
/* if we are running under the workqueue, TCP could have
|
|
|
|
* collapsed skbs between dummy map creation and now
|
|
|
|
* be sure to adjust the size
|
|
|
|
*/
|
|
|
|
map_remaining = skb->len;
|
|
|
|
subflow->map_data_len = skb->len;
|
|
|
|
}
|
|
|
|
|
2020-02-26 17:14:48 +08: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 16:01:12 +08:00
|
|
|
if (__mptcp_move_skb(msk, ssk, skb, offset, len))
|
|
|
|
moved += len;
|
2020-02-26 17:14:48 +08: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 17:14:49 +08:00
|
|
|
|
2020-11-04 03:05:03 +08:00
|
|
|
if (atomic_read(&sk->sk_rmem_alloc) > sk_rbuf) {
|
2020-02-26 17:14:49 +08:00
|
|
|
done = true;
|
|
|
|
break;
|
|
|
|
}
|
2020-02-26 17:14:48 +08:00
|
|
|
} while (more_data_avail);
|
|
|
|
|
2020-09-14 16:01:09 +08:00
|
|
|
*bytes += moved;
|
2020-02-26 17:14:48 +08:00
|
|
|
return done;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
static bool __mptcp_ofo_queue(struct mptcp_sock *msk)
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
pr_debug("msk=%p empty=%d", msk, RB_EMPTY_ROOT(&msk->out_of_order_queue));
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_DUPDATA);
|
2020-09-14 16:01:12 +08: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 16:01:14 +08:00
|
|
|
pr_debug("uncoalesced seq=%llx ack seq=%llx delta=%d",
|
|
|
|
MPTCP_SKB_CB(skb)->map_seq, msk->ack_seq,
|
|
|
|
delta);
|
2020-09-14 16:01:12 +08:00
|
|
|
MPTCP_SKB_CB(skb)->offset += delta;
|
|
|
|
__skb_queue_tail(&sk->sk_receive_queue, skb);
|
|
|
|
}
|
|
|
|
msk->ack_seq = end_seq;
|
|
|
|
moved = true;
|
|
|
|
}
|
|
|
|
return moved;
|
|
|
|
}
|
|
|
|
|
2020-02-26 17:14:51 +08: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-11 06:59:41 +08:00
|
|
|
static bool move_skbs_to_msk(struct mptcp_sock *msk, struct sock *ssk)
|
2020-02-26 17:14:51 +08:00
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
unsigned int moved = 0;
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
__mptcp_move_skbs_from_subflow(msk, ssk, &moved);
|
|
|
|
__mptcp_ofo_queue(msk);
|
2021-06-11 06:59:44 +08:00
|
|
|
if (unlikely(ssk->sk_err)) {
|
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_error_report(sk);
|
|
|
|
else
|
|
|
|
set_bit(MPTCP_ERROR_REPORT, &msk->flags);
|
|
|
|
}
|
2020-02-26 17:14:51 +08:00
|
|
|
|
2020-11-27 18:10:24 +08: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-11 06:59:41 +08:00
|
|
|
return moved > 0;
|
2020-02-26 17:14:51 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void mptcp_data_ready(struct sock *sk, struct sock *ssk)
|
2020-02-26 17:14:46 +08:00
|
|
|
{
|
2020-09-14 16:01:09 +08:00
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-02-26 17:14:46 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-04 03:05:03 +08:00
|
|
|
int sk_rbuf, ssk_rbuf;
|
2020-02-26 17:14:46 +08:00
|
|
|
|
2020-12-09 19:03:31 +08: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-04 03:05:03 +08: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-11 06:59:41 +08:00
|
|
|
/* over limit? can't append more skbs to msk, Also, no need to wake-up*/
|
2021-07-10 08:20:51 +08:00
|
|
|
if (__mptcp_rmem(sk) > sk_rbuf) {
|
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED);
|
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-11 06:59:41 +08:00
|
|
|
return;
|
2021-07-10 08:20:51 +08:00
|
|
|
}
|
2020-02-26 17:14:49 +08: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-11 06:59:41 +08:00
|
|
|
/* Wake-up the reader only for in-sequence data */
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
if (move_skbs_to_msk(msk, ssk)) {
|
|
|
|
set_bit(MPTCP_DATA_READY, &msk->flags);
|
2020-09-14 16:01:09 +08: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-11 06:59:41 +08:00
|
|
|
}
|
|
|
|
mptcp_data_unlock(sk);
|
2020-02-26 17:14:46 +08:00
|
|
|
}
|
|
|
|
|
2021-04-16 07:44:53 +08:00
|
|
|
static bool mptcp_do_flush_join_list(struct mptcp_sock *msk)
|
2020-03-28 05:48:40 +08:00
|
|
|
{
|
2021-01-20 22:39:11 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-04-16 07:44:54 +08:00
|
|
|
bool ret = false;
|
2021-01-20 22:39:11 +08:00
|
|
|
|
2020-03-28 05:48:40 +08:00
|
|
|
if (likely(list_empty(&msk->join_list)))
|
2021-04-16 07:44:53 +08:00
|
|
|
return false;
|
2020-03-28 05:48:40 +08:00
|
|
|
|
|
|
|
spin_lock_bh(&msk->join_list_lock);
|
2021-04-16 07:44:54 +08:00
|
|
|
list_for_each_entry(subflow, &msk->join_list, node) {
|
|
|
|
u32 sseq = READ_ONCE(subflow->setsockopt_seq);
|
2021-04-16 07:44:53 +08:00
|
|
|
|
2021-04-16 07:44:54 +08:00
|
|
|
mptcp_propagate_sndbuf((struct sock *)msk, mptcp_subflow_tcp_sock(subflow));
|
|
|
|
if (READ_ONCE(msk->setsockopt_seq) != sseq)
|
|
|
|
ret = true;
|
|
|
|
}
|
2020-03-28 05:48:40 +08:00
|
|
|
list_splice_tail_init(&msk->join_list, &msk->conn_list);
|
|
|
|
spin_unlock_bh(&msk->join_list_lock);
|
2021-04-16 07:44:53 +08:00
|
|
|
|
2021-04-16 07:44:54 +08:00
|
|
|
return ret;
|
2021-04-16 07:44:53 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void __mptcp_flush_join_list(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
if (likely(!mptcp_do_flush_join_list(msk)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!test_and_set_bit(MPTCP_WORK_SYNC_SETSOCKOPT, &msk->flags))
|
|
|
|
mptcp_schedule_work((struct sock *)msk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_flush_join_list(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
bool sync_needed = test_and_clear_bit(MPTCP_WORK_SYNC_SETSOCKOPT, &msk->flags);
|
|
|
|
|
|
|
|
might_sleep();
|
|
|
|
|
|
|
|
if (!mptcp_do_flush_join_list(msk) && !sync_needed)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mptcp_sockopt_sync_all(msk);
|
2020-03-28 05:48:40 +08:00
|
|
|
}
|
|
|
|
|
2020-03-28 05:48:44 +08:00
|
|
|
static bool mptcp_timer_pending(struct sock *sk)
|
|
|
|
{
|
|
|
|
return timer_pending(&inet_csk(sk)->icsk_retransmit_timer);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_reset_timer(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
|
|
|
unsigned long tout;
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
/* prevent rescheduling on close */
|
|
|
|
if (unlikely(inet_sk_state_load(sk) == TCP_CLOSE))
|
|
|
|
return;
|
|
|
|
|
2021-08-14 06:15:41 +08:00
|
|
|
tout = mptcp_sk(sk)->timer_ival;
|
2020-03-28 05:48:44 +08:00
|
|
|
sk_reset_timer(sk, &icsk->icsk_retransmit_timer, jiffies + tout);
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:05 +08: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-04-02 19:44:52 +08:00
|
|
|
void mptcp_subflow_eof(struct sock *sk)
|
|
|
|
{
|
2020-11-16 17:48:05 +08:00
|
|
|
if (!test_and_set_bit(MPTCP_WORK_EOF, &mptcp_sk(sk)->flags))
|
|
|
|
mptcp_schedule_work(sk);
|
2020-04-02 19:44:52 +08:00
|
|
|
}
|
|
|
|
|
2020-06-10 16:47:41 +08:00
|
|
|
static void mptcp_check_for_eof(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
int receivers = 0;
|
|
|
|
|
|
|
|
mptcp_for_each_subflow(msk, subflow)
|
|
|
|
receivers += !subflow->rx_eof;
|
2020-11-16 17:48:09 +08:00
|
|
|
if (receivers)
|
|
|
|
return;
|
2020-06-10 16:47:41 +08:00
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
if (!(sk->sk_shutdown & RCV_SHUTDOWN)) {
|
2020-06-10 16:47:41 +08:00
|
|
|
/* hopefully temporary hack: propagate shutdown status
|
|
|
|
* to msk, when all subflows agree on it
|
|
|
|
*/
|
|
|
|
sk->sk_shutdown |= RCV_SHUTDOWN;
|
|
|
|
|
|
|
|
smp_mb__before_atomic(); /* SHUTDOWN must be visible first */
|
|
|
|
set_bit(MPTCP_DATA_READY, &msk->flags);
|
|
|
|
sk->sk_data_ready(sk);
|
|
|
|
}
|
2020-11-16 17:48:09 +08:00
|
|
|
|
|
|
|
switch (sk->sk_state) {
|
|
|
|
case TCP_ESTABLISHED:
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE_WAIT);
|
|
|
|
break;
|
|
|
|
case TCP_FIN_WAIT1:
|
2020-11-20 03:45:55 +08:00
|
|
|
inet_sk_state_store(sk, TCP_CLOSING);
|
|
|
|
break;
|
|
|
|
case TCP_FIN_WAIT2:
|
2020-11-16 17:48:09 +08:00
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
mptcp_close_wake_up(sk);
|
2020-06-10 16:47:41 +08:00
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:26 +08:00
|
|
|
static struct sock *mptcp_subflow_recv_lookup(const struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
|
|
|
sock_owned_by_me(sk);
|
|
|
|
|
|
|
|
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-11 06:59:41 +08:00
|
|
|
if (READ_ONCE(subflow->data_avail))
|
2020-01-22 08:56:26 +08:00
|
|
|
return mptcp_subflow_tcp_sock(subflow);
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-03-28 05:48:47 +08:00
|
|
|
static bool mptcp_skb_can_collapse_to(u64 write_seq,
|
|
|
|
const struct sk_buff *skb,
|
|
|
|
const struct mptcp_ext *mpext)
|
2020-01-22 08:56:27 +08:00
|
|
|
{
|
|
|
|
if (!tcp_skb_can_collapse_to(skb))
|
|
|
|
return false;
|
|
|
|
|
2020-11-04 03:05:05 +08: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 08:56:27 +08:00
|
|
|
}
|
|
|
|
|
2021-05-12 01:13:51 +08: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-28 05:48:43 +08: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 17:48:10 +08:00
|
|
|
pfrag->size - pfrag->offset > 0 &&
|
2021-05-12 01:13:51 +08:00
|
|
|
pfrag->offset == (df->offset + df->data_len) &&
|
2020-03-28 05:48:43 +08:00
|
|
|
df->data_seq + df->data_len == msk->write_seq;
|
|
|
|
}
|
|
|
|
|
2021-06-22 06:54:33 +08:00
|
|
|
static int mptcp_wmem_with_overhead(int size)
|
2020-11-27 18:10:23 +08:00
|
|
|
{
|
2021-06-22 06:54:33 +08:00
|
|
|
return size + ((sizeof(struct mptcp_data_frag) * size) >> PAGE_SHIFT);
|
2020-11-27 18:10:23 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __mptcp_wmem_reserve(struct sock *sk, int size)
|
|
|
|
{
|
2021-06-22 06:54:33 +08:00
|
|
|
int amount = mptcp_wmem_with_overhead(size);
|
2020-11-27 18:10:23 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
WARN_ON_ONCE(msk->wmem_reserved);
|
net: mptcp: cap forward allocation to 1M
the following syzkaller reproducer:
r0 = socket$inet_mptcp(0x2, 0x1, 0x106)
bind$inet(r0, &(0x7f0000000080)={0x2, 0x4e24, @multicast2}, 0x10)
connect$inet(r0, &(0x7f0000000480)={0x2, 0x4e24, @local}, 0x10)
sendto$inet(r0, &(0x7f0000000100)="f6", 0xffffffe7, 0xc000, 0x0, 0x0)
systematically triggers the following warning:
WARNING: CPU: 2 PID: 8618 at net/core/stream.c:208 sk_stream_kill_queues+0x3fa/0x580
Modules linked in:
CPU: 2 PID: 8618 Comm: syz-executor Not tainted 5.10.0+ #334
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.1-4.module+el8.1.0+4066+0f1aadab 04/04
RIP: 0010:sk_stream_kill_queues+0x3fa/0x580
Code: df 48 c1 ea 03 0f b6 04 02 84 c0 74 04 3c 03 7e 40 8b ab 20 02 00 00 e9 64 ff ff ff e8 df f0 81 2
RSP: 0018:ffffc9000290fcb0 EFLAGS: 00010293
RAX: ffff888011cb8000 RBX: 0000000000000000 RCX: ffffffff86eecf0e
RDX: 0000000000000000 RSI: ffffffff86eecf6a RDI: 0000000000000005
RBP: 0000000000000e28 R08: ffff888011cb8000 R09: fffffbfff1f48139
R10: ffffffff8fa409c7 R11: fffffbfff1f48138 R12: ffff8880215e6220
R13: ffffffff8fa409c0 R14: ffffc9000290fd30 R15: 1ffff92000521fa2
FS: 00007f41c78f4800(0000) GS:ffff88802d000000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f95c803d088 CR3: 0000000025ed2000 CR4: 00000000000006f0
Call Trace:
__mptcp_destroy_sock+0x4f5/0x8e0
mptcp_close+0x5e2/0x7f0
inet_release+0x12b/0x270
__sock_release+0xc8/0x270
sock_close+0x18/0x20
__fput+0x272/0x8e0
task_work_run+0xe0/0x1a0
exit_to_user_mode_prepare+0x1df/0x200
syscall_exit_to_user_mode+0x19/0x50
entry_SYSCALL_64_after_hwframe+0x44/0xa9
userspace programs provide arbitrarily high values of 'len' in sendmsg():
this is causing integer overflow of 'amount'. Cap forward allocation to 1
megabyte: higher values are not really useful.
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Fixes: e93da92896bc ("mptcp: implement wmem reservation")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Link: https://lore.kernel.org/r/3334d00d8b2faecafdfab9aa593efcbf61442756.1608584474.git.dcaratti@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-12-22 05:07:25 +08:00
|
|
|
if (WARN_ON_ONCE(amount < 0))
|
|
|
|
amount = 0;
|
|
|
|
|
2020-11-27 18:10:23 +08:00
|
|
|
if (amount <= sk->sk_forward_alloc)
|
|
|
|
goto reserve;
|
|
|
|
|
|
|
|
/* under memory pressure try to reserve at most a single page
|
|
|
|
* otherwise try to reserve the full estimate and fallback
|
|
|
|
* to a single page before entering the error path
|
|
|
|
*/
|
|
|
|
if ((tcp_under_memory_pressure(sk) && amount > PAGE_SIZE) ||
|
|
|
|
!sk_wmem_schedule(sk, amount)) {
|
|
|
|
if (amount <= PAGE_SIZE)
|
|
|
|
goto nomem;
|
|
|
|
|
|
|
|
amount = PAGE_SIZE;
|
|
|
|
if (!sk_wmem_schedule(sk, amount))
|
|
|
|
goto nomem;
|
|
|
|
}
|
|
|
|
|
|
|
|
reserve:
|
|
|
|
msk->wmem_reserved = amount;
|
|
|
|
sk->sk_forward_alloc -= amount;
|
|
|
|
return;
|
|
|
|
|
|
|
|
nomem:
|
|
|
|
/* we will wait for memory on next allocation */
|
|
|
|
msk->wmem_reserved = -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __mptcp_update_wmem(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2021-05-28 07:31:37 +08:00
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
|
WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock));
|
|
|
|
#endif
|
|
|
|
|
2020-11-27 18:10:23 +08:00
|
|
|
if (!msk->wmem_reserved)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (msk->wmem_reserved < 0)
|
|
|
|
msk->wmem_reserved = 0;
|
|
|
|
if (msk->wmem_reserved > 0) {
|
|
|
|
sk->sk_forward_alloc += msk->wmem_reserved;
|
|
|
|
msk->wmem_reserved = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_wmem_alloc(struct sock *sk, int size)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
/* check for pre-existing error condition */
|
|
|
|
if (msk->wmem_reserved < 0)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (msk->wmem_reserved >= size)
|
|
|
|
goto account;
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
mptcp_data_lock(sk);
|
|
|
|
if (!sk_wmem_schedule(sk, size)) {
|
|
|
|
mptcp_data_unlock(sk);
|
2020-11-27 18:10:23 +08:00
|
|
|
return false;
|
2020-11-27 18:10:24 +08:00
|
|
|
}
|
2020-11-27 18:10:23 +08:00
|
|
|
|
|
|
|
sk->sk_forward_alloc -= size;
|
|
|
|
msk->wmem_reserved += size;
|
2020-11-27 18:10:24 +08:00
|
|
|
mptcp_data_unlock(sk);
|
2020-11-27 18:10:23 +08:00
|
|
|
|
|
|
|
account:
|
|
|
|
msk->wmem_reserved -= size;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
static void mptcp_wmem_uncharge(struct sock *sk, int size)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
if (msk->wmem_reserved < 0)
|
|
|
|
msk->wmem_reserved = 0;
|
|
|
|
msk->wmem_reserved += size;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:25 +08:00
|
|
|
static void mptcp_mem_reclaim_partial(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
/* if we are experiencing a transint allocation error,
|
|
|
|
* the forward allocation memory has been already
|
|
|
|
* released
|
|
|
|
*/
|
|
|
|
if (msk->wmem_reserved < 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
sk->sk_forward_alloc += msk->wmem_reserved;
|
|
|
|
sk_mem_reclaim_partial(sk);
|
|
|
|
msk->wmem_reserved = sk->sk_forward_alloc;
|
|
|
|
sk->sk_forward_alloc = 0;
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
}
|
|
|
|
|
2020-03-28 05:48:45 +08:00
|
|
|
static void dfrag_uncharge(struct sock *sk, int len)
|
|
|
|
{
|
|
|
|
sk_mem_uncharge(sk, len);
|
2020-03-28 05:48:46 +08:00
|
|
|
sk_wmem_queued_add(sk, -len);
|
2020-03-28 05:48:45 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void dfrag_clear(struct sock *sk, struct mptcp_data_frag *dfrag)
|
2020-03-28 05:48:43 +08:00
|
|
|
{
|
2020-03-28 05:48:45 +08:00
|
|
|
int len = dfrag->data_len + dfrag->overhead;
|
|
|
|
|
2020-03-28 05:48:43 +08:00
|
|
|
list_del(&dfrag->list);
|
2020-03-28 05:48:45 +08:00
|
|
|
dfrag_uncharge(sk, len);
|
2020-03-28 05:48:43 +08:00
|
|
|
put_page(dfrag->page);
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
static void __mptcp_clean_una(struct sock *sk)
|
2020-03-28 05:48:43 +08:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
struct mptcp_data_frag *dtmp, *dfrag;
|
2020-03-28 05:48:45 +08:00
|
|
|
bool cleaned = false;
|
2020-06-30 04:26:20 +08:00
|
|
|
u64 snd_una;
|
|
|
|
|
|
|
|
/* on fallback we just need to ignore snd_una, as this is really
|
|
|
|
* plain TCP
|
|
|
|
*/
|
|
|
|
if (__mptcp_check_fallback(msk))
|
2020-11-27 18:10:26 +08:00
|
|
|
msk->snd_una = READ_ONCE(msk->snd_nxt);
|
2020-11-16 17:48:13 +08:00
|
|
|
|
2020-11-27 18:10:26 +08:00
|
|
|
snd_una = msk->snd_una;
|
2020-03-28 05:48:43 +08:00
|
|
|
list_for_each_entry_safe(dfrag, dtmp, &msk->rtx_queue, list) {
|
|
|
|
if (after64(dfrag->data_seq + dfrag->data_len, snd_una))
|
|
|
|
break;
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
if (WARN_ON_ONCE(dfrag == msk->first_pending))
|
|
|
|
break;
|
2020-03-28 05:48:45 +08:00
|
|
|
dfrag_clear(sk, dfrag);
|
|
|
|
cleaned = true;
|
|
|
|
}
|
|
|
|
|
2020-03-28 05:48:46 +08:00
|
|
|
dfrag = mptcp_rtx_head(sk);
|
|
|
|
if (dfrag && after64(snd_una, dfrag->data_seq)) {
|
2020-07-23 19:02:30 +08:00
|
|
|
u64 delta = snd_una - dfrag->data_seq;
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
if (WARN_ON_ONCE(delta > dfrag->already_sent))
|
2020-07-23 19:02:30 +08:00
|
|
|
goto out;
|
2020-03-28 05:48:46 +08:00
|
|
|
|
|
|
|
dfrag->data_seq += delta;
|
2020-07-23 19:02:30 +08:00
|
|
|
dfrag->offset += delta;
|
2020-03-28 05:48:46 +08:00
|
|
|
dfrag->data_len -= delta;
|
2020-11-16 17:48:10 +08:00
|
|
|
dfrag->already_sent -= delta;
|
2020-03-28 05:48:46 +08:00
|
|
|
|
|
|
|
dfrag_uncharge(sk, delta);
|
|
|
|
cleaned = true;
|
|
|
|
}
|
|
|
|
|
2020-07-23 19:02:30 +08:00
|
|
|
out:
|
2020-11-27 18:10:27 +08:00
|
|
|
if (cleaned) {
|
|
|
|
if (tcp_under_memory_pressure(sk)) {
|
|
|
|
__mptcp_update_wmem(sk);
|
|
|
|
sk_mem_reclaim_partial(sk);
|
|
|
|
}
|
|
|
|
}
|
2020-11-04 03:05:06 +08:00
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
if (snd_una == READ_ONCE(msk->snd_nxt)) {
|
2021-08-14 06:15:41 +08:00
|
|
|
if (mptcp_timer_pending(sk) && !mptcp_data_fin_enabled(msk))
|
2020-11-27 18:10:27 +08:00
|
|
|
mptcp_stop_timer(sk);
|
|
|
|
} else {
|
|
|
|
mptcp_reset_timer(sk);
|
2020-03-28 05:48:43 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-03-05 05:32:15 +08:00
|
|
|
static void __mptcp_clean_una_wakeup(struct sock *sk)
|
|
|
|
{
|
2021-05-28 07:31:37 +08:00
|
|
|
#ifdef CONFIG_LOCKDEP
|
|
|
|
WARN_ON_ONCE(!lockdep_is_held(&sk->sk_lock.slock));
|
|
|
|
#endif
|
2021-03-05 05:32:15 +08:00
|
|
|
__mptcp_clean_una(sk);
|
|
|
|
mptcp_write_space(sk);
|
|
|
|
}
|
|
|
|
|
2021-05-28 07:31:37 +08: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 18:10:25 +08:00
|
|
|
static void mptcp_enter_memory_pressure(struct sock *sk)
|
2020-03-28 05:48:43 +08:00
|
|
|
{
|
2020-11-16 17:48:10 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
bool first = true;
|
|
|
|
|
2020-03-28 05:48:43 +08:00
|
|
|
sk_stream_moderate_sndbuf(sk);
|
2020-11-16 17:48:10 +08:00
|
|
|
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);
|
|
|
|
first = false;
|
|
|
|
}
|
2020-11-27 18:10:25 +08: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-28 05:48:43 +08: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 17:48:10 +08:00
|
|
|
dfrag->already_sent = 0;
|
2020-03-28 05:48:43 +08:00
|
|
|
dfrag->page = pfrag->page;
|
|
|
|
|
|
|
|
return dfrag;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:06 +08:00
|
|
|
struct mptcp_sendmsg_info {
|
|
|
|
int mss_now;
|
|
|
|
int size_goal;
|
2020-11-16 17:48:10 +08:00
|
|
|
u16 limit;
|
|
|
|
u16 sent;
|
|
|
|
unsigned int flags;
|
2020-11-16 17:48:06 +08:00
|
|
|
};
|
|
|
|
|
2020-11-16 17:48:13 +08:00
|
|
|
static int mptcp_check_allowed_size(struct mptcp_sock *msk, u64 data_seq,
|
|
|
|
int avail_size)
|
|
|
|
{
|
|
|
|
u64 window_end = mptcp_wnd_end(msk);
|
|
|
|
|
|
|
|
if (__mptcp_check_fallback(msk))
|
|
|
|
return avail_size;
|
|
|
|
|
|
|
|
if (!before64(data_seq + avail_size, window_end)) {
|
|
|
|
u64 allowed_size = window_end - data_seq;
|
|
|
|
|
|
|
|
return min_t(unsigned int, allowed_size, avail_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
return avail_size;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:25 +08: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 18:10:27 +08:00
|
|
|
static struct sk_buff *__mptcp_do_alloc_tx_skb(struct sock *sk, gfp_t gfp)
|
2020-11-27 18:10:25 +08:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
skb = alloc_skb_fclone(MAX_TCP_HEADER, gfp);
|
2020-11-27 18:10:25 +08:00
|
|
|
if (likely(skb)) {
|
2020-11-27 18:10:27 +08:00
|
|
|
if (likely(__mptcp_add_ext(skb, gfp))) {
|
2020-11-27 18:10:25 +08:00
|
|
|
skb_reserve(skb, MAX_TCP_HEADER);
|
|
|
|
skb->reserved_tailroom = skb->end - skb->tail;
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
__kfree_skb(skb);
|
|
|
|
} else {
|
|
|
|
mptcp_enter_memory_pressure(sk);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
static bool __mptcp_alloc_tx_skb(struct sock *sk, struct sock *ssk, gfp_t gfp)
|
2020-11-27 18:10:25 +08:00
|
|
|
{
|
|
|
|
struct sk_buff *skb;
|
|
|
|
|
|
|
|
if (ssk->sk_tx_skb_cache) {
|
|
|
|
skb = ssk->sk_tx_skb_cache;
|
|
|
|
if (unlikely(!skb_ext_find(skb, SKB_EXT_MPTCP) &&
|
2020-11-27 18:10:27 +08:00
|
|
|
!__mptcp_add_ext(skb, gfp)))
|
2020-11-27 18:10:25 +08:00
|
|
|
return false;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
skb = __mptcp_do_alloc_tx_skb(sk, gfp);
|
2020-11-27 18:10:25 +08:00
|
|
|
if (!skb)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
if (likely(sk_wmem_schedule(ssk, skb->truesize))) {
|
|
|
|
ssk->sk_tx_skb_cache = skb;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
kfree_skb(skb);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_must_reclaim_memory(struct sock *sk, struct sock *ssk)
|
|
|
|
{
|
|
|
|
return !ssk->sk_tx_skb_cache &&
|
|
|
|
tcp_under_memory_pressure(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool mptcp_alloc_tx_skb(struct sock *sk, struct sock *ssk)
|
|
|
|
{
|
|
|
|
if (unlikely(mptcp_must_reclaim_memory(sk, ssk)))
|
|
|
|
mptcp_mem_reclaim_partial(sk);
|
2020-11-27 18:10:27 +08:00
|
|
|
return __mptcp_alloc_tx_skb(sk, ssk, sk->sk_allocation);
|
2020-11-27 18:10:25 +08:00
|
|
|
}
|
|
|
|
|
2021-06-18 07:46:08 +08: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));
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:23 +08:00
|
|
|
static int mptcp_sendmsg_frag(struct sock *sk, struct sock *ssk,
|
2020-11-16 17:48:10 +08:00
|
|
|
struct mptcp_data_frag *dfrag,
|
2020-11-16 17:48:06 +08:00
|
|
|
struct mptcp_sendmsg_info *info)
|
2020-01-22 08:56:23 +08:00
|
|
|
{
|
2020-11-16 17:48:10 +08:00
|
|
|
u64 data_seq = dfrag->data_seq + info->sent;
|
2020-01-22 08:56:23 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-16 17:48:13 +08:00
|
|
|
bool zero_window_probe = false;
|
2020-01-22 08:56:23 +08:00
|
|
|
struct mptcp_ext *mpext = NULL;
|
2020-01-22 08:56:27 +08:00
|
|
|
struct sk_buff *skb, *tail;
|
2020-11-16 17:48:10 +08:00
|
|
|
bool can_collapse = false;
|
2020-12-11 06:25:06 +08:00
|
|
|
int size_bias = 0;
|
2020-11-16 17:48:10 +08:00
|
|
|
int avail_size;
|
2020-11-27 18:10:25 +08:00
|
|
|
size_t ret = 0;
|
2020-01-22 08:56:23 +08:00
|
|
|
|
2021-04-17 06:38:02 +08:00
|
|
|
pr_debug("msk=%p ssk=%p sending dfrag at seq=%llu len=%u already sent=%u",
|
2020-11-16 17:48:10 +08:00
|
|
|
msk, ssk, dfrag->data_seq, dfrag->data_len, info->sent);
|
|
|
|
|
|
|
|
/* compute send limit */
|
|
|
|
info->mss_now = tcp_send_mss(ssk, &info->size_goal, info->flags);
|
2020-11-16 17:48:06 +08:00
|
|
|
avail_size = info->size_goal;
|
2020-01-22 08:56:27 +08:00
|
|
|
skb = tcp_write_queue_tail(ssk);
|
|
|
|
if (skb) {
|
|
|
|
/* 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
|
|
|
|
*/
|
2020-11-16 17:48:10 +08:00
|
|
|
mpext = skb_ext_find(skb, SKB_EXT_MPTCP);
|
2020-11-16 17:48:06 +08:00
|
|
|
can_collapse = (info->size_goal - skb->len > 0) &&
|
2020-11-16 17:48:10 +08:00
|
|
|
mptcp_skb_can_collapse_to(data_seq, skb, mpext);
|
2020-12-11 06:25:06 +08:00
|
|
|
if (!can_collapse) {
|
2020-01-22 08:56:27 +08:00
|
|
|
TCP_SKB_CB(skb)->eor = 1;
|
2020-12-11 06:25:06 +08:00
|
|
|
} else {
|
|
|
|
size_bias = skb->len;
|
2020-11-16 17:48:06 +08:00
|
|
|
avail_size = info->size_goal - skb->len;
|
2020-12-11 06:25:06 +08:00
|
|
|
}
|
2020-01-22 08:56:27 +08:00
|
|
|
}
|
2020-03-28 05:48:43 +08:00
|
|
|
|
2020-11-16 17:48:13 +08:00
|
|
|
/* Zero window and all data acked? Probe. */
|
|
|
|
avail_size = mptcp_check_allowed_size(msk, data_seq, avail_size);
|
|
|
|
if (avail_size == 0) {
|
2020-11-27 18:10:26 +08:00
|
|
|
u64 snd_una = READ_ONCE(msk->snd_una);
|
|
|
|
|
|
|
|
if (skb || snd_una != msk->snd_nxt)
|
2020-11-16 17:48:13 +08:00
|
|
|
return 0;
|
|
|
|
zero_window_probe = true;
|
2020-11-27 18:10:26 +08:00
|
|
|
data_seq = snd_una - 1;
|
2020-11-16 17:48:13 +08:00
|
|
|
avail_size = 1;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
if (WARN_ON_ONCE(info->sent > info->limit ||
|
|
|
|
info->limit > dfrag->data_len))
|
|
|
|
return 0;
|
2020-03-28 05:48:45 +08:00
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
ret = info->limit - info->sent;
|
2020-12-11 06:25:06 +08:00
|
|
|
tail = tcp_build_frag(ssk, avail_size + size_bias, info->flags,
|
|
|
|
dfrag->page, dfrag->offset + info->sent, &ret);
|
2020-11-16 17:48:03 +08:00
|
|
|
if (!tail) {
|
|
|
|
tcp_remove_empty_skb(sk, tcp_write_queue_tail(ssk));
|
|
|
|
return -ENOMEM;
|
2020-08-14 21:56:34 +08:00
|
|
|
}
|
2020-03-28 05:48:43 +08:00
|
|
|
|
2020-11-16 17:48:03 +08:00
|
|
|
/* if the tail skb is still the cached one, collapsing really happened.
|
2020-01-22 08:56:27 +08:00
|
|
|
*/
|
2020-11-16 17:48:03 +08:00
|
|
|
if (skb == tail) {
|
2020-12-11 06:25:06 +08:00
|
|
|
TCP_SKB_CB(tail)->tcp_flags &= ~TCPHDR_PSH;
|
2020-01-22 08:56:27 +08:00
|
|
|
mpext->data_len += ret;
|
2020-12-11 06:25:06 +08:00
|
|
|
WARN_ON_ONCE(!can_collapse);
|
2020-11-16 17:48:13 +08:00
|
|
|
WARN_ON_ONCE(zero_window_probe);
|
2020-01-22 08:56:27 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:25 +08:00
|
|
|
mpext = skb_ext_find(tail, SKB_EXT_MPTCP);
|
|
|
|
if (WARN_ON_ONCE(!mpext)) {
|
|
|
|
/* should never reach here, stream corrupted */
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
2020-01-22 08:56:23 +08:00
|
|
|
|
|
|
|
memset(mpext, 0, sizeof(*mpext));
|
2020-11-16 17:48:10 +08:00
|
|
|
mpext->data_seq = data_seq;
|
2020-01-22 08:56:23 +08:00
|
|
|
mpext->subflow_seq = mptcp_subflow_ctx(ssk)->rel_write_seq;
|
|
|
|
mpext->data_len = ret;
|
|
|
|
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 17:48:13 +08:00
|
|
|
if (zero_window_probe) {
|
|
|
|
mptcp_subflow_ctx(ssk)->rel_write_seq += ret;
|
|
|
|
mpext->frozen = 1;
|
2021-06-18 07:46:08 +08:00
|
|
|
if (READ_ONCE(msk->csum_enabled))
|
|
|
|
mptcp_update_data_checksum(tail, ret);
|
2020-11-16 17:48:13 +08:00
|
|
|
tcp_push_pending_frames(ssk);
|
2021-06-18 07:46:08 +08:00
|
|
|
return 0;
|
2020-11-16 17:48:13 +08:00
|
|
|
}
|
2020-01-22 08:56:27 +08:00
|
|
|
out:
|
2021-06-18 07:46:08 +08:00
|
|
|
if (READ_ONCE(msk->csum_enabled))
|
|
|
|
mptcp_update_data_checksum(tail, ret);
|
2020-01-22 08:56:23 +08:00
|
|
|
mptcp_subflow_ctx(ssk)->rel_write_seq += ret;
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2020-09-14 16:01:17 +08: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;
|
|
|
|
u64 ratio;
|
|
|
|
};
|
|
|
|
|
2021-08-14 06:15:41 +08:00
|
|
|
/* implement the mptcp packet scheduler;
|
|
|
|
* returns the subflow that will transmit the next DSS
|
|
|
|
* additionally updates the rtx timeout
|
|
|
|
*/
|
2021-01-20 22:39:11 +08:00
|
|
|
static struct sock *mptcp_subflow_get_send(struct mptcp_sock *msk)
|
2020-03-28 05:48:39 +08:00
|
|
|
{
|
2020-09-14 16:01:17 +08:00
|
|
|
struct subflow_send_info send_info[2];
|
2020-03-28 05:48:39 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-08-14 06:15:41 +08:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-09-14 16:01:17 +08:00
|
|
|
int i, nr_active = 0;
|
|
|
|
struct sock *ssk;
|
2021-08-14 06:15:41 +08:00
|
|
|
long tout = 0;
|
2020-09-14 16:01:17 +08:00
|
|
|
u64 ratio;
|
|
|
|
u32 pace;
|
2020-03-28 05:48:39 +08:00
|
|
|
|
2021-08-14 06:15:41 +08:00
|
|
|
sock_owned_by_me(sk);
|
2020-03-28 05:48:39 +08:00
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
if (__mptcp_check_fallback(msk)) {
|
|
|
|
if (!msk->first)
|
2020-03-28 05:48:39 +08:00
|
|
|
return NULL;
|
2020-09-14 16:01:17 +08:00
|
|
|
return sk_stream_memory_free(msk->first) ? msk->first : NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* re-use last subflow, if the burst allow that */
|
|
|
|
if (msk->last_snd && msk->snd_burst > 0 &&
|
|
|
|
sk_stream_memory_free(msk->last_snd) &&
|
2021-08-14 06:15:41 +08:00
|
|
|
mptcp_subflow_active(mptcp_subflow_ctx(msk->last_snd))) {
|
|
|
|
mptcp_set_timeout(sk);
|
2020-09-14 16:01:17 +08:00
|
|
|
return msk->last_snd;
|
2021-08-14 06:15:41 +08:00
|
|
|
}
|
2020-03-28 05:48:39 +08:00
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
/* pick the subflow with the lower wmem/wspace ratio */
|
|
|
|
for (i = 0; i < 2; ++i) {
|
|
|
|
send_info[i].ssk = NULL;
|
|
|
|
send_info[i].ratio = -1;
|
|
|
|
}
|
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
2021-04-17 06:38:04 +08:00
|
|
|
trace_mptcp_subflow_get_send(subflow);
|
2020-09-14 16:01:17 +08:00
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
if (!mptcp_subflow_active(subflow))
|
|
|
|
continue;
|
|
|
|
|
2021-08-14 06:15:41 +08:00
|
|
|
tout = max(tout, mptcp_timeout_from_subflow(subflow));
|
2020-09-14 16:01:17 +08:00
|
|
|
nr_active += !subflow->backup;
|
2021-01-20 22:39:12 +08:00
|
|
|
if (!sk_stream_memory_free(subflow->tcp_sock) || !tcp_sk(ssk)->snd_wnd)
|
2020-09-14 16:01:17 +08:00
|
|
|
continue;
|
2020-03-28 05:48:39 +08:00
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
pace = READ_ONCE(ssk->sk_pacing_rate);
|
|
|
|
if (!pace)
|
2020-03-28 05:48:39 +08:00
|
|
|
continue;
|
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
ratio = div_u64((u64)READ_ONCE(ssk->sk_wmem_queued) << 32,
|
|
|
|
pace);
|
|
|
|
if (ratio < send_info[subflow->backup].ratio) {
|
|
|
|
send_info[subflow->backup].ssk = ssk;
|
|
|
|
send_info[subflow->backup].ratio = ratio;
|
|
|
|
}
|
2020-03-28 05:48:39 +08:00
|
|
|
}
|
2021-08-14 06:15:41 +08:00
|
|
|
__mptcp_set_timeout(sk, tout);
|
2020-03-28 05:48:39 +08:00
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
/* pick the best backup if no other subflow is active */
|
|
|
|
if (!nr_active)
|
|
|
|
send_info[0].ssk = send_info[1].ssk;
|
|
|
|
|
|
|
|
if (send_info[0].ssk) {
|
|
|
|
msk->last_snd = send_info[0].ssk;
|
|
|
|
msk->snd_burst = min_t(int, MPTCP_SEND_BURST_SIZE,
|
2021-01-20 22:39:12 +08:00
|
|
|
tcp_sk(msk->last_snd)->snd_wnd);
|
2020-09-14 16:01:17 +08:00
|
|
|
return msk->last_snd;
|
|
|
|
}
|
2021-01-20 22:39:11 +08:00
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
return NULL;
|
2020-03-28 05:48:39 +08:00
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
static void mptcp_push_release(struct sock *sk, struct sock *ssk,
|
|
|
|
struct mptcp_sendmsg_info *info)
|
|
|
|
{
|
|
|
|
tcp_push(ssk, 0, info->mss_now, tcp_sk(ssk)->nonagle, info->size_goal);
|
|
|
|
release_sock(ssk);
|
|
|
|
}
|
|
|
|
|
2021-03-05 05:32:14 +08:00
|
|
|
static void __mptcp_push_pending(struct sock *sk, unsigned int flags)
|
2020-01-22 08:56:15 +08:00
|
|
|
{
|
2020-11-16 17:48:10 +08:00
|
|
|
struct sock *prev_ssk = NULL, *ssk = NULL;
|
2020-01-22 08:56:15 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-16 17:48:06 +08:00
|
|
|
struct mptcp_sendmsg_info info = {
|
2020-11-16 17:48:10 +08:00
|
|
|
.flags = flags,
|
2020-11-16 17:48:06 +08:00
|
|
|
};
|
2020-11-16 17:48:10 +08:00
|
|
|
struct mptcp_data_frag *dfrag;
|
|
|
|
int len, copied = 0;
|
|
|
|
|
|
|
|
while ((dfrag = mptcp_send_head(sk))) {
|
|
|
|
info.sent = dfrag->already_sent;
|
|
|
|
info.limit = dfrag->data_len;
|
|
|
|
len = dfrag->data_len - dfrag->already_sent;
|
|
|
|
while (len > 0) {
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
prev_ssk = ssk;
|
2021-04-16 07:44:53 +08:00
|
|
|
mptcp_flush_join_list(msk);
|
2021-01-20 22:39:11 +08:00
|
|
|
ssk = mptcp_subflow_get_send(msk);
|
2020-11-16 17:48:10 +08:00
|
|
|
|
|
|
|
/* try to keep the subflow socket lock across
|
|
|
|
* consecutive xmit on the same socket
|
|
|
|
*/
|
|
|
|
if (ssk != prev_ssk && prev_ssk)
|
|
|
|
mptcp_push_release(sk, prev_ssk, &info);
|
|
|
|
if (!ssk)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
if (ssk != prev_ssk || !prev_ssk)
|
|
|
|
lock_sock(ssk);
|
|
|
|
|
2020-11-27 18:10:25 +08:00
|
|
|
/* keep it simple and always provide a new skb for the
|
|
|
|
* subflow, even if we will not use it when collapsing
|
|
|
|
* on the pending one
|
|
|
|
*/
|
|
|
|
if (!mptcp_alloc_tx_skb(sk, ssk)) {
|
|
|
|
mptcp_push_release(sk, ssk, &info);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
ret = mptcp_sendmsg_frag(sk, ssk, dfrag, &info);
|
|
|
|
if (ret <= 0) {
|
|
|
|
mptcp_push_release(sk, ssk, &info);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
info.sent += ret;
|
|
|
|
dfrag->already_sent += ret;
|
|
|
|
msk->snd_nxt += ret;
|
|
|
|
msk->snd_burst -= ret;
|
2020-11-27 18:10:25 +08:00
|
|
|
msk->tx_pending_data -= ret;
|
2020-11-16 17:48:10 +08:00
|
|
|
copied += ret;
|
|
|
|
len -= ret;
|
|
|
|
}
|
|
|
|
WRITE_ONCE(msk->first_pending, mptcp_send_next(sk));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* at this point we held the socket lock for the last subflow we used */
|
|
|
|
if (ssk)
|
|
|
|
mptcp_push_release(sk, ssk, &info);
|
|
|
|
|
|
|
|
out:
|
2021-08-14 06:15:41 +08:00
|
|
|
/* ensure the rtx timer is running */
|
|
|
|
if (!mptcp_timer_pending(sk))
|
|
|
|
mptcp_reset_timer(sk);
|
|
|
|
if (copied)
|
2020-11-16 17:48:10 +08:00
|
|
|
__mptcp_check_send_data_fin(sk);
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
struct mptcp_sendmsg_info info;
|
|
|
|
struct mptcp_data_frag *dfrag;
|
2021-01-20 22:39:14 +08:00
|
|
|
struct sock *xmit_ssk;
|
2020-11-27 18:10:27 +08:00
|
|
|
int len, copied = 0;
|
2021-01-20 22:39:14 +08:00
|
|
|
bool first = true;
|
2020-11-27 18:10:27 +08:00
|
|
|
|
|
|
|
info.flags = 0;
|
|
|
|
while ((dfrag = mptcp_send_head(sk))) {
|
|
|
|
info.sent = dfrag->already_sent;
|
|
|
|
info.limit = dfrag->data_len;
|
|
|
|
len = dfrag->data_len - dfrag->already_sent;
|
|
|
|
while (len > 0) {
|
|
|
|
int ret = 0;
|
|
|
|
|
2021-01-20 22:39:14 +08:00
|
|
|
/* the caller already invoked the packet scheduler,
|
|
|
|
* check for a different subflow usage only after
|
|
|
|
* spooling the first chunk of data
|
|
|
|
*/
|
|
|
|
xmit_ssk = first ? ssk : mptcp_subflow_get_send(mptcp_sk(sk));
|
|
|
|
if (!xmit_ssk)
|
|
|
|
goto out;
|
|
|
|
if (xmit_ssk != ssk) {
|
|
|
|
mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk));
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
if (unlikely(mptcp_must_reclaim_memory(sk, ssk))) {
|
|
|
|
__mptcp_update_wmem(sk);
|
|
|
|
sk_mem_reclaim_partial(sk);
|
|
|
|
}
|
|
|
|
if (!__mptcp_alloc_tx_skb(sk, ssk, GFP_ATOMIC))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
ret = mptcp_sendmsg_frag(sk, ssk, dfrag, &info);
|
|
|
|
if (ret <= 0)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
info.sent += ret;
|
|
|
|
dfrag->already_sent += ret;
|
|
|
|
msk->snd_nxt += ret;
|
|
|
|
msk->snd_burst -= ret;
|
|
|
|
msk->tx_pending_data -= ret;
|
|
|
|
copied += ret;
|
|
|
|
len -= ret;
|
2021-01-20 22:39:14 +08:00
|
|
|
first = false;
|
2020-11-27 18:10:27 +08:00
|
|
|
}
|
|
|
|
WRITE_ONCE(msk->first_pending, mptcp_send_next(sk));
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
/* __mptcp_alloc_tx_skb could have released some wmem and we are
|
|
|
|
* not going to flush it via release_sock()
|
|
|
|
*/
|
|
|
|
__mptcp_update_wmem(sk);
|
|
|
|
if (copied) {
|
|
|
|
tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,
|
|
|
|
info.size_goal);
|
2021-02-12 07:30:42 +08:00
|
|
|
if (!mptcp_timer_pending(sk))
|
|
|
|
mptcp_reset_timer(sk);
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
if (msk->snd_data_fin_enable &&
|
|
|
|
msk->snd_nxt + 1 == msk->write_seq)
|
|
|
|
mptcp_schedule_work(sk);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2021-01-20 22:39:11 +08:00
|
|
|
static void mptcp_set_nospace(struct sock *sk)
|
|
|
|
{
|
|
|
|
/* enable autotune */
|
|
|
|
set_bit(SOCK_NOSPACE, &sk->sk_socket->flags);
|
|
|
|
|
|
|
|
/* will be cleared on avail space */
|
|
|
|
set_bit(MPTCP_NOSPACE, &mptcp_sk(sk)->flags);
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
static int mptcp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-05-16 16:46:21 +08:00
|
|
|
struct page_frag *pfrag;
|
2020-01-22 08:56:23 +08:00
|
|
|
size_t copied = 0;
|
2020-11-16 17:48:06 +08:00
|
|
|
int ret = 0;
|
2020-01-22 08:56:23 +08:00
|
|
|
long timeo;
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2021-04-24 02:17:07 +08:00
|
|
|
/* we don't support FASTOPEN yet */
|
|
|
|
if (msg->msg_flags & MSG_FASTOPEN)
|
2020-01-22 08:56:15 +08:00
|
|
|
return -EOPNOTSUPP;
|
|
|
|
|
2021-04-24 02:17:07 +08:00
|
|
|
/* silently ignore everything else */
|
|
|
|
msg->msg_flags &= MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL;
|
|
|
|
|
net: mptcp: cap forward allocation to 1M
the following syzkaller reproducer:
r0 = socket$inet_mptcp(0x2, 0x1, 0x106)
bind$inet(r0, &(0x7f0000000080)={0x2, 0x4e24, @multicast2}, 0x10)
connect$inet(r0, &(0x7f0000000480)={0x2, 0x4e24, @local}, 0x10)
sendto$inet(r0, &(0x7f0000000100)="f6", 0xffffffe7, 0xc000, 0x0, 0x0)
systematically triggers the following warning:
WARNING: CPU: 2 PID: 8618 at net/core/stream.c:208 sk_stream_kill_queues+0x3fa/0x580
Modules linked in:
CPU: 2 PID: 8618 Comm: syz-executor Not tainted 5.10.0+ #334
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.11.1-4.module+el8.1.0+4066+0f1aadab 04/04
RIP: 0010:sk_stream_kill_queues+0x3fa/0x580
Code: df 48 c1 ea 03 0f b6 04 02 84 c0 74 04 3c 03 7e 40 8b ab 20 02 00 00 e9 64 ff ff ff e8 df f0 81 2
RSP: 0018:ffffc9000290fcb0 EFLAGS: 00010293
RAX: ffff888011cb8000 RBX: 0000000000000000 RCX: ffffffff86eecf0e
RDX: 0000000000000000 RSI: ffffffff86eecf6a RDI: 0000000000000005
RBP: 0000000000000e28 R08: ffff888011cb8000 R09: fffffbfff1f48139
R10: ffffffff8fa409c7 R11: fffffbfff1f48138 R12: ffff8880215e6220
R13: ffffffff8fa409c0 R14: ffffc9000290fd30 R15: 1ffff92000521fa2
FS: 00007f41c78f4800(0000) GS:ffff88802d000000(0000) knlGS:0000000000000000
CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
CR2: 00007f95c803d088 CR3: 0000000025ed2000 CR4: 00000000000006f0
Call Trace:
__mptcp_destroy_sock+0x4f5/0x8e0
mptcp_close+0x5e2/0x7f0
inet_release+0x12b/0x270
__sock_release+0xc8/0x270
sock_close+0x18/0x20
__fput+0x272/0x8e0
task_work_run+0xe0/0x1a0
exit_to_user_mode_prepare+0x1df/0x200
syscall_exit_to_user_mode+0x19/0x50
entry_SYSCALL_64_after_hwframe+0x44/0xa9
userspace programs provide arbitrarily high values of 'len' in sendmsg():
this is causing integer overflow of 'amount'. Cap forward allocation to 1
megabyte: higher values are not really useful.
Suggested-by: Paolo Abeni <pabeni@redhat.com>
Fixes: e93da92896bc ("mptcp: implement wmem reservation")
Signed-off-by: Davide Caratti <dcaratti@redhat.com>
Link: https://lore.kernel.org/r/3334d00d8b2faecafdfab9aa593efcbf61442756.1608584474.git.dcaratti@redhat.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2020-12-22 05:07:25 +08:00
|
|
|
mptcp_lock_sock(sk, __mptcp_wmem_reserve(sk, min_t(size_t, 1 << 20, len)));
|
2020-02-29 07:47:39 +08: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)
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2020-05-16 16:46:21 +08:00
|
|
|
pfrag = sk_page_frag(sk);
|
2020-03-28 05:48:43 +08:00
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
while (msg_data_left(msg)) {
|
2020-11-27 18:10:25 +08:00
|
|
|
int total_ts, frag_truesize = 0;
|
2020-11-16 17:48:10 +08:00
|
|
|
struct mptcp_data_frag *dfrag;
|
|
|
|
bool dfrag_collapsed;
|
|
|
|
size_t psize, offset;
|
2020-03-28 05:48:43 +08:00
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
if (sk->sk_err || (sk->sk_shutdown & SEND_SHUTDOWN)) {
|
|
|
|
ret = -EPIPE;
|
2020-03-28 05:48:39 +08:00
|
|
|
goto out;
|
|
|
|
}
|
2020-09-14 16:01:10 +08:00
|
|
|
|
2020-11-16 17:48:10 +08: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) {
|
2020-11-27 18:10:27 +08:00
|
|
|
if (!sk_stream_memory_free(sk))
|
|
|
|
goto wait_for_memory;
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
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 16:46:19 +08:00
|
|
|
}
|
2020-01-22 08:56:23 +08:00
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
/* we do not bound vs wspace, to allow a single packet.
|
|
|
|
* memory accounting will prevent execessive memory usage
|
|
|
|
* anyway
|
2020-09-14 16:01:17 +08:00
|
|
|
*/
|
2020-11-16 17:48:10 +08:00
|
|
|
offset = dfrag->offset + dfrag->data_len;
|
|
|
|
psize = pfrag->size - offset;
|
|
|
|
psize = min_t(size_t, psize, msg_data_left(msg));
|
2020-11-27 18:10:25 +08:00
|
|
|
total_ts = psize + frag_truesize;
|
2020-11-16 17:48:10 +08:00
|
|
|
|
2021-06-22 06:54:33 +08:00
|
|
|
if (!mptcp_wmem_alloc(sk, total_ts))
|
2020-11-27 18:10:25 +08:00
|
|
|
goto wait_for_memory;
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
if (copy_page_from_iter(dfrag->page, offset, psize,
|
|
|
|
&msg->msg_iter) != psize) {
|
2020-11-27 18:10:24 +08:00
|
|
|
mptcp_wmem_uncharge(sk, psize + frag_truesize);
|
2020-11-16 17:48:10 +08:00
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
2020-05-16 16:46:19 +08:00
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
/* data successfully copied into the write queue */
|
|
|
|
copied += psize;
|
|
|
|
dfrag->data_len += psize;
|
|
|
|
frag_truesize += psize;
|
|
|
|
pfrag->offset += frag_truesize;
|
|
|
|
WRITE_ONCE(msk->write_seq, msk->write_seq + psize);
|
2020-12-16 19:48:35 +08:00
|
|
|
msk->tx_pending_data += psize;
|
2020-11-16 17:48:10 +08:00
|
|
|
|
|
|
|
/* charge data on mptcp pending queue to the msk socket
|
|
|
|
* Note: we charge such data both to sk and ssk
|
2020-05-16 16:46:18 +08:00
|
|
|
*/
|
2020-11-16 17:48:10 +08: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 16:46:18 +08:00
|
|
|
}
|
2021-04-17 06:38:02 +08:00
|
|
|
pr_debug("msk=%p dfrag at seq=%llu len=%u sent=%u new=%d", msk,
|
2020-11-16 17:48:10 +08:00
|
|
|
dfrag->data_seq, dfrag->data_len, dfrag->already_sent,
|
|
|
|
!dfrag_collapsed);
|
2020-01-22 08:56:23 +08:00
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
continue;
|
2020-03-28 05:48:44 +08:00
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
wait_for_memory:
|
2021-01-20 22:39:11 +08:00
|
|
|
mptcp_set_nospace(sk);
|
2021-03-05 05:32:14 +08:00
|
|
|
__mptcp_push_pending(sk, msg->msg_flags);
|
2020-11-16 17:48:10 +08:00
|
|
|
ret = sk_stream_wait_memory(sk, &timeo);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2020-01-22 08:56:27 +08:00
|
|
|
}
|
2020-01-22 08:56:23 +08:00
|
|
|
|
2020-12-16 19:48:35 +08:00
|
|
|
if (copied)
|
2021-03-05 05:32:14 +08:00
|
|
|
__mptcp_push_pending(sk, msg->msg_flags);
|
2020-11-16 17:48:10 +08:00
|
|
|
|
2020-02-29 07:47:39 +08:00
|
|
|
out:
|
2020-01-22 08:56:18 +08:00
|
|
|
release_sock(sk);
|
2020-08-04 00:40:39 +08:00
|
|
|
return copied ? : ret;
|
2020-01-22 08:56:15 +08:00
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:26 +08:00
|
|
|
static void mptcp_wait_data(struct sock *sk, long *timeo)
|
|
|
|
{
|
|
|
|
DEFINE_WAIT_FUNC(wait, woken_wake_function);
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
|
|
|
add_wait_queue(sk_sleep(sk), &wait);
|
|
|
|
sk_set_bit(SOCKWQ_ASYNC_WAITDATA, sk);
|
|
|
|
|
|
|
|
sk_wait_event(sk, timeo,
|
2021-06-22 06:54:35 +08:00
|
|
|
test_bit(MPTCP_DATA_READY, &msk->flags), &wait);
|
2020-01-22 08:56:26 +08:00
|
|
|
|
|
|
|
sk_clear_bit(SOCKWQ_ASYNC_WAITDATA, sk);
|
|
|
|
remove_wait_queue(sk_sleep(sk), &wait);
|
|
|
|
}
|
|
|
|
|
2020-02-26 17:14:48 +08:00
|
|
|
static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk,
|
|
|
|
struct msghdr *msg,
|
2021-06-04 07:24:32 +08:00
|
|
|
size_t len, int flags,
|
|
|
|
struct scm_timestamping_internal *tss,
|
|
|
|
int *cmsg_flags)
|
2020-02-26 17:14:48 +08:00
|
|
|
{
|
2021-04-24 02:17:08 +08:00
|
|
|
struct sk_buff *skb, *tmp;
|
2020-02-26 17:14:48 +08:00
|
|
|
int copied = 0;
|
|
|
|
|
2021-04-24 02:17:08 +08:00
|
|
|
skb_queue_walk_safe(&msk->receive_queue, skb, tmp) {
|
2020-02-26 17:14:48 +08: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-24 02:17:06 +08: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 17:14:48 +08:00
|
|
|
}
|
|
|
|
|
2021-06-04 07:24:32 +08:00
|
|
|
if (MPTCP_SKB_CB(skb)->has_rxtstamp) {
|
|
|
|
tcp_update_recv_tstamps(skb, tss);
|
|
|
|
*cmsg_flags |= MPTCP_CMSG_TS;
|
|
|
|
}
|
|
|
|
|
2020-02-26 17:14:48 +08:00
|
|
|
copied += count;
|
|
|
|
|
|
|
|
if (count < data_len) {
|
2021-04-24 02:17:08 +08:00
|
|
|
if (!(flags & MSG_PEEK))
|
|
|
|
MPTCP_SKB_CB(skb)->offset += count;
|
2020-02-26 17:14:48 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2021-04-24 02:17:08 +08:00
|
|
|
if (!(flags & MSG_PEEK)) {
|
|
|
|
/* we will bulk release the skb memory later */
|
|
|
|
skb->destructor = NULL;
|
2021-07-10 08:20:51 +08:00
|
|
|
WRITE_ONCE(msk->rmem_released, msk->rmem_released + skb->truesize);
|
2021-04-24 02:17:08 +08:00
|
|
|
__skb_unlink(skb, &msk->receive_queue);
|
|
|
|
__kfree_skb(skb);
|
|
|
|
}
|
2020-02-26 17:14:48 +08:00
|
|
|
|
|
|
|
if (copied >= len)
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
2020-07-01 03:24:45 +08: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;
|
|
|
|
u32 time, advmss = 1;
|
|
|
|
u64 rtt_us, mstamp;
|
|
|
|
|
|
|
|
sock_owned_by_me(sk);
|
|
|
|
|
|
|
|
if (copied <= 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
|
|
|
|
msk->rcvq_space.rtt_us = rtt_us;
|
|
|
|
if (time < (rtt_us >> 3) || rtt_us == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (msk->rcvq_space.copied <= msk->rcvq_space.space)
|
|
|
|
goto new_measure;
|
|
|
|
|
|
|
|
if (sock_net(sk)->ipv4.sysctl_tcp_moderate_rcvbuf &&
|
|
|
|
!(sk->sk_userlocks & SOCK_RCVBUF_LOCK)) {
|
|
|
|
int rcvmem, rcvbuf;
|
|
|
|
u64 rcvwin, grow;
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
|
|
|
rcvmem = SKB_TRUESIZE(advmss + MAX_TCP_HEADER);
|
|
|
|
while (tcp_win_from_space(sk, rcvmem) < advmss)
|
|
|
|
rcvmem += 128;
|
|
|
|
|
|
|
|
do_div(rcvwin, advmss);
|
|
|
|
rcvbuf = min_t(u64, rcvwin * rcvmem,
|
|
|
|
sock_net(sk)->ipv4.sysctl_tcp_rmem[2]);
|
|
|
|
|
|
|
|
if (rcvbuf > sk->sk_rcvbuf) {
|
|
|
|
u32 window_clamp;
|
|
|
|
|
|
|
|
window_clamp = tcp_win_from_space(sk, rcvbuf);
|
|
|
|
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 16:01:18 +08:00
|
|
|
bool slow;
|
2020-07-01 03:24:45 +08:00
|
|
|
|
|
|
|
ssk = mptcp_subflow_tcp_sock(subflow);
|
2020-09-14 16:01:18 +08:00
|
|
|
slow = lock_sock_fast(ssk);
|
2020-07-01 03:24:45 +08:00
|
|
|
WRITE_ONCE(ssk->sk_rcvbuf, rcvbuf);
|
|
|
|
tcp_sk(ssk)->window_clamp = window_clamp;
|
2020-09-14 16:01:18 +08:00
|
|
|
tcp_cleanup_rbuf(ssk, 1);
|
|
|
|
unlock_sock_fast(ssk, slow);
|
2020-07-01 03:24:45 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
msk->rcvq_space.space = msk->rcvq_space.copied;
|
|
|
|
new_measure:
|
|
|
|
msk->rcvq_space.copied = 0;
|
|
|
|
msk->rcvq_space.time = mstamp;
|
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:24 +08: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);
|
|
|
|
sk_mem_uncharge(sk, msk->rmem_released);
|
2021-07-10 08:20:51 +08:00
|
|
|
WRITE_ONCE(msk->rmem_released, 0);
|
2020-11-27 18:10:24 +08: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-12 07:30:41 +08:00
|
|
|
static bool __mptcp_move_skbs(struct mptcp_sock *msk)
|
2020-02-26 17:14:48 +08:00
|
|
|
{
|
2020-11-27 18:10:24 +08:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
2020-02-26 17:14:48 +08:00
|
|
|
unsigned int moved = 0;
|
2020-11-27 18:10:24 +08:00
|
|
|
bool ret, done;
|
2020-09-14 16:01:17 +08:00
|
|
|
|
2021-04-16 07:44:53 +08:00
|
|
|
mptcp_flush_join_list(msk);
|
2020-02-26 17:14:48 +08:00
|
|
|
do {
|
|
|
|
struct sock *ssk = mptcp_subflow_recv_lookup(msk);
|
2020-11-04 03:05:04 +08:00
|
|
|
bool slowpath;
|
2020-02-26 17:14:48 +08:00
|
|
|
|
2020-11-27 18:10:24 +08: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 17:14:48 +08:00
|
|
|
break;
|
|
|
|
|
2020-11-04 03:05:04 +08:00
|
|
|
slowpath = lock_sock_fast(ssk);
|
2020-11-27 18:10:24 +08:00
|
|
|
mptcp_data_lock(sk);
|
2021-02-12 07:30:41 +08:00
|
|
|
__mptcp_update_rmem(sk);
|
2020-02-26 17:14:48 +08:00
|
|
|
done = __mptcp_move_skbs_from_subflow(msk, ssk, &moved);
|
2020-11-27 18:10:24 +08:00
|
|
|
mptcp_data_unlock(sk);
|
2021-06-11 06:59:44 +08:00
|
|
|
|
|
|
|
if (unlikely(ssk->sk_err))
|
|
|
|
__mptcp_error_report(sk);
|
2020-11-04 03:05:04 +08:00
|
|
|
unlock_sock_fast(ssk, slowpath);
|
2020-02-26 17:14:48 +08:00
|
|
|
} while (!done);
|
|
|
|
|
2020-11-27 18:10:24 +08: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 16:01:12 +08:00
|
|
|
}
|
2020-11-27 18:10:24 +08:00
|
|
|
if (ret)
|
|
|
|
mptcp_check_data_fin((struct sock *)msk);
|
|
|
|
return !skb_queue_empty(&msk->receive_queue);
|
2020-02-26 17:14:48 +08:00
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
static int mptcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
|
|
|
|
int nonblock, int flags, int *addr_len)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2021-06-04 07:24:32 +08:00
|
|
|
struct scm_timestamping_internal tss;
|
|
|
|
int copied = 0, cmsg_flags = 0;
|
2020-01-22 08:56:26 +08:00
|
|
|
int target;
|
|
|
|
long timeo;
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2021-04-24 02:17:05 +08: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);
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
mptcp_lock_sock(sk, __mptcp_splice_receive_queue(sk));
|
2020-11-25 05:51:24 +08:00
|
|
|
if (unlikely(sk->sk_state == TCP_LISTEN)) {
|
|
|
|
copied = -ENOTCONN;
|
|
|
|
goto out_err;
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:26 +08:00
|
|
|
timeo = sock_rcvtimeo(sk, nonblock);
|
|
|
|
|
|
|
|
len = min_t(size_t, len, INT_MAX);
|
|
|
|
target = sock_rcvlowat(sk, flags & MSG_WAITALL, len);
|
|
|
|
|
2020-12-03 01:16:57 +08:00
|
|
|
while (copied < len) {
|
2021-02-12 07:30:41 +08:00
|
|
|
int bytes_read;
|
2020-01-22 08:56:26 +08:00
|
|
|
|
2021-06-04 07:24:32 +08:00
|
|
|
bytes_read = __mptcp_recvmsg_mskq(msk, msg, len - copied, flags, &tss, &cmsg_flags);
|
2020-02-26 17:14:48 +08:00
|
|
|
if (unlikely(bytes_read < 0)) {
|
|
|
|
if (!copied)
|
|
|
|
copied = bytes_read;
|
|
|
|
goto out_err;
|
|
|
|
}
|
2020-01-22 08:56:26 +08:00
|
|
|
|
2020-02-26 17:14:48 +08:00
|
|
|
copied += bytes_read;
|
2020-01-22 08:56:26 +08:00
|
|
|
|
2020-11-20 03:46:03 +08:00
|
|
|
/* be sure to advertise window change */
|
2021-02-12 07:30:41 +08:00
|
|
|
mptcp_cleanup_rbuf(msk);
|
|
|
|
|
|
|
|
if (skb_queue_empty(&msk->receive_queue) && __mptcp_move_skbs(msk))
|
|
|
|
continue;
|
2020-11-20 03:46:03 +08:00
|
|
|
|
2020-01-22 08:56:26 +08:00
|
|
|
/* only the master socket status is relevant here. The exit
|
|
|
|
* 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-06-10 16:47:41 +08:00
|
|
|
if (test_and_clear_bit(MPTCP_WORK_EOF, &msk->flags))
|
|
|
|
mptcp_check_for_eof(msk);
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
if (sk->sk_shutdown & RCV_SHUTDOWN) {
|
|
|
|
/* race breaker: the shutdown could be after the
|
|
|
|
* previous receive queue check
|
|
|
|
*/
|
2021-02-12 07:30:41 +08:00
|
|
|
if (__mptcp_move_skbs(msk))
|
2020-11-27 18:10:24 +08:00
|
|
|
continue;
|
2020-01-22 08:56:26 +08:00
|
|
|
break;
|
2020-11-27 18:10:24 +08:00
|
|
|
}
|
2020-01-22 08:56:26 +08: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);
|
|
|
|
mptcp_wait_data(sk, &timeo);
|
2020-01-22 08:56:18 +08:00
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
if (skb_queue_empty_lockless(&sk->sk_receive_queue) &&
|
|
|
|
skb_queue_empty(&msk->receive_queue)) {
|
2020-02-26 17:14:48 +08:00
|
|
|
/* entire backlog drained, clear DATA_READY. */
|
2020-01-22 08:56:26 +08:00
|
|
|
clear_bit(MPTCP_DATA_READY, &msk->flags);
|
2020-01-22 08:56:18 +08:00
|
|
|
|
2020-02-26 17:14:48 +08:00
|
|
|
/* .. race-breaker: ssk might have gotten new data
|
|
|
|
* after last __mptcp_move_skbs() returned false.
|
2020-01-22 08:56:26 +08:00
|
|
|
*/
|
2021-02-12 07:30:41 +08:00
|
|
|
if (unlikely(__mptcp_move_skbs(msk)))
|
2020-01-22 08:56:26 +08:00
|
|
|
set_bit(MPTCP_DATA_READY, &msk->flags);
|
|
|
|
}
|
2021-06-22 06:54:35 +08:00
|
|
|
|
2020-02-26 17:14:48 +08:00
|
|
|
out_err:
|
2021-06-04 07:24:32 +08:00
|
|
|
if (cmsg_flags && copied >= 0) {
|
|
|
|
if (cmsg_flags & MPTCP_CMSG_TS)
|
|
|
|
tcp_recv_timestamp(msg, sk, &tss);
|
|
|
|
}
|
|
|
|
|
2020-09-14 16:01:09 +08:00
|
|
|
pr_debug("msk=%p data_ready=%d rx queue empty=%d copied=%d",
|
|
|
|
msk, test_bit(MPTCP_DATA_READY, &msk->flags),
|
2020-11-27 18:10:24 +08:00
|
|
|
skb_queue_empty_lockless(&sk->sk_receive_queue), copied);
|
2021-04-24 02:17:08 +08:00
|
|
|
if (!(flags & MSG_PEEK))
|
|
|
|
mptcp_rcv_space_adjust(msk, copied);
|
2020-07-01 03:24:45 +08:00
|
|
|
|
2020-01-22 08:56:26 +08:00
|
|
|
release_sock(sk);
|
2020-01-22 08:56:18 +08:00
|
|
|
return copied;
|
|
|
|
}
|
|
|
|
|
2020-03-28 05:48:44 +08: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-27 02:26:30 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-03-28 05:48:44 +08:00
|
|
|
|
|
|
|
bh_lock_sock(sk);
|
|
|
|
if (!sock_owned_by_user(sk)) {
|
2021-03-27 02:26:30 +08:00
|
|
|
/* we need a process context to retransmit */
|
|
|
|
if (!test_and_set_bit(MPTCP_WORK_RTX, &msk->flags))
|
|
|
|
mptcp_schedule_work(sk);
|
2020-03-28 05:48:44 +08:00
|
|
|
} else {
|
|
|
|
/* delegate our work to tcp_release_cb() */
|
2021-03-27 02:26:30 +08:00
|
|
|
set_bit(MPTCP_RETRANSMIT, &msk->flags);
|
2020-03-28 05:48:44 +08:00
|
|
|
}
|
|
|
|
bh_unlock_sock(sk);
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
static void mptcp_timeout_timer(struct timer_list *t)
|
|
|
|
{
|
|
|
|
struct sock *sk = from_timer(sk, t, sk_timer);
|
|
|
|
|
|
|
|
mptcp_schedule_work(sk);
|
2020-11-25 00:24:46 +08:00
|
|
|
sock_put(sk);
|
2020-11-16 17:48:09 +08:00
|
|
|
}
|
|
|
|
|
2020-03-28 05:48:48 +08: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.
|
|
|
|
*/
|
|
|
|
static struct sock *mptcp_subflow_get_retrans(const struct mptcp_sock *msk)
|
|
|
|
{
|
2021-08-14 06:15:42 +08:00
|
|
|
struct sock *backup = NULL, *pick = NULL;
|
2020-03-28 05:48:48 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2021-08-14 06:15:42 +08:00
|
|
|
int min_stale_count = INT_MAX;
|
2020-03-28 05:48:48 +08:00
|
|
|
|
|
|
|
sock_owned_by_me((const struct sock *)msk);
|
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
if (__mptcp_check_fallback(msk))
|
2020-11-16 17:48:10 +08:00
|
|
|
return NULL;
|
2020-09-14 16:01:17 +08:00
|
|
|
|
2020-03-28 05:48:48 +08:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
2020-09-14 16:01:17 +08:00
|
|
|
if (!mptcp_subflow_active(subflow))
|
|
|
|
continue;
|
|
|
|
|
2021-08-14 06:15:42 +08: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-20 03:45:56 +08:00
|
|
|
}
|
2020-03-28 05:48:48 +08:00
|
|
|
|
|
|
|
if (subflow->backup) {
|
|
|
|
if (!backup)
|
|
|
|
backup = ssk;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2021-08-14 06:15:42 +08:00
|
|
|
if (!pick)
|
|
|
|
pick = ssk;
|
2020-03-28 05:48:48 +08:00
|
|
|
}
|
|
|
|
|
2021-08-14 06:15:42 +08:00
|
|
|
if (pick)
|
|
|
|
return pick;
|
|
|
|
|
|
|
|
/* use backup only if there are no progresses anywhere */
|
|
|
|
return min_stale_count > 1 ? backup : NULL;
|
2020-03-28 05:48:48 +08:00
|
|
|
}
|
|
|
|
|
2021-03-05 05:32:11 +08:00
|
|
|
static void mptcp_dispose_initial_subflow(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
if (msk->subflow) {
|
|
|
|
iput(SOCK_INODE(msk->subflow));
|
|
|
|
msk->subflow = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:18 +08: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-13 07:59:55 +08:00
|
|
|
static void __mptcp_close_ssk(struct sock *sk, struct sock *ssk,
|
|
|
|
struct mptcp_subflow_context *subflow)
|
2020-01-22 08:56:18 +08:00
|
|
|
{
|
2021-03-05 05:32:08 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
list_del(&subflow->node);
|
|
|
|
|
2020-12-16 19:48:33 +08:00
|
|
|
lock_sock_nested(ssk, SINGLE_DEPTH_NESTING);
|
2020-11-16 17:48:09 +08:00
|
|
|
|
|
|
|
/* if we are invoked by the msk cleanup code, the subflow is
|
|
|
|
* already orphaned
|
|
|
|
*/
|
2021-01-20 22:39:10 +08:00
|
|
|
if (ssk->sk_socket)
|
2020-11-16 17:48:09 +08:00
|
|
|
sock_orphan(ssk);
|
|
|
|
|
2020-12-09 19:03:31 +08:00
|
|
|
subflow->disposable = 1;
|
|
|
|
|
2020-11-16 17:48:09 +08: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) {
|
|
|
|
kfree_rcu(subflow, rcu);
|
2020-01-22 08:56:18 +08:00
|
|
|
} else {
|
2020-12-09 19:03:31 +08:00
|
|
|
/* otherwise tcp will dispose of the ssk and subflow ctx */
|
2020-11-16 17:48:09 +08:00
|
|
|
__tcp_close(ssk, 0);
|
|
|
|
|
|
|
|
/* close acquired an extra ref */
|
|
|
|
__sock_put(ssk);
|
2020-01-22 08:56:18 +08:00
|
|
|
}
|
2020-11-16 17:48:09 +08:00
|
|
|
release_sock(ssk);
|
|
|
|
|
|
|
|
sock_put(ssk);
|
2021-03-05 05:32:08 +08:00
|
|
|
|
|
|
|
if (ssk == msk->last_snd)
|
|
|
|
msk->last_snd = NULL;
|
2021-03-05 05:32:11 +08:00
|
|
|
|
2021-03-05 05:32:12 +08:00
|
|
|
if (ssk == msk->first)
|
|
|
|
msk->first = NULL;
|
|
|
|
|
2021-03-05 05:32:11 +08:00
|
|
|
if (msk->subflow && ssk == msk->subflow->sk)
|
|
|
|
mptcp_dispose_initial_subflow(msk);
|
2020-01-22 08:56:15 +08:00
|
|
|
}
|
|
|
|
|
2021-02-13 07:59:55 +08:00
|
|
|
void mptcp_close_ssk(struct sock *sk, struct sock *ssk,
|
|
|
|
struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
2021-02-13 08:00:01 +08:00
|
|
|
if (sk->sk_state == TCP_ESTABLISHED)
|
|
|
|
mptcp_event(MPTCP_EVENT_SUB_CLOSED, mptcp_sk(sk), ssk, GFP_KERNEL);
|
2021-02-13 07:59:55 +08:00
|
|
|
__mptcp_close_ssk(sk, ssk, subflow);
|
|
|
|
}
|
|
|
|
|
2020-02-26 19:19:03 +08:00
|
|
|
static unsigned int mptcp_sync_mss(struct sock *sk, u32 pmtu)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-10-10 01:00:01 +08:00
|
|
|
static void __mptcp_close_subflow(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
|
|
|
|
2021-02-05 07:23:30 +08:00
|
|
|
might_sleep();
|
|
|
|
|
2020-10-10 01:00:01 +08:00
|
|
|
list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
if (inet_sk_state_load(ssk) != TCP_CLOSE)
|
|
|
|
continue;
|
|
|
|
|
2021-02-13 07:59:56 +08:00
|
|
|
/* 'subflow_data_ready' will re-sched once rx queue is empty */
|
|
|
|
if (!skb_queue_empty_lockless(&ssk->sk_receive_queue))
|
|
|
|
continue;
|
|
|
|
|
2021-02-13 07:59:55 +08:00
|
|
|
mptcp_close_ssk((struct sock *)msk, ssk, subflow);
|
2020-10-10 01:00:01 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
static bool mptcp_check_close_timeout(const struct sock *sk)
|
|
|
|
{
|
|
|
|
s32 delta = tcp_jiffies32 - inet_csk(sk)->icsk_mtup.probe_timestamp;
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
|
|
|
|
if (delta >= TCP_TIMEWAIT_LEN)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* if all subflows are in closed status don't bother with additional
|
|
|
|
* timeout
|
|
|
|
*/
|
|
|
|
mptcp_for_each_subflow(mptcp_sk(sk), subflow) {
|
|
|
|
if (inet_sk_state_load(mptcp_subflow_tcp_sock(subflow)) !=
|
|
|
|
TCP_CLOSE)
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2020-12-11 06:25:04 +08:00
|
|
|
static void mptcp_check_fastclose(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
|
|
|
struct sock *sk = &msk->sk.icsk_inet.sk;
|
|
|
|
|
|
|
|
if (likely(!READ_ONCE(msk->rcv_fastclose)))
|
|
|
|
return;
|
|
|
|
|
|
|
|
mptcp_token_destroy(msk);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(subflow, tmp, &msk->conn_list, node) {
|
|
|
|
struct sock *tcp_sk = mptcp_subflow_tcp_sock(subflow);
|
2021-06-22 06:54:34 +08:00
|
|
|
bool slow;
|
2020-12-11 06:25:04 +08:00
|
|
|
|
2021-06-22 06:54:34 +08:00
|
|
|
slow = lock_sock_fast(tcp_sk);
|
2020-12-11 06:25:04 +08:00
|
|
|
if (tcp_sk->sk_state != TCP_CLOSE) {
|
|
|
|
tcp_send_active_reset(tcp_sk, GFP_ATOMIC);
|
|
|
|
tcp_set_state(tcp_sk, TCP_CLOSE);
|
|
|
|
}
|
2021-06-22 06:54:34 +08:00
|
|
|
unlock_sock_fast(tcp_sk, slow);
|
2020-12-11 06:25:04 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
|
|
|
smp_mb__before_atomic(); /* SHUTDOWN must be visible first */
|
|
|
|
set_bit(MPTCP_DATA_READY, &msk->flags);
|
|
|
|
set_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags);
|
|
|
|
|
|
|
|
mptcp_close_wake_up(sk);
|
|
|
|
}
|
|
|
|
|
2021-03-05 05:32:13 +08:00
|
|
|
static void __mptcp_retrans(struct sock *sk)
|
2020-02-26 17:14:47 +08:00
|
|
|
{
|
2021-03-05 05:32:13 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-11-16 17:48:06 +08:00
|
|
|
struct mptcp_sendmsg_info info = {};
|
2020-03-28 05:48:48 +08:00
|
|
|
struct mptcp_data_frag *dfrag;
|
|
|
|
size_t copied = 0;
|
2021-03-05 05:32:13 +08:00
|
|
|
struct sock *ssk;
|
|
|
|
int ret;
|
2020-03-28 05:48:48 +08:00
|
|
|
|
2021-05-28 07:31:37 +08:00
|
|
|
mptcp_clean_una_wakeup(sk);
|
2020-03-28 05:48:48 +08:00
|
|
|
dfrag = mptcp_rtx_head(sk);
|
2021-04-24 00:40:33 +08: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-03-05 05:32:13 +08:00
|
|
|
return;
|
2021-04-24 00:40:33 +08:00
|
|
|
}
|
2020-03-28 05:48:48 +08:00
|
|
|
|
|
|
|
ssk = mptcp_subflow_get_retrans(msk);
|
|
|
|
if (!ssk)
|
2021-03-05 05:32:13 +08:00
|
|
|
goto reset_timer;
|
2020-03-28 05:48:48 +08:00
|
|
|
|
|
|
|
lock_sock(ssk);
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
/* limit retransmission to the bytes already sent on some subflows */
|
|
|
|
info.sent = 0;
|
2021-06-18 07:46:17 +08:00
|
|
|
info.limit = READ_ONCE(msk->csum_enabled) ? dfrag->data_len : dfrag->already_sent;
|
|
|
|
while (info.sent < info.limit) {
|
2020-11-27 18:10:25 +08:00
|
|
|
if (!mptcp_alloc_tx_skb(sk, ssk))
|
|
|
|
break;
|
|
|
|
|
2020-11-16 17:48:10 +08:00
|
|
|
ret = mptcp_sendmsg_frag(sk, ssk, dfrag, &info);
|
2020-11-16 17:48:13 +08:00
|
|
|
if (ret <= 0)
|
2020-03-28 05:48:48 +08:00
|
|
|
break;
|
|
|
|
|
2020-03-28 05:48:50 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RETRANSSEGS);
|
2020-03-28 05:48:48 +08:00
|
|
|
copied += ret;
|
2020-11-16 17:48:10 +08:00
|
|
|
info.sent += ret;
|
2020-03-28 05:48:48 +08:00
|
|
|
}
|
2021-06-18 07:46:17 +08:00
|
|
|
if (copied) {
|
|
|
|
dfrag->already_sent = max(dfrag->already_sent, info.sent);
|
2020-11-16 17:48:06 +08:00
|
|
|
tcp_push(ssk, 0, info.mss_now, tcp_sk(ssk)->nonagle,
|
|
|
|
info.size_goal);
|
2021-06-18 07:46:17 +08:00
|
|
|
}
|
2020-03-28 05:48:48 +08:00
|
|
|
|
|
|
|
release_sock(ssk);
|
|
|
|
|
2021-03-05 05:32:13 +08:00
|
|
|
reset_timer:
|
2020-03-28 05:48:48 +08:00
|
|
|
if (!mptcp_timer_pending(sk))
|
|
|
|
mptcp_reset_timer(sk);
|
2021-03-05 05:32:13 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_worker(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = container_of(work, struct mptcp_sock, work);
|
|
|
|
struct sock *sk = &msk->sk.icsk_inet.sk;
|
|
|
|
int state;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
state = sk->sk_state;
|
|
|
|
if (unlikely(state == TCP_CLOSE))
|
|
|
|
goto unlock;
|
|
|
|
|
|
|
|
mptcp_check_data_fin_ack(sk);
|
2021-04-16 07:44:53 +08:00
|
|
|
mptcp_flush_join_list(msk);
|
2021-03-05 05:32:13 +08:00
|
|
|
|
|
|
|
mptcp_check_fastclose(msk);
|
|
|
|
|
|
|
|
if (msk->pm.status)
|
|
|
|
mptcp_pm_nl_work(msk);
|
|
|
|
|
|
|
|
if (test_and_clear_bit(MPTCP_WORK_EOF, &msk->flags))
|
|
|
|
mptcp_check_for_eof(msk);
|
|
|
|
|
|
|
|
__mptcp_check_send_data_fin(sk);
|
|
|
|
mptcp_check_data_fin(sk);
|
|
|
|
|
|
|
|
/* There is no point in keeping around an orphaned sk timedout or
|
|
|
|
* closed, but we need the msk around to reply to incoming DATA_FIN,
|
|
|
|
* even if it is orphaned and in FIN_WAIT2 state
|
|
|
|
*/
|
|
|
|
if (sock_flag(sk, SOCK_DEAD) &&
|
|
|
|
(mptcp_check_close_timeout(sk) || sk->sk_state == TCP_CLOSE)) {
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
__mptcp_destroy_sock(sk);
|
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (test_and_clear_bit(MPTCP_WORK_CLOSE_SUBFLOW, &msk->flags))
|
|
|
|
__mptcp_close_subflow(msk);
|
|
|
|
|
|
|
|
if (test_and_clear_bit(MPTCP_WORK_RTX, &msk->flags))
|
|
|
|
__mptcp_retrans(sk);
|
2020-03-28 05:48:48 +08:00
|
|
|
|
|
|
|
unlock:
|
2020-02-26 17:14:47 +08:00
|
|
|
release_sock(sk);
|
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:28 +08:00
|
|
|
static int __mptcp_init_sock(struct sock *sk)
|
2020-01-22 08:56:15 +08:00
|
|
|
{
|
2020-01-22 08:56:18 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-03-28 05:48:40 +08:00
|
|
|
spin_lock_init(&msk->join_list_lock);
|
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
INIT_LIST_HEAD(&msk->conn_list);
|
2020-03-28 05:48:40 +08:00
|
|
|
INIT_LIST_HEAD(&msk->join_list);
|
2020-03-28 05:48:43 +08:00
|
|
|
INIT_LIST_HEAD(&msk->rtx_queue);
|
2020-02-26 17:14:47 +08:00
|
|
|
INIT_WORK(&msk->work, mptcp_worker);
|
2020-11-27 18:10:24 +08:00
|
|
|
__skb_queue_head_init(&msk->receive_queue);
|
2020-09-14 16:01:12 +08:00
|
|
|
msk->out_of_order_queue = RB_ROOT;
|
2020-11-16 17:48:07 +08:00
|
|
|
msk->first_pending = NULL;
|
2020-11-27 18:10:23 +08:00
|
|
|
msk->wmem_reserved = 0;
|
2021-07-10 08:20:51 +08:00
|
|
|
WRITE_ONCE(msk->rmem_released, 0);
|
2020-11-27 18:10:25 +08:00
|
|
|
msk->tx_pending_data = 0;
|
2021-08-14 06:15:41 +08:00
|
|
|
msk->timer_ival = TCP_RTO_MIN;
|
2020-01-22 08:56:18 +08:00
|
|
|
|
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 08:56:33 +08:00
|
|
|
msk->first = NULL;
|
2020-02-26 19:19:03 +08:00
|
|
|
inet_csk(sk)->icsk_sync_mss = mptcp_sync_mss;
|
2021-06-18 07:46:07 +08:00
|
|
|
WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(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 08:56:33 +08:00
|
|
|
|
2020-03-28 05:48:38 +08:00
|
|
|
mptcp_pm_data_init(msk);
|
|
|
|
|
2020-03-28 05:48:44 +08:00
|
|
|
/* re-use the csk retrans timer for MPTCP-level retrans */
|
|
|
|
timer_setup(&msk->sk.icsk_retransmit_timer, mptcp_retransmit_timer, 0);
|
2020-11-16 17:48:09 +08:00
|
|
|
timer_setup(&sk->sk_timer, mptcp_timeout_timer, 0);
|
2021-04-16 07:45:01 +08:00
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:28 +08:00
|
|
|
static int mptcp_init_sock(struct sock *sk)
|
|
|
|
{
|
2021-05-26 05:23:10 +08:00
|
|
|
struct inet_connection_sock *icsk = inet_csk(sk);
|
2020-03-28 05:48:50 +08:00
|
|
|
struct net *net = sock_net(sk);
|
|
|
|
int ret;
|
2020-03-28 05:48:43 +08:00
|
|
|
|
2020-09-24 08:29:54 +08:00
|
|
|
ret = __mptcp_init_sock(sk);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2020-03-28 05:48:50 +08:00
|
|
|
if (!mptcp_is_enabled(net))
|
|
|
|
return -ENOPROTOOPT;
|
|
|
|
|
|
|
|
if (unlikely(!net->mib.mptcp_statistics) && !mptcp_mib_alloc(net))
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2020-06-30 04:26:23 +08:00
|
|
|
ret = __mptcp_socket_create(mptcp_sk(sk));
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
2021-05-26 05:23:10 +08:00
|
|
|
/* fetch the ca name; do it outside __mptcp_init_sock(), so that clone will
|
|
|
|
* propagate the correct value
|
|
|
|
*/
|
|
|
|
tcp_assign_congestion_control(sk);
|
|
|
|
strcpy(mptcp_sk(sk)->ca_name, icsk->icsk_ca_ops->name);
|
|
|
|
|
|
|
|
/* no need to keep a reference to the ops, the name will suffice */
|
|
|
|
tcp_cleanup_congestion_control(sk);
|
|
|
|
icsk->icsk_ca_ops = NULL;
|
|
|
|
|
2020-03-28 05:48:45 +08:00
|
|
|
sk_sockets_allocated_inc(sk);
|
2020-07-01 03:24:45 +08:00
|
|
|
sk->sk_rcvbuf = sock_net(sk)->ipv4.sysctl_tcp_rmem[1];
|
2020-09-14 16:01:10 +08:00
|
|
|
sk->sk_sndbuf = sock_net(sk)->ipv4.sysctl_tcp_wmem[1];
|
2020-03-28 05:48:45 +08:00
|
|
|
|
2020-03-28 05:48:43 +08: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 17:48:10 +08:00
|
|
|
WRITE_ONCE(msk->first_pending, NULL);
|
2020-03-28 05:48:43 +08:00
|
|
|
list_for_each_entry_safe(dfrag, dtmp, &msk->rtx_queue, list)
|
2020-03-28 05:48:45 +08:00
|
|
|
dfrag_clear(sk, dfrag);
|
2020-01-22 08:56:28 +08:00
|
|
|
}
|
|
|
|
|
2020-02-26 17:14:47 +08:00
|
|
|
static void mptcp_cancel_work(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-11-20 03:45:54 +08:00
|
|
|
if (cancel_work_sync(&msk->work))
|
2020-11-16 17:48:09 +08:00
|
|
|
__sock_put(sk);
|
2020-02-26 17:14:47 +08:00
|
|
|
}
|
|
|
|
|
2020-09-24 08:29:49 +08:00
|
|
|
void mptcp_subflow_shutdown(struct sock *sk, struct sock *ssk, int how)
|
2020-01-22 08:56:21 +08:00
|
|
|
{
|
|
|
|
lock_sock(ssk);
|
|
|
|
|
|
|
|
switch (ssk->sk_state) {
|
|
|
|
case TCP_LISTEN:
|
|
|
|
if (!(how & RCV_SHUTDOWN))
|
|
|
|
break;
|
2020-08-24 06:36:59 +08:00
|
|
|
fallthrough;
|
2020-01-22 08:56:21 +08:00
|
|
|
case TCP_SYN_SENT:
|
|
|
|
tcp_disconnect(ssk, O_NONBLOCK);
|
|
|
|
break;
|
|
|
|
default:
|
2020-07-29 06:12:06 +08:00
|
|
|
if (__mptcp_check_fallback(mptcp_sk(sk))) {
|
|
|
|
pr_debug("Fallback");
|
|
|
|
ssk->sk_shutdown |= how;
|
|
|
|
tcp_shutdown(ssk, how);
|
|
|
|
} else {
|
|
|
|
pr_debug("Sending DATA_FIN on subflow %p", ssk);
|
|
|
|
tcp_send_ack(ssk);
|
2021-04-24 00:40:33 +08:00
|
|
|
if (!mptcp_timer_pending(sk))
|
|
|
|
mptcp_reset_timer(sk);
|
2020-07-29 06:12:06 +08:00
|
|
|
}
|
2020-01-22 08:56:21 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
release_sock(ssk);
|
|
|
|
}
|
|
|
|
|
2020-07-29 06:12:04 +08: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;
|
|
|
|
|
|
|
|
inet_sk_state_store(sk, ns);
|
|
|
|
|
|
|
|
return next & TCP_ACTION_FIN;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
static void __mptcp_check_send_data_fin(struct sock *sk)
|
2020-01-22 08:56:15 +08:00
|
|
|
{
|
2020-11-16 17:48:09 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2020-01-22 08:56:15 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-11-16 17:48:09 +08: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-29 06:12:06 +08:00
|
|
|
|
2020-11-16 17:48:09 +08: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);
|
|
|
|
|
2020-11-20 03:45:55 +08:00
|
|
|
/* fallback socket will not get data_fin/ack, can move to the next
|
|
|
|
* state now
|
|
|
|
*/
|
|
|
|
if (__mptcp_check_fallback(msk)) {
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_CLOSING | TCPF_LAST_ACK)) {
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
mptcp_close_wake_up(sk);
|
|
|
|
} else if (sk->sk_state == TCP_FIN_WAIT1) {
|
|
|
|
inet_sk_state_store(sk, TCP_FIN_WAIT2);
|
|
|
|
}
|
2020-07-29 06:12:06 +08:00
|
|
|
}
|
|
|
|
|
2021-04-16 07:44:53 +08:00
|
|
|
mptcp_flush_join_list(msk);
|
2020-11-16 17:48:09 +08:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *tcp_sk = mptcp_subflow_tcp_sock(subflow);
|
2020-07-29 06:12:06 +08:00
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
mptcp_subflow_shutdown(sk, tcp_sk, SEND_SHUTDOWN);
|
2020-07-29 06:12:06 +08:00
|
|
|
}
|
2020-11-16 17:48:09 +08:00
|
|
|
}
|
2020-02-05 01:12:30 +08:00
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
static void __mptcp_wr_shutdown(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-07-29 06:12:06 +08:00
|
|
|
|
2020-11-16 17:48:09 +08: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);
|
|
|
|
|
|
|
|
__mptcp_check_send_data_fin(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void __mptcp_destroy_sock(struct sock *sk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow, *tmp;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
LIST_HEAD(conn_list);
|
|
|
|
|
|
|
|
pr_debug("msk=%p", msk);
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2021-02-05 07:23:30 +08:00
|
|
|
might_sleep();
|
|
|
|
|
2020-05-29 23:43:30 +08:00
|
|
|
/* be sure to always acquire the join list lock, to sync vs
|
|
|
|
* mptcp_finish_join().
|
|
|
|
*/
|
|
|
|
spin_lock_bh(&msk->join_list_lock);
|
|
|
|
list_splice_tail_init(&msk->join_list, &msk->conn_list);
|
|
|
|
spin_unlock_bh(&msk->join_list_lock);
|
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 22:54:45 +08:00
|
|
|
list_splice_init(&msk->conn_list, &conn_list);
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
sk_stop_timer(sk, &msk->sk.icsk_retransmit_timer);
|
2020-11-16 17:48:09 +08:00
|
|
|
sk_stop_timer(sk, &sk->sk_timer);
|
|
|
|
msk->pm.status = 0;
|
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 22:54:45 +08:00
|
|
|
|
|
|
|
list_for_each_entry_safe(subflow, tmp, &conn_list, node) {
|
2020-01-22 08:56:18 +08:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
2020-11-16 17:48:09 +08:00
|
|
|
__mptcp_close_ssk(sk, ssk, subflow);
|
2020-01-22 08:56:15 +08:00
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
sk->sk_prot->destroy(sk);
|
2020-02-26 17:14:47 +08:00
|
|
|
|
2020-11-27 18:10:23 +08:00
|
|
|
WARN_ON_ONCE(msk->wmem_reserved);
|
2020-11-27 18:10:24 +08:00
|
|
|
WARN_ON_ONCE(msk->rmem_released);
|
2020-11-16 17:48:09 +08:00
|
|
|
sk_stream_kill_queues(sk);
|
|
|
|
xfrm_sk_free_policy(sk);
|
2021-04-16 07:45:01 +08:00
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
sk_refcnt_debug_release(sk);
|
2021-03-05 05:32:11 +08:00
|
|
|
mptcp_dispose_initial_subflow(msk);
|
2020-11-16 17:48:09 +08:00
|
|
|
sock_put(sk);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void mptcp_close(struct sock *sk, long timeout)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
bool do_cancel_work = false;
|
|
|
|
|
|
|
|
lock_sock(sk);
|
|
|
|
sk->sk_shutdown = SHUTDOWN_MASK;
|
|
|
|
|
|
|
|
if ((1 << sk->sk_state) & (TCPF_LISTEN | TCPF_CLOSE)) {
|
|
|
|
inet_sk_state_store(sk, TCP_CLOSE);
|
|
|
|
goto cleanup;
|
|
|
|
}
|
2020-02-26 17:14:48 +08:00
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
if (mptcp_close_state(sk))
|
|
|
|
__mptcp_wr_shutdown(sk);
|
|
|
|
|
|
|
|
sk_stream_wait_close(sk, timeout);
|
|
|
|
|
|
|
|
cleanup:
|
|
|
|
/* orphan all the subflows */
|
|
|
|
inet_csk(sk)->icsk_mtup.probe_timestamp = tcp_jiffies32;
|
2021-04-17 06:38:08 +08:00
|
|
|
mptcp_for_each_subflow(mptcp_sk(sk), subflow) {
|
2020-11-16 17:48:09 +08:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
2021-01-20 22:39:10 +08:00
|
|
|
bool slow = lock_sock_fast(ssk);
|
2020-11-16 17:48:09 +08:00
|
|
|
|
|
|
|
sock_orphan(ssk);
|
|
|
|
unlock_sock_fast(ssk, slow);
|
|
|
|
}
|
|
|
|
sock_orphan(sk);
|
|
|
|
|
|
|
|
sock_hold(sk);
|
|
|
|
pr_debug("msk=%p state=%d", sk, sk->sk_state);
|
|
|
|
if (sk->sk_state == TCP_CLOSE) {
|
|
|
|
__mptcp_destroy_sock(sk);
|
|
|
|
do_cancel_work = true;
|
|
|
|
} else {
|
|
|
|
sk_reset_timer(sk, &sk->sk_timer, jiffies + TCP_TIMEWAIT_LEN);
|
|
|
|
}
|
|
|
|
release_sock(sk);
|
|
|
|
if (do_cancel_work)
|
|
|
|
mptcp_cancel_work(sk);
|
2021-02-13 08:00:01 +08:00
|
|
|
|
|
|
|
if (mptcp_sk(sk)->token)
|
|
|
|
mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL);
|
|
|
|
|
2020-11-16 17:48:09 +08:00
|
|
|
sock_put(sk);
|
2020-01-22 08:56:15 +08:00
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:19 +08:00
|
|
|
static void mptcp_copy_inaddrs(struct sock *msk, const struct sock *ssk)
|
|
|
|
{
|
|
|
|
#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-28 05:48:43 +08:00
|
|
|
static int mptcp_disconnect(struct sock *sk, int flags)
|
|
|
|
{
|
2021-01-13 01:25:24 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2021-04-16 07:44:53 +08:00
|
|
|
mptcp_do_flush_join_list(msk);
|
|
|
|
|
2021-01-14 23:37:37 +08:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
lock_sock(ssk);
|
|
|
|
tcp_disconnect(ssk, flags);
|
|
|
|
release_sock(ssk);
|
|
|
|
}
|
2020-04-30 02:43:20 +08:00
|
|
|
return 0;
|
2020-03-28 05:48:43 +08:00
|
|
|
}
|
|
|
|
|
2020-02-06 07:39:37 +08: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);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2020-04-20 22:25:06 +08:00
|
|
|
struct sock *mptcp_sk_clone(const struct sock *sk,
|
mptcp: move option parsing into mptcp_incoming_options()
The mptcp_options_received structure carries several per
packet flags (mp_capable, mp_join, etc.). Such fields must
be cleared on each packet, even on dropped ones or packet
not carrying any MPTCP options, but the current mptcp
code clears them only on TCP option reset.
On several races/corner cases we end-up with stray bits in
incoming options, leading to WARN_ON splats. e.g.:
[ 171.164906] Bad mapping: ssn=32714 map_seq=1 map_data_len=32713
[ 171.165006] WARNING: CPU: 1 PID: 5026 at net/mptcp/subflow.c:533 warn_bad_map (linux-mptcp/net/mptcp/subflow.c:533 linux-mptcp/net/mptcp/subflow.c:531)
[ 171.167632] Modules linked in: ip6_vti ip_vti ip_gre ipip sit tunnel4 ip_tunnel geneve ip6_udp_tunnel udp_tunnel macsec macvtap tap ipvlan macvlan 8021q garp mrp xfrm_interface veth netdevsim nlmon dummy team bonding vcan bridge stp llc ip6_gre gre ip6_tunnel tunnel6 tun binfmt_misc intel_rapl_msr intel_rapl_common rfkill kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel joydev virtio_balloon pcspkr i2c_piix4 sunrpc ip_tables xfs libcrc32c crc32c_intel serio_raw virtio_console ata_generic virtio_blk virtio_net net_failover failover ata_piix libata
[ 171.199464] CPU: 1 PID: 5026 Comm: repro Not tainted 5.7.0-rc1.mptcp_f227fdf5d388+ #95
[ 171.200886] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014
[ 171.202546] RIP: 0010:warn_bad_map (linux-mptcp/net/mptcp/subflow.c:533 linux-mptcp/net/mptcp/subflow.c:531)
[ 171.206537] Code: c1 ea 03 0f b6 14 02 48 89 f8 83 e0 07 83 c0 03 38 d0 7c 04 84 d2 75 1d 8b 55 3c 44 89 e6 48 c7 c7 20 51 13 95 e8 37 8b 22 fe <0f> 0b 48 83 c4 08 5b 5d 41 5c c3 89 4c 24 04 e8 db d6 94 fe 8b 4c
[ 171.220473] RSP: 0018:ffffc90000150560 EFLAGS: 00010282
[ 171.221639] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 171.223108] RDX: 0000000000000000 RSI: 0000000000000008 RDI: fffff5200002a09e
[ 171.224388] RBP: ffff8880aa6e3c00 R08: 0000000000000001 R09: fffffbfff2ec9955
[ 171.225706] R10: ffffffff9764caa7 R11: fffffbfff2ec9954 R12: 0000000000007fca
[ 171.227211] R13: ffff8881066f4a7f R14: ffff8880aa6e3c00 R15: 0000000000000020
[ 171.228460] FS: 00007f8623719740(0000) GS:ffff88810be00000(0000) knlGS:0000000000000000
[ 171.230065] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 171.231303] CR2: 00007ffdab190a50 CR3: 00000001038ea006 CR4: 0000000000160ee0
[ 171.232586] Call Trace:
[ 171.233109] <IRQ>
[ 171.233531] get_mapping_status (linux-mptcp/net/mptcp/subflow.c:691)
[ 171.234371] mptcp_subflow_data_available (linux-mptcp/net/mptcp/subflow.c:736 linux-mptcp/net/mptcp/subflow.c:832)
[ 171.238181] subflow_state_change (linux-mptcp/net/mptcp/subflow.c:1085 (discriminator 1))
[ 171.239066] tcp_fin (linux-mptcp/net/ipv4/tcp_input.c:4217)
[ 171.240123] tcp_data_queue (linux-mptcp/./include/linux/compiler.h:199 linux-mptcp/net/ipv4/tcp_input.c:4822)
[ 171.245083] tcp_rcv_established (linux-mptcp/./include/linux/skbuff.h:1785 linux-mptcp/./include/net/tcp.h:1774 linux-mptcp/./include/net/tcp.h:1847 linux-mptcp/net/ipv4/tcp_input.c:5238 linux-mptcp/net/ipv4/tcp_input.c:5730)
[ 171.254089] tcp_v4_rcv (linux-mptcp/./include/linux/spinlock.h:393 linux-mptcp/net/ipv4/tcp_ipv4.c:2009)
[ 171.258969] ip_protocol_deliver_rcu (linux-mptcp/net/ipv4/ip_input.c:204 (discriminator 1))
[ 171.260214] ip_local_deliver_finish (linux-mptcp/./include/linux/rcupdate.h:651 linux-mptcp/net/ipv4/ip_input.c:232)
[ 171.261389] ip_local_deliver (linux-mptcp/./include/linux/netfilter.h:307 linux-mptcp/./include/linux/netfilter.h:301 linux-mptcp/net/ipv4/ip_input.c:252)
[ 171.265884] ip_rcv (linux-mptcp/./include/linux/netfilter.h:307 linux-mptcp/./include/linux/netfilter.h:301 linux-mptcp/net/ipv4/ip_input.c:539)
[ 171.273666] process_backlog (linux-mptcp/./include/linux/rcupdate.h:651 linux-mptcp/net/core/dev.c:6135)
[ 171.275328] net_rx_action (linux-mptcp/net/core/dev.c:6572 linux-mptcp/net/core/dev.c:6640)
[ 171.280472] __do_softirq (linux-mptcp/./arch/x86/include/asm/jump_label.h:25 linux-mptcp/./include/linux/jump_label.h:200 linux-mptcp/./include/trace/events/irq.h:142 linux-mptcp/kernel/softirq.c:293)
[ 171.281379] do_softirq_own_stack (linux-mptcp/arch/x86/entry/entry_64.S:1083)
[ 171.282358] </IRQ>
We could address the issue clearing explicitly the relevant fields
in several places - tcp_parse_option, tcp_fast_parse_options,
possibly others.
Instead we move the MPTCP option parsing into the already existing
mptcp ingress hook, so that we need to clear the fields in a single
place.
This allows us dropping an MPTCP hook from the TCP code and
removing the quite large mptcp_options_received from the tcp_sock
struct. On the flip side, the MPTCP sockets will traverse the
option space twice (in tcp_parse_option() and in
mptcp_incoming_options(). That looks acceptable: we already
do that for syn and 3rd ack packets, plain TCP socket will
benefit from it, and even MPTCP sockets will experience better
code locality, reducing the jumps between TCP and MPTCP code.
v1 -> v2:
- rebased on current '-net' tree
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-04-30 21:01:52 +08:00
|
|
|
const struct mptcp_options_received *mp_opt,
|
2020-04-20 22:25:06 +08:00
|
|
|
struct request_sock *req)
|
2020-02-06 07:39:37 +08:00
|
|
|
{
|
2020-03-13 23:52:41 +08:00
|
|
|
struct mptcp_subflow_request_sock *subflow_req = mptcp_subflow_rsk(req);
|
2020-02-06 07:39:37 +08:00
|
|
|
struct sock *nsk = sk_clone_lock(sk, GFP_ATOMIC);
|
2020-03-13 23:52:41 +08:00
|
|
|
struct mptcp_sock *msk;
|
|
|
|
u64 ack_seq;
|
2020-02-06 07:39:37 +08: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 23:52:41 +08:00
|
|
|
__mptcp_init_sock(nsk);
|
|
|
|
|
|
|
|
msk = mptcp_sk(nsk);
|
|
|
|
msk->local_key = subflow_req->local_key;
|
|
|
|
msk->token = subflow_req->token;
|
|
|
|
msk->subflow = NULL;
|
2020-07-23 19:02:32 +08:00
|
|
|
WRITE_ONCE(msk->fully_established, false);
|
2021-06-18 07:46:13 +08:00
|
|
|
if (mp_opt->csum_reqd)
|
|
|
|
WRITE_ONCE(msk->csum_enabled, true);
|
2020-03-13 23:52:41 +08:00
|
|
|
|
|
|
|
msk->write_seq = subflow_req->idsn + 1;
|
2020-11-16 17:48:08 +08:00
|
|
|
msk->snd_nxt = msk->write_seq;
|
2020-11-27 18:10:26 +08:00
|
|
|
msk->snd_una = msk->write_seq;
|
|
|
|
msk->wnd_end = msk->snd_nxt + req->rsk_rcv_wnd;
|
2021-04-16 07:44:54 +08:00
|
|
|
msk->setsockopt_seq = mptcp_sk(sk)->setsockopt_seq;
|
2020-11-16 17:48:13 +08:00
|
|
|
|
mptcp: move option parsing into mptcp_incoming_options()
The mptcp_options_received structure carries several per
packet flags (mp_capable, mp_join, etc.). Such fields must
be cleared on each packet, even on dropped ones or packet
not carrying any MPTCP options, but the current mptcp
code clears them only on TCP option reset.
On several races/corner cases we end-up with stray bits in
incoming options, leading to WARN_ON splats. e.g.:
[ 171.164906] Bad mapping: ssn=32714 map_seq=1 map_data_len=32713
[ 171.165006] WARNING: CPU: 1 PID: 5026 at net/mptcp/subflow.c:533 warn_bad_map (linux-mptcp/net/mptcp/subflow.c:533 linux-mptcp/net/mptcp/subflow.c:531)
[ 171.167632] Modules linked in: ip6_vti ip_vti ip_gre ipip sit tunnel4 ip_tunnel geneve ip6_udp_tunnel udp_tunnel macsec macvtap tap ipvlan macvlan 8021q garp mrp xfrm_interface veth netdevsim nlmon dummy team bonding vcan bridge stp llc ip6_gre gre ip6_tunnel tunnel6 tun binfmt_misc intel_rapl_msr intel_rapl_common rfkill kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel joydev virtio_balloon pcspkr i2c_piix4 sunrpc ip_tables xfs libcrc32c crc32c_intel serio_raw virtio_console ata_generic virtio_blk virtio_net net_failover failover ata_piix libata
[ 171.199464] CPU: 1 PID: 5026 Comm: repro Not tainted 5.7.0-rc1.mptcp_f227fdf5d388+ #95
[ 171.200886] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014
[ 171.202546] RIP: 0010:warn_bad_map (linux-mptcp/net/mptcp/subflow.c:533 linux-mptcp/net/mptcp/subflow.c:531)
[ 171.206537] Code: c1 ea 03 0f b6 14 02 48 89 f8 83 e0 07 83 c0 03 38 d0 7c 04 84 d2 75 1d 8b 55 3c 44 89 e6 48 c7 c7 20 51 13 95 e8 37 8b 22 fe <0f> 0b 48 83 c4 08 5b 5d 41 5c c3 89 4c 24 04 e8 db d6 94 fe 8b 4c
[ 171.220473] RSP: 0018:ffffc90000150560 EFLAGS: 00010282
[ 171.221639] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 171.223108] RDX: 0000000000000000 RSI: 0000000000000008 RDI: fffff5200002a09e
[ 171.224388] RBP: ffff8880aa6e3c00 R08: 0000000000000001 R09: fffffbfff2ec9955
[ 171.225706] R10: ffffffff9764caa7 R11: fffffbfff2ec9954 R12: 0000000000007fca
[ 171.227211] R13: ffff8881066f4a7f R14: ffff8880aa6e3c00 R15: 0000000000000020
[ 171.228460] FS: 00007f8623719740(0000) GS:ffff88810be00000(0000) knlGS:0000000000000000
[ 171.230065] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 171.231303] CR2: 00007ffdab190a50 CR3: 00000001038ea006 CR4: 0000000000160ee0
[ 171.232586] Call Trace:
[ 171.233109] <IRQ>
[ 171.233531] get_mapping_status (linux-mptcp/net/mptcp/subflow.c:691)
[ 171.234371] mptcp_subflow_data_available (linux-mptcp/net/mptcp/subflow.c:736 linux-mptcp/net/mptcp/subflow.c:832)
[ 171.238181] subflow_state_change (linux-mptcp/net/mptcp/subflow.c:1085 (discriminator 1))
[ 171.239066] tcp_fin (linux-mptcp/net/ipv4/tcp_input.c:4217)
[ 171.240123] tcp_data_queue (linux-mptcp/./include/linux/compiler.h:199 linux-mptcp/net/ipv4/tcp_input.c:4822)
[ 171.245083] tcp_rcv_established (linux-mptcp/./include/linux/skbuff.h:1785 linux-mptcp/./include/net/tcp.h:1774 linux-mptcp/./include/net/tcp.h:1847 linux-mptcp/net/ipv4/tcp_input.c:5238 linux-mptcp/net/ipv4/tcp_input.c:5730)
[ 171.254089] tcp_v4_rcv (linux-mptcp/./include/linux/spinlock.h:393 linux-mptcp/net/ipv4/tcp_ipv4.c:2009)
[ 171.258969] ip_protocol_deliver_rcu (linux-mptcp/net/ipv4/ip_input.c:204 (discriminator 1))
[ 171.260214] ip_local_deliver_finish (linux-mptcp/./include/linux/rcupdate.h:651 linux-mptcp/net/ipv4/ip_input.c:232)
[ 171.261389] ip_local_deliver (linux-mptcp/./include/linux/netfilter.h:307 linux-mptcp/./include/linux/netfilter.h:301 linux-mptcp/net/ipv4/ip_input.c:252)
[ 171.265884] ip_rcv (linux-mptcp/./include/linux/netfilter.h:307 linux-mptcp/./include/linux/netfilter.h:301 linux-mptcp/net/ipv4/ip_input.c:539)
[ 171.273666] process_backlog (linux-mptcp/./include/linux/rcupdate.h:651 linux-mptcp/net/core/dev.c:6135)
[ 171.275328] net_rx_action (linux-mptcp/net/core/dev.c:6572 linux-mptcp/net/core/dev.c:6640)
[ 171.280472] __do_softirq (linux-mptcp/./arch/x86/include/asm/jump_label.h:25 linux-mptcp/./include/linux/jump_label.h:200 linux-mptcp/./include/trace/events/irq.h:142 linux-mptcp/kernel/softirq.c:293)
[ 171.281379] do_softirq_own_stack (linux-mptcp/arch/x86/entry/entry_64.S:1083)
[ 171.282358] </IRQ>
We could address the issue clearing explicitly the relevant fields
in several places - tcp_parse_option, tcp_fast_parse_options,
possibly others.
Instead we move the MPTCP option parsing into the already existing
mptcp ingress hook, so that we need to clear the fields in a single
place.
This allows us dropping an MPTCP hook from the TCP code and
removing the quite large mptcp_options_received from the tcp_sock
struct. On the flip side, the MPTCP sockets will traverse the
option space twice (in tcp_parse_option() and in
mptcp_incoming_options(). That looks acceptable: we already
do that for syn and 3rd ack packets, plain TCP socket will
benefit from it, and even MPTCP sockets will experience better
code locality, reducing the jumps between TCP and MPTCP code.
v1 -> v2:
- rebased on current '-net' tree
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-04-30 21:01:52 +08:00
|
|
|
if (mp_opt->mp_capable) {
|
2020-03-13 23:52:41 +08:00
|
|
|
msk->can_ack = true;
|
mptcp: move option parsing into mptcp_incoming_options()
The mptcp_options_received structure carries several per
packet flags (mp_capable, mp_join, etc.). Such fields must
be cleared on each packet, even on dropped ones or packet
not carrying any MPTCP options, but the current mptcp
code clears them only on TCP option reset.
On several races/corner cases we end-up with stray bits in
incoming options, leading to WARN_ON splats. e.g.:
[ 171.164906] Bad mapping: ssn=32714 map_seq=1 map_data_len=32713
[ 171.165006] WARNING: CPU: 1 PID: 5026 at net/mptcp/subflow.c:533 warn_bad_map (linux-mptcp/net/mptcp/subflow.c:533 linux-mptcp/net/mptcp/subflow.c:531)
[ 171.167632] Modules linked in: ip6_vti ip_vti ip_gre ipip sit tunnel4 ip_tunnel geneve ip6_udp_tunnel udp_tunnel macsec macvtap tap ipvlan macvlan 8021q garp mrp xfrm_interface veth netdevsim nlmon dummy team bonding vcan bridge stp llc ip6_gre gre ip6_tunnel tunnel6 tun binfmt_misc intel_rapl_msr intel_rapl_common rfkill kvm_intel kvm irqbypass crct10dif_pclmul crc32_pclmul ghash_clmulni_intel joydev virtio_balloon pcspkr i2c_piix4 sunrpc ip_tables xfs libcrc32c crc32c_intel serio_raw virtio_console ata_generic virtio_blk virtio_net net_failover failover ata_piix libata
[ 171.199464] CPU: 1 PID: 5026 Comm: repro Not tainted 5.7.0-rc1.mptcp_f227fdf5d388+ #95
[ 171.200886] Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-2.fc30 04/01/2014
[ 171.202546] RIP: 0010:warn_bad_map (linux-mptcp/net/mptcp/subflow.c:533 linux-mptcp/net/mptcp/subflow.c:531)
[ 171.206537] Code: c1 ea 03 0f b6 14 02 48 89 f8 83 e0 07 83 c0 03 38 d0 7c 04 84 d2 75 1d 8b 55 3c 44 89 e6 48 c7 c7 20 51 13 95 e8 37 8b 22 fe <0f> 0b 48 83 c4 08 5b 5d 41 5c c3 89 4c 24 04 e8 db d6 94 fe 8b 4c
[ 171.220473] RSP: 0018:ffffc90000150560 EFLAGS: 00010282
[ 171.221639] RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000000
[ 171.223108] RDX: 0000000000000000 RSI: 0000000000000008 RDI: fffff5200002a09e
[ 171.224388] RBP: ffff8880aa6e3c00 R08: 0000000000000001 R09: fffffbfff2ec9955
[ 171.225706] R10: ffffffff9764caa7 R11: fffffbfff2ec9954 R12: 0000000000007fca
[ 171.227211] R13: ffff8881066f4a7f R14: ffff8880aa6e3c00 R15: 0000000000000020
[ 171.228460] FS: 00007f8623719740(0000) GS:ffff88810be00000(0000) knlGS:0000000000000000
[ 171.230065] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 171.231303] CR2: 00007ffdab190a50 CR3: 00000001038ea006 CR4: 0000000000160ee0
[ 171.232586] Call Trace:
[ 171.233109] <IRQ>
[ 171.233531] get_mapping_status (linux-mptcp/net/mptcp/subflow.c:691)
[ 171.234371] mptcp_subflow_data_available (linux-mptcp/net/mptcp/subflow.c:736 linux-mptcp/net/mptcp/subflow.c:832)
[ 171.238181] subflow_state_change (linux-mptcp/net/mptcp/subflow.c:1085 (discriminator 1))
[ 171.239066] tcp_fin (linux-mptcp/net/ipv4/tcp_input.c:4217)
[ 171.240123] tcp_data_queue (linux-mptcp/./include/linux/compiler.h:199 linux-mptcp/net/ipv4/tcp_input.c:4822)
[ 171.245083] tcp_rcv_established (linux-mptcp/./include/linux/skbuff.h:1785 linux-mptcp/./include/net/tcp.h:1774 linux-mptcp/./include/net/tcp.h:1847 linux-mptcp/net/ipv4/tcp_input.c:5238 linux-mptcp/net/ipv4/tcp_input.c:5730)
[ 171.254089] tcp_v4_rcv (linux-mptcp/./include/linux/spinlock.h:393 linux-mptcp/net/ipv4/tcp_ipv4.c:2009)
[ 171.258969] ip_protocol_deliver_rcu (linux-mptcp/net/ipv4/ip_input.c:204 (discriminator 1))
[ 171.260214] ip_local_deliver_finish (linux-mptcp/./include/linux/rcupdate.h:651 linux-mptcp/net/ipv4/ip_input.c:232)
[ 171.261389] ip_local_deliver (linux-mptcp/./include/linux/netfilter.h:307 linux-mptcp/./include/linux/netfilter.h:301 linux-mptcp/net/ipv4/ip_input.c:252)
[ 171.265884] ip_rcv (linux-mptcp/./include/linux/netfilter.h:307 linux-mptcp/./include/linux/netfilter.h:301 linux-mptcp/net/ipv4/ip_input.c:539)
[ 171.273666] process_backlog (linux-mptcp/./include/linux/rcupdate.h:651 linux-mptcp/net/core/dev.c:6135)
[ 171.275328] net_rx_action (linux-mptcp/net/core/dev.c:6572 linux-mptcp/net/core/dev.c:6640)
[ 171.280472] __do_softirq (linux-mptcp/./arch/x86/include/asm/jump_label.h:25 linux-mptcp/./include/linux/jump_label.h:200 linux-mptcp/./include/trace/events/irq.h:142 linux-mptcp/kernel/softirq.c:293)
[ 171.281379] do_softirq_own_stack (linux-mptcp/arch/x86/entry/entry_64.S:1083)
[ 171.282358] </IRQ>
We could address the issue clearing explicitly the relevant fields
in several places - tcp_parse_option, tcp_fast_parse_options,
possibly others.
Instead we move the MPTCP option parsing into the already existing
mptcp ingress hook, so that we need to clear the fields in a single
place.
This allows us dropping an MPTCP hook from the TCP code and
removing the quite large mptcp_options_received from the tcp_sock
struct. On the flip side, the MPTCP sockets will traverse the
option space twice (in tcp_parse_option() and in
mptcp_incoming_options(). That looks acceptable: we already
do that for syn and 3rd ack packets, plain TCP socket will
benefit from it, and even MPTCP sockets will experience better
code locality, reducing the jumps between TCP and MPTCP code.
v1 -> v2:
- rebased on current '-net' tree
Fixes: 648ef4b88673 ("mptcp: Implement MPTCP receive path")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2020-04-30 21:01:52 +08:00
|
|
|
msk->remote_key = mp_opt->sndr_key;
|
2020-03-13 23:52:41 +08:00
|
|
|
mptcp_crypto_key_sha(msk->remote_key, NULL, &ack_seq);
|
|
|
|
ack_seq++;
|
2020-09-30 06:08:19 +08:00
|
|
|
WRITE_ONCE(msk->ack_seq, ack_seq);
|
2020-11-20 03:46:02 +08:00
|
|
|
WRITE_ONCE(msk->rcv_wnd_sent, ack_seq);
|
2020-03-13 23:52:41 +08:00
|
|
|
}
|
2020-03-17 22:53:34 +08:00
|
|
|
|
2020-04-20 22:25:04 +08:00
|
|
|
sock_reset_flag(nsk, SOCK_RCU_FREE);
|
2020-03-17 22:53:34 +08:00
|
|
|
/* will be fully established after successful MPC subflow creation */
|
|
|
|
inet_sk_state_store(nsk, TCP_SYN_RECV);
|
2020-12-16 19:48:32 +08:00
|
|
|
|
|
|
|
security_inet_csk_clone(nsk, req);
|
2020-03-13 23:52:41 +08:00
|
|
|
bh_unlock_sock(nsk);
|
|
|
|
|
|
|
|
/* keep a single reference */
|
|
|
|
__sock_put(nsk);
|
2020-02-06 07:39:37 +08:00
|
|
|
return nsk;
|
|
|
|
}
|
|
|
|
|
2020-07-01 03:24:45 +08:00
|
|
|
void mptcp_rcv_space_init(struct mptcp_sock *msk, const struct sock *ssk)
|
|
|
|
{
|
|
|
|
const struct tcp_sock *tp = tcp_sk(ssk);
|
|
|
|
|
|
|
|
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;
|
2020-11-16 17:48:13 +08:00
|
|
|
|
2020-11-27 18:10:26 +08:00
|
|
|
WRITE_ONCE(msk->wnd_end, msk->snd_nxt + tcp_sk(ssk)->snd_wnd);
|
2020-07-01 03:24:45 +08:00
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:19 +08:00
|
|
|
static struct sock *mptcp_accept(struct sock *sk, int flags, int *err,
|
|
|
|
bool kern)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
struct socket *listener;
|
|
|
|
struct sock *newsk;
|
|
|
|
|
|
|
|
listener = __mptcp_nmpc_socket(msk);
|
|
|
|
if (WARN_ON_ONCE(!listener)) {
|
|
|
|
*err = -EINVAL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
pr_debug("msk=%p, listener=%p", msk, mptcp_subflow_ctx(listener->sk));
|
|
|
|
newsk = inet_csk_accept(listener->sk, flags, err, kern);
|
|
|
|
if (!newsk)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
pr_debug("msk=%p, subflow is mptcp=%d", msk, sk_is_mptcp(newsk));
|
|
|
|
if (sk_is_mptcp(newsk)) {
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct sock *new_mptcp_sock;
|
|
|
|
|
|
|
|
subflow = mptcp_subflow_ctx(newsk);
|
2020-03-13 23:52:41 +08:00
|
|
|
new_mptcp_sock = subflow->conn;
|
2020-01-22 08:56:19 +08:00
|
|
|
|
2020-03-13 23:52:41 +08:00
|
|
|
/* 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;
|
|
|
|
return newsk;
|
2020-01-22 08:56:19 +08:00
|
|
|
}
|
|
|
|
|
2020-03-13 23:52:41 +08:00
|
|
|
/* acquire the 2nd reference for the owning socket */
|
|
|
|
sock_hold(new_mptcp_sock);
|
2020-01-22 08:56:19 +08:00
|
|
|
newsk = new_mptcp_sock;
|
2020-11-20 03:45:58 +08:00
|
|
|
MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPCAPABLEPASSIVEACK);
|
2020-03-28 05:48:50 +08:00
|
|
|
} else {
|
|
|
|
MPTCP_INC_STATS(sock_net(sk),
|
|
|
|
MPTCP_MIB_MPCAPABLEPASSIVEFALLBACK);
|
2020-01-22 08:56:19 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
return newsk;
|
|
|
|
}
|
|
|
|
|
2020-09-24 08:29:57 +08:00
|
|
|
void mptcp_destroy_common(struct mptcp_sock *msk)
|
|
|
|
{
|
2020-11-27 18:10:24 +08:00
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
__mptcp_clear_xmit(sk);
|
|
|
|
|
2020-11-27 18:10:24 +08:00
|
|
|
/* move to sk_receive_queue, sk_stream_kill_queues will purge it */
|
|
|
|
skb_queue_splice_tail_init(&msk->receive_queue, &sk->sk_receive_queue);
|
|
|
|
|
2020-09-24 08:29:57 +08:00
|
|
|
skb_rbtree_purge(&msk->out_of_order_queue);
|
|
|
|
mptcp_token_destroy(msk);
|
|
|
|
mptcp_pm_free_anno_list(msk);
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:20 +08:00
|
|
|
static void mptcp_destroy(struct sock *sk)
|
|
|
|
{
|
2020-01-29 22:54:43 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
|
|
|
|
2020-09-24 08:29:57 +08:00
|
|
|
mptcp_destroy_common(msk);
|
2020-03-28 05:48:45 +08:00
|
|
|
sk_sockets_allocated_dec(sk);
|
2020-01-22 08:56:20 +08:00
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
void __mptcp_data_acked(struct sock *sk)
|
|
|
|
{
|
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_clean_una(sk);
|
|
|
|
else
|
|
|
|
set_bit(MPTCP_CLEAN_UNA, &mptcp_sk(sk)->flags);
|
|
|
|
|
|
|
|
if (mptcp_pending_data_fin_ack(sk))
|
|
|
|
mptcp_schedule_work(sk);
|
|
|
|
}
|
|
|
|
|
2020-12-16 19:48:34 +08:00
|
|
|
void __mptcp_check_push(struct sock *sk, struct sock *ssk)
|
2020-11-27 18:10:27 +08:00
|
|
|
{
|
|
|
|
if (!mptcp_send_head(sk))
|
|
|
|
return;
|
|
|
|
|
2021-01-20 22:39:13 +08:00
|
|
|
if (!sock_owned_by_user(sk)) {
|
2021-01-20 22:39:14 +08:00
|
|
|
struct sock *xmit_ssk = mptcp_subflow_get_send(mptcp_sk(sk));
|
|
|
|
|
|
|
|
if (xmit_ssk == ssk)
|
2021-01-20 22:39:13 +08:00
|
|
|
__mptcp_subflow_push_pending(sk, ssk);
|
2021-01-20 22:39:14 +08:00
|
|
|
else if (xmit_ssk)
|
|
|
|
mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk));
|
2021-01-20 22:39:13 +08:00
|
|
|
} else {
|
2020-11-27 18:10:27 +08:00
|
|
|
set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags);
|
2021-01-20 22:39:13 +08:00
|
|
|
}
|
2020-11-27 18:10:27 +08:00
|
|
|
}
|
|
|
|
|
2020-11-27 18:10:23 +08:00
|
|
|
/* processes deferred events and flush wmem */
|
2020-02-26 17:14:52 +08:00
|
|
|
static void mptcp_release_cb(struct sock *sk)
|
|
|
|
{
|
2021-03-05 05:32:14 +08:00
|
|
|
for (;;) {
|
2021-03-27 02:26:30 +08:00
|
|
|
unsigned long flags = 0;
|
|
|
|
|
2021-03-05 05:32:14 +08:00
|
|
|
if (test_and_clear_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags))
|
2021-03-12 15:41:12 +08:00
|
|
|
flags |= BIT(MPTCP_PUSH_PENDING);
|
2021-03-27 02:26:30 +08:00
|
|
|
if (test_and_clear_bit(MPTCP_RETRANSMIT, &mptcp_sk(sk)->flags))
|
|
|
|
flags |= BIT(MPTCP_RETRANSMIT);
|
2021-03-05 05:32:14 +08:00
|
|
|
if (!flags)
|
|
|
|
break;
|
|
|
|
|
|
|
|
/* the following actions acquire the subflow socket lock
|
2020-11-27 18:10:27 +08: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
|
|
|
|
*/
|
|
|
|
|
|
|
|
spin_unlock_bh(&sk->sk_lock.slock);
|
2021-03-12 15:41:12 +08:00
|
|
|
if (flags & BIT(MPTCP_PUSH_PENDING))
|
2021-03-05 05:32:14 +08:00
|
|
|
__mptcp_push_pending(sk, 0);
|
2021-03-27 02:26:30 +08:00
|
|
|
if (flags & BIT(MPTCP_RETRANSMIT))
|
|
|
|
__mptcp_retrans(sk);
|
2021-03-05 05:32:14 +08:00
|
|
|
|
|
|
|
cond_resched();
|
2020-11-27 18:10:27 +08:00
|
|
|
spin_lock_bh(&sk->sk_lock.slock);
|
|
|
|
}
|
2021-03-05 05:32:14 +08:00
|
|
|
|
2021-06-22 08:33:08 +08:00
|
|
|
/* be sure to set the current sk state before tacking actions
|
|
|
|
* depending on sk_state
|
|
|
|
*/
|
|
|
|
if (test_and_clear_bit(MPTCP_CONNECTED, &mptcp_sk(sk)->flags))
|
|
|
|
__mptcp_set_connected(sk);
|
2021-03-05 05:32:14 +08:00
|
|
|
if (test_and_clear_bit(MPTCP_CLEAN_UNA, &mptcp_sk(sk)->flags))
|
2021-03-05 05:32:15 +08:00
|
|
|
__mptcp_clean_una_wakeup(sk);
|
2021-02-12 07:30:37 +08:00
|
|
|
if (test_and_clear_bit(MPTCP_ERROR_REPORT, &mptcp_sk(sk)->flags))
|
|
|
|
__mptcp_error_report(sk);
|
2020-11-27 18:10:27 +08:00
|
|
|
|
2021-03-05 05:32:14 +08:00
|
|
|
/* push_pending may touch wmem_reserved, ensure we do the cleanup
|
|
|
|
* later
|
|
|
|
*/
|
2020-11-27 18:10:23 +08:00
|
|
|
__mptcp_update_wmem(sk);
|
2020-11-27 18:10:24 +08:00
|
|
|
__mptcp_update_rmem(sk);
|
2020-02-26 17:14:52 +08:00
|
|
|
}
|
|
|
|
|
2021-01-20 22:39:14 +08:00
|
|
|
void mptcp_subflow_process_delegated(struct sock *ssk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
struct sock *sk = subflow->conn;
|
|
|
|
|
|
|
|
mptcp_data_lock(sk);
|
|
|
|
if (!sock_owned_by_user(sk))
|
|
|
|
__mptcp_subflow_push_pending(sk, ssk);
|
|
|
|
else
|
|
|
|
set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->flags);
|
|
|
|
mptcp_data_unlock(sk);
|
|
|
|
mptcp_subflow_delegated_done(subflow);
|
|
|
|
}
|
|
|
|
|
2020-06-27 01:30:00 +08:00
|
|
|
static int mptcp_hash(struct sock *sk)
|
|
|
|
{
|
|
|
|
/* should never be called,
|
|
|
|
* we hash the TCP subflows not the master socket
|
|
|
|
*/
|
|
|
|
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 08:56:18 +08:00
|
|
|
static int mptcp_get_port(struct sock *sk, unsigned short snum)
|
2020-01-22 08:56:15 +08:00
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sk);
|
2020-01-22 08:56:18 +08:00
|
|
|
struct socket *ssock;
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
ssock = __mptcp_nmpc_socket(msk);
|
|
|
|
pr_debug("msk=%p, subflow=%p", msk, ssock);
|
|
|
|
if (WARN_ON_ONCE(!ssock))
|
|
|
|
return -EINVAL;
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
return inet_csk_get_port(ssock->sk, snum);
|
|
|
|
}
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
void mptcp_finish_connect(struct sock *ssk)
|
|
|
|
{
|
|
|
|
struct mptcp_subflow_context *subflow;
|
|
|
|
struct mptcp_sock *msk;
|
|
|
|
struct sock *sk;
|
2020-01-22 08:56:23 +08:00
|
|
|
u64 ack_seq;
|
2020-01-22 08:56:15 +08:00
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
subflow = mptcp_subflow_ctx(ssk);
|
|
|
|
sk = subflow->conn;
|
|
|
|
msk = mptcp_sk(sk);
|
|
|
|
|
2020-01-22 08:56:24 +08:00
|
|
|
pr_debug("msk=%p, token=%u", sk, subflow->token);
|
|
|
|
|
2020-01-22 08:56:23 +08:00
|
|
|
mptcp_crypto_key_sha(subflow->remote_key, NULL, &ack_seq);
|
|
|
|
ack_seq++;
|
2020-01-22 08:56:24 +08:00
|
|
|
subflow->map_seq = ack_seq;
|
|
|
|
subflow->map_subflow_seq = 1;
|
2020-01-22 08:56:23 +08:00
|
|
|
|
2020-01-22 08:56:18 +08:00
|
|
|
/* the socket is not connected yet, no msk/subflow ops can access/race
|
|
|
|
* accessing the field below
|
|
|
|
*/
|
|
|
|
WRITE_ONCE(msk->remote_key, subflow->remote_key);
|
|
|
|
WRITE_ONCE(msk->local_key, subflow->local_key);
|
2020-01-22 08:56:23 +08:00
|
|
|
WRITE_ONCE(msk->write_seq, subflow->idsn + 1);
|
2020-11-16 17:48:08 +08:00
|
|
|
WRITE_ONCE(msk->snd_nxt, msk->write_seq);
|
2020-01-22 08:56:23 +08:00
|
|
|
WRITE_ONCE(msk->ack_seq, ack_seq);
|
2020-11-20 03:46:02 +08:00
|
|
|
WRITE_ONCE(msk->rcv_wnd_sent, ack_seq);
|
2020-01-22 08:56:32 +08:00
|
|
|
WRITE_ONCE(msk->can_ack, 1);
|
2020-11-27 18:10:26 +08:00
|
|
|
WRITE_ONCE(msk->snd_una, msk->write_seq);
|
2020-03-28 05:48:38 +08:00
|
|
|
|
2021-02-13 07:59:58 +08:00
|
|
|
mptcp_pm_new_connection(msk, ssk, 0);
|
2020-07-01 03:24:45 +08:00
|
|
|
|
|
|
|
mptcp_rcv_space_init(msk, ssk);
|
2020-01-22 08:56:15 +08:00
|
|
|
}
|
|
|
|
|
2021-01-20 22:39:10 +08:00
|
|
|
void mptcp_sock_graft(struct sock *sk, struct socket *parent)
|
2020-01-22 08:56:19 +08: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 17:48:09 +08:00
|
|
|
bool mptcp_finish_join(struct sock *ssk)
|
2020-03-28 05:48:39 +08:00
|
|
|
{
|
2020-11-16 17:48:09 +08:00
|
|
|
struct mptcp_subflow_context *subflow = mptcp_subflow_ctx(ssk);
|
2020-03-28 05:48:39 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(subflow->conn);
|
|
|
|
struct sock *parent = (void *)msk;
|
|
|
|
struct socket *parent_sock;
|
2020-03-28 05:48:40 +08:00
|
|
|
bool ret;
|
2020-03-28 05:48:39 +08:00
|
|
|
|
|
|
|
pr_debug("msk=%p, subflow=%p", msk, subflow);
|
|
|
|
|
|
|
|
/* mptcp socket already closing? */
|
2021-04-02 07:19:44 +08:00
|
|
|
if (!mptcp_is_fully_established(parent)) {
|
|
|
|
subflow->reset_reason = MPTCP_RST_EMPTCP;
|
2020-03-28 05:48:39 +08:00
|
|
|
return false;
|
2021-04-02 07:19:44 +08:00
|
|
|
}
|
2020-03-28 05:48:39 +08:00
|
|
|
|
|
|
|
if (!msk->pm.server_side)
|
2021-02-13 08:00:01 +08:00
|
|
|
goto out;
|
2020-03-28 05:48:39 +08:00
|
|
|
|
2021-04-02 07:19:44 +08:00
|
|
|
if (!mptcp_pm_allow_new_subflow(msk)) {
|
|
|
|
subflow->reset_reason = MPTCP_RST_EPROHIBIT;
|
2020-05-29 23:43:30 +08:00
|
|
|
return false;
|
2021-04-02 07:19:44 +08:00
|
|
|
}
|
2020-05-29 23:43:30 +08:00
|
|
|
|
|
|
|
/* active connections are already on conn_list, and we can't acquire
|
|
|
|
* msk lock here.
|
|
|
|
* use the join list lock as synchronization point and double-check
|
2020-11-16 17:48:09 +08:00
|
|
|
* msk status to avoid racing with __mptcp_destroy_sock()
|
2020-05-29 23:43:30 +08:00
|
|
|
*/
|
|
|
|
spin_lock_bh(&msk->join_list_lock);
|
|
|
|
ret = inet_sk_state_load(parent) == TCP_ESTABLISHED;
|
2020-11-16 17:48:09 +08:00
|
|
|
if (ret && !WARN_ON_ONCE(!list_empty(&subflow->node))) {
|
2020-05-29 23:43:30 +08:00
|
|
|
list_add_tail(&subflow->node, &msk->join_list);
|
2020-11-16 17:48:09 +08:00
|
|
|
sock_hold(ssk);
|
|
|
|
}
|
2020-05-29 23:43:30 +08:00
|
|
|
spin_unlock_bh(&msk->join_list_lock);
|
2021-04-02 07:19:44 +08:00
|
|
|
if (!ret) {
|
|
|
|
subflow->reset_reason = MPTCP_RST_EPROHIBIT;
|
2020-05-29 23:43:30 +08:00
|
|
|
return false;
|
2021-04-02 07:19:44 +08:00
|
|
|
}
|
2020-05-29 23:43:30 +08:00
|
|
|
|
|
|
|
/* attach to msk socket only after we are sure he will deal with us
|
|
|
|
* at close time
|
|
|
|
*/
|
2020-03-28 05:48:39 +08:00
|
|
|
parent_sock = READ_ONCE(parent->sk_socket);
|
2020-11-16 17:48:09 +08:00
|
|
|
if (parent_sock && !ssk->sk_socket)
|
|
|
|
mptcp_sock_graft(ssk, parent_sock);
|
2020-09-30 06:08:19 +08:00
|
|
|
subflow->map_seq = READ_ONCE(msk->ack_seq);
|
2021-02-13 08:00:01 +08:00
|
|
|
out:
|
|
|
|
mptcp_event(MPTCP_EVENT_SUB_ESTABLISHED, msk, ssk, GFP_ATOMIC);
|
2020-05-29 23:43:30 +08:00
|
|
|
return true;
|
2020-03-28 05:48:39 +08:00
|
|
|
}
|
|
|
|
|
2021-01-13 01:25:24 +08: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);
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
static struct proto mptcp_prot = {
|
|
|
|
.name = "MPTCP",
|
|
|
|
.owner = THIS_MODULE,
|
|
|
|
.init = mptcp_init_sock,
|
2020-03-28 05:48:43 +08:00
|
|
|
.disconnect = mptcp_disconnect,
|
2020-01-22 08:56:15 +08:00
|
|
|
.close = mptcp_close,
|
2020-01-22 08:56:19 +08:00
|
|
|
.accept = mptcp_accept,
|
2020-01-22 08:56:22 +08:00
|
|
|
.setsockopt = mptcp_setsockopt,
|
|
|
|
.getsockopt = mptcp_getsockopt,
|
2021-01-13 01:25:24 +08:00
|
|
|
.shutdown = mptcp_shutdown,
|
2020-01-22 08:56:20 +08:00
|
|
|
.destroy = mptcp_destroy,
|
2020-01-22 08:56:15 +08:00
|
|
|
.sendmsg = mptcp_sendmsg,
|
|
|
|
.recvmsg = mptcp_recvmsg,
|
2020-02-26 17:14:52 +08:00
|
|
|
.release_cb = mptcp_release_cb,
|
2020-06-27 01:30:00 +08:00
|
|
|
.hash = mptcp_hash,
|
|
|
|
.unhash = mptcp_unhash,
|
2020-01-22 08:56:18 +08:00
|
|
|
.get_port = mptcp_get_port,
|
2020-03-28 05:48:45 +08:00
|
|
|
.sockets_allocated = &mptcp_sockets_allocated,
|
|
|
|
.memory_allocated = &tcp_memory_allocated,
|
|
|
|
.memory_pressure = &tcp_memory_pressure,
|
|
|
|
.sysctl_wmem_offset = offsetof(struct net, ipv4.sysctl_tcp_wmem),
|
2020-11-09 02:49:59 +08:00
|
|
|
.sysctl_rmem_offset = offsetof(struct net, ipv4.sysctl_tcp_rmem),
|
2020-03-28 05:48:45 +08:00
|
|
|
.sysctl_mem = sysctl_tcp_mem,
|
2020-01-22 08:56:15 +08:00
|
|
|
.obj_size = sizeof(struct mptcp_sock),
|
2020-06-27 01:30:00 +08:00
|
|
|
.slab_flags = SLAB_TYPESAFE_BY_RCU,
|
2020-01-22 08:56:15 +08:00
|
|
|
.no_autobind = true,
|
|
|
|
};
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
static int mptcp_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
|
|
|
struct socket *ssock;
|
2020-01-22 08:56:19 +08:00
|
|
|
int err;
|
2020-01-22 08:56:17 +08:00
|
|
|
|
|
|
|
lock_sock(sock->sk);
|
2020-06-30 04:26:23 +08:00
|
|
|
ssock = __mptcp_nmpc_socket(msk);
|
|
|
|
if (!ssock) {
|
|
|
|
err = -EINVAL;
|
2020-01-22 08:56:17 +08:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = ssock->ops->bind(ssock, uaddr, addr_len);
|
2020-01-22 08:56:19 +08:00
|
|
|
if (!err)
|
|
|
|
mptcp_copy_inaddrs(sock->sk, ssock->sk);
|
2020-01-22 08:56:17 +08:00
|
|
|
|
|
|
|
unlock:
|
|
|
|
release_sock(sock->sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2020-07-23 19:02:31 +08:00
|
|
|
static void mptcp_subflow_early_fallback(struct mptcp_sock *msk,
|
|
|
|
struct mptcp_subflow_context *subflow)
|
|
|
|
{
|
|
|
|
subflow->request_mptcp = 0;
|
|
|
|
__mptcp_do_fallback(msk);
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
static int mptcp_stream_connect(struct socket *sock, struct sockaddr *uaddr,
|
|
|
|
int addr_len, int flags)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
2020-06-27 01:30:00 +08:00
|
|
|
struct mptcp_subflow_context *subflow;
|
2020-01-22 08:56:17 +08:00
|
|
|
struct socket *ssock;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
lock_sock(sock->sk);
|
2020-05-29 23:43:29 +08:00
|
|
|
if (sock->state != SS_UNCONNECTED && msk->subflow) {
|
|
|
|
/* pending connection or invalid state, let existing subflow
|
|
|
|
* cope with that
|
|
|
|
*/
|
|
|
|
ssock = msk->subflow;
|
|
|
|
goto do_connect;
|
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:23 +08:00
|
|
|
ssock = __mptcp_nmpc_socket(msk);
|
|
|
|
if (!ssock) {
|
|
|
|
err = -EINVAL;
|
2020-01-22 08:56:17 +08:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:23 +08:00
|
|
|
mptcp_token_destroy(msk);
|
|
|
|
inet_sk_state_store(sock->sk, TCP_SYN_SENT);
|
2020-06-27 01:30:00 +08:00
|
|
|
subflow = mptcp_subflow_ctx(ssock->sk);
|
2020-01-22 08:56:19 +08:00
|
|
|
#ifdef CONFIG_TCP_MD5SIG
|
|
|
|
/* no MPTCP if MD5SIG is enabled on this socket or we may run out of
|
|
|
|
* TCP option space.
|
|
|
|
*/
|
|
|
|
if (rcu_access_pointer(tcp_sk(ssock->sk)->md5sig_info))
|
2020-07-23 19:02:31 +08:00
|
|
|
mptcp_subflow_early_fallback(msk, subflow);
|
2020-01-22 08:56:19 +08:00
|
|
|
#endif
|
2021-04-02 07:19:41 +08:00
|
|
|
if (subflow->request_mptcp && mptcp_token_new_connect(ssock->sk)) {
|
|
|
|
MPTCP_INC_STATS(sock_net(ssock->sk), MPTCP_MIB_TOKENFALLBACKINIT);
|
2020-07-23 19:02:31 +08:00
|
|
|
mptcp_subflow_early_fallback(msk, subflow);
|
2021-04-02 07:19:41 +08:00
|
|
|
}
|
2021-04-02 07:19:42 +08:00
|
|
|
if (likely(!__mptcp_check_fallback(msk)))
|
|
|
|
MPTCP_INC_STATS(sock_net(sock->sk), MPTCP_MIB_MPCAPABLEACTIVE);
|
2020-01-22 08:56:19 +08:00
|
|
|
|
2020-05-29 23:43:29 +08:00
|
|
|
do_connect:
|
2020-01-22 08:56:17 +08:00
|
|
|
err = ssock->ops->connect(ssock, uaddr, addr_len, flags);
|
2020-05-29 23:43:29 +08:00
|
|
|
sock->state = ssock->state;
|
|
|
|
|
|
|
|
/* on successful connect, the msk state will be moved to established by
|
|
|
|
* subflow_finish_connect()
|
|
|
|
*/
|
2020-07-27 18:24:33 +08:00
|
|
|
if (!err || err == -EINPROGRESS)
|
2020-05-29 23:43:29 +08:00
|
|
|
mptcp_copy_inaddrs(sock->sk, ssock->sk);
|
|
|
|
else
|
|
|
|
inet_sk_state_store(sock->sk, inet_sk_state_load(ssock->sk));
|
2020-01-22 08:56:17 +08:00
|
|
|
|
|
|
|
unlock:
|
|
|
|
release_sock(sock->sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:19 +08:00
|
|
|
static int mptcp_listen(struct socket *sock, int backlog)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
|
|
|
struct socket *ssock;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
pr_debug("msk=%p", msk);
|
|
|
|
|
|
|
|
lock_sock(sock->sk);
|
2020-06-30 04:26:23 +08:00
|
|
|
ssock = __mptcp_nmpc_socket(msk);
|
|
|
|
if (!ssock) {
|
|
|
|
err = -EINVAL;
|
2020-01-22 08:56:19 +08:00
|
|
|
goto unlock;
|
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:23 +08:00
|
|
|
mptcp_token_destroy(msk);
|
|
|
|
inet_sk_state_store(sock->sk, TCP_LISTEN);
|
2020-04-20 22:25:04 +08:00
|
|
|
sock_set_flag(sock->sk, SOCK_RCU_FREE);
|
|
|
|
|
2020-01-22 08:56:19 +08:00
|
|
|
err = ssock->ops->listen(ssock, backlog);
|
|
|
|
inet_sk_state_store(sock->sk, inet_sk_state_load(ssock->sk));
|
|
|
|
if (!err)
|
|
|
|
mptcp_copy_inaddrs(sock->sk, ssock->sk);
|
|
|
|
|
|
|
|
unlock:
|
|
|
|
release_sock(sock->sk);
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int mptcp_stream_accept(struct socket *sock, struct socket *newsock,
|
|
|
|
int flags, bool kern)
|
|
|
|
{
|
|
|
|
struct mptcp_sock *msk = mptcp_sk(sock->sk);
|
|
|
|
struct socket *ssock;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
pr_debug("msk=%p", msk);
|
|
|
|
|
|
|
|
lock_sock(sock->sk);
|
|
|
|
if (sock->sk->sk_state != TCP_LISTEN)
|
|
|
|
goto unlock_fail;
|
|
|
|
|
|
|
|
ssock = __mptcp_nmpc_socket(msk);
|
|
|
|
if (!ssock)
|
|
|
|
goto unlock_fail;
|
|
|
|
|
2020-06-30 04:26:25 +08:00
|
|
|
clear_bit(MPTCP_DATA_READY, &msk->flags);
|
2020-01-22 08:56:19 +08:00
|
|
|
sock_hold(ssock->sk);
|
|
|
|
release_sock(sock->sk);
|
|
|
|
|
|
|
|
err = ssock->ops->accept(sock, newsock, flags, kern);
|
2020-06-30 04:26:22 +08:00
|
|
|
if (err == 0 && !mptcp_is_tcpsk(newsock->sk)) {
|
2020-01-22 08:56:19 +08:00
|
|
|
struct mptcp_sock *msk = mptcp_sk(newsock->sk);
|
|
|
|
struct mptcp_subflow_context *subflow;
|
2020-11-20 03:45:58 +08:00
|
|
|
struct sock *newsk = newsock->sk;
|
|
|
|
|
2021-02-13 07:59:59 +08:00
|
|
|
lock_sock(newsk);
|
2020-12-09 19:03:29 +08:00
|
|
|
|
|
|
|
/* PM/worker can now acquire the first subflow socket
|
|
|
|
* lock without racing with listener queue cleanup,
|
|
|
|
* we can notify it, if needed.
|
2021-03-05 05:32:12 +08:00
|
|
|
*
|
|
|
|
* Even if remote has reset the initial subflow by now
|
|
|
|
* the refcnt is still at least one.
|
2020-12-09 19:03:29 +08:00
|
|
|
*/
|
|
|
|
subflow = mptcp_subflow_ctx(msk->first);
|
|
|
|
list_add(&subflow->node, &msk->conn_list);
|
|
|
|
sock_hold(msk->first);
|
|
|
|
if (mptcp_is_fully_established(newsk))
|
2021-02-13 07:59:58 +08:00
|
|
|
mptcp_pm_fully_established(msk, msk->first, GFP_KERNEL);
|
2020-12-09 19:03:29 +08:00
|
|
|
|
2020-11-20 03:45:58 +08:00
|
|
|
mptcp_copy_inaddrs(newsk, msk->first);
|
|
|
|
mptcp_rcv_space_init(msk, msk->first);
|
2021-01-20 22:39:11 +08:00
|
|
|
mptcp_propagate_sndbuf(newsk, msk->first);
|
2020-01-22 08:56:19 +08:00
|
|
|
|
|
|
|
/* set ssk->sk_socket of accept()ed flows to mptcp socket.
|
|
|
|
* This is needed so NOSPACE flag can be set from tcp stack.
|
|
|
|
*/
|
2021-04-16 07:44:53 +08:00
|
|
|
mptcp_flush_join_list(msk);
|
2020-08-03 21:00:44 +08:00
|
|
|
mptcp_for_each_subflow(msk, subflow) {
|
2020-01-22 08:56:19 +08:00
|
|
|
struct sock *ssk = mptcp_subflow_tcp_sock(subflow);
|
|
|
|
|
|
|
|
if (!ssk->sk_socket)
|
|
|
|
mptcp_sock_graft(ssk, newsock);
|
|
|
|
}
|
2021-02-13 07:59:59 +08:00
|
|
|
release_sock(newsk);
|
2020-01-22 08:56:19 +08:00
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:25 +08:00
|
|
|
if (inet_csk_listen_poll(ssock->sk))
|
|
|
|
set_bit(MPTCP_DATA_READY, &msk->flags);
|
2020-01-22 08:56:19 +08:00
|
|
|
sock_put(ssock->sk);
|
|
|
|
return err;
|
|
|
|
|
|
|
|
unlock_fail:
|
|
|
|
release_sock(sock->sk);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2020-06-30 04:26:25 +08:00
|
|
|
static __poll_t mptcp_check_readable(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
return test_bit(MPTCP_DATA_READY, &msk->flags) ? EPOLLIN | EPOLLRDNORM :
|
|
|
|
0;
|
|
|
|
}
|
|
|
|
|
2020-11-16 17:48:12 +08:00
|
|
|
static __poll_t mptcp_check_writeable(struct mptcp_sock *msk)
|
|
|
|
{
|
|
|
|
struct sock *sk = (struct sock *)msk;
|
|
|
|
|
|
|
|
if (unlikely(sk->sk_shutdown & SEND_SHUTDOWN))
|
2021-02-12 07:30:38 +08:00
|
|
|
return EPOLLOUT | EPOLLWRNORM;
|
2020-11-16 17:48:12 +08:00
|
|
|
|
|
|
|
if (sk_stream_is_writeable(sk))
|
|
|
|
return EPOLLOUT | EPOLLWRNORM;
|
|
|
|
|
2021-01-20 22:39:11 +08:00
|
|
|
mptcp_set_nospace(sk);
|
2020-11-27 18:10:27 +08:00
|
|
|
smp_mb__after_atomic(); /* msk->flags is changed by write_space cb */
|
|
|
|
if (sk_stream_is_writeable(sk))
|
|
|
|
return EPOLLOUT | EPOLLWRNORM;
|
2020-11-16 17:48:12 +08:00
|
|
|
|
2020-11-27 18:10:27 +08:00
|
|
|
return 0;
|
2020-11-16 17:48:12 +08:00
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
static __poll_t mptcp_poll(struct file *file, struct socket *sock,
|
|
|
|
struct poll_table_struct *wait)
|
|
|
|
{
|
2020-01-22 08:56:25 +08: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 08:56:33 +08:00
|
|
|
struct mptcp_sock *msk;
|
2020-01-22 08:56:17 +08:00
|
|
|
__poll_t mask = 0;
|
2020-06-30 04:26:25 +08:00
|
|
|
int state;
|
2020-01-22 08:56:17 +08:00
|
|
|
|
2020-01-22 08:56:25 +08:00
|
|
|
msk = mptcp_sk(sk);
|
|
|
|
sock_poll_wait(file, sock, wait);
|
|
|
|
|
2020-06-30 04:26:25 +08:00
|
|
|
state = inet_sk_state_load(sk);
|
2020-09-14 16:01:09 +08:00
|
|
|
pr_debug("msk=%p state=%d flags=%lx", msk, state, msk->flags);
|
2020-06-30 04:26:25 +08:00
|
|
|
if (state == TCP_LISTEN)
|
|
|
|
return mptcp_check_readable(msk);
|
|
|
|
|
|
|
|
if (state != TCP_SYN_SENT && state != TCP_SYN_RECV) {
|
|
|
|
mask |= mptcp_check_readable(msk);
|
2020-11-16 17:48:12 +08:00
|
|
|
mask |= mptcp_check_writeable(msk);
|
2020-06-30 04:26:25 +08:00
|
|
|
}
|
2021-02-12 07:30:38 +08:00
|
|
|
if (sk->sk_shutdown == SHUTDOWN_MASK || state == TCP_CLOSE)
|
|
|
|
mask |= EPOLLHUP;
|
2020-01-22 08:56:25 +08:00
|
|
|
if (sk->sk_shutdown & RCV_SHUTDOWN)
|
|
|
|
mask |= EPOLLIN | EPOLLRDNORM | EPOLLRDHUP;
|
|
|
|
|
2021-02-12 07:30:37 +08:00
|
|
|
/* This barrier is coupled with smp_wmb() in tcp_reset() */
|
|
|
|
smp_rmb();
|
|
|
|
if (sk->sk_err)
|
|
|
|
mask |= EPOLLERR;
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
return mask;
|
|
|
|
}
|
|
|
|
|
2020-01-25 08:04:02 +08:00
|
|
|
static const struct proto_ops mptcp_stream_ops = {
|
|
|
|
.family = PF_INET,
|
|
|
|
.owner = THIS_MODULE,
|
2021-04-02 00:57:45 +08:00
|
|
|
.release = inet_release,
|
2020-01-25 08:04:02 +08:00
|
|
|
.bind = mptcp_bind,
|
|
|
|
.connect = mptcp_stream_connect,
|
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = mptcp_stream_accept,
|
2020-06-30 04:26:22 +08:00
|
|
|
.getname = inet_getname,
|
2020-01-25 08:04:02 +08:00
|
|
|
.poll = mptcp_poll,
|
|
|
|
.ioctl = inet_ioctl,
|
|
|
|
.gettstamp = sock_gettstamp,
|
|
|
|
.listen = mptcp_listen,
|
2021-01-13 01:25:24 +08:00
|
|
|
.shutdown = inet_shutdown,
|
2020-01-25 08:04:02 +08:00
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
|
|
|
.sendmsg = inet_sendmsg,
|
|
|
|
.recvmsg = inet_recvmsg,
|
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
.sendpage = inet_sendpage,
|
|
|
|
};
|
2020-01-22 08:56:17 +08:00
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
static struct inet_protosw mptcp_protosw = {
|
|
|
|
.type = SOCK_STREAM,
|
|
|
|
.protocol = IPPROTO_MPTCP,
|
|
|
|
.prot = &mptcp_prot,
|
2020-01-22 08:56:17 +08:00
|
|
|
.ops = &mptcp_stream_ops,
|
|
|
|
.flags = INET_PROTOSW_ICSK,
|
2020-01-22 08:56:15 +08:00
|
|
|
};
|
|
|
|
|
2021-01-20 22:39:14 +08: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);
|
|
|
|
if (!sock_owned_by_user(ssk) &&
|
|
|
|
mptcp_subflow_has_delegated_action(subflow))
|
|
|
|
mptcp_subflow_process_delegated(ssk);
|
|
|
|
/* ... elsewhere 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.
|
|
|
|
*/
|
|
|
|
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-27 01:29:59 +08:00
|
|
|
void __init mptcp_proto_init(void)
|
2020-01-22 08:56:15 +08:00
|
|
|
{
|
2021-01-20 22:39:14 +08:00
|
|
|
struct mptcp_delegated_action *delegated;
|
|
|
|
int cpu;
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
mptcp_prot.h.hashinfo = tcp_prot.h.hashinfo;
|
|
|
|
|
2020-03-28 05:48:45 +08:00
|
|
|
if (percpu_counter_init(&mptcp_sockets_allocated, 0, GFP_KERNEL))
|
|
|
|
panic("Failed to allocate MPTCP pcpu counter\n");
|
|
|
|
|
2021-01-20 22:39:14 +08: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);
|
|
|
|
netif_tx_napi_add(&mptcp_napi_dev, &delegated->napi, mptcp_napi_poll,
|
|
|
|
NAPI_POLL_WEIGHT);
|
|
|
|
napi_enable(&delegated->napi);
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:17 +08:00
|
|
|
mptcp_subflow_init();
|
2020-03-28 05:48:38 +08:00
|
|
|
mptcp_pm_init();
|
2020-06-27 01:30:00 +08:00
|
|
|
mptcp_token_init();
|
2020-01-22 08:56:17 +08:00
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
if (proto_register(&mptcp_prot, 1) != 0)
|
|
|
|
panic("Failed to register MPTCP proto.\n");
|
|
|
|
|
|
|
|
inet_register_protosw(&mptcp_protosw);
|
2020-02-26 17:14:48 +08:00
|
|
|
|
|
|
|
BUILD_BUG_ON(sizeof(struct mptcp_skb_cb) > sizeof_field(struct sk_buff, cb));
|
2020-01-22 08:56:15 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
#if IS_ENABLED(CONFIG_MPTCP_IPV6)
|
2020-01-25 08:04:02 +08:00
|
|
|
static const struct proto_ops mptcp_v6_stream_ops = {
|
|
|
|
.family = PF_INET6,
|
|
|
|
.owner = THIS_MODULE,
|
2021-04-02 00:57:45 +08:00
|
|
|
.release = inet6_release,
|
2020-01-25 08:04:02 +08:00
|
|
|
.bind = mptcp_bind,
|
|
|
|
.connect = mptcp_stream_connect,
|
|
|
|
.socketpair = sock_no_socketpair,
|
|
|
|
.accept = mptcp_stream_accept,
|
2020-06-30 04:26:22 +08:00
|
|
|
.getname = inet6_getname,
|
2020-01-25 08:04:02 +08:00
|
|
|
.poll = mptcp_poll,
|
|
|
|
.ioctl = inet6_ioctl,
|
|
|
|
.gettstamp = sock_gettstamp,
|
|
|
|
.listen = mptcp_listen,
|
2021-01-13 01:25:24 +08:00
|
|
|
.shutdown = inet_shutdown,
|
2020-01-25 08:04:02 +08:00
|
|
|
.setsockopt = sock_common_setsockopt,
|
|
|
|
.getsockopt = sock_common_getsockopt,
|
|
|
|
.sendmsg = inet6_sendmsg,
|
|
|
|
.recvmsg = inet6_recvmsg,
|
|
|
|
.mmap = sock_no_mmap,
|
|
|
|
.sendpage = inet_sendpage,
|
|
|
|
#ifdef CONFIG_COMPAT
|
2020-05-18 14:28:06 +08:00
|
|
|
.compat_ioctl = inet6_compat_ioctl,
|
2020-01-25 08:04:02 +08:00
|
|
|
#endif
|
|
|
|
};
|
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
static struct proto mptcp_v6_prot;
|
|
|
|
|
2020-01-22 08:56:20 +08:00
|
|
|
static void mptcp_v6_destroy(struct sock *sk)
|
|
|
|
{
|
|
|
|
mptcp_destroy(sk);
|
|
|
|
inet6_destroy_sock(sk);
|
|
|
|
}
|
|
|
|
|
2020-01-22 08:56:15 +08:00
|
|
|
static struct inet_protosw mptcp_v6_protosw = {
|
|
|
|
.type = SOCK_STREAM,
|
|
|
|
.protocol = IPPROTO_MPTCP,
|
|
|
|
.prot = &mptcp_v6_prot,
|
2020-01-22 08:56:17 +08:00
|
|
|
.ops = &mptcp_v6_stream_ops,
|
2020-01-22 08:56:15 +08:00
|
|
|
.flags = INET_PROTOSW_ICSK,
|
|
|
|
};
|
|
|
|
|
2020-06-27 01:29:59 +08:00
|
|
|
int __init mptcp_proto_v6_init(void)
|
2020-01-22 08:56:15 +08:00
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
mptcp_v6_prot = mptcp_prot;
|
|
|
|
strcpy(mptcp_v6_prot.name, "MPTCPv6");
|
|
|
|
mptcp_v6_prot.slab = NULL;
|
2020-01-22 08:56:20 +08:00
|
|
|
mptcp_v6_prot.destroy = mptcp_v6_destroy;
|
2020-02-06 07:39:37 +08:00
|
|
|
mptcp_v6_prot.obj_size = sizeof(struct mptcp6_sock);
|
2020-01-22 08:56:15 +08: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
|