From nobody Mon Feb 9 04:59:58 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a05:6a06:1624:b0:4ae:a3e3:8373 with SMTP id t4csp333450pip; Mon, 11 Apr 2022 03:40:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJztxHztSP5sjLoLXMU1RePuyXaOoi588XzIzF0wTox9zHrisBUhenx/7DIVxD9M/VN6aEdx X-Received: by 2002:a17:90b:3b8c:b0:1c6:ed78:67e2 with SMTP id pc12-20020a17090b3b8c00b001c6ed7867e2mr36246113pjb.163.1649673633366; Mon, 11 Apr 2022 03:40:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649673633; cv=none; d=google.com; s=arc-20160816; b=V2XUtzk1ifFcvswq34rODXZ8Gp7tykUs2iQNSmUKcLfCRmgFqbSp/GqDoq7FxhIqAj g3fhGEcNVuYIRaCHDEucP7ed3wchIQsA6vjHqmTAjHkw9Ni53GCQJWzE4n/xjTvdl7DG CUDi4RFQW1jvVEzukNJTHEZ8ZeMjCg/GEybwp5MPqlw+Qce7rEz9ccn1fDdPGIQEpNEp az/WY1C7BWgjriQeQJJSZONTPWCy8ejI49UuLxnjnJSlhQiVyymMITP2aIUnMd5s+BdA 14BCoxind6mxqeaI9od0r3O/3cg0ImIhgzHcD9ukkyVvxYmeAB+u0X/o/JGQDWcIo/GD ypbA== 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:to:from:dkim-signature; bh=PpDc4gVMBDRc+/UUbohG0qL7+IGhwbwPzENfYTvKhmo=; b=lMhLmOLx1jGahK7YTTfZXx/lf5mt14xbxUwoJkmjXDZHbhW0kj4mPyQbMAzYvY394r idiL2tcyy/7P6wmN3cveSXFI6AkoZoJnjxg9P679st73B9R9vdSy/yUEvtemsMdKdejK j/7MNBYCvqPxoitmj2tOlfcJ0oKkepiWPPzA8+jxG9LGEiQGvAvy6o8oxoOhbkzlNv+i m807ExAHe4ANi9x50Ndnd8GYmif9M3h2hde4xmwt8Uo75ViXLyvkD45IDvcoIdcLg6Ib Q1/m6qpz/hUFfNRxCBSWW8QD4OTIpNYpSds+Z4K0hsDiwcLZZUJCUneIbgbt815gmcdI uD+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PTO18LU5; spf=pass (google.com: domain of mptcp+bounces-4718-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4718-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id l16-20020a17090a599000b001cb91d2108fsi3255791pji.117.2022.04.11.03.40.33 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Apr 2022 03:40:33 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4718-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PTO18LU5; spf=pass (google.com: domain of mptcp+bounces-4718-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4718-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.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 sjc.edge.kernel.org (Postfix) with ESMTPS id D18593E0F29 for ; Mon, 11 Apr 2022 10:40:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7EF9B1840; Mon, 11 Apr 2022 10:40:29 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 08BE51844 for ; Mon, 11 Apr 2022 10:40:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1649673626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PpDc4gVMBDRc+/UUbohG0qL7+IGhwbwPzENfYTvKhmo=; b=PTO18LU50Jo6CKKceOLEq1K+TYKZb+qWjo/0xryr6Dwbkn7PiTdZCfqZ8KcUBioPb048aN MeaigL0FoyamAtzcABXKmhm0rzQLHMIfmLXM2fbsBIUcNCCw/nNdRIqRXqYhsEF4F5RLgJ 98WGXngZJyUhrSys3aemAK0sAF+vKxo= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-424-cqfo8of6Oiipd-U1vfwPbw-1; Mon, 11 Apr 2022 06:40:26 -0400 X-MC-Unique: cqfo8of6Oiipd-U1vfwPbw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5454805F7C for ; Mon, 11 Apr 2022 10:40:25 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.193.187]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5529040E80E0 for ; Mon, 11 Apr 2022 10:40:25 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [RFC PATCH 4/4] mptcp: add more offered MIBs counter. Date: Mon, 11 Apr 2022 12:40:05 +0200 Message-Id: <66a6c06373c3905d5b0ecf4fc082cc3750f5479b.1649672265.git.pabeni@redhat.com> In-Reply-To: References: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.2 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8"; x-default="true" Track the exceptional handling of MPTCP-level offered window with a few more counters for observability. Signed-off-by: Paolo Abeni --- 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..e05428838005 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 another subflow while updating= msk rcv wnd */ __MPTCP_MIB_MAX }; =20 diff --git a/net/mptcp/options.c b/net/mptcp/options.c index ffc0292da041..dc84f39ff9f9 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -1249,8 +1249,11 @@ static void mptcp_set_rwin(struct tcp_sock *tp, void= *opt) =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; @@ -1278,6 +1281,7 @@ static void mptcp_set_rwin(struct tcp_sock *tp, void = *opt) /* 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.35.1