From nobody Mon Feb 9 22:38:37 2026 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:ab0:32da:0:0:0:0:0 with SMTP id f26csp1632651uao; Tue, 6 Sep 2022 13:56:48 -0700 (PDT) X-Google-Smtp-Source: AA6agR6jqLSME1/TQQs/nV6HfUrKOmG4E8cBA5oCRCnMzQXAT/RKGyvOyk83LnhMq8i70WSw6DlD X-Received: by 2002:a05:6214:d04:b0:498:f0ed:fa0c with SMTP id 4-20020a0562140d0400b00498f0edfa0cmr136978qvh.104.1662497807934; Tue, 06 Sep 2022 13:56:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662497807; cv=none; d=google.com; s=arc-20160816; b=Ge9QvxNUN862KOMw+svgDHtgbiUaxIoqbNSQ1LtaSHohU3tBK7DwM+gNnKT6O9QjUE xglwCkN6aRmFmZGPA4oafuEy1riXKivz7zXIWtZij4wnSd2h79QW/rBmf02+mkKAEtZG j3zc38WaGXSMrWSDUd7YCtYORVA7a+nsABpzYQOpezO0ygW0m7BmD2oDz5Er0jJl87ib 4qD851gf1kRfo+QP1JhIcr2X/ZAxgjxqCKwdlwL7Jf/WZu5kLCZWD2S4EUX3WmnbfpOU 3JGmPIRjp0kNkMzP5YITTiDCXkqPk8BHwv1atUBWOumqFGPWDh6Xe11H7u6iDgfKZOT5 OC+Q== 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=Yl6+l6Tz5nZm4wkgL71pM9KuNzn5abHVXtmHe0YrRrQ=; b=JjqqQ6zdpzCyI0sjQ78fLkhY+UMhqTC29YUxpSKNbT7Nefusvu13GoTIt+t18b+k+q zD7QK+dzHd0dC8fFJYGDFeBzIjkB5aUdcTRJDdC1WSlsinabWOHxNxM3z56vn8jnOnaJ T134C9X1Qu4UILL1ZOozjpSlSlYc/drgZ6qi8pwuvgUuUESvUj97qsVwwgAMCOUqsPDn 1VGIr7yBmIlirkuM4mzFGjsAKNYbW6u+IjFQmV+enb3ovIQ/NSihPk1bUc/E7yqDqAX3 VnqOooxoCv0HCG97OJZ67NI4dNBGYtDPSBOGjHyPYTF98y5Yi6JgXLOdW9XY94VgV1g4 qmiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=Wsk6eP+i; spf=pass (google.com: domain of mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev" Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id m15-20020ac8688f000000b003445501b5c2si6701564qtq.382.2022.09.06.13.56.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Sep 2022 13:56:47 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@tessares.net header.s=google header.b=Wsk6eP+i; spf=pass (google.com: domain of mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 147.75.199.223 as permitted sender) smtp.mailfrom="mptcp+bounces-6202-wpasupplicant.patchew=gmail.com@lists.linux.dev" 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 ny.mirrors.kernel.org (Postfix) with ESMTPS id A08591C2083F for ; Tue, 6 Sep 2022 20:56:47 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6FD9086EB; Tue, 6 Sep 2022 20:56:46 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC24C29A5 for ; Tue, 6 Sep 2022 20:56:44 +0000 (UTC) Received: by mail-wr1-f42.google.com with SMTP id bj14so3976980wrb.12 for ; Tue, 06 Sep 2022 13:56:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tessares.net; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Yl6+l6Tz5nZm4wkgL71pM9KuNzn5abHVXtmHe0YrRrQ=; b=Wsk6eP+iYpej7PR3Z12QkHrVvOqdtkrqUS6r1jIHv/1OI454NV/w11aRkiYkHpjUpv 5cXZNQzHi8s5nAf2hTWOCxXkhLon7O514CL7Ea0+H01Z75AFt1mP7REKi9jQ/DCZ2ujn EufF9s7tb32bAqsfjRTmrtkiiZA9WQUKrK1PVmZ9MdkfAlsl6R2Hwr+3WR/nVCgGwKbI cUZTd7NNJe3vcog5Z3kPZuVr7wR+ImCV4B+ffjm7k0H1MLR4GCGezLeHzRdZ2pAIXxyG fnaBElVLxDMswzMVLxg6jlDtBR5d7RtM3LolxuFmP1dSpYzCPxb6Euwjt20o1ZhdPyyt w2tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Yl6+l6Tz5nZm4wkgL71pM9KuNzn5abHVXtmHe0YrRrQ=; b=owJQZOUW5TC5CtnNWPYVcHjbHemNIWNY051j7/bUk/ZRj7/7QwdAg8ixQmyCGOr1QD Cp7t/bYDWJfXajoNlCz6cQyc7ldeVtQILRPwIEbn2ltwEyNsfnGwsvi3qOKsaceJqVg3 b21Q0Z7fbe2HgDExJZTQMbd/7OUseemKOGyApYkVfEy+YkKkCmZwH0AEoE3xFTbJ7o5j zTmqR9w/Nfx61kQSjYlraSxf4I8+5kyoqq1T411q9czttLcxXIeZaNVFVVk6e8VwvJXp IYzZbqFnlLpwkb4/sjeOeoqw2YLdeVVIY63QXszjdr6ALVnPqMmA/canpUxaNTuUCZuL 5MMg== X-Gm-Message-State: ACgBeo0Wgu3JNYF0ID5kMTvFtq9+vIrts87nxWSuUPQE0A7znNCV6C8o iA9uLG0cGcxLVAy2iCVc3DGwEQ== X-Received: by 2002:adf:e508:0:b0:228:62fd:932b with SMTP id j8-20020adfe508000000b0022862fd932bmr172063wrm.410.1662497804186; Tue, 06 Sep 2022 13:56:44 -0700 (PDT) Received: from vdi08.nix.tessares.net (static.219.156.76.144.clients.your-server.de. [144.76.156.219]) by smtp.gmail.com with ESMTPSA id n24-20020a1c7218000000b003a317ee3036sm15735887wmc.2.2022.09.06.13.56.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Sep 2022 13:56:38 -0700 (PDT) From: Matthieu Baerts To: Mat Martineau , Matthieu Baerts , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Cc: Geliang Tang , netdev@vger.kernel.org, mptcp@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH net-next 3/5] mptcp: add do_check_data_fin to replace copied Date: Tue, 6 Sep 2022 22:55:41 +0200 Message-Id: <20220906205545.1623193-4-matthieu.baerts@tessares.net> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220906205545.1623193-1-matthieu.baerts@tessares.net> References: <20220906205545.1623193-1-matthieu.baerts@tessares.net> Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1570; i=matthieu.baerts@tessares.net; h=from:subject; bh=+g38Y+mWkUnFq5R25N4kk6AO7g0tjZvhLM1UE5s88uo=; b=owEBbQKS/ZANAwAIAfa3gk9CaaBzAcsmYgBjF7O526/+GZWT9lBKJnLQ/VE3wnDNU3rQklnMFTjr Pa+rFmCJAjMEAAEIAB0WIQToy4X3aHcFem4n93r2t4JPQmmgcwUCYxezuQAKCRD2t4JPQmmgc7aJD/ 493eZXF51bN99DL4y0aof8awj3f9U0k03ET0iUc+u6kQKiM+7RqelfEaugu4JnTcUIRiHf3IqCPGyT crKMnxwJpe37U0CfKX3AqRpdnCDHcxuj6T1Dj3Z6/n/pUwK3n5vQ2GAiIDNhs+5tLyBfPiEFXxlDX/ Sr+wQxmD/lfS8LI4LhW6pdXp8ZhZ7x5Dq8kA3hFzzAbkKN3bTPIs2lh3JfZmmB8czOt3rXx1LOOnBi woF4vcdJPOlI74D5Vi8yLeTehH9i0nrneyvvgIiCkUi0rLc+mslEmf2re/mrrtV8duIrObcg16hr8O c4WEUSTCNO0E0Icvm7B+EjDgQB2oGWjz78c7VgondZnqt4EpG/y6+fA4Q+b33gfL/9Zon/ANJU8XTU 1gd0Ohrgl5GFlE8MJ9UOyfB8XcaMdLoWmgWZu8haUmYpmxHHH/Qv7QrXjvcHYhyE6SLmQxBxsiy5T1 P/9bh6CRk6AA/W2obIm7JyzqB7WLdL/Czq3B/7crOhenilNM0v9VWfZWhOB5dbCH9Md3wLg34uBOlm LEYAubzcel7PUx60+yXNiU1pUZI0LkpPja4/5vwxfbOTuf8V0sel0L19jlkCSmc/GArmsUyXOfCpA8 K4pULk5mS9c/IRGmonP8qGTiyM2o5Zn3KshQQPEbphLfGQ1NDUbV9qTfdh4g== X-Developer-Key: i=matthieu.baerts@tessares.net; a=openpgp; fpr=E8CB85F76877057A6E27F77AF6B7824F4269A073 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Geliang Tang This patch adds a new bool variable 'do_check_data_fin' to replace the original int variable 'copied' in __mptcp_push_pending(), check it to determine whether to call __mptcp_check_send_data_fin(). Suggested-by: Mat Martineau Signed-off-by: Geliang Tang Reviewed-by: Matthieu Baerts Signed-off-by: Matthieu Baerts --- net/mptcp/protocol.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index fc782d693eaf..47931f6cf387 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1538,8 +1538,9 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) struct mptcp_sendmsg_info info =3D { .flags =3D flags, }; + bool do_check_data_fin =3D false; struct mptcp_data_frag *dfrag; - int len, copied =3D 0; + int len; =20 while ((dfrag =3D mptcp_send_head(sk))) { info.sent =3D dfrag->already_sent; @@ -1574,8 +1575,8 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) goto out; } =20 + do_check_data_fin =3D true; info.sent +=3D ret; - copied +=3D ret; len -=3D ret; =20 mptcp_update_post_push(msk, dfrag, ret); @@ -1591,7 +1592,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) /* ensure the rtx timer is running */ if (!mptcp_timer_pending(sk)) mptcp_reset_timer(sk); - if (copied) + if (do_check_data_fin) __mptcp_check_send_data_fin(sk); } =20 --=20 2.37.2