From nobody Sat May 4 23:22:34 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp661832uad; Thu, 30 Jun 2022 15:18:07 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tc/GNauUZ/fRBo9Ut9T5rgeg7sEUMrwraJrdszM7XNV6ozrpr7dIIa+D5VTqOZ5HqRyagy X-Received: by 2002:aca:5a0a:0:b0:32e:9c9e:fb0d with SMTP id o10-20020aca5a0a000000b0032e9c9efb0dmr8322909oib.151.1656627487742; Thu, 30 Jun 2022 15:18:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656627487; cv=none; d=google.com; s=arc-20160816; b=JzTnTwzL3/HgRML1ROW3ewB026zfwoTYRX6+89HQTVMOJ78RRB1ZI9K3mxA/vUU+qZ 6MXGnC80hQXXUyqZr5r5FFCPCn8Rj2qS3gHJFGSBOukMj+FH3LZYmd9dR1jlMxJKM33k ULv4/Z8xXGYVXQ5etBQVmxACkD5liD4J+qTtvDxRkiJ8v8D2iUdwbRZ1dIJNu/GPbBXW Gf2YJhpoc8NSfzvp9jujD58AzJOSdMM0JsOtdP3IQsoUrwF/QW4METjzjbwhLtRZpOvm jkpqyq8xHLb41OViCPOv/tZygPONFEsDPMf+3DCN+8DWFu8bEWLMZqIhVzsy1gLe1d2X ofQg== 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=vg+VIHMk77ioZspSNcNhwnjBEqWWmf9YPkXEgBqCmRw=; b=AHIRq31tUQXRiDfdnQiS0cog0UsfHa6Km46xAZNcjUe3Y8x/PZ+vd45qrx5d6Unuk5 /nYqQIBOmzpFv4QJ/29UFkZsOBfvvtblJCTj9CKUCoY49oExldcf9E3l+SG9TgO+6YLQ 2NnRKuRFkAZr5czeKaWa2AjnMcpSkmLS+xes2+VfCiHOE6orVXMH8yH6R7HU2zcl502R WI0cpNtFo7zidHgsSW9+TcrzSf23pyS//cgUp8z2k4sbhZqJZcWX6lBYwMAyb2VPdgG+ /C5WBq9nBLYcKiy5j520k12h9IZUZ2YQlmGBT/CXHXg9pCaUDTBAU+g3edoqaYBbWE/F jcbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=WcVgshoV; spf=pass (google.com: domain of mptcp+bounces-5921-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5921-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 l4-20020a05683004a400b00605f70c4d58si23826030otd.163.2022.06.30.15.18.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 15:18:07 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5921-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=WcVgshoV; spf=pass (google.com: domain of mptcp+bounces-5921-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5921-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 AFA602E0A84 for ; Thu, 30 Jun 2022 22:18:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0EDDF7489; 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 9DB6C7486 for ; Thu, 30 Jun 2022 22:18:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656627483; x=1688163483; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=lZ5vKuw10oEXYHP9I4iPemj76N36tbCMGBq9V6tz1vw=; b=WcVgshoViUB9clIu40u54xYdYooNrBTPWwZ8xMqb/gyYNyOBfhMQFWqM 29Aad5zOFjkPrA1Vz6lyex4GhqxoQSCmXgvpXw3jdaUlCICCcoeeGZBmw FPAhb04KFA8OK8YgtAbli5qLMWGv3TNAa6THAStk2+91c09LPyD8mOYUB unEtchn40+7mX6GWH+Iaoomm21Q2pwfd6POpkba+Ezwi2ycUB+T7V5akS 7PhDeiLoscezxdzJIpWBRhj286PGuSmGFtp5SkCPtRMrebyFdHjpho+tz g3J9DbiwIm2o1hU8zbQ7YKqKrtvuNNdRCUinXe5StoxtvOYagjxSotnhT Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10394"; a="368797903" X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="368797903" 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="733804539" 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:01 -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 1/4] mptcp: never fetch fwd memory from the subflow Date: Thu, 30 Jun 2022 15:17:54 -0700 Message-Id: <20220630221757.763751-2-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 The memory accounting is broken in such exceptional code path, and after commit 4890b686f408 ("net: keep sk->sk_forward_alloc as small as possible") we can't find much help there. Drop the broken code. Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e0fb9f96c45c..c67c6fc1fe04 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -328,15 +328,10 @@ static bool mptcp_rmem_schedule(struct sock *sk, stru= ct sock *ssk, int size) =20 amt =3D sk_mem_pages(size); amount =3D amt << PAGE_SHIFT; - msk->rmem_fwd_alloc +=3D amount; - if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV)) { - if (ssk->sk_forward_alloc < amount) { - msk->rmem_fwd_alloc -=3D amount; - return false; - } + if (!__sk_mem_raise_allocated(sk, size, amt, SK_MEM_RECV)) + return false; =20 - ssk->sk_forward_alloc -=3D amount; - } + msk->rmem_fwd_alloc +=3D amount; return true; } =20 --=20 2.37.0 From nobody Sat May 4 23:22:34 2024 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 From nobody Sat May 4 23:22:34 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp661873uad; Thu, 30 Jun 2022 15:18:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vnHMMCN02V9+n9FhZV2TXfwKBPib+DEPyL02vZRFXzulRlZamhOqGiHC02xTc33MsoR3T9 X-Received: by 2002:a05:6870:2f15:b0:108:c28d:3304 with SMTP id qj21-20020a0568702f1500b00108c28d3304mr7106189oab.92.1656627490682; Thu, 30 Jun 2022 15:18:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656627490; cv=none; d=google.com; s=arc-20160816; b=zlLf0XSRQTQ5XzlpikXexjpeRH0qsbtNQ2ypeWVjuoUzLlpU3QJlArqRwSgMCkqgZ5 /CzeE1CcsOjbbWbICuEA0m2MFBDtTemcHKwfLqpIeIkXAlOc8Cfi33askwuyBCQCQctS RYs5+D5cUYEvyL38Ub7UKcE50gKH7r6Wy2tl70YcW3Mi5SVfjIMJ/BZOjyUhKxL/GxQD 5iWJuM6yGvz+p/7hZJQNAeZ8kDJ2D4BakI6JpUe990Mm+qtM4hlxkN4YiQtzTsYLqw0a 4xgl/21JcznHsJncMERBpQLJnnpVwe41g1DASbE0Lq0erOWjvwnMWlKnLNnDalRNFPSC g/2A== 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=UHojOjvaeWs5Tif5PgOBml0IY8VC+lEEmMQvo9Z1l7E=; b=QqD1Q3ey2dYU43cun+j+SwrpqAmrecKfxTpg8q8f4arZaF0hmsO++gwl1i2VxTw5X9 YoFNtPNrcKx0kkM0qNi6nxfjo8n6bQvTuC+zvoqiaj/asFfR+4RgkfKnYU7yZcGk3YAt DaAA92LLRadFBPUaLPoQrbqhgPwR9gGlI9wjEJxLncklacSQ8xE0TN5NM/7HKkiAIdV1 6iawMOJEY2w5gOkLfeEfTP3J+zxh/6gTPtlB5ssRDPMS2ug40WvtVucBAq+lZgblb77W B0fOTQo6DcggPS1RHgrp+ViZoPyO2ayy0803MDitVtn06N+pWlsKKTmDD/Eg7BYV0Z34 D3Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JvgDMj9E; spf=pass (google.com: domain of mptcp+bounces-5924-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5924-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g5-20020a056870c14500b000f5d454e366si26267105oad.121.2022.06.30.15.18.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 15:18:10 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5924-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=@intel.com header.s=Intel header.b=JvgDMj9E; spf=pass (google.com: domain of mptcp+bounces-5924-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5924-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 4BF0E280C9C for ; Thu, 30 Jun 2022 22:18:10 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5C6EB7486; Thu, 30 Jun 2022 22:18:06 +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 C7A387488 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=tF/Wq5emO17ur6n4i4kolET5/WZvdXynovD9SwfsTxM=; b=JvgDMj9E/icT2AUxD2HSeEqKrwWSG8pjX2123WZ8L7QVQRwrLQwcvRzg 8ZDLKZ0TUuqxLVCypyJB3LzJCIypZuXXZ35oSxqQxOidooqmd8OFBb3Wn Lqwol0nlBBfXuC1E/gO96T4MvP2pdnlzmjEuTj8PRMn4XGCb/OHzB1VtQ wjUSL6i6PHkbDptMv05LVqDkfHL9sfihxetGzcJ/HWejc5HGeiDeb945y pqjdkm8tCpS5hRYz0lQSg7HEopBxX8qqW+5yASjoJZ01Rnf2TrLf0r1lE /ghQaZk77vYarFI+pp4nfmrqAJK4HJ9rjb0y5QI9cfeRHmtYJTz3xGlAf w==; X-IronPort-AV: E=McAfee;i="6400,9594,10394"; a="368797906" X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="368797906" 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="733804541" 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 3/4] mptcp: refine memory scheduling Date: Thu, 30 Jun 2022 15:17:56 -0700 Message-Id: <20220630221757.763751-4-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 Similar to commit 7c80b038d23e ("net: fix sk_wmem_schedule() and sk_rmem_schedule() errors"), let the MPTCP receive path schedule exactly the required amount of memory. Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index e89a0124023f..91628dbe5a2d 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -323,9 +323,10 @@ static bool mptcp_rmem_schedule(struct sock *sk, struc= t sock *ssk, int size) struct mptcp_sock *msk =3D mptcp_sk(sk); int amt, amount; =20 - if (size < msk->rmem_fwd_alloc) + if (size <=3D msk->rmem_fwd_alloc) return true; =20 + 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)) --=20 2.37.0 From nobody Sat May 4 23:22:34 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:590e:0:0:0:0:0 with SMTP id n14csp661858uad; Thu, 30 Jun 2022 15:18:09 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ttlqMnUE8XAMLaNrZsRTAoedeg3Nx0o3kv4LZqrJvPDcbfY6KpDcvkjLefYmgpiQv8tE+l X-Received: by 2002:a05:6870:73cf:b0:101:f924:322f with SMTP id a15-20020a05687073cf00b00101f924322fmr8169364oan.73.1656627489515; Thu, 30 Jun 2022 15:18:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656627489; cv=none; d=google.com; s=arc-20160816; b=yppr1njqcm7Cp799xEozy5MQorzn0Lbko3BMqQaOdJ+fd177R0ISi9zEBWOcs60u34 FYQuwGbB6tDOiSfHyjXpivFNMfV9GYym3rfxKwkC0dQrLMHysnLSvq1Gb2d4TTFjXbCF WV1/qHH3J/mhNumBa2LzBDdzclqxy3BCo66faCWT7Wkmgz6/5Uri1bGfJYPFVy6VlShO QPeYR3VyuFwqxCjNbXU5bKbaF6ZseRZpK2ic+P2gU1MzcnRuoS5vjWUlBrcpLAgy4RgN kvhkKVGhxAUE3tGjTao8ZSuh1cLcKaRQcsvUWGCjCmE5JN2FYVnoKlt7XCmJJrPrAPqp f6Og== 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=6Z0iSNDlf9RGs62APM1ve7MwffkBYN8lqgE/Y4Gu8PY=; b=Nl2j/nQbD5uUywFLdVFbJ0Lj5wStpm/es8JSnYAT9SMF/eXJ5m/Tib9L4/FAmSdqNB fD/q4OXG0vElalziOH2j0ZZVsLl3SGvbr479GcCofHjztkfWfhefEFZZHbtJLWLot/52 ULzrnKxqs+QHS4YcGh1QDI0rBbJMRruLcWwc9Nf3kLINL2gzEOd/RuJJljrCJVvpLaGI J4v35BpGOJyOZ/nBPgmIPE8DF2uhNXHXq4r62BHqShizKKTI4Stmt4Dels9kTRjoV8gi lTCTjA5x+kwDm8ePi+Wc6+Bm4q5gwT5XICxy5OKfD3BIF5BH7kbxcLa2vlA9UAqQqugk 8grA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CSwUk8zd; spf=pass (google.com: domain of mptcp+bounces-5923-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5923-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g5-20020a056870c14500b000f5d454e366si26267105oad.121.2022.06.30.15.18.09 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Jun 2022 15:18:09 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5923-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=@intel.com header.s=Intel header.b=CSwUk8zd; spf=pass (google.com: domain of mptcp+bounces-5923-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5923-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 1121D280CA7 for ; Thu, 30 Jun 2022 22:18:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 31F9F6D19; Thu, 30 Jun 2022 22:18:06 +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 198707486 for ; Thu, 30 Jun 2022 22:18:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656627485; x=1688163485; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=kficdG33KB5IFb2Wh6Gc/zp7DW5LVB1zb0myAwDVGow=; b=CSwUk8zdoE/L8dSAuz4CUUpWxmhyF0P7OE0kaIiHtm79CgzNup26j6mu Usib+W+RWMw98IlRrLqOXKxmpYG/gb0ApjK8GkWTq9X8n+bkRj0gm4sgD D7jWpB3mzQQcPgEGj92BZ8i45PvRSJY/GOI37ktdHMe2tQwFw5p4cCr9u O3KRXq/3WmCgzQ+iXyqPnbNTN3lzZGMR30qTnB13pX8W85Z8Xdf2WEWHf M1TVRB7iirvM3nAmepOOczRCMjJ8bPdncUEq7xdXN5UAu7H1/0Sb+ZekE u3iHEBYhC0hBWHRDnvBc2s+y6y6GghEyYMNhi6AcsVZsxpaKSlSKs/15g Q==; X-IronPort-AV: E=McAfee;i="6400,9594,10394"; a="368797910" X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="368797910" 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:03 -0700 X-IronPort-AV: E=Sophos;i="5.92,235,1650956400"; d="scan'208";a="733804543" 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 4/4] net: remove SK_RECLAIM_THRESHOLD and SK_RECLAIM_CHUNK Date: Thu, 30 Jun 2022 15:17:57 -0700 Message-Id: <20220630221757.763751-5-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 There are no more users for the mentioned macros, just drop them. Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- include/net/sock.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index 40bbd0e8925b..0dd43c3df49b 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1619,11 +1619,6 @@ static inline void sk_mem_charge(struct sock *sk, in= t size) sk->sk_forward_alloc -=3D size; } =20 -/* the following macros control memory reclaiming in mptcp_rmem_uncharge() - */ -#define SK_RECLAIM_THRESHOLD (1 << 21) -#define SK_RECLAIM_CHUNK (1 << 20) - static inline void sk_mem_uncharge(struct sock *sk, int size) { if (!sk_has_account(sk)) --=20 2.37.0