From nobody Mon Feb 9 22:59:46 2026 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