From nobody Thu Sep 18 08:16:31 2025 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:35eb:0:0:0:0:0 with SMTP id w11csp2243048uau; Mon, 27 Jun 2022 18:02:54 -0700 (PDT) X-Google-Smtp-Source: AGRyM1shCWLxnDbEN/dIN8HjXwNqzOWCMNO1vl1cFpPGsnoqwpAdfBCQ6MM0MXzl/U0YWvOveyLF X-Received: by 2002:a17:903:2488:b0:163:b2c0:7efe with SMTP id p8-20020a170903248800b00163b2c07efemr2308189plw.164.1656378174607; Mon, 27 Jun 2022 18:02:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656378174; cv=none; d=google.com; s=arc-20160816; b=RfJHNPXltfiixpbS4Xv1qzsYsXP9jsR9nCjo/XOaqn9l2+CAsQld9/a6+5Sx+A3RIf VcElPLdGIDjjuVfsM7i/8/LCoJPDUrHWCBwzkgpJMK8k842+E+DN4F/38g+kXLg5iv09 E0aKoNW2J+csSm5+E++zWbQR4b0dPyOimDbRbuyVE0CQ9TyZcWTR95JVH3eyVHDfd+sx lLP5gtflIGzBxv7GPO2/Wn/T+lGadUNDq64KDvCRWeqeHUh83Ere/lcGrBPDqEAci4wb E8/CMGfZYRH0pxuiPtTJ5knVAF3AcWiL8GlKlT710noEgKWQtSwu+hJQXxfTivgAaxxa pNig== 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=TaYGB59fhrkfNkHXsKJvNHFTse+NbpgU5um2o+mAioU=; b=iYdXMsLu1F079ePcvmyO7Syv0oyY89SPKu9yDXcf0ZQHLuAmk41C3rJ6BYS6ne/Wgt aFqiC7aASt0UETdCghi8eDUobcQiPs0eq1GisYSG2Ub1jueGMBvM7v5lmiYwjccT1XeJ /l/bZoSJU5u8v+nMoUbbmnM/biYgIrdIq+obU7DjEGhDlZ+F0gsy9Mm1OXn/3f3wwbAI 0bSThYjiKPVw63Pbp5zpSSE9cX0FqoaI3JMWTxIX21BhSIlIwJ4Dpcrcr4ach1FZBwFv rRKfhWk/cssKBjuNjMXn89QzqvxBEjxQyH5Qr1Uwgfjixv0o4NQC0srrK6RXklOjs3Hd x/uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=CZm0bzY4; spf=pass (google.com: domain of mptcp+bounces-5849-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5849-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 k13-20020a170902c40d00b0016a417b06c9si18423715plk.591.2022.06.27.18.02.54 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 27 Jun 2022 18:02:54 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-5849-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=CZm0bzY4; spf=pass (google.com: domain of mptcp+bounces-5849-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 139.178.88.99 as permitted sender) smtp.mailfrom="mptcp+bounces-5849-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 5B3BA280C34 for ; Tue, 28 Jun 2022 01:02:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 80923374; Tue, 28 Jun 2022 01:02:52 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 36779370 for ; Tue, 28 Jun 2022 01:02:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1656378171; x=1687914171; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5hf/zUwtyP1xs7psY5r6yP8mmqKKeCfRL8bQ2qhiE1Q=; b=CZm0bzY4/xiYhsSq2G98mTn9oYC/YNIOOVaU0llS/XPmRltDqE189Uyw CN6aQTdBERhEELZJfsjRX5gtIaf9pU+kBd6om7+uIKacM8mK9XF84b1tC y8hfzEmIvaO1rCgx+nVIGxRZyrVjTpMJIkWeoRC5lWoRuXdXqI8HNcOM5 0uiIkLRsFFxQ9wjuIPgWM+fO8dZHQmQiR1cYC3Xy8EmHnZIHsLgDAF3D6 4emPBMTDJCN9XkeZwLZR4rpG6oCeBnGZ4+8bY1BCcsMbE5dAPlz2d7QAg 9WgH/rYLyQLtm11XMyOa1ew4D7tJXanU0zyJ3xurQ94hCahcWsxsfiti1 A==; X-IronPort-AV: E=McAfee;i="6400,9594,10391"; a="270347712" X-IronPort-AV: E=Sophos;i="5.92,227,1650956400"; d="scan'208";a="270347712" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2022 18:02:49 -0700 X-IronPort-AV: E=Sophos;i="5.92,227,1650956400"; d="scan'208";a="692867361" Received: from cgarner-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.251.0.217]) by fmsmga002-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Jun 2022 18:02:49 -0700 From: Mat Martineau To: netdev@vger.kernel.org Cc: Paolo Abeni , davem@davemloft.net, kuba@kernel.org, edumazet@google.com, fw@strlen.de, geliang.tang@suse.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net 1/9] mptcp: fix error mibs accounting Date: Mon, 27 Jun 2022 18:02:35 -0700 Message-Id: <20220628010243.166605-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220628010243.166605-1-mathew.j.martineau@linux.intel.com> References: <20220628010243.166605-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 The current accounting for MP_FAIL and FASTCLOSE is not very accurate: both can be increased even when the related option is not really sent. Move the accounting into the correct place. Fixes: eb7f33654dc1 ("mptcp: add the mibs for MP_FAIL") Fixes: 1e75629cb964 ("mptcp: add the mibs for MP_FASTCLOSE") Signed-off-by: Paolo Abeni Signed-off-by: Mat Martineau --- net/mptcp/options.c | 5 +++-- net/mptcp/pm.c | 1 - net/mptcp/subflow.c | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/net/mptcp/options.c b/net/mptcp/options.c index be3b918a6d15..2a6351d55a7d 100644 --- a/net/mptcp/options.c +++ b/net/mptcp/options.c @@ -765,6 +765,7 @@ static noinline bool mptcp_established_options_rst(stru= ct sock *sk, struct sk_bu opts->suboptions |=3D OPTION_MPTCP_RST; opts->reset_transient =3D subflow->reset_transient; opts->reset_reason =3D subflow->reset_reason; + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX); =20 return true; } @@ -788,6 +789,7 @@ static bool mptcp_established_options_fastclose(struct = sock *sk, opts->rcvr_key =3D msk->remote_key; =20 pr_debug("FASTCLOSE key=3D%llu", opts->rcvr_key); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); return true; } =20 @@ -809,6 +811,7 @@ static bool mptcp_established_options_mp_fail(struct so= ck *sk, opts->fail_seq =3D subflow->map_seq; =20 pr_debug("MP_FAIL fail_seq=3D%llu", opts->fail_seq); + MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); =20 return true; } @@ -833,13 +836,11 @@ bool mptcp_established_options(struct sock *sk, struc= t sk_buff *skb, mptcp_established_options_mp_fail(sk, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFASTCLOSETX); } /* MP_RST can be used with MP_FASTCLOSE and MP_FAIL if there is room */ if (mptcp_established_options_rst(sk, skb, &opt_size, remaining, opts)) { *size +=3D opt_size; remaining -=3D opt_size; - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPRSTTX); } return true; } diff --git a/net/mptcp/pm.c b/net/mptcp/pm.c index 59a85220edc9..91a62b598de4 100644 --- a/net/mptcp/pm.c +++ b/net/mptcp/pm.c @@ -310,7 +310,6 @@ void mptcp_pm_mp_fail_received(struct sock *sk, u64 fai= l_seq) pr_debug("send MP_FAIL response and infinite map"); =20 subflow->send_mp_fail =3D 1; - MPTCP_INC_STATS(sock_net(sk), MPTCP_MIB_MPFAILTX); subflow->send_infinite_map =3D 1; } else if (!sock_flag(sk, SOCK_DEAD)) { pr_debug("MP_FAIL response received"); diff --git a/net/mptcp/subflow.c b/net/mptcp/subflow.c index 8841e8cd9ad8..50ad19adc003 100644 --- a/net/mptcp/subflow.c +++ b/net/mptcp/subflow.c @@ -958,10 +958,8 @@ static enum mapping_status validate_data_csum(struct s= ock *ssk, struct sk_buff * subflow->map_data_csum); if (unlikely(csum)) { MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_DATACSUMERR); - if (subflow->mp_join || subflow->valid_csum_seen) { + if (subflow->mp_join || subflow->valid_csum_seen) subflow->send_mp_fail =3D 1; - MPTCP_INC_STATS(sock_net(ssk), MPTCP_MIB_MPFAILTX); - } return subflow->mp_join ? MAPPING_INVALID : MAPPING_DUMMY; } =20 --=20 2.37.0