From nobody Mon Feb 9 09:33:14 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp661843uad; Thu, 30 Jun 2022 15:18:08 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sEJ+rAKpoo5hobrsMLKfwwIln/c65X4jqcPoq/ZYOX8X3m07o8uV+tl/0/UWlunDLWGjE7 X-Received: by 2002:a9d:84a:0:b0:60c:3175:2bc1 with SMTP id 68-20020a9d084a000000b0060c31752bc1mr5050591oty.146.1656627488261; Thu, 30 Jun 2022 15:18:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656627488; cv=none; d=google.com; s=arc-20160816; b=r2cZWZdr56fo3DEc+ynDd2wqFVTbpJMLfWxF4xm8FAmgKwweIw2Dy5DUIxPN0I2CaA g+ga2Hef8aiMA5G2isgNuNqu0eyiVC/jjhK+et27Oov2EgccoOds6tm7IdKIyu5lZTHW nzcJD97PdB3KlftpruPbN0Z8p4gSQSs4WSlUqdqIwPFyca7EJK6Xx+4JSvVX3phQcn+j 81qY8sGftvEk/cbPf2DFKzvsioHwWZjGnxQXaRPXC7q+6tEoOMvoIkS4XXcstwJfHROq E3H4y9E+pcqVgMFy0746tM1dlzpBZi0hoxYciNhmaFjPWXWrUogrJKQdKoukPNjribEF mEQA== 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:cc:to:from:dkim-signature; bh=wFlHDEYuxzDpF6LauuLXT95WwbsBhRG1MDvj+rxhiRk=; b=lligDCmmfOw/rAms79/L+tlwuzvSmVpXtOCUve9c+hDmeoWoPdg3+630XYPAARXhRs d6i2RnLhfpPxv/VtkudQNTUUjQoStiOCNOEz0uIvWnIfvRL/E163I1ejoJ/yxHcKM/uJ e0+q89tMzPMNOPFxYuVuhpjk+VlPzbtRUn64ANzwqofzCtGHb/fH+qEL5BfAZXWOGI8W RhrZgQ/iHEvipGA+vUtymlnFbK8/V3VC529iCd8NC6iCIWjx00xzm2G/PtPZlEfKUaPO cwaV9DKfG9raQy2f+2VCZCAglWiDnbarRiB+8IjzVBIgXNQsTT+lJq8m28l8FUaHjqg7 sZYA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="G4/BPWtb"; spf=pass (google.com: domain of mptcp+bounces-5922-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5922-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from da.mirrors.kernel.org (da.mirrors.kernel.org. [139.178.84.19]) by mx.google.com with ESMTPS id cy37-20020a056870b6a500b000f5f122f4aasi24985756oab.138.2022.06.30.15.18.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 15:18:08 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5922-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) client-ip=139.178.84.19; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b="G4/BPWtb"; spf=pass (google.com: domain of mptcp+bounces-5922-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5922-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.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 da.mirrors.kernel.org (Postfix) with ESMTPS id 1F3332E0A24 for ; Thu, 30 Jun 2022 22:18:08 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E4F9B748A; Thu, 30 Jun 2022 22:18:05 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 5E4EA6D19 for ; Thu, 30 Jun 2022 22:18:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656627484; x=1688163484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=+nXFSZV6auwwe5r6EZ7dcssoTkxwua1fREwHRzORSDY=; b=G4/BPWtbKTeToUyIcmYStDxe8KdQxHozGFy89IN5HvP7fawuXk2jHFPD Kw8iMjYckLYragD9+h439Jv+LeKsJ3ja9PyHiHBpBA8W8kncINEw2CtuQ OhtccGNiMcHlMs6kCp02aupEkshKcLronFQsBRAr36OQfW8VPvEmfTtt2 HvHcTLAHDbEsaAnAMIeNPSyBhTwrQky8OUMb6RbMHl5qYJ23U1P060Q1o 2NWPdRbthfAjGhxK3sTr2G4Drdwi1S7vfH+FUrbkH1uUaoE+vN7JJYwJF 1MjiB6XTtQQqUNK1fjMjVRVI5LiGTW3eSjaqW+ZatyuQYMwT9643nNhzm Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10394"; a="368797905" X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="368797905" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2022 15:18:02 -0700 X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="733804540" Received: from mhtran-desk5.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.176.78]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Jun 2022 15:18:02 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 2/4] mptcp: drop SK_RECLAIM_* macros Date: Thu, 30 Jun 2022 15:17:55 -0700 Message-Id: <20220630221757.763751-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220630221757.763751-1-mathew.j.martineau@linux.intel.com> References: <20220630221757.763751-1-mathew.j.martineau@linux.intel.com> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Paolo Abeni After commit 4890b686f408 ("net: keep sk->sk_forward_alloc as small as possible"), the MPTCP protocol is the last SK_RECLAIM_CHUNK and SK_RECLAIM_THRESHOLD users. Update the MPTCP reclaim schema to match the core/TCP one and drop the mentioned macros. This additionally clean the MPTCP code a bit. Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 35 ++--------------------------------- 1 file changed, 2 insertions(+), 33 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index c67c6fc1fe04..e89a0124023f 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -181,8 +181,8 @@ static void mptcp_rmem_uncharge(struct sock *sk, int si= ze) reclaimable =3D msk->rmem_fwd_alloc - sk_unused_reserved_mem(sk); =20 /* see sk_mem_uncharge() for the rationale behind the following schema */ - if (unlikely(reclaimable >=3D SK_RECLAIM_THRESHOLD)) - __mptcp_rmem_reclaim(sk, SK_RECLAIM_CHUNK); + if (unlikely(reclaimable >=3D PAGE_SIZE)) + __mptcp_rmem_reclaim(sk, reclaimable); } =20 static void mptcp_rfree(struct sk_buff *skb) @@ -961,25 +961,6 @@ static bool mptcp_frag_can_collapse_to(const struct mp= tcp_sock *msk, df->data_seq + df->data_len =3D=3D msk->write_seq; } =20 -static void __mptcp_mem_reclaim_partial(struct sock *sk) -{ - int reclaimable =3D mptcp_sk(sk)->rmem_fwd_alloc - sk_unused_reserved_mem= (sk); - - lockdep_assert_held_once(&sk->sk_lock.slock); - - if (reclaimable > (int)PAGE_SIZE) - __mptcp_rmem_reclaim(sk, reclaimable - 1); - - sk_mem_reclaim(sk); -} - -static void mptcp_mem_reclaim_partial(struct sock *sk) -{ - mptcp_data_lock(sk); - __mptcp_mem_reclaim_partial(sk); - mptcp_data_unlock(sk); -} - static void dfrag_uncharge(struct sock *sk, int len) { sk_mem_uncharge(sk, len); @@ -999,7 +980,6 @@ static void __mptcp_clean_una(struct sock *sk) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_data_frag *dtmp, *dfrag; - bool cleaned =3D false; u64 snd_una; =20 /* on fallback we just need to ignore snd_una, as this is really @@ -1022,7 +1002,6 @@ static void __mptcp_clean_una(struct sock *sk) } =20 dfrag_clear(sk, dfrag); - cleaned =3D true; } =20 dfrag =3D mptcp_rtx_head(sk); @@ -1044,7 +1023,6 @@ static void __mptcp_clean_una(struct sock *sk) dfrag->already_sent -=3D delta; =20 dfrag_uncharge(sk, delta); - cleaned =3D true; } =20 /* all retransmitted data acked, recovery completed */ @@ -1052,9 +1030,6 @@ static void __mptcp_clean_una(struct sock *sk) msk->recovery =3D false; =20 out: - if (cleaned && tcp_under_memory_pressure(sk)) - __mptcp_mem_reclaim_partial(sk); - if (snd_una =3D=3D READ_ONCE(msk->snd_nxt) && snd_una =3D=3D READ_ONCE(msk->write_seq)) { if (mptcp_timer_pending(sk) && !mptcp_data_fin_enabled(msk)) @@ -1206,12 +1181,6 @@ static struct sk_buff *mptcp_alloc_tx_skb(struct soc= k *sk, struct sock *ssk, boo { gfp_t gfp =3D data_lock_held ? GFP_ATOMIC : sk->sk_allocation; =20 - if (unlikely(tcp_under_memory_pressure(sk))) { - if (data_lock_held) - __mptcp_mem_reclaim_partial(sk); - else - mptcp_mem_reclaim_partial(sk); - } return __mptcp_alloc_tx_skb(sk, ssk, gfp); } =20 --=20 2.37.0