From nobody Mon Feb 9 16:34:08 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp995385uad; Fri, 29 Jul 2022 08:34:01 -0700 (PDT) X-Google-Smtp-Source: AA6agR6XTHXPTOeDcNdmMXAkMg/SWnC1sy7HOseZ/qkc2jyt55oGeysK3+vloaUMs4CZ8jsJ5tRw X-Received: by 2002:a0c:8170:0:b0:473:af82:9a77 with SMTP id 103-20020a0c8170000000b00473af829a77mr3918765qvc.87.1659108841765; Fri, 29 Jul 2022 08:34:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659108841; cv=none; d=google.com; s=arc-20160816; b=yOpSOSxu7Ogq/u6Y9Vn6OkE9gCcaaJjoHvro3b9+88FY9EPsP8rayUtGphYUFhQ1hc RZeU68QMz3/vE1eRMB9MoeDvsW8ZmlHiLf4FMLbyLB0pe7i/fp5/TXCf7UModmE/z6cj RrNxsnyAnOqhMNZoJnOJWyJHIsDItZDjxs8t69mnHLnZ8sbHJWu8VGdlIc4vXdMQCMl0 4qp6/K+nZmGLW12dj7KHaSpBo2bADtJG5tWIh4wyCqXOcnmrWKRDBU8QViYaOnECC/ES PNZHnpolzK6/oz2svdmoQ+m3frjDLl9bBgSDftAsrnEQj72tdkYEezLmckdQRTcHkghS AxJA== 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=RcD0XgS5CQtJH05z28AzMNQ3avH8pEU8s6cv8rKq/v8=; b=sogxBKNl/Z/3++w2CJpzL1hO+XoSZj02xr/0Bzr8U83FxzKdqwFHsBSkiazoq1y9Un O1WQCeZM68Zm+xW8/BBA3lFoOTK16tQeApMKPV25b7ZAnBy+hVFz32qzGKqEwLbHLks+ jYdnBwOWEpPEJLzONg0TO0bpj/LVgvJbNqiQFqAVwk6Oiua1t3X+O95odDLCKAtIO14u ZZy0uZbuj9RGyYu+Hc/NtdeCjvapFZS4woBFr7ShzHijX4RxGhIeD5lz8g14iLhHUDh2 5J8+Uhsue3LzWPB1MquIoy4Z45O+CYXRhVnkIFj0+8TfmOLnWSHaH2czi81uH2cJwVPQ D2bw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=RAv2dT6m; spf=pass (google.com: domain of mptcp+bounces-6068-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6068-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 hu11-20020a056214234b00b00474479acbf7si2054788qvb.480.2022.07.29.08.34.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Jul 2022 08:34:01 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6068-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=RAv2dT6m; spf=pass (google.com: domain of mptcp+bounces-6068-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6068-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 997C41C20A76 for ; Fri, 29 Jul 2022 15:34:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 541644C6A; Fri, 29 Jul 2022 15:34:00 +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 81B754C67 for ; Fri, 29 Jul 2022 15:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1659108837; 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=RcD0XgS5CQtJH05z28AzMNQ3avH8pEU8s6cv8rKq/v8=; b=RAv2dT6m1Og8di+PRBGO41c8ZbLvuSEsPniQSdpjplVgq37V6SBVod0MIr6w4E1pExB9S6 tOlL67xNR45foMUBspD6m8XNtycUA1OEYAb5OiVcgJ0vHXS3hki6WKl8URAAAUwbY6mIV5 OkaOjElUpu5WRrCP2/DZhGSkfmoIVMI= 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-661-oqqT7AVoPTqNet3IpM13Hw-1; Fri, 29 Jul 2022 11:33:55 -0400 X-MC-Unique: oqqT7AVoPTqNet3IpM13Hw-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 75F3E811E7A for ; Fri, 29 Jul 2022 15:33:55 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 041F490A00 for ; Fri, 29 Jul 2022 15:33:54 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next 4/4] mptcp: use common helper for rmem memory accounting Date: Fri, 29 Jul 2022 17:33:04 +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.79 on 10.11.54.5 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" Signed-off-by: Paolo Abeni --- 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 b9402a13a69d..130afd239ecf 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)) { @@ -1784,7 +1722,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 @@ -1822,9 +1759,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); } @@ -1934,18 +1872,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); @@ -1960,7 +1886,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)) @@ -1969,11 +1894,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); @@ -2563,8 +2484,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; @@ -2776,8 +2695,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 @@ -3045,11 +2962,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); @@ -3147,8 +3059,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: @@ -3329,11 +3239,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; @@ -3414,7 +3319,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 99c710e1ff5c..9ddee7eac00d 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