From nobody Sun Feb 8 17:13:18 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ac4:a898:0:b0:4b1:af33:c52d with SMTP id z24csp151235pid; Fri, 15 Apr 2022 07:49:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxzsA9ewIF8H26571v4wCscQYPwTarsQ1SvDKx2ov+Rz5JIvwX/0tAr6ZG8mTu6IjnTpML9 X-Received: by 2002:a05:622a:1f0c:b0:2ed:1211:364 with SMTP id ca12-20020a05622a1f0c00b002ed12110364mr5524485qtb.390.1650034143703; Fri, 15 Apr 2022 07:49:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1650034143; cv=none; d=google.com; s=arc-20160816; b=i/XWbZBgUJH4L8+ufqIfpyTYKuCBErVccWEt3MYQA9/gC0Mt3MpdxskJOKx62yraQg c222isdAJaF2hDHBChTcBIIqq0CEHc43rOjxhepJTd4Pdyw6rHDEFNbSRbfKh3J9zmd6 bNv+mBFVwIonfcN6BsQRJ8tKn+MA5WzQ580dUtsS0vFUyOiFOX7LEkVvKvvo3RbV0db0 mGxw9VBeb45orKvFi1Xeb6Y2+oZqqmmX7J92VN/8ohSPCa4Y6EyqpN/bg7q8XK/4eqCy RHCahPvAYrlayYh0Iu+bYnrr4zjSnz+ES0hv7rJmgvdriIW5cdNZRWoj1B8evdVF9jP7 yx2g== 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=oErkHFvEncO7PQBlF7qExGGFgc38OhMtDhkX/b7xgEo=; b=DkqYWQAsNj/fUaDaJXLdonom9V/vo53RSCSbEEemi2RwdNIC4xSQJbILe53dV171ht as2yJJWpwU0SM4IIZJ4rZgS9XcNz/LTPJmArgL1vjHnKKuDLZ6bBIOhwBJH7ICIdyJdv K2f63uQCMmsGlSokree+tKsFRy0Hib1IevF8Ya58D595k7AB3OzvmtwRA/Kmb+8hhjxg AA6j5y4TLe22l8Ff7Te7iDHcTly1xkClHSznFzCYqS1a9ymI0QRCCYcmwJufZw4bHyno zkr/QKolCJSumkUUEDslyj6YiYMq3fL6zgBevAF70ueFo1hSHMU1ZsV8M04hJ7rGdGTw f8Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NKjrsqbK; spf=pass (google.com: domain of mptcp+bounces-4758-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4758-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from ewr.edge.kernel.org (ewr.edge.kernel.org. [2604:1380:1:3600::1]) by mx.google.com with ESMTPS id gw12-20020a0562140f0c00b00444515042b7si595305qvb.309.2022.04.15.07.49.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Apr 2022 07:49:03 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-4758-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) client-ip=2604:1380:1:3600::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=NKjrsqbK; spf=pass (google.com: domain of mptcp+bounces-4758-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1:3600::1 as permitted sender) smtp.mailfrom="mptcp+bounces-4758-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 ewr.edge.kernel.org (Postfix) with ESMTPS id 62F971C0F2C for ; Fri, 15 Apr 2022 14:49:03 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6B5C033C5; Fri, 15 Apr 2022 14:48:59 +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 12E0C33C2 for ; Fri, 15 Apr 2022 14:48:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1650034137; 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=oErkHFvEncO7PQBlF7qExGGFgc38OhMtDhkX/b7xgEo=; b=NKjrsqbK03BH/Tmih4axgPEOVgPKSizX650nHtOfwix5QvFn8XcFfeaIoSEUwPdrxzAWfJ eqaEYeW/Zkf1dy6HkMYCW4uZsG9JY/k1+un5c55kLv45SY+EXjkoqzQFhN0GBUCfmFDN4O /CEC3+EBl0KlJoBc+Npae+m17yT4Ke0= 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-590-oYUkKz0AM6uGdPZyFKP-vA-1; Fri, 15 Apr 2022 10:48:55 -0400 X-MC-Unique: oYUkKz0AM6uGdPZyFKP-vA-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 9F0D9802803 for ; Fri, 15 Apr 2022 14:48:55 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.192.179]) by smtp.corp.redhat.com (Postfix) with ESMTP id 36B7B440AAA for ; Fri, 15 Apr 2022 14:48:55 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH net-next 5/5] mptcp: add more offered MIBs counter. Date: Fri, 15 Apr 2022 16:48:48 +0200 Message-Id: <43cbe1db36c118468bc6e88ced16079d05f30643.1650034062.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.85 on 10.11.54.9 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..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 9c76a171af1e..559ff6ca6e66 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.35.1