From nobody Mon Feb 9 11:46:41 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:869:b0:4b8:7781:bd2f with SMTP id d41csp746329pis; Wed, 4 May 2022 14:54:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzI2A+Zypk9JFcAqGX4EVVJeaAlN1JmexDS4izBAKD2JXfdArynma9vHi0lr13/8aLMHJyX X-Received: by 2002:a05:6808:bc2:b0:325:9646:43a0 with SMTP id o2-20020a0568080bc200b00325964643a0mr857913oik.152.1651701274366; Wed, 04 May 2022 14:54:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651701274; cv=none; d=google.com; s=arc-20160816; b=SwLv0KnCJsv/uI9euRmIL50vWoTBs/RZsbk03b0uIvzcxLMsq+9uxYe9/90ny7IA7k 2V0LwonJp1DyCcg/TjhmEAomTOIKAYOo6kllHclhcZVvxNACOSOmMYBYZ8RB6lbeGE3h K8iXn4ZcNxeSGalRU7J8Pmy/vWDXl3Lenl+h0ef4jbzfmuCRh4Raj0P9BCkj0BaTkxT+ ILxZb7QF9RMC/D2/jvJjYYaARccU5Qn9SN7+hOjsCVuIxTUKN4h7sNThAWtP4XJwvEV4 jDVErQu0fgAtqPeIvw3Izjq44Zk9IcZRW/glEjPbnpNzuwbW09CeyT95cKeLlEVw0drY +2MA== 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=eUb1J58Sea2a7MANIc1yVviKeadVJiCebZWj0Osj30k=; b=RZiRSrrKeNaUS5JnRGxO5m8VUuczqahuTSrUeKEStHZVOzDzfQojqo/gdyyoDUS+yM Dm3j/A5LKAVufb1DHI9e6gY+f6oR2SDwJdvx8PHOiWU6MTiOpBCPkn+9fyfNwskVzTAK RIRrquZoEz77/bKeOxlEVqUJZ1FSIQRa4P6EhsX2jpp88TK/0NOREDPr+YeYTcrIYm/Y yeCzvWx/aoHjfWCCKKaY3UZr20Vrpau/Anmq/N8kRNAXxUlKLnxWPpc/tWqKuEQoeVIC p4QAJ+xzZ/75ohjjsnvexPo3KMg/tn/p+FrPCDmCCkOAGciQPFd/RDvdmLoCULiS/cSD zXXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=ZRezqdKQ; spf=pass (google.com: domain of mptcp+bounces-5115-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5115-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 k13-20020a056870148d00b000ecc9e5e38fsi7065000oab.278.2022.05.04.14.54.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 May 2022 14:54:34 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5115-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=ZRezqdKQ; spf=pass (google.com: domain of mptcp+bounces-5115-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.84.19 as permitted sender) smtp.mailfrom="mptcp+bounces-5115-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 359D92E09E7 for ; Wed, 4 May 2022 21:54:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9C1FA33E8; Wed, 4 May 2022 21:54:32 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) (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 684A733F4 for ; Wed, 4 May 2022 21:54:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651701269; x=1683237269; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=rAc1/rLJSR1p6poXeUKLegm8cyFurQp8xHNbpGX67OY=; b=ZRezqdKQoWLzK7YmIwupqF7UNC8z/em8NcuoFUOrxDfAeyX7nPfU8qnF IW66F0dkQR4b4mhHMUGLGDYFTZ4gTnvZ7JB9I982F0YYmJtc9+XFG9n1E s4MzGf15ObUSJGn/u9D47xVBmYiPcMHuLMaTUZlQlL7FS8KwAFe6I4jwx AiHjnBFlEk5Ioba/DkA4e25hxFnFBZzNfgG9iKOgZ3JUqLH4kom+F3u82 WJLzvi8GrjmsOuqzt6PBMOB8cyCx3d36K7XK9PzPzIkQWb0CiUuR38LLm PjN1lxD971dj92GMo6BqPgnQ/gfxkIEY2l8DXBHQNn6SJ+EfuaVv3F8ZN A==; X-IronPort-AV: E=McAfee;i="6400,9594,10337"; a="268064541" X-IronPort-AV: E=Sophos;i="5.91,199,1647327600"; d="scan'208";a="268064541" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 May 2022 14:54:23 -0700 X-IronPort-AV: E=Sophos;i="5.91,199,1647327600"; d="scan'208";a="621000387" 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:22 -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 5/5] mptcp: add more offered MIBs counter Date: Wed, 4 May 2022 14:54:08 -0700 Message-Id: <20220504215408.349318-6-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 Track the exceptional handling of MPTCP-level offered window with a few more counters for observability. Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/mib.c | 3 +++ net/mptcp/mib.h | 5 +++++ net/mptcp/options.c | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/net/mptcp/mib.c b/net/mptcp/mib.c index 6a6f8151375a..0dac2863c6e1 100644 --- a/net/mptcp/mib.c +++ b/net/mptcp/mib.c @@ -57,6 +57,9 @@ static const struct snmp_mib mptcp_snmp_list[] =3D { SNMP_MIB_ITEM("SubflowStale", MPTCP_MIB_SUBFLOWSTALE), SNMP_MIB_ITEM("SubflowRecover", MPTCP_MIB_SUBFLOWRECOVER), SNMP_MIB_ITEM("SndWndShared", MPTCP_MIB_SNDWNDSHARED), + SNMP_MIB_ITEM("RcvWndShared", MPTCP_MIB_RCVWNDSHARED), + SNMP_MIB_ITEM("RcvWndConflictUpdate", MPTCP_MIB_RCVWNDCONFLICTUPDATE), + SNMP_MIB_ITEM("RcvWndConflict", MPTCP_MIB_RCVWNDCONFLICT), SNMP_MIB_SENTINEL }; =20 diff --git a/net/mptcp/mib.h b/net/mptcp/mib.h index 2411510bef66..2be3596374f4 100644 --- a/net/mptcp/mib.h +++ b/net/mptcp/mib.h @@ -50,6 +50,11 @@ enum linux_mptcp_mib_field { 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_RCVWNDSHARED, /* Subflow rcv wnd is overridden by msk's one */ + MPTCP_MIB_RCVWNDCONFLICTUPDATE, /* subflow rcv wnd is overridden by msk's= one due to + * conflict with another subflow while updating msk rcv wnd + */ + MPTCP_MIB_RCVWNDCONFLICT, /* Conflict with while updating msk rcv wnd */ __MPTCP_MIB_MAX }; =20 diff --git a/net/mptcp/options.c b/net/mptcp/options.c index 3e3156cfe813..ac3b7b8a02f6 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1248,8 +1248,11 @@ static void mptcp_set_rwin(struct tcp_sock *tp, stru= ct tcphdr *th) =20 if (rcv_wnd =3D=3D rcv_wnd_old) break; - if (before64(rcv_wnd_new, rcv_wnd)) + if (before64(rcv_wnd_new, rcv_wnd)) { + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_RCVWNDCONFLICTUPDATE); goto raise_win; + } + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_RCVWNDCONFLICT); rcv_wnd_old =3D rcv_wnd; } return; @@ -1275,6 +1278,7 @@ static void mptcp_set_rwin(struct tcp_sock *tp, struc= t tcphdr *th) /* RFC1323 scaling applied */ new_win >>=3D tp->rx_opt.rcv_wscale; th->window =3D htons(new_win); + MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_RCVWNDSHARED); } } =20 --=20 2.36.0