From nobody Thu Apr 25 22:25:37 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3968813AE3 for ; Mon, 22 May 2023 13:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ly35l8hucK23xGSvWhCJJfAD3Rr35TqRMnngF+/4qkE=; b=Z0J8ev1lUxoBmILiydqwDoUYJvNgBFbspgVm2CcalBfFyIXuLeJOxOlaUcU7aSoGHWgJQH s0Xtpc5wyKMMwgXiJkzdaHttxdvUuQl29/FxvPEFReHHII311RG9doG3goGSEzPQ1w+WPQ 6vcefscqLpEwAoVFuGPe0FJ0t7HD1/w= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-47-2CAs7CbdPSeYFBayLON7kA-1; Mon, 22 May 2023 09:56:49 -0400 X-MC-Unique: 2CAs7CbdPSeYFBayLON7kA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 52E832811BC0 for ; Mon, 22 May 2023 13:56:49 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id DB9FB492B0A for ; Mon, 22 May 2023 13:56:48 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 1/6] mptcp: add subflow unique id Date: Mon, 22 May 2023 15:56:27 +0200 Message-Id: <82dfa3a412939eb515bba411d8aa585f987e61f6.1684763196.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" The user-space need to preperly account the data received/sent by individual subflows. When additional subflows are created and/or closed during the MPTCP socket lifetime, the information currently exposed via MPTCP_TCPINFO are not enough: subflows are identifed only by the sequential position inside the info dumps, and that will change with the above mentioned events. To solve the above problem, this patch introduces a new subflow identifier that is unique inside the given mptcp socket scope. The initial subflow get the id 1 and the other subflows get incremental values at join time. Signed-off-by: Paolo Abeni --- v1 -> v2: - properly set subflow_id for the first passive subflow and active subflow= s, too - drop the tcpi_fackets overload --- net/mptcp/protocol.c | 4 ++++ net/mptcp/protocol.h | 5 ++++- net/mptcp/subflow.c | 2 ++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 28da6a9fe8fd..b2f0408a5d7c 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -96,6 +96,7 @@ static int __mptcp_socket_create(struct mptcp_sock *msk) list_add(&subflow->node, &msk->conn_list); sock_hold(ssock->sk); subflow->request_mptcp =3D 1; + subflow->subflow_id =3D msk->subflow_id++; =20 /* This is the first subflow, always with id 0 */ subflow->local_id_valid =3D 1; @@ -845,6 +846,7 @@ static bool __mptcp_finish_join(struct mptcp_sock *msk,= struct sock *ssk) if (sk->sk_socket && !ssk->sk_socket) mptcp_sock_graft(ssk, sk->sk_socket); =20 + mptcp_subflow_ctx(ssk)->subflow_id =3D msk->subflow_id++; mptcp_sockopt_sync_locked(msk, ssk); mptcp_subflow_joined(msk, ssk); return true; @@ -2775,6 +2777,7 @@ static int __mptcp_init_sock(struct sock *sk) WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk))); WRITE_ONCE(msk->allow_infinite_fallback, true); msk->recovery =3D false; + msk->subflow_id =3D 1; =20 mptcp_pm_data_init(msk); =20 @@ -3203,6 +3206,7 @@ struct sock *mptcp_sk_clone_init(const struct sock *s= k, msk->snd_nxt =3D msk->write_seq; msk->snd_una =3D msk->write_seq; msk->wnd_end =3D msk->snd_nxt + req->rsk_rcv_wnd; + msk->subflow_id++; msk->setsockopt_seq =3D mptcp_sk(sk)->setsockopt_seq; mptcp_init_sched(msk, mptcp_sk(sk)->sched); =20 diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index de94c01746dc..f9180ecce5e4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -319,7 +319,8 @@ struct mptcp_sock { u64 rtt_us; /* last maximum rtt of subflows */ } rcvq_space; =20 - u32 setsockopt_seq; + u32 subflow_id; + u32 setsockopt_seq; char ca_name[TCP_CA_NAME_MAX]; struct mptcp_sock *dl_next; }; @@ -501,6 +502,8 @@ struct mptcp_subflow_context { u8 reset_reason:4; u8 stale_count; =20 + u32 subflow_id; + long delegated_status; unsigned long fail_tout; =20 diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 63ac4dc621d4..c7001a23550a 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -819,6 +819,7 @@ static struct sock *subflow_syn_recv_sock(const struct = sock *sk, if (!ctx->conn) goto fallback; =20 + ctx->subflow_id =3D 1; owner =3D mptcp_sk(ctx->conn); mptcp_pm_new_connection(owner, child, 1); =20 @@ -1574,6 +1575,7 @@ int __mptcp_subflow_connect(struct sock *sk, const st= ruct mptcp_addr_info *loc, subflow->remote_id =3D remote_id; subflow->request_join =3D 1; subflow->request_bkup =3D !!(flags & MPTCP_PM_ADDR_FLAG_BACKUP); + subflow->subflow_id =3D msk->subflow_id++; mptcp_info2sockaddr(remote, &addr, ssk->sk_family); =20 sock_hold(ssk); --=20 2.40.1 From nobody Thu Apr 25 22:25:37 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 657CB13AE3 for ; Mon, 22 May 2023 13:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=7Px0eBrLz3bmvjYQe///ujAk1G4L+CCyx4CMBUE3PxY=; b=QyXZg41ifJuBWZ2uEUPDebXksb84kNhUEJWebqMHmlxnDvZ6DHEkZc/NzyXufn1kuLeBt1 27oL7a6TyGT26fVLBk8EJd5LkrKqmD6wvIYFVCuj/NCUVi7AHiaFOGQgpl2RSL0zmH98RY ZpVlirggtFjIAV+Zqpxd+2XfOpCxw2o= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-130-oGfo5if_NY-3TNTLVE270A-1; Mon, 22 May 2023 09:56:51 -0400 X-MC-Unique: oGfo5if_NY-3TNTLVE270A-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1289B811E7C for ; Mon, 22 May 2023 13:56:51 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 96D8E492B0B for ; Mon, 22 May 2023 13:56:49 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 2/6] mptcp: introduce MPTCP_FULL_INFO getsockopt Date: Mon, 22 May 2023 15:56:28 +0200 Message-Id: <7caed74486cdeec1c929cd2b62d3f04dd67db46e.1684763196.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Paolo Abeni --- include/uapi/linux/mptcp.h | 12 ++++++ net/mptcp/sockopt.c | 75 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 32af2d278cb4..483d4d2a3646 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -12,6 +12,7 @@ #include /* for sockaddr_in */ #include /* for sockaddr_in6 */ #include /* for sockaddr_storage and sa_family */ +#include /* for tcp_info */ =20 #define MPTCP_SUBFLOW_FLAG_MCAP_REM _BITUL(0) #define MPTCP_SUBFLOW_FLAG_MCAP_LOC _BITUL(1) @@ -244,9 +245,20 @@ struct mptcp_subflow_addrs { }; }; =20 +struct mptcp_subflow_info { + __u32 id; + struct mptcp_subflow_addrs addrs; +}; + +struct mptcp_subflow_full_info { + struct mptcp_subflow_info subflow_info; + struct tcp_info tcp_info; +}; + /* MPTCP socket options */ #define MPTCP_INFO 1 #define MPTCP_TCPINFO 2 #define MPTCP_SUBFLOW_ADDRS 3 +#define MPTCP_FULL_INFO 4 =20 #endif /* _UAPI_MPTCP_H */ diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index d4258869ac48..b4d04d5dc1f7 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -1146,6 +1146,79 @@ static int mptcp_getsockopt_subflow_addrs(struct mpt= cp_sock *msk, char __user *o return 0; } =20 +static int mptcp_getsockopt_full_info(struct mptcp_sock *msk, char __user = *optval, + int __user *optlen) +{ + struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; + unsigned int sfcount =3D 0, copied =3D 0; + int mptcp_info_len, len, size_user; + struct mptcp_subflow_data sfd; + char __user *infoptr; + + len =3D mptcp_get_subflow_data(&sfd, optval, optlen); + if (len < 0) + return len; + + /* don't bother filling the mptcp info if there is not enough + * user-space-provided storage + */ + infoptr =3D optval + sfd.size_subflow_data; + if (len > sizeof(struct mptcp_subflow_data)) { + struct mptcp_info mptcp_info; + + memset(&mptcp_info, 0, sizeof(mptcp_info)); + mptcp_info_len =3D min_t(unsigned int, len, sizeof(struct mptcp_info)); + + mptcp_diag_fill_info(msk, &mptcp_info); + + if (copy_to_user(infoptr, &mptcp_info, mptcp_info_len)) + return -EFAULT; + + len -=3D mptcp_info_len; + copied +=3D mptcp_info_len; + infoptr +=3D mptcp_info_len; + } + + sfd.size_kernel =3D sizeof(struct mptcp_subflow_full_info); + sfd.size_user =3D min_t(unsigned int, sfd.size_user, + sizeof(struct mptcp_subflow_full_info)); + lock_sock(sk); + + mptcp_for_each_subflow(msk, subflow) { + struct sock *ssk =3D mptcp_subflow_tcp_sock(subflow); + + ++sfcount; + if (len >=3D size_user) { + struct mptcp_subflow_full_info sinfo; + + memset(&sinfo, 0, sizeof(sinfo)); + sinfo.subflow_info.id =3D subflow->subflow_id; + mptcp_get_sub_addrs(ssk, &sinfo.subflow_info.addrs); + + /* don't bother filling the tcp info if the storage is too small */ + if (sfd.size_user > sizeof(struct mptcp_subflow_info)) + tcp_get_info(ssk, &sinfo.tcp_info); + + if (copy_to_user(infoptr, &sinfo, sfd.size_user)) { + release_sock(sk); + return -EFAULT; + } + + infoptr +=3D sfd.size_user; + copied +=3D sfd.size_user; + len -=3D sfd.size_user; + } + } + release_sock(sk); + + sfd.num_subflows =3D sfcount; + if (mptcp_put_subflow_data(&sfd, optval, copied, optlen)) + return -EFAULT; + + return 0; +} + static int mptcp_put_int_option(struct mptcp_sock *msk, char __user *optva= l, int __user *optlen, int val) { @@ -1219,6 +1292,8 @@ static int mptcp_getsockopt_sol_mptcp(struct mptcp_so= ck *msk, int optname, switch (optname) { case MPTCP_INFO: return mptcp_getsockopt_info(msk, optval, optlen); + case MPTCP_FULL_INFO: + return mptcp_getsockopt_full_info(msk, optval, optlen); case MPTCP_TCPINFO: return mptcp_getsockopt_tcpinfo(msk, optval, optlen); case MPTCP_SUBFLOW_ADDRS: --=20 2.40.1 From nobody Thu Apr 25 22:25:37 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 60A581426B for ; Mon, 22 May 2023 13:56:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Fjrb07kx4muJdYSg6hex89U6fZNuDWwVyMD/4PaUa/M=; b=YAf54WXOBmFnslZgog1zva2NnEi5wDnfoNNngRGKZxqJYBY/vY9uvq6NZx0gq3XMk14f5v M303NYBXBZMleQGGNVJ48DJdw1ZX4cXjzxySzZbdJLkcIZrWUfreRYFzFbL3zsJca+IEOb V6VnDpHtwMdGV9mEfNZV0zTt3vpv0KU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-159-88mTehgTPVm2Ek_wwW46pQ-1; Mon, 22 May 2023 09:56:52 -0400 X-MC-Unique: 88mTehgTPVm2Ek_wwW46pQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C809F800B2A for ; Mon, 22 May 2023 13:56:51 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 58405492B0A for ; Mon, 22 May 2023 13:56:51 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 3/6] mptcp: move snd_una update earlier for fallback socket. Date: Mon, 22 May 2023 15:56:29 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" That will avoid an unneeded conditional in both the fast-path and in the fallback case and will simplify a bit the next patch. Signed-off-by: Paolo Abeni --- net/mptcp/options.c | 6 ++++++ net/mptcp/protocol.c | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 8a8083207be4..4bdcd2b326bd 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1119,6 +1119,12 @@ bool mptcp_incoming_options(struct sock *sk, struct = sk_buff *skb) mptcp_data_lock(subflow->conn); if (sk_stream_memory_free(sk)) __mptcp_check_push(subflow->conn, sk); + + /* on fallback we just need to ignore the msk-level snd_una, as + * this is really plain TCP + */ + msk->snd_una =3D READ_ONCE(msk->snd_nxt); + __mptcp_data_acked(subflow->conn); mptcp_data_unlock(subflow->conn); return true; diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index b2f0408a5d7c..d93c8cdeeda7 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1006,12 +1006,6 @@ static void __mptcp_clean_una(struct sock *sk) struct mptcp_data_frag *dtmp, *dfrag; u64 snd_una; =20 - /* on fallback we just need to ignore snd_una, as this is really - * plain TCP - */ - if (__mptcp_check_fallback(msk)) - msk->snd_una =3D READ_ONCE(msk->snd_nxt); - snd_una =3D msk->snd_una; list_for_each_entry_safe(dfrag, dtmp, &msk->rtx_queue, list) { if (after64(dfrag->data_seq + dfrag->data_len, snd_una)) --=20 2.40.1 From nobody Thu Apr 25 22:25:37 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 80F6F1426A for ; Mon, 22 May 2023 13:56:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=frzZiu2GCi1zkq0JkA2nx1cq2Gwi2qjj5xfTbpeE7x4=; b=HUl5v25E16Y+GzDxszZTyqBSPAJqW3GDccIUZ3uhu5Gwv0LwpbbK1bpvrmI1poQwyUPbVB Z/USGQU6j8v0HHuK0F7Zuv2y0k8YEIXXc/MZnZ5lt3Ug7I9f5z3d+FYX5MVWONTbUJOKTr rb2JgCG+E1u1JZ5iYi5BKXDuvtZEcv8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-153-_qDCxhdLPJm4SlyfhtPkNQ-1; Mon, 22 May 2023 09:56:52 -0400 X-MC-Unique: _qDCxhdLPJm4SlyfhtPkNQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 893408032F5 for ; Mon, 22 May 2023 13:56:52 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1865A492B0A for ; Mon, 22 May 2023 13:56:51 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 4/6] mptcp: track some aggregate data counters. Date: Mon, 22 May 2023 15:56:30 +0200 Message-Id: In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Currently there are no data transfer counters accounting for all the subflows used by a given MPTCP socket. The user-space can compute such figures aggregating the subflow info, but that is inaccurate if any subflow is closed before the MPTCP socket itself. Add the new counters in the MPTCP socket itself and expose them via the existing diag and sockopt. While touching mptcp_diag_fill_info(), acquire the relevant locks before fetching the msk data, to ensure better data consistency Signed-off-by: Paolo Abeni --- include/uapi/linux/mptcp.h | 5 +++++ net/mptcp/options.c | 10 ++++++++-- net/mptcp/protocol.c | 12 +++++++++++- net/mptcp/protocol.h | 4 ++++ net/mptcp/sockopt.c | 22 +++++++++++++++++----- 5 files changed, 45 insertions(+), 8 deletions(-) diff --git a/include/uapi/linux/mptcp.h b/include/uapi/linux/mptcp.h index 483d4d2a3646..0e12ec7e05d0 100644 --- a/include/uapi/linux/mptcp.h +++ b/include/uapi/linux/mptcp.h @@ -124,6 +124,11 @@ struct mptcp_info { __u8 mptcpi_local_addr_used; __u8 mptcpi_local_addr_max; __u8 mptcpi_csum_enabled; + __u32 mptcpi_retransmits; + __u64 mptcpi_bytes_retrans; + __u64 mptcpi_bytes_sent; + __u64 mptcpi_bytes_received; + __u64 mptcpi_bytes_acked; }; =20 /* diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 4bdcd2b326bd..c254accb14de 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1026,6 +1026,12 @@ u64 __mptcp_expand_seq(u64 old_seq, u64 cur_seq) return cur_seq; } =20 +static void __mptcp_snd_una_update(struct mptcp_sock *msk, u64 new_snd_una) +{ + msk->bytes_acked +=3D new_snd_una - msk->snd_una; + msk->snd_una =3D new_snd_una; +} + static void ack_update_msk(struct mptcp_sock *msk, struct sock *ssk, struct mptcp_options_received *mp_opt) @@ -1057,7 +1063,7 @@ static void ack_update_msk(struct mptcp_sock *msk, __mptcp_check_push(sk, ssk); =20 if (after64(new_snd_una, old_snd_una)) { - msk->snd_una =3D new_snd_una; + __mptcp_snd_una_update(msk, new_snd_una); __mptcp_data_acked(sk); } mptcp_data_unlock(sk); @@ -1123,7 +1129,7 @@ bool mptcp_incoming_options(struct sock *sk, struct s= k_buff *skb) /* on fallback we just need to ignore the msk-level snd_una, as * this is really plain TCP */ - msk->snd_una =3D READ_ONCE(msk->snd_nxt); + __mptcp_snd_una_update(msk, READ_ONCE(msk->snd_nxt)); =20 __mptcp_data_acked(subflow->conn); mptcp_data_unlock(subflow->conn); diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index d93c8cdeeda7..edf26782fe2e 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -378,6 +378,7 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, st= ruct sock *ssk, =20 if (MPTCP_SKB_CB(skb)->map_seq =3D=3D msk->ack_seq) { /* in sequence */ + msk->bytes_received +=3D copy_len; WRITE_ONCE(msk->ack_seq, msk->ack_seq + copy_len); tail =3D skb_peek_tail(&sk->sk_receive_queue); if (tail && mptcp_try_coalesce(sk, tail, skb)) @@ -761,6 +762,7 @@ static bool __mptcp_ofo_queue(struct mptcp_sock *msk) MPTCP_SKB_CB(skb)->map_seq +=3D delta; __skb_queue_tail(&sk->sk_receive_queue, skb); } + msk->bytes_received +=3D end_seq - msk->ack_seq; msk->ack_seq =3D end_seq; moved =3D true; } @@ -1513,8 +1515,10 @@ static void mptcp_update_post_push(struct mptcp_sock= *msk, * that has been handed to the subflow for transmission * and skip update in case it was old dfrag. */ - if (likely(after64(snd_nxt_new, msk->snd_nxt))) + if (likely(after64(snd_nxt_new, msk->snd_nxt))) { + msk->bytes_sent +=3D snd_nxt_new - msk->snd_nxt; msk->snd_nxt =3D snd_nxt_new; + } } =20 void mptcp_check_and_set_pending(struct sock *sk) @@ -2639,6 +2643,8 @@ static void __mptcp_retrans(struct sock *sk) msk->last_snd =3D ssk; } } + + msk->bytes_retrans +=3D len; dfrag->already_sent =3D max(dfrag->already_sent, len); =20 reset_timer: @@ -3153,6 +3159,10 @@ static int mptcp_disconnect(struct sock *sk, int fla= gs) WRITE_ONCE(msk->csum_enabled, mptcp_is_checksum_enabled(sock_net(sk))); mptcp_pm_data_reset(msk); mptcp_ca_reset(sk); + msk->bytes_acked =3D 0; + msk->bytes_received =3D 0; + msk->bytes_sent =3D 0; + msk->bytes_retrans =3D 0; =20 WRITE_ONCE(sk->sk_shutdown, 0); sk_error_report(sk); diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f9180ecce5e4..0283383a09f4 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -261,10 +261,13 @@ struct mptcp_sock { u64 local_key; u64 remote_key; u64 write_seq; + u64 bytes_sent; u64 snd_nxt; + u64 bytes_received; u64 ack_seq; atomic64_t rcv_wnd_sent; u64 rcv_data_fin_seq; + u64 bytes_retrans; int rmem_fwd_alloc; struct sock *last_snd; int snd_burst; @@ -273,6 +276,7 @@ struct mptcp_sock { * recovery related fields are under data_lock * protection */ + u64 bytes_acked; u64 snd_una; u64 wnd_end; unsigned long timer_ival; diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index b4d04d5dc1f7..2464100ef820 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -888,7 +888,9 @@ static int mptcp_getsockopt_first_sf_only(struct mptcp_= sock *msk, int level, int =20 void mptcp_diag_fill_info(struct mptcp_sock *msk, struct mptcp_info *info) { + struct sock *sk =3D (struct sock *)msk; u32 flags =3D 0; + bool slow; =20 memset(info, 0, sizeof(*info)); =20 @@ -914,11 +916,21 @@ void mptcp_diag_fill_info(struct mptcp_sock *msk, str= uct mptcp_info *info) if (READ_ONCE(msk->can_ack)) flags |=3D MPTCP_INFO_FLAG_REMOTE_KEY_RECEIVED; info->mptcpi_flags =3D flags; - info->mptcpi_token =3D READ_ONCE(msk->token); - info->mptcpi_write_seq =3D READ_ONCE(msk->write_seq); - info->mptcpi_snd_una =3D READ_ONCE(msk->snd_una); - info->mptcpi_rcv_nxt =3D READ_ONCE(msk->ack_seq); - info->mptcpi_csum_enabled =3D READ_ONCE(msk->csum_enabled); + mptcp_data_lock(sk); + info->mptcpi_snd_una =3D msk->snd_una; + info->mptcpi_rcv_nxt =3D msk->ack_seq; + info->mptcpi_bytes_acked =3D msk->bytes_acked; + mptcp_data_unlock(sk); + + slow =3D lock_sock_fast(sk); + info->mptcpi_csum_enabled =3D msk->csum_enabled; + info->mptcpi_token =3D msk->token; + info->mptcpi_write_seq =3D msk->write_seq; + info->mptcpi_retransmits =3D inet_csk(sk)->icsk_retransmits; + info->mptcpi_bytes_sent =3D msk->bytes_sent; + info->mptcpi_bytes_received =3D msk->bytes_received; + info->mptcpi_bytes_retrans =3D msk->bytes_retrans; + unlock_sock_fast(sk, slow); } EXPORT_SYMBOL_GPL(mptcp_diag_fill_info); =20 --=20 2.40.1 From nobody Thu Apr 25 22:25:37 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4531D1426C for ; Mon, 22 May 2023 13:56:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mi6SkL+VFXAxLhRY/iwA6moEYBCJ64Xp3XKn3aOVv34=; b=UegI2WhxvvmwuHj2Lkf+iYTl1hKOHPZoaenFvX2VoQqO7Y/s9l2VwlGsrz0MXQTVhBYbz8 2mqPARp9xhcWiadPcn3nmovvOgXzHeCvf9HgISzdMesVSoDFEazTj4hRAKQVgLNxqwpk/N gaBzJgL8RVpu4WRc+YZDHQ3Xq1zrU1E= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-673-kKycMA_KON2M23lk-mEvdA-1; Mon, 22 May 2023 09:56:53 -0400 X-MC-Unique: kKycMA_KON2M23lk-mEvdA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 535371C08DA8 for ; Mon, 22 May 2023 13:56:53 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id CD653492B0B for ; Mon, 22 May 2023 13:56:52 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 5/6] selftests: mptcp: explicitly tests aggregate counters Date: Mon, 22 May 2023 15:56:31 +0200 Message-Id: <7e32265ebe2ed650df1373c3774656c1b62f04d4.1684763197.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Update the existing sockopt test-case to do some some basic checks on the newly added counters. Signed-off-by: Paolo Abeni --- .../selftests/net/mptcp/mptcp_sockopt.c | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index ae61f39556ca..869c041c34f3 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -51,6 +51,11 @@ struct mptcp_info { __u8 mptcpi_local_addr_used; __u8 mptcpi_local_addr_max; __u8 mptcpi_csum_enabled; + __u32 mptcpi_retransmits; + __u64 mptcpi_bytes_retrans; + __u64 mptcpi_bytes_sent; + __u64 mptcpi_bytes_received; + __u64 mptcpi_bytes_acked; }; =20 struct mptcp_subflow_data { @@ -83,8 +88,10 @@ struct mptcp_subflow_addrs { =20 struct so_state { struct mptcp_info mi; + struct mptcp_info last_sample; uint64_t mptcpi_rcv_delta; uint64_t tcpi_rcv_delta; + bool pkt_stats_avail; }; =20 static void die_perror(const char *msg) @@ -320,6 +327,9 @@ static void do_getsockopt_mptcp_info(struct so_state *s= , int fd, size_t w) =20 assert(olen =3D=3D sizeof(i)); =20 + s->pkt_stats_avail =3D olen =3D=3D sizeof(i); + + s->last_sample =3D i; if (s->mi.mptcpi_write_seq =3D=3D 0) s->mi =3D i; =20 @@ -556,6 +566,23 @@ static void process_one_client(int fd, int pipefd) do_getsockopts(&s, fd, ret, ret2); if (s.mptcpi_rcv_delta !=3D (uint64_t)ret + 1) xerror("mptcpi_rcv_delta %" PRIu64 ", expect %" PRIu64, s.mptcpi_rcv_del= ta, ret + 1, s.mptcpi_rcv_delta - ret); + + /* be nice when running on top of older kernel */ + if (s.pkt_stats_avail) { + if (s.last_sample.mptcpi_bytes_sent !=3D ret2) + xerror("mptcpi_bytes_sent %" PRIu64 ", expect %" PRIu64, + s.last_sample.mptcpi_bytes_sent, ret2, + s.last_sample.mptcpi_bytes_sent - ret2); + if (s.last_sample.mptcpi_bytes_received !=3D ret) + xerror("mptcpi_bytes_received %" PRIu64 ", expect %" PRIu64, + s.last_sample.mptcpi_bytes_received, ret, + s.last_sample.mptcpi_bytes_received - ret); + if (s.last_sample.mptcpi_bytes_acked !=3D ret) + xerror("mptcpi_bytes_acked %" PRIu64 ", expect %" PRIu64, + s.last_sample.mptcpi_bytes_acked, ret2, + s.last_sample.mptcpi_bytes_acked - ret2); + } + close(fd); } =20 --=20 2.40.1 From nobody Thu Apr 25 22:25:37 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6F5E13AD9 for ; Mon, 22 May 2023 13:56:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1684763815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SgP1ZzpiNEFBi8XhtbBvMrPWaYdsaWtddgJhNEuZcZw=; b=XLBHEGroJ6rNQ1D1pymKgvNTnonmyajVi1yWyTlHPLaPb1X//kcAr7aGK2VyzSze4Olrby WX33rAqamNEq4Zq9HEpEmyODSfXKeFF62Zwdv07s1EkzhkC6Vkq+f4PROztFYQHVVV0bGP g/nO8L+gAWua8GM1IPSKk/4SJFjmE0M= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-331-APCNgOJvN-imMuw9giB6Wg-1; Mon, 22 May 2023 09:56:54 -0400 X-MC-Unique: APCNgOJvN-imMuw9giB6Wg-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0FDE8800159 for ; Mon, 22 May 2023 13:56:54 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 989B6492B0A for ; Mon, 22 May 2023 13:56:53 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next v2 6/6] selftests: mptcp: add MPTCP_FULL_INFO testcase Date: Mon, 22 May 2023 15:56:32 +0200 Message-Id: <3f923bfd4a136085d4058090a3cb6a7f72cd8a2d.1684763197.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Add a testcase explicitly triggering the newly introduce MPTCP_FULL_INFO getsockopt. Signed-off-by: Paolo Abeni --- .../selftests/net/mptcp/mptcp_sockopt.c | 76 ++++++++++++++++++- 1 file changed, 74 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c b/tools/test= ing/selftests/net/mptcp/mptcp_sockopt.c index 869c041c34f3..598e0f2c592c 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_sockopt.c +++ b/tools/testing/selftests/net/mptcp/mptcp_sockopt.c @@ -86,9 +86,25 @@ struct mptcp_subflow_addrs { #define MPTCP_SUBFLOW_ADDRS 3 #endif =20 +#ifndef MPTCP_FULL_INFO +struct mptcp_subflow_info { + __u32 id; + struct mptcp_subflow_addrs addrs; +}; + +struct mptcp_subflow_full_info { + struct mptcp_subflow_info subflow_info; + struct tcp_info tcp_info; +}; + +#define MPTCP_FULL_INFO 4 +#endif + struct so_state { struct mptcp_info mi; struct mptcp_info last_sample; + struct tcp_info tcp_info; + struct mptcp_subflow_addrs addrs; uint64_t mptcpi_rcv_delta; uint64_t tcpi_rcv_delta; bool pkt_stats_avail; @@ -367,6 +383,8 @@ static void do_getsockopt_tcp_info(struct so_state *s, = int fd, size_t r, size_t olen -=3D sizeof(struct mptcp_subflow_data); assert(olen =3D=3D sizeof(struct tcp_info)); =20 + s->tcp_info =3D ti.ti[0]; + if (ti.ti[0].tcpi_bytes_sent =3D=3D w && ti.ti[0].tcpi_bytes_received =3D=3D r) goto done; @@ -388,7 +406,7 @@ static void do_getsockopt_tcp_info(struct so_state *s, = int fd, size_t r, size_t do_getsockopt_bogus_sf_data(fd, MPTCP_TCPINFO); } =20 -static void do_getsockopt_subflow_addrs(int fd) +static void do_getsockopt_subflow_addrs(struct so_state *s, int fd) { struct sockaddr_storage remote, local; socklen_t olen, rlen, llen; @@ -435,6 +453,7 @@ static void do_getsockopt_subflow_addrs(int fd) =20 assert(memcmp(&local, &addrs.addr[0].ss_local, sizeof(local)) =3D=3D 0); assert(memcmp(&remote, &addrs.addr[0].ss_remote, sizeof(remote)) =3D=3D 0= ); + s->addrs =3D addrs.addr[0]; =20 memset(&addrs, 0, sizeof(addrs)); =20 @@ -455,13 +474,66 @@ static void do_getsockopt_subflow_addrs(int fd) do_getsockopt_bogus_sf_data(fd, MPTCP_SUBFLOW_ADDRS); } =20 +static void do_getsockopt_mptcp_full_info(struct so_state *s, int fd) +{ + size_t data_size =3D 2 * sizeof(struct mptcp_subflow_full_info) + + sizeof(struct mptcp_subflow_data) + + sizeof(struct mptcp_info); + struct mptcp_subflow_full_info *sfi; + struct mptcp_subflow_data *sfd; + void *data =3D alloca(data_size); + struct mptcp_info *mi; + socklen_t olen; + int ret; + + sfd =3D data; + memset(data, 0, data_size); + + sfd->size_subflow_data =3D sizeof(struct mptcp_subflow_data); + sfd->size_user =3D sizeof(struct mptcp_subflow_full_info); + olen =3D data_size; + + ret =3D getsockopt(fd, SOL_MPTCP, MPTCP_FULL_INFO, data, &olen); + if (ret < 0) { + if (errno =3D=3D EOPNOTSUPP) { + fprintf(stderr, "\tMPTCP_FULL_INFO test skipped due to lack of kernel s= upport\n"); + return; + } + xerror("getsockopt MPTCP_FULL_INFO"); + } + + assert(olen <=3D data_size); + assert(sfd->size_user =3D=3D sfd->size_kernel); + assert(sfd->size_user =3D=3D sizeof(struct mptcp_subflow_full_info)); + assert(sfd->num_subflows =3D=3D 1); + + assert(olen > (socklen_t)sizeof(struct mptcp_subflow_data)); + olen -=3D sizeof(struct mptcp_subflow_data); + assert(olen > (socklen_t)sizeof(struct mptcp_info)); + mi =3D data + sizeof(struct mptcp_subflow_data); + assert(mi->mptcpi_subflows =3D=3D 0); + assert(mi->mptcpi_bytes_sent =3D=3D s->last_sample.mptcpi_bytes_sent); + assert(mi->mptcpi_bytes_received =3D=3D s->last_sample.mptcpi_bytes_recei= ved); + + olen -=3D sizeof(struct mptcp_info); + assert(olen =3D=3D sizeof(struct mptcp_subflow_full_info)); + sfi =3D data + sizeof(struct mptcp_subflow_data) + sizeof(struct mptcp_in= fo); + assert(sfi->subflow_info.id =3D=3D 1); + assert(sfi->tcp_info.tcpi_bytes_sent =3D=3D s->tcp_info.tcpi_bytes_sent); + assert(sfi->tcp_info.tcpi_bytes_received =3D=3D s->tcp_info.tcpi_bytes_re= ceived); + assert(!memcmp(&sfi->subflow_info.addrs, &s->addrs, sizeof(struct mptcp_s= ubflow_addrs))); +} + static void do_getsockopts(struct so_state *s, int fd, size_t r, size_t w) { do_getsockopt_mptcp_info(s, fd, w); =20 do_getsockopt_tcp_info(s, fd, r, w); =20 - do_getsockopt_subflow_addrs(fd); + do_getsockopt_subflow_addrs(s, fd); + + if (r) + do_getsockopt_mptcp_full_info(s, fd); } =20 static void connect_one_server(int fd, int pipefd) --=20 2.40.1