From nobody Fri Apr 26 08:08:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1343810uad; Sat, 30 Jul 2022 01:05:05 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t9+hdDAmAMskfM/snS/4TNZjfcjsmwORp7NghdZKFh32fwW9oFtU02aDvQ4amMnaz2WswG X-Received: by 2002:a05:620a:4606:b0:6b6:1df6:8ea7 with SMTP id br6-20020a05620a460600b006b61df68ea7mr5352312qkb.276.1659168304999; Sat, 30 Jul 2022 01:05:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659168304; cv=none; d=google.com; s=arc-20160816; b=mku9E7m8vQDDXdbdIMq3gzjSmp+FLwCqjj+2RKn6TgT19kUroNB32IU/HvnNC+V0xL pJavtbFklozZGw0JTlUiNpOe8DN//ZnoZF8WEG8RlI/pD+QfZeT5839NgxTahWmqyrk9 KAxT/dhn4IfwOJh3y6hLaafH8Ab51ioglm0w43xuDilmyuRzDqRc1Wmgn/tcxpc4wW6n j0lkpQ5XluXVyjw9igZ0vkWsNm0+tNwIyXBYEDoZjbZUDvi/1lg6/3SUzA9xQDQfNHrS daYx5ZTCbWTLEWAUVqc5gHupUkS5x+3fsfFQNuHmJ4t87dZag/q/vBwXJyjmR+b5mAEw kAkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=bOxjCT/a5P87RNatFo2lM2GkXg3NSBmm+aMpbukibtQ=; b=KK0raSO6CEyRBdHugwVOA1UTjuR41WA+Z5qJ1H1K+Nfxoz/b7rZKiQlcDih5AIHmwZ 7b5tuktqwtTULE3AOEIXZDuCY5rO4ndKP345Y9Y+cGJqWdOCNSaXgt3fQi/I8MT6QoMO zEOUHbdujA1Z6LtiNLKf4hA1CTxSyGZW8Uk4XtpBE9jnIWuPJvrI2D7bwjYxsCa/aVQE /ULmKf/q/hVWfO4PJj/7UMBR0yd5Un2vDTSlmlxZd0WRYzLmtvvxkyp541Azisg1VzLp yh+SqdjSjoh8q0MrAzvUc0XL1I8r3rMna1HMVFw9x2wtBI47zuBx00bPSg22QrJMgB52 AQNg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XTq5f0go; spf=pass (google.com: domain of mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id v20-20020a05620a0f1400b006a70a853931si3608075qkl.607.2022.07.30.01.05.04 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jul 2022 01:05:04 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XTq5f0go; spf=pass (google.com: domain of mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6095-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id BB41E1C20966 for ; Sat, 30 Jul 2022 08:05:04 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9222F23CB; Sat, 30 Jul 2022 08:05:03 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 7856123CC for ; Sat, 30 Jul 2022 08:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659168299; 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=bOxjCT/a5P87RNatFo2lM2GkXg3NSBmm+aMpbukibtQ=; b=XTq5f0golIxveG8z7ZgfCKC2rdHuob8uKJMtFNtdthxXWYFousnaJp9boM4dGoZCzZZJKt W8o4uBFMC+fD1NayO7YhiLwbUarge0XVzPhDFsdjO7nh3kR2CmXBDgz0CwDjqdjkaAcR59 j8r9zQ+NGDNxgWZTND8DpF4fFGcr0+g= 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-357-oxOT0wnMOaCQTRgXCczp8g-1; Sat, 30 Jul 2022 04:04:58 -0400 X-MC-Unique: oxOT0wnMOaCQTRgXCczp8g-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B750E1C05148 for ; Sat, 30 Jul 2022 08:04:57 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 47BA62026D64 for ; Sat, 30 Jul 2022 08:04:57 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 1/4] mptcp: move RCVPRUNE event later Date: Sat, 30 Jul 2022 10:04:39 +0200 Message-Id: <81be75dff29adfdc136035168f5bcd6d1378b0b4.1659165378.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 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com 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" This clean the code a bit, and avoid skipping msk receive buffer update on some weird corner case. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 970da88cd04f..5af3d591a20b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -642,6 +642,10 @@ static bool __mptcp_move_skbs_from_subflow(struct mptc= p_sock *msk, } } =20 + /* over limit? can't append more skbs to msk */ + if (__mptcp_rmem(sk) > sk_rbuf) + return true; + pr_debug("msk=3D%p ssk=3D%p", msk, ssk); tp =3D tcp_sk(ssk); do { @@ -786,8 +790,6 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, st= ruct sock *ssk) void mptcp_data_ready(struct sock *sk, struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); - struct mptcp_sock *msk =3D mptcp_sk(sk); - int sk_rbuf, ssk_rbuf; =20 /* The peer can send data while we are shutting down this * subflow at msk destruction time, but we must avoid enqueuing @@ -796,20 +798,9 @@ void mptcp_data_ready(struct sock *sk, struct sock *ss= k) if (unlikely(subflow->disposable)) return; =20 - ssk_rbuf =3D READ_ONCE(ssk->sk_rcvbuf); - sk_rbuf =3D READ_ONCE(sk->sk_rcvbuf); - if (unlikely(ssk_rbuf > sk_rbuf)) - sk_rbuf =3D ssk_rbuf; - - /* over limit? can't append more skbs to msk, Also, no need to wake-up*/ - if (__mptcp_rmem(sk) > sk_rbuf) { - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_RCVPRUNED); - return; - } - /* Wake-up the reader only for in-sequence data */ mptcp_data_lock(sk); - if (move_skbs_to_msk(msk, ssk)) + if (move_skbs_to_msk(mptcp_sk(sk), ssk)) sk->sk_data_ready(sk); =20 mptcp_data_unlock(sk); --=20 2.35.3 From nobody Fri Apr 26 08:08:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1343819uad; Sat, 30 Jul 2022 01:05:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR7F3HxNpQ8YSjSJ55kiFUq9TKMzE4BKvS1s0QUYUHH7n0trWUq674fZBTQgL0JrdyOhZ8UY X-Received: by 2002:a05:6214:4243:b0:474:9c2a:b66a with SMTP id ne3-20020a056214424300b004749c2ab66amr2781691qvb.37.1659168306047; Sat, 30 Jul 2022 01:05:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659168306; cv=none; d=google.com; s=arc-20160816; b=jI3BMtUa+O6zCMR9R6V8HZOTJNx3vceDAHs/ixg9jLhlgtkasTRC/iHmwUa03xxTPG 4ztNYmZncGtK0ZXaI/ggdsj9OrJK3FlBkFWjgwZ5ixUJfxVQj294uVmNavm6GSjGpWuG th1WXRWoGAy1ndloyNQlZsfYY71H/TqRUXk8JWPRMpjYV8uD76KiNkBxU2vmxNvmvtdA hDdVXdQv/jjsJ114GzmTApxk1hK/2So2fyAdIE69y6vH8ypbFP/4dOfDQWvKsRgOA9Ge hHcMuHY23jR3zNaTuXQkfRE6zVKzrrF8USQSTuSjVYK/qu00MbC9BLt5XYAe2WwNlpBi GyTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=gjfYXwHTjVj4dpG6Lrt9wHMWmkdR4GiZUOwTPo+fbmU=; b=EQyRhAPqFDojvpvT5wbVN/ySD+IvdSghFrUMCLKKl5mik0CpvbZvsylfIaclUUg8YL FH0tobJeblktNjaQ593qsXyjM7LdCYqPTy13lhsMxIkskQaKijHT7WFcECu/jxCUpbym wvYhV5WYEs3FyksclYgfvcBQhxekX3vaqdO2q+U1cW8D2aPsynhg9jYbvqOE4NDYL4xh Hpxlc+tC2d4/86CXPlhXm1tnVVS/cVJ9Mx4CRysAidiZaUd2BixZ9VomWgPUT0sWkckO lJ4fhwS/kZMHDKiJxtSGy54ghLiuCwMG6O1jpMQRCi2VLIaENSuH+8AKwSaiuNOxS065 34zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Qc++/pN3"; spf=pass (google.com: domain of mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id h16-20020a05620a401000b006b5df8f35a5si3831911qko.608.2022.07.30.01.05.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jul 2022 01:05:06 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Qc++/pN3"; spf=pass (google.com: domain of mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6096-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id D2F671C2097D for ; Sat, 30 Jul 2022 08:05:05 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id EF80823CF; Sat, 30 Jul 2022 08:05:03 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 2863323CD for ; Sat, 30 Jul 2022 08:05:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659168300; 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=gjfYXwHTjVj4dpG6Lrt9wHMWmkdR4GiZUOwTPo+fbmU=; b=Qc++/pN3uFLtD0OUtxAxFhuH5YI0WNI0qz/KQagua3WZ14guFEfWLjavNTbNPT0zUpdJ5G DfeSvaT57NpGCtm7qZW0+RcHkcKR/dUR3mk+hWDLDWgFgPArZkfaEcGW8joXAJMSZDfqoL YcvJWZEHSV47pb4LJuyT1q0+1z4Fj+E= 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-38-MWnU0YGPMUGJtpiBTy6p0A-1; Sat, 30 Jul 2022 04:04:58 -0400 X-MC-Unique: MWnU0YGPMUGJtpiBTy6p0A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 79CEE803301 for ; Sat, 30 Jul 2022 08:04:58 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 072F12026D64 for ; Sat, 30 Jul 2022 08:04:57 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 2/4] mptcp: more accurate receive buffer updates Date: Sat, 30 Jul 2022 10:04:40 +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 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com 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 mptcp_cleanup_rbuf() makes a significant effort to avoid acquiring the subflow socket lock, estimating if the tcp level cleanup could actually send an ack. Such estimate is a bit rough when accounting for receive window change, as it consider the msk available buffer space instead of the announced mptcp-level window. Let's consider the announced window instead, mirroring closely the plain TCP implementation. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- include/net/mptcp.h | 2 ++ net/ipv4/tcp.c | 3 +++ net/mptcp/options.c | 1 - net/mptcp/protocol.c | 14 +++++++++++--- net/mptcp/protocol.h | 6 +++++- 5 files changed, 21 insertions(+), 5 deletions(-) diff --git a/include/net/mptcp.h b/include/net/mptcp.h index 7af7fd48acc7..4b6c66b73bf4 100644 --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@ -136,6 +136,7 @@ static inline bool rsk_drop_req(const struct request_so= ck *req) return tcp_rsk(req)->is_mptcp && tcp_rsk(req)->drop_req; } =20 +void mptcp_receive_window(const struct sock *ssk, int *rwnd); void mptcp_space(const struct sock *ssk, int *space, int *full_space); bool mptcp_syn_options(struct sock *sk, const struct sk_buff *skb, unsigned int *size, struct mptcp_out_options *opts); @@ -284,6 +285,7 @@ static inline bool mptcp_skb_can_collapse(const struct = sk_buff *to, return true; } =20 +static inline void mptcp_receive_window(const struct sock *ssk, int *rwnd)= { } static inline void mptcp_space(const struct sock *ssk, int *s, int *fs) { } static inline void mptcp_seq_show(struct seq_file *seq) { } =20 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 970e9a2cca4a..d0c0100f74f3 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1606,6 +1606,9 @@ void tcp_cleanup_rbuf(struct sock *sk, int copied) if (copied > 0 && !time_to_ack && !(sk->sk_shutdown & RCV_SHUTDOWN)) { __u32 rcv_window_now =3D tcp_receive_window(tp); =20 + if (sk_is_mptcp(sk)) + mptcp_receive_window(sk, &rcv_window_now); + /* Optimize, __tcp_select_window() is not cheap. */ if (2*rcv_window_now <=3D tp->window_clamp) { __u32 new_window =3D __tcp_select_window(sk); diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 30d289044e71..563ef8fe5a85 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -604,7 +604,6 @@ static bool mptcp_established_options_dss(struct sock *= sk, struct sk_buff *skb, } opts->ext_copy.use_ack =3D 1; opts->suboptions =3D OPTION_MPTCP_DSS; - WRITE_ONCE(msk->old_wspace, __mptcp_space((struct sock *)msk)); =20 /* Add kind/length/subtype/flag overhead if mapping is not populated */ if (dss_size =3D=3D 0) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5af3d591a20b..17e2dbe43639 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -535,6 +535,14 @@ static void mptcp_subflow_cleanup_rbuf(struct sock *ss= k) unlock_sock_fast(ssk, slow); } =20 +void mptcp_receive_window(const struct sock *ssk, int *rwnd) +{ + const struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); + const struct sock *sk =3D subflow->conn; + + *rwnd =3D __mptcp_receive_window(mptcp_sk(sk)); +} + static bool mptcp_subflow_could_cleanup(const struct sock *ssk, bool rx_em= pty) { const struct inet_connection_sock *icsk =3D inet_csk(ssk); @@ -550,13 +558,13 @@ static bool mptcp_subflow_could_cleanup(const struct = sock *ssk, bool rx_empty) =20 static void mptcp_cleanup_rbuf(struct mptcp_sock *msk) { - int old_space =3D READ_ONCE(msk->old_wspace); + int cur_window =3D __mptcp_receive_window(msk); struct mptcp_subflow_context *subflow; struct sock *sk =3D (struct sock *)msk; - int space =3D __mptcp_space(sk); + int new_window =3D __mptcp_space(sk); bool cleanup, rx_empty; =20 - cleanup =3D (space > 0) && (space >=3D (old_space << 1)); + cleanup =3D new_window > 0 && new_window >=3D (cur_window << 1); rx_empty =3D !__mptcp_rmem(sk); =20 mptcp_for_each_subflow(msk, subflow) { diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1bc9f6e77ddd..1e603f28f1db 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -260,7 +260,6 @@ struct mptcp_sock { int rmem_fwd_alloc; struct sock *last_snd; int snd_burst; - int old_wspace; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; * recovery related fields are under data_lock * protection @@ -336,6 +335,11 @@ static inline int __mptcp_rmem(const struct sock *sk) return atomic_read(&sk->sk_rmem_alloc) - READ_ONCE(mptcp_sk(sk)->rmem_rel= eased); } =20 +static inline int __mptcp_receive_window(const struct mptcp_sock *msk) +{ + return atomic64_read(&msk->rcv_wnd_sent) - READ_ONCE(msk->ack_seq); +} + static inline int __mptcp_space(const struct sock *sk) { return tcp_win_from_space(sk, READ_ONCE(sk->sk_rcvbuf) - __mptcp_rmem(sk)= ); --=20 2.35.3 From nobody Fri Apr 26 08:08:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1343853uad; Sat, 30 Jul 2022 01:05:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR4sz681/uq37gNoQe673KDFIpuXsHaNS2HG4QZgkcczSr1QE6CcXDVnrazHk22lv2SdSLTB X-Received: by 2002:a17:902:d711:b0:16d:1665:1162 with SMTP id w17-20020a170902d71100b0016d16651162mr7440757ply.5.1659168310710; Sat, 30 Jul 2022 01:05:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659168310; cv=none; d=google.com; s=arc-20160816; b=DycJBFcmC30f3eUOHntew/l07myCzbmrgeq91Y9bT/hjidX10xAyfr/B4ck6kE86od onmNv23IJJM8q8diNWJ6LTFZ3xtlQspQ6seetqLsk/qe4HYJ9qeHupBs31Qcefgyf2xS BX9+I9tnvX537qcZF2hUFU9tL8HLBpkZT0gW6FtNGSaRTWWBEq5Nws820XisSi4SqfWa WK4sh+NskOc/8lV+EuujdXfw/XSM0azxkLEnsHshSV1Dc3ZgThbFRN5BU0VMarupllWn dTCCJP6mZHA6EK+BRmKaS3IKhXVIe73cfQMCoUFdFEmJca1Z54wYB9v6gYqHpededQwH YtLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=C9K/Bki4tqwadc02E6yhA68T2+vw/VGE/d5nDEgpjBY=; b=QH/He3No5PJWgcIpG1yuHm8RF10xKnkrq5z4ocxFMcJKJCARVPgepfwwIYdR5UE1Hp BHGJiL5VZzHAMatHDAW5HJ7Z96zuEw9iVvYe9bMyldFE2WvnabeOOXMxGUEnqvDOqIR+ 9EVLJoTABj9BjkL65/kgSp4q9Zyj6f8rkZRYHFevabpDrUFtqU5QnEIZ4c/x+PA64moI T2UVI5p2gmvPSAcaMBN2w1oa/ebrWGRLwDa0B6bw3H9WuPpV049wulB5xluHvEjOP64B m77mkQhf/qTi0UWP1jhOru+7WHLTiMKpscFwHNq2G/E2YSDeK3LJMvkMszIpTbtQJEvo mzhw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=i6OEuZ8r; spf=pass (google.com: domain of mptcp+bounces-6098-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6098-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id 13-20020a63020d000000b0041bba59564fsi1867322pgc.257.2022.07.30.01.05.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jul 2022 01:05:10 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6098-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=i6OEuZ8r; spf=pass (google.com: domain of mptcp+bounces-6098-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-6098-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 08E02280C7F for ; Sat, 30 Jul 2022 08:05:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E6F7F23BB; Sat, 30 Jul 2022 08:05:08 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 0701023CB for ; Sat, 30 Jul 2022 08:05:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659168305; 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=C9K/Bki4tqwadc02E6yhA68T2+vw/VGE/d5nDEgpjBY=; b=i6OEuZ8r6E2DItMp36fWcBex9gICa1NTXIF3p0U3vpvc2TXU17uOYcPdkapZM2oIBfprQb QFmHRXB/m4C/2DtoqHp200O/BLJvt0f2lGxP+Lf0ckzHXs8OxpQPFNPHP7kq1DrnjXUvm0 tiWjvGNGXGCwIiUnh1jM4D1KH4vzYvk= 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-131-vvLJfRYBPYSgDDxTcEXczw-1; Sat, 30 Jul 2022 04:04:59 -0400 X-MC-Unique: vvLJfRYBPYSgDDxTcEXczw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 3F00685A584 for ; Sat, 30 Jul 2022 08:04:59 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id C16092026D64 for ; Sat, 30 Jul 2022 08:04:58 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 3/4] mptcp: move msk input path under full msk socket lock Date: Sat, 30 Jul 2022 10:04:41 +0200 Message-Id: <77525c9134c096a13ebc0dda30d8696d9f64eb9a.1659165378.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 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com 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" After commit c2e6048fa1cf ("mptcp: fix race in release_cb") it's pretty straight forward move the whole MPTCP rx path under the socket lock leveraging the release_cb. We can drop a bunch of spin_lock pairs in the receive functions, use a single receive queue and invoke __mptcp_move_skbs only when subflows ask for it. This will allow more cleanup in the next patch. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 78 +++++++++++++++++++------------------------- net/mptcp/protocol.h | 2 +- 2 files changed, 35 insertions(+), 45 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 17e2dbe43639..a916637b687f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -795,7 +795,7 @@ static bool move_skbs_to_msk(struct mptcp_sock *msk, st= ruct sock *ssk) return moved > 0; } =20 -void mptcp_data_ready(struct sock *sk, struct sock *ssk) +static void __mptcp_data_ready(struct sock *sk, struct sock *ssk) { struct mptcp_subflow_context *subflow =3D mptcp_subflow_ctx(ssk); =20 @@ -807,10 +807,17 @@ void mptcp_data_ready(struct sock *sk, struct sock *s= sk) return; =20 /* Wake-up the reader only for in-sequence data */ - mptcp_data_lock(sk); if (move_skbs_to_msk(mptcp_sk(sk), ssk)) sk->sk_data_ready(sk); +} =20 +void mptcp_data_ready(struct sock *sk, struct sock *ssk) +{ + mptcp_data_lock(sk); + if (!sock_owned_by_user(sk)) + __mptcp_data_ready(sk, ssk); + else + __set_bit(MPTCP_DEQUEUE, &mptcp_sk(sk)->cb_flags); mptcp_data_unlock(sk); } =20 @@ -1768,16 +1775,22 @@ static int mptcp_sendmsg(struct sock *sk, struct ms= ghdr *msg, size_t len) return copied ? : ret; } =20 -static int __mptcp_recvmsg_mskq(struct mptcp_sock *msk, +static bool __mptcp_move_skbs(struct sock *sk); + +static int __mptcp_recvmsg_mskq(struct sock *sk, struct msghdr *msg, size_t len, int flags, struct scm_timestamping_internal *tss, int *cmsg_flags) { + struct mptcp_sock *msk =3D mptcp_sk(sk); struct sk_buff *skb, *tmp; int copied =3D 0; =20 - skb_queue_walk_safe(&msk->receive_queue, skb, tmp) { + if (skb_queue_empty(&sk->sk_receive_queue) && !__mptcp_move_skbs(sk)) + return 0; + + skb_queue_walk_safe(&sk->sk_receive_queue, skb, tmp) { u32 offset =3D MPTCP_SKB_CB(skb)->offset; u32 data_len =3D skb->len - offset; u32 count =3D min_t(size_t, len - copied, data_len); @@ -1811,7 +1824,7 @@ static int __mptcp_recvmsg_mskq(struct mptcp_sock *ms= k, /* we will bulk release the skb memory later */ skb->destructor =3D NULL; WRITE_ONCE(msk->rmem_released, msk->rmem_released + skb->truesize); - __skb_unlink(skb, &msk->receive_queue); + __skb_unlink(skb, &sk->sk_receive_queue); __kfree_skb(skb); } =20 @@ -1932,16 +1945,9 @@ static void __mptcp_update_rmem(struct sock *sk) WRITE_ONCE(msk->rmem_released, 0); } =20 -static void __mptcp_splice_receive_queue(struct sock *sk) +static bool __mptcp_move_skbs(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); - - skb_queue_splice_tail_init(&sk->sk_receive_queue, &msk->receive_queue); -} - -static bool __mptcp_move_skbs(struct mptcp_sock *msk) -{ - struct sock *sk =3D (struct sock *)msk; unsigned int moved =3D 0; bool ret, done; =20 @@ -1949,37 +1955,29 @@ static bool __mptcp_move_skbs(struct mptcp_sock *ms= k) struct sock *ssk =3D mptcp_subflow_recv_lookup(msk); bool slowpath; =20 - /* 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)) + if (unlikely(!ssk)) break; =20 slowpath =3D lock_sock_fast(ssk); - mptcp_data_lock(sk); __mptcp_update_rmem(sk); done =3D __mptcp_move_skbs_from_subflow(msk, ssk, &moved); - mptcp_data_unlock(sk); =20 if (unlikely(ssk->sk_err)) __mptcp_error_report(sk); unlock_sock_fast(ssk, slowpath); } while (!done); =20 - /* acquire the data lock only if some input data is pending */ ret =3D moved > 0; if (!RB_EMPTY_ROOT(&msk->out_of_order_queue) || - !skb_queue_empty_lockless(&sk->sk_receive_queue)) { - mptcp_data_lock(sk); + !skb_queue_empty(&sk->sk_receive_queue)) { __mptcp_update_rmem(sk); ret |=3D __mptcp_ofo_queue(msk); - __mptcp_splice_receive_queue(sk); - mptcp_data_unlock(sk); } - if (ret) + if (ret) { + mptcp_cleanup_rbuf(msk); mptcp_check_data_fin((struct sock *)msk); - return !skb_queue_empty(&msk->receive_queue); + } + return ret; } =20 static unsigned int mptcp_inq_hint(const struct sock *sk) @@ -1987,7 +1985,7 @@ static unsigned int mptcp_inq_hint(const struct sock = *sk) const struct mptcp_sock *msk =3D mptcp_sk(sk); const struct sk_buff *skb; =20 - skb =3D skb_peek(&msk->receive_queue); + skb =3D skb_peek(&sk->sk_receive_queue); if (skb) { u64 hint_val =3D msk->ack_seq - MPTCP_SKB_CB(skb)->map_seq; =20 @@ -2033,7 +2031,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, while (copied < len) { int bytes_read; =20 - bytes_read =3D __mptcp_recvmsg_mskq(msk, msg, len - copied, flags, &tss,= &cmsg_flags); + bytes_read =3D __mptcp_recvmsg_mskq(sk, msg, len - copied, flags, &tss, = &cmsg_flags); if (unlikely(bytes_read < 0)) { if (!copied) copied =3D bytes_read; @@ -2045,9 +2043,6 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, /* be sure to advertise window change */ mptcp_cleanup_rbuf(msk); =20 - if (skb_queue_empty(&msk->receive_queue) && __mptcp_move_skbs(msk)) - continue; - /* only the master socket status is relevant here. The exit * conditions mirror closely tcp_recvmsg() */ @@ -2074,7 +2069,7 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, /* race breaker: the shutdown could be after the * previous receive queue check */ - if (__mptcp_move_skbs(msk)) + if (__mptcp_move_skbs(sk)) continue; break; } @@ -2111,9 +2106,8 @@ static int mptcp_recvmsg(struct sock *sk, struct msgh= dr *msg, size_t len, } } =20 - pr_debug("msk=3D%p rx queue empty=3D%d:%d copied=3D%d", - msk, skb_queue_empty_lockless(&sk->sk_receive_queue), - skb_queue_empty(&msk->receive_queue), copied); + pr_debug("msk=3D%p rx queue empty=3D%d copied=3D%d", + msk, skb_queue_empty(&sk->sk_receive_queue), copied); if (!(flags & MSG_PEEK)) mptcp_rcv_space_adjust(msk, copied); =20 @@ -2566,7 +2560,6 @@ static int __mptcp_init_sock(struct sock *sk) INIT_LIST_HEAD(&msk->join_list); INIT_LIST_HEAD(&msk->rtx_queue); INIT_WORK(&msk->work, mptcp_worker); - __skb_queue_head_init(&msk->receive_queue); msk->out_of_order_queue =3D RB_ROOT; msk->first_pending =3D NULL; msk->rmem_fwd_alloc =3D 0; @@ -3048,12 +3041,8 @@ void mptcp_destroy_common(struct mptcp_sock *msk, un= signed int flags) mptcp_for_each_subflow_safe(msk, subflow, tmp) __mptcp_close_ssk(sk, mptcp_subflow_tcp_sock(subflow), subflow, flags); =20 - /* move to sk_receive_queue, sk_stream_kill_queues will purge it */ - mptcp_data_lock(sk); - skb_queue_splice_tail_init(&msk->receive_queue, &sk->sk_receive_queue); __skb_queue_purge(&sk->sk_receive_queue); skb_rbtree_purge(&msk->out_of_order_queue); - mptcp_data_unlock(sk); =20 /* move all the rx fwd alloc into the sk_mem_reclaim_final in * inet_sock_destruct() will dispose it @@ -3135,6 +3124,8 @@ static void mptcp_release_cb(struct sock *sk) __mptcp_flush_join_list(sk); if (flags & BIT(MPTCP_PUSH_PENDING)) __mptcp_push_pending(sk, 0); + if ((flags & BIT(MPTCP_DEQUEUE)) && __mptcp_move_skbs(sk)) + sk->sk_data_ready(sk); if (flags & BIT(MPTCP_RETRANSMIT)) __mptcp_retrans(sk); =20 @@ -3383,7 +3374,7 @@ static int mptcp_ioctl(struct sock *sk, int cmd, unsi= gned long arg) return -EINVAL; =20 lock_sock(sk); - __mptcp_move_skbs(msk); + __mptcp_move_skbs(sk); answ =3D mptcp_inq_hint(sk); release_sock(sk); break; @@ -3619,8 +3610,7 @@ static __poll_t mptcp_check_readable(struct mptcp_soc= k *msk) /* Concurrent splices from sk_receive_queue into receive_queue will * always show at least one non-empty queue when checked in this order. */ - if (skb_queue_empty_lockless(&((struct sock *)msk)->sk_receive_queue) && - skb_queue_empty_lockless(&msk->receive_queue)) + if (skb_queue_empty_lockless(&((struct sock *)msk)->sk_receive_queue)) return 0; =20 return EPOLLIN | EPOLLRDNORM; diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index 1e603f28f1db..f12a6e80171d 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -125,6 +125,7 @@ #define MPTCP_FLUSH_JOIN_LIST 5 #define MPTCP_CONNECTED 6 #define MPTCP_RESET_SCHEDULER 7 +#define MPTCP_DEQUEUE 8 =20 static inline bool before64(__u64 seq1, __u64 seq2) { @@ -288,7 +289,6 @@ struct mptcp_sock { struct work_struct work; struct sk_buff *ooo_last_skb; struct rb_root out_of_order_queue; - struct sk_buff_head receive_queue; struct list_head conn_list; struct list_head rtx_queue; struct mptcp_data_frag *first_pending; --=20 2.35.3 From nobody Fri Apr 26 08:08:24 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp1343825uad; Sat, 30 Jul 2022 01:05:07 -0700 (PDT) X-Google-Smtp-Source: AA6agR7zEEy+lmpVhga/5IEEZU11ApsKzz+0G+DsQM8PQvNIs0S0lI1FoaiG1drZiVsEKBAX5jTW X-Received: by 2002:a05:620a:4893:b0:6b8:94ef:32a6 with SMTP id ea19-20020a05620a489300b006b894ef32a6mr34072qkb.535.1659168307331; Sat, 30 Jul 2022 01:05:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659168307; cv=none; d=google.com; s=arc-20160816; b=Q2IgNfEwjGceDPCuggqaVTynt4bIbkkeyCCkZeidhRVLy+kyBw6px2WWZi/o/mhsJo 2m4nK6/+m5gqcAsjt9bjCTgXMvH/8Te/yv/JxQsR3jo/Ytr2lhr9+dWw/Z1Eqr97z82n LTKaQYdV02rlaYlaRKVPPoTw1FqivM1Q0r3lmEC2qW6jygUmKw74+TklPPNZTOsaPhfO q4cur5oV8NkTMg2APhshiJD+xntwrZxJ3HkmlN0ph3S5IhNsgDKGQ2Bul0CoM7PIHiev xqBlXo5vQTPzPj0+78umUVfdWC7dKRO2Bm7i1pclQ4qr9RNTp5cK5/pEOyoBjSSi4D3U 5vRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:to:from:dkim-signature; bh=7GxXX5cVF+vIodHP0XfRgAFitePHoMtOd8Yu6AhRjSY=; b=lOhLOxIWcNcFcOSr6jTndV0e13QmCkT2g2cDdx0RB0/SJdsa3K/YvF/z6Rp70XC9rR 1oPs3bNQAALBgOGxpqhRrSFe/aFcZ7CmPN1xJj16BRZzuJKCRwFWzauPMKj2hCpXiV6F 4WtHGmnfd/ZI+ljWyMuTOHCbtYKdzjtl+/8NSBkkmtB24Xgx0QTCWWl8K+MpCXuwcJwV +m86bVQqK7oo7D/vtp3IQMuwXFhnyaxzXuUVYuoxmnjPjpdbEGVaCOPbKVc4IXmjml7B 5xBb1dU8R7tF8HSMkmb8PQMC5aq9NHcfgvtPjoDIcoJ/j0Y1t0nItRv5insfFcR3dzvJ XYZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZymHa9+q; spf=pass (google.com: domain of mptcp+bounces-6097-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6097-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id h16-20020a05620a401000b006b5df8f35a5si3831911qko.608.2022.07.30.01.05.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 30 Jul 2022 01:05:07 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6097-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=ZymHa9+q; spf=pass (google.com: domain of mptcp+bounces-6097-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6097-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 133591C20998 for ; Sat, 30 Jul 2022 08:05:07 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C215923BB; Sat, 30 Jul 2022 08:05:05 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev 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 EDCD823CC for ; Sat, 30 Jul 2022 08:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659168303; 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=7GxXX5cVF+vIodHP0XfRgAFitePHoMtOd8Yu6AhRjSY=; b=ZymHa9+qhy8yNqkQXRpB2CbAccazp/2X1m27uhDiK3UqwffE3BOx+sbOtQg5XuB7DS3Ben gm/XSwlcUtv1eVDLkCvUWQjqJXYSM/pxD+NRh5kwfYQg+KuO7GVC9HKMUqRPZCnkWND5AH KXDriIjEdjYB+IMclSIeDFM7q1VN2G8= 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-625-JzJwHeYzPWeuW2yUUa-2IQ-1; Sat, 30 Jul 2022 04:05:00 -0400 X-MC-Unique: JzJwHeYzPWeuW2yUUa-2IQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id F2C1A801585 for ; Sat, 30 Jul 2022 08:04:59 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.37]) by smtp.corp.redhat.com (Postfix) with ESMTP id 823C42026D64 for ; Sat, 30 Jul 2022 08:04:59 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH v3 mptcp-next 4/4] mptcp: use common helper for rmem memory accounting Date: Sat, 30 Jul 2022 10:04:42 +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 2.78 on 10.11.54.4 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com 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" After the previous patch, updating sk_forward_memory is cheap and we can drop a lot of complexity from the MPTCP memory acconting, using the common helper for that. Signed-off-by: Paolo Abeni Reviewed-by: Mat Martineau --- net/mptcp/protocol.c | 112 ++++--------------------------------------- net/mptcp/protocol.h | 4 +- 2 files changed, 9 insertions(+), 107 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index a916637b687f..74699bd47edf 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -131,11 +131,6 @@ static void mptcp_drop(struct sock *sk, struct sk_buff= *skb) __kfree_skb(skb); } =20 -static void mptcp_rmem_charge(struct sock *sk, int size) -{ - mptcp_sk(sk)->rmem_fwd_alloc -=3D size; -} - static bool mptcp_try_coalesce(struct sock *sk, struct sk_buff *to, struct sk_buff *from) { @@ -152,7 +147,7 @@ static bool mptcp_try_coalesce(struct sock *sk, struct = sk_buff *to, MPTCP_SKB_CB(to)->end_seq =3D MPTCP_SKB_CB(from)->end_seq; kfree_skb_partial(from, fragstolen); atomic_add(delta, &sk->sk_rmem_alloc); - mptcp_rmem_charge(sk, delta); + sk->sk_forward_alloc -=3D delta; return true; } =20 @@ -165,44 +160,6 @@ static bool mptcp_ooo_try_coalesce(struct mptcp_sock *= msk, struct sk_buff *to, return mptcp_try_coalesce((struct sock *)msk, to, from); } =20 -static void __mptcp_rmem_reclaim(struct sock *sk, int amount) -{ - amount >>=3D PAGE_SHIFT; - mptcp_sk(sk)->rmem_fwd_alloc -=3D amount << PAGE_SHIFT; - __sk_mem_reduce_allocated(sk, amount); -} - -static void mptcp_rmem_uncharge(struct sock *sk, int size) -{ - struct mptcp_sock *msk =3D mptcp_sk(sk); - int reclaimable; - - msk->rmem_fwd_alloc +=3D size; - reclaimable =3D msk->rmem_fwd_alloc - sk_unused_reserved_mem(sk); - - /* see sk_mem_uncharge() for the rationale behind the following schema */ - if (unlikely(reclaimable >=3D PAGE_SIZE)) - __mptcp_rmem_reclaim(sk, reclaimable); -} - -static void mptcp_rfree(struct sk_buff *skb) -{ - unsigned int len =3D skb->truesize; - struct sock *sk =3D skb->sk; - - atomic_sub(len, &sk->sk_rmem_alloc); - mptcp_rmem_uncharge(sk, len); -} - -static void mptcp_set_owner_r(struct sk_buff *skb, struct sock *sk) -{ - skb_orphan(skb); - skb->sk =3D sk; - skb->destructor =3D mptcp_rfree; - atomic_add(skb->truesize, &sk->sk_rmem_alloc); - mptcp_rmem_charge(sk, skb->truesize); -} - /* "inspired" by tcp_data_queue_ofo(), main differences: * - use mptcp seqs * - don't cope with sacks @@ -315,25 +272,7 @@ static void mptcp_data_queue_ofo(struct mptcp_sock *ms= k, struct sk_buff *skb) =20 end: skb_condense(skb); - mptcp_set_owner_r(skb, sk); -} - -static bool mptcp_rmem_schedule(struct sock *sk, struct sock *ssk, int siz= e) -{ - struct mptcp_sock *msk =3D mptcp_sk(sk); - int amt, amount; - - if (size <=3D msk->rmem_fwd_alloc) - return true; - - size -=3D msk->rmem_fwd_alloc; - amt =3D sk_mem_pages(size); - amount =3D amt << PAGE_SHIFT; - if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV)) - return false; - - msk->rmem_fwd_alloc +=3D amount; - return true; + skb_set_owner_r(skb, sk); } =20 static bool __mptcp_move_skb(struct mptcp_sock *msk, struct sock *ssk, @@ -350,8 +289,7 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, st= ruct sock *ssk, skb_ext_reset(skb); skb_orphan(skb); =20 - /* try to fetch required memory from subflow */ - if (!mptcp_rmem_schedule(sk, ssk, skb->truesize)) + if (!sk_rmem_schedule(sk, skb, skb->truesize)) goto drop; =20 has_rxtstamp =3D TCP_SKB_CB(skb)->has_rxtstamp; @@ -372,7 +310,7 @@ static bool __mptcp_move_skb(struct mptcp_sock *msk, st= ruct sock *ssk, if (tail && mptcp_try_coalesce(sk, tail, skb)) return true; =20 - mptcp_set_owner_r(skb, sk); + 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)) { @@ -1783,7 +1721,6 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, struct scm_timestamping_internal *tss, int *cmsg_flags) { - struct mptcp_sock *msk =3D mptcp_sk(sk); struct sk_buff *skb, *tmp; int copied =3D 0; =20 @@ -1821,9 +1758,10 @@ static int __mptcp_recvmsg_mskq(struct sock *sk, } =20 if (!(flags & MSG_PEEK)) { - /* we will bulk release the skb memory later */ + /* avoid the indirect call, we know the destructor is sock_wfree */ skb->destructor =3D NULL; - WRITE_ONCE(msk->rmem_released, msk->rmem_released + skb->truesize); + atomic_sub(skb->truesize, &sk->sk_rmem_alloc); + sk_mem_uncharge(sk, skb->truesize); __skb_unlink(skb, &sk->sk_receive_queue); __kfree_skb(skb); } @@ -1933,18 +1871,6 @@ static void mptcp_rcv_space_adjust(struct mptcp_sock= *msk, int copied) msk->rcvq_space.time =3D mstamp; } =20 -static void __mptcp_update_rmem(struct sock *sk) -{ - struct mptcp_sock *msk =3D mptcp_sk(sk); - - if (!msk->rmem_released) - return; - - atomic_sub(msk->rmem_released, &sk->sk_rmem_alloc); - mptcp_rmem_uncharge(sk, msk->rmem_released); - WRITE_ONCE(msk->rmem_released, 0); -} - static bool __mptcp_move_skbs(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); @@ -1959,7 +1885,6 @@ static bool __mptcp_move_skbs(struct sock *sk) break; =20 slowpath =3D lock_sock_fast(ssk); - __mptcp_update_rmem(sk); done =3D __mptcp_move_skbs_from_subflow(msk, ssk, &moved); =20 if (unlikely(ssk->sk_err)) @@ -1968,11 +1893,7 @@ static bool __mptcp_move_skbs(struct sock *sk) } while (!done); =20 ret =3D moved > 0; - if (!RB_EMPTY_ROOT(&msk->out_of_order_queue) || - !skb_queue_empty(&sk->sk_receive_queue)) { - __mptcp_update_rmem(sk); - ret |=3D __mptcp_ofo_queue(msk); - } + ret |=3D __mptcp_ofo_queue(msk); if (ret) { mptcp_cleanup_rbuf(msk); mptcp_check_data_fin((struct sock *)msk); @@ -2562,8 +2483,6 @@ static int __mptcp_init_sock(struct sock *sk) INIT_WORK(&msk->work, mptcp_worker); msk->out_of_order_queue =3D RB_ROOT; msk->first_pending =3D NULL; - msk->rmem_fwd_alloc =3D 0; - WRITE_ONCE(msk->rmem_released, 0); msk->timer_ival =3D TCP_RTO_MIN; =20 msk->first =3D NULL; @@ -2775,8 +2694,6 @@ static void __mptcp_destroy_sock(struct sock *sk) =20 sk->sk_prot->destroy(sk); =20 - WARN_ON_ONCE(msk->rmem_fwd_alloc); - WARN_ON_ONCE(msk->rmem_released); sk_stream_kill_queues(sk); xfrm_sk_free_policy(sk); =20 @@ -3044,11 +2961,6 @@ void mptcp_destroy_common(struct mptcp_sock *msk, un= signed int flags) __skb_queue_purge(&sk->sk_receive_queue); skb_rbtree_purge(&msk->out_of_order_queue); =20 - /* move all the rx fwd alloc into the sk_mem_reclaim_final in - * inet_sock_destruct() will dispose it - */ - sk->sk_forward_alloc +=3D msk->rmem_fwd_alloc; - msk->rmem_fwd_alloc =3D 0; mptcp_token_destroy(msk); mptcp_pm_free_anno_list(msk); mptcp_free_local_addr_list(msk); @@ -3146,8 +3058,6 @@ static void mptcp_release_cb(struct sock *sk) if (__test_and_clear_bit(MPTCP_RESET_SCHEDULER, &msk->cb_flags)) msk->last_snd =3D NULL; } - - __mptcp_update_rmem(sk); } =20 /* MP_JOIN client subflow must wait for 4th ack before sending any data: @@ -3328,11 +3238,6 @@ static void mptcp_shutdown(struct sock *sk, int how) __mptcp_wr_shutdown(sk); } =20 -static int mptcp_forward_alloc_get(const struct sock *sk) -{ - return sk->sk_forward_alloc + mptcp_sk(sk)->rmem_fwd_alloc; -} - static int mptcp_ioctl_outq(const struct mptcp_sock *msk, u64 v) { const struct sock *sk =3D (void *)msk; @@ -3413,7 +3318,6 @@ static struct proto mptcp_prot =3D { .hash =3D mptcp_hash, .unhash =3D mptcp_unhash, .get_port =3D mptcp_get_port, - .forward_alloc_get =3D mptcp_forward_alloc_get, .sockets_allocated =3D &mptcp_sockets_allocated, =20 .memory_allocated =3D &tcp_memory_allocated, diff --git a/net/mptcp/protocol.h b/net/mptcp/protocol.h index f12a6e80171d..d4a267cb7663 100644 --- a/net/mptcp/protocol.h +++ b/net/mptcp/protocol.h @@ -258,7 +258,6 @@ struct mptcp_sock { u64 ack_seq; atomic64_t rcv_wnd_sent; u64 rcv_data_fin_seq; - int rmem_fwd_alloc; struct sock *last_snd; int snd_burst; u64 recovery_snd_nxt; /* in recovery mode accept up to this seq; @@ -269,7 +268,6 @@ struct mptcp_sock { u64 wnd_end; unsigned long timer_ival; u32 token; - int rmem_released; unsigned long flags; unsigned long cb_flags; unsigned long push_pending; @@ -332,7 +330,7 @@ static inline struct mptcp_sock *mptcp_sk(const struct = sock *sk) */ static inline int __mptcp_rmem(const struct sock *sk) { - return atomic_read(&sk->sk_rmem_alloc) - READ_ONCE(mptcp_sk(sk)->rmem_rel= eased); + return atomic_read(&sk->sk_rmem_alloc); } =20 static inline int __mptcp_receive_window(const struct mptcp_sock *msk) --=20 2.35.3