From nobody Mon Feb 9 19:52:23 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp746320pis; Wed, 4 May 2022 14:54:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnZYns30a4FcQhBvh26IcAs1KqUDMAdbZUyXYVHrZ2WuC0JA/OqQyTFkbw65XnwutY0TDI X-Received: by 2002:a05:6870:15d0:b0:e9:8787:60c2 with SMTP id k16-20020a05687015d000b000e9878760c2mr847307oad.294.1651701273196; Wed, 04 May 2022 14:54:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651701273; cv=none; d=google.com; s=arc-20160816; b=EpqWpSDFihfFrOAYCpyHUgqvCFcAO/79kJEZ4tJ+YNShxPxFUrdvOsEt0tD24qMi7n 9jTTfgEmJSijJJkVafk+UaKPzHG0sqwVZ7OPrsqcadMLjA6l/2go1rGlS6TRAMxKTOpk PC2GGHVJ0JiSRg9ZjLmCsScICHjrzJfpIem1Hveh+JzQHRYUMc+seFJNggXhoTF4TECG nklzsZkPsxNYSBKXXM/ri2pV0skwz+NDRHPi3gsM9/Ij0ZRHiC0VAmsM5HleSnbfKdR2 aeG/SuEmNNL+yzzlrzwskjMpVAALSZSDoABnG37XarCCapzIu6iZtLJrjkgXtQjWxkv7 qaew== 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=wIrF94emSHUflTjFySXUYBJ75BM3l3wykhP25YWAW7k=; b=m772yUf8bcirJzghs8WaSHd3Yw5b9prUPNTIK4xvP2hRDqWQvsvPtFrxRY+sscXJ0L //HKYdeXl36fjNuHeESgbOBKB9D83S8051r3BjaIt5MeZni0jCOp9DLx9NshkYqGxu77 xb0uKvbsn3QNBEF9VqqpQIriuNSL4KQlvKzL9Mq1zsk8W/5l7MGypaFMcn5NdieiW0PN K1sbnmJuDcwlzhwpcEYjwcXegyTwn14QOO9kkpBlfCq0Wy9zXpHOX+Sd3kz/XvpPuc4o soaXkefXmJNbYuBUnuvCZYzLi7xh37XN52OmYWhFtbVhaYxowzXhtytb0vf30DNJnm+m UCYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=QvsoqF6f; spf=pass (google.com: domain of mptcp+bounces-5114-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5114-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 s23-20020a9d7597000000b00605fc96dac3si8029493otk.185.2022.05.04.14.54.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2022 14:54:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5114-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=QvsoqF6f; spf=pass (google.com: domain of mptcp+bounces-5114-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5114-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 078F82E09C0 for ; Wed, 4 May 2022 21:54:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D303D33E0; Wed, 4 May 2022 21:54:30 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (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 8B02133F3 for ; Wed, 4 May 2022 21:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651701268; x=1683237268; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Keh/V0hKcsPVV4uZnaQ4ISYtNk/JzPjaop5gmEJiqy4=; b=QvsoqF6fNuouDUaPTlDnPEgoREf5oXiapGlpNEUsb569g9VSV52+Q7T+ CKVJ4qgOIwqB+VfhQK6G66v/1TYTJFLaMYFMFgw67nEzPoKRF47khqtbS wt3hZY4xfBUpQz6wzFXW3MvsgwzeU2aBbA8tGvXfhjbv5lO9KUw8KdoE1 jEo/gapZRwymhC09qHm6L594KhY3Fhry9OIgOHliCM3vy53Xe+m7wMwwP YkF5FMUnHYWaXt2iRvdXoMks+MqY+uFPlFVMCNWlPMr0DbovCTskWiJ7N yLDsWuyFDnVIOyZeGLLbbky+Ni2iSXyzl+FtOiwF7pQwmfL/IqIagO85+ g==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="249892481" X-IronPort-AV: E=Sophos;i="5.91,199,1647327600"; d="scan'208";a="249892481" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2022 14:54:19 -0700 X-IronPort-AV: E=Sophos;i="5.91,199,1647327600"; d="scan'208";a="621000370" Received: from mjmartin-desk2.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.212.251.111]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2022 14:54:17 -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/5] mptcp: add mib for xmit window sharing Date: Wed, 4 May 2022 14:54:05 -0700 Message-Id: <20220504215408.349318-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504215408.349318-1-mathew.j.martineau@linux.intel.com> References: <20220504215408.349318-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 Bump a counter for counter when snd_wnd is shared among subflow, for observability's sake. Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/mib.c | 1 + net/mptcp/mib.h | 1 + net/mptcp/protocol.c | 4 +++- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index d93a8c9996fd..6a6f8151375a 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -56,6 +56,7 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("RcvPruned", MPTCP_MIB_RCVPRUNED), SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE), SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER), + SNMP_MIB_ITEM("SndWndShared", MPTCP_MIB_SNDWNDSHARED), SNMP_MIB_SENTINEL }; =20 diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 529d07af9e14..2411510bef66 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -49,6 +49,7 @@ enum linux_mptcp_mib_field { MPTCP_MIB_RCVPRUNED, /* Incoming packet dropped due to memory limit */ MPTCP_MIB_SUBFLOWSTALE, /* Subflows entered 'stale' status */ MPTCP_MIB_SUBFLOWRECOVER, /* Subflows returned to active status after bei= ng stale */ + MPTCP_MIB_SNDWNDSHARED, /* Subflow snd wnd is overridden by msk's one */ __MPTCP_MIB_MAX }; =20 diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 97a375eabd34..6710960b74f3 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1153,8 +1153,10 @@ static int mptcp_check_allowed_size(const struct mpt= cp_sock *msk, struct sock *s mptcp_snd_wnd =3D window_end - data_seq; avail_size =3D min_t(unsigned int, mptcp_snd_wnd, avail_size); =20 - if (unlikely(tcp_sk(ssk)->snd_wnd < mptcp_snd_wnd)) + if (unlikely(tcp_sk(ssk)->snd_wnd < mptcp_snd_wnd)) { tcp_sk(ssk)->snd_wnd =3D min_t(u64, U32_MAX, mptcp_snd_wnd); + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_SNDWNDSHARED); + } =20 return avail_size; } --=20 2.36.0