From nobody Thu Apr 18 08:05:15 2024 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 268091EA09 for ; Thu, 10 Nov 2022 23:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668122611; x=1699658611; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=08INuczsVucp5wVRZ+rv6X4otGbIrUIqPbdYPU3peQ4=; b=kwendT/jTdTq7iV1vdt5WcVJve85FKaapotpzoA850ACWWMH5SwPQ4T2 kbvG/5wAC2KKbJgkqWW1yhY2WOAo+NgcCW0uwrfz/T2ObvjCfQGZRfgJR jv1G4MUHUBBBWZfrT40ClyHfEvLOnOV5QS0i9/llkHbxwKUpzJDOZG98m svmT5EMrajo0MX3Miie5i08OjjTMtBgqHFTMfIAlq8hyxMbXkqQwcE/Wq eCWBDbo39Ge8pmSUq7fOvaZ1yWOnfz+kUnUFf8KWHCO0yOzt6gcPsp90X xxxWan3Ejcy/MZ999vyL46TdPD39I3XFzXk+6tfrzPQCR3iLhS/CHBEB9 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373594069" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373594069" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="637367369" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="637367369" Received: from jsandova-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.81.89]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 1/5] mptcp: use msk instead of mptcp_sk Date: Thu, 10 Nov 2022 15:23:18 -0800 Message-Id: <20221110232322.125068-2-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110232322.125068-1-mathew.j.martineau@linux.intel.com> References: <20221110232322.125068-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: Geliang Tang Use msk instead of mptcp_sk(sk) in the functions where the variable "msk =3D mptcp_sk(sk)" has been defined. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 109eea2c65ff..64d7070de901 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1625,7 +1625,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) * check for a different subflow usage only after * spooling the first chunk of data */ - xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(mptcp_sk(sk)); + xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); if (!xmit_ssk) goto out; if (xmit_ssk !=3D ssk) { @@ -2275,7 +2275,7 @@ bool __mptcp_retransmit_pending_data(struct sock *sk) struct mptcp_data_frag *cur, *rtx_head; struct mptcp_sock *msk =3D mptcp_sk(sk); =20 - if (__mptcp_check_fallback(mptcp_sk(sk))) + if (__mptcp_check_fallback(msk)) return false; =20 if (tcp_rtx_and_write_queues_empty(sk)) @@ -2949,7 +2949,7 @@ bool __mptcp_close(struct sock *sk, long timeout) =20 sock_hold(sk); pr_debug("msk=3D%p state=3D%d", sk, sk->sk_state); - if (mptcp_sk(sk)->token) + if (msk->token) mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL); =20 if (sk->sk_state =3D=3D TCP_CLOSE) { @@ -3008,8 +3008,8 @@ static int mptcp_disconnect(struct sock *sk, int flag= s) mptcp_stop_timer(sk); sk_stop_timer(sk, &sk->sk_timer); =20 - if (mptcp_sk(sk)->token) - mptcp_event(MPTCP_EVENT_CLOSED, mptcp_sk(sk), NULL, GFP_KERNEL); + if (msk->token) + mptcp_event(MPTCP_EVENT_CLOSED, msk, NULL, GFP_KERNEL); =20 /* msk->subflow is still intact, the following will not free the first * subflow --=20 2.38.1 From nobody Thu Apr 18 08:05:15 2024 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 76F651E9F8 for ; Thu, 10 Nov 2022 23:23:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668122611; x=1699658611; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cNGnY0VU4qbhgNQGwKKP6KBBS84YJ9VSkme6zv3AmPs=; b=DsWzg8cqjFewnA2kmBVsAX8y8drBzdJE7mhCmChXRKwAvQ6ecXqMvy/j eJO7Xalfx74Y+waa+tHkSxI9KkhBdWalZFtFPghBNt+cHwtv+bbGEDudK mdq5YGEJZnC8tWZhh9PE6fetxspu4EvXkszrq4jgBrRXhMy2Etqzw277o c35kEJFRiV+esD3QkgoLpJOSyXNruymljJkFw+m0zPvLXfV1hgPru4wAw YLUQ8ZMgK7MVpqaVrT+jGgSYWve+XsYbTWPzSSg37mBa0l5tO4Rh6LVo9 2RSjoEiQ8rXS1ItT+HwhAptB1ABvA0zgKdgSMM1o5tmmiYKqsYix00OhW A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373594071" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373594071" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="637367371" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="637367371" Received: from jsandova-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.81.89]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 2/5] mptcp: change 'first' as a parameter Date: Thu, 10 Nov 2022 15:23:19 -0800 Message-Id: <20221110232322.125068-3-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110232322.125068-1-mathew.j.martineau@linux.intel.com> References: <20221110232322.125068-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: Geliang Tang The function mptcp_subflow_process_delegated() uses the input ssk first, while __mptcp_check_push() invokes the packet scheduler first. So this patch adds a new parameter named 'first' for the function __mptcp_subflow_push_pending() to deal with these two cases separately. With this change, the code that invokes the packet scheduler in the function __mptcp_check_push() can be removed, and replaced by invoking __mptcp_subflow_push_pending() directly. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/protocol.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 64d7070de901..5a344788f843 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -1602,7 +1602,7 @@ void __mptcp_push_pending(struct sock *sk, unsigned i= nt flags) __mptcp_check_send_data_fin(sk); } =20 -static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk) +static void __mptcp_subflow_push_pending(struct sock *sk, struct sock *ssk= , bool first) { struct mptcp_sock *msk =3D mptcp_sk(sk); struct mptcp_sendmsg_info info =3D { @@ -1611,7 +1611,6 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) struct mptcp_data_frag *dfrag; struct sock *xmit_ssk; int len, copied =3D 0; - bool first =3D true; =20 info.flags =3D 0; while ((dfrag =3D mptcp_send_head(sk))) { @@ -1621,8 +1620,7 @@ static void __mptcp_subflow_push_pending(struct sock = *sk, struct sock *ssk) while (len > 0) { int ret =3D 0; =20 - /* the caller already invoked the packet scheduler, - * check for a different subflow usage only after + /* check for a different subflow usage only after * spooling the first chunk of data */ xmit_ssk =3D first ? ssk : mptcp_subflow_get_send(msk); @@ -3220,16 +3218,10 @@ void __mptcp_check_push(struct sock *sk, struct soc= k *ssk) if (!mptcp_send_head(sk)) return; =20 - if (!sock_owned_by_user(sk)) { - struct sock *xmit_ssk =3D mptcp_subflow_get_send(mptcp_sk(sk)); - - if (xmit_ssk =3D=3D ssk) - __mptcp_subflow_push_pending(sk, ssk); - else if (xmit_ssk) - mptcp_subflow_delegate(mptcp_subflow_ctx(xmit_ssk), MPTCP_DELEGATE_SEND= ); - } else { + if (!sock_owned_by_user(sk)) + __mptcp_subflow_push_pending(sk, ssk, false); + else __set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags); - } } =20 #define MPTCP_FLAGS_PROCESS_CTX_NEED (BIT(MPTCP_PUSH_PENDING) | \ @@ -3320,7 +3312,7 @@ void mptcp_subflow_process_delegated(struct sock *ssk) if (test_bit(MPTCP_DELEGATE_SEND, &subflow->delegated_status)) { mptcp_data_lock(sk); if (!sock_owned_by_user(sk)) - __mptcp_subflow_push_pending(sk, ssk); + __mptcp_subflow_push_pending(sk, ssk, true); else __set_bit(MPTCP_PUSH_PENDING, &mptcp_sk(sk)->cb_flags); mptcp_data_unlock(sk); --=20 2.38.1 From nobody Thu Apr 18 08:05:15 2024 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 B4E7A1EA09 for ; Thu, 10 Nov 2022 23:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668122612; x=1699658612; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=dkHFHct5jmMR29HfWsBOmJdLyB9m7Wj7O5Y3w3dZj3Y=; b=Z1UGHSzEAQd1oI0SJOsY0UpSEF6Q+bx1XM0Bu3IYE4PldQUw8i9m7Tr5 m/XhERsjtohaAHfKqNPri0X4oP9ANSYfrfMew5oe0f8liyerVx6E0B3dx Ov+bpRVvqehYQFMFXJOsbeXc17Zcm3nccx9ycLU1d4fLwCmv6DMuyt7h0 LhJFrOe7EItXf/8zmHDYLmAAsluZK0fDkcIdXCf/DgM48+vl3Lm8aETMz T2mgROhvL0Pb/AFm2tNYdTJ0EZLMdJllSC3VcctLO32FhEXeM97Jh+W+N yvhJnQ8AT/8hfeU+j/79jc3snd3kenHTj6k+dSs3rrN/fc59cQWAT59ac A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373594074" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373594074" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="637367373" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="637367373" Received: from jsandova-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.81.89]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 3/5] mptcp: get sk from msk directly Date: Thu, 10 Nov 2022 15:23:20 -0800 Message-Id: <20221110232322.125068-4-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110232322.125068-1-mathew.j.martineau@linux.intel.com> References: <20221110232322.125068-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: Geliang Tang Use '(struct sock *)msk' to get 'sk' from 'msk' in a more direct way instead of using '&msk->sk.icsk_inet.sk'. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- net/mptcp/pm_userspace.c | 4 ++-- net/mptcp/protocol.c | 4 ++-- net/mptcp/sockopt.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/net/mptcp/pm_userspace.c b/net/mptcp/pm_userspace.c index 9e82250cbb70..5cb65f0928f4 100644 --- a/net/mptcp/pm_userspace.c +++ b/net/mptcp/pm_userspace.c @@ -291,7 +291,7 @@ int mptcp_nl_cmd_sf_create(struct sk_buff *skb, struct = genl_info *info) goto create_err; } =20 - sk =3D &msk->sk.icsk_inet.sk; + sk =3D (struct sock *)msk; lock_sock(sk); =20 err =3D __mptcp_subflow_connect(sk, &addr_l, &addr_r); @@ -403,7 +403,7 @@ int mptcp_nl_cmd_sf_destroy(struct sk_buff *skb, struct= genl_info *info) goto destroy_err; } =20 - sk =3D &msk->sk.icsk_inet.sk; + sk =3D (struct sock *)msk; lock_sock(sk); ssk =3D mptcp_nl_find_ssk(msk, &addr_l, &addr_r); if (ssk) { diff --git a/net/mptcp/protocol.c b/net/mptcp/protocol.c index 5a344788f843..3796d1bfef6b 100644 --- a/net/mptcp/protocol.c +++ b/net/mptcp/protocol.c @@ -2454,7 +2454,7 @@ static bool mptcp_check_close_timeout(const struct so= ck *sk) static void mptcp_check_fastclose(struct mptcp_sock *msk) { struct mptcp_subflow_context *subflow, *tmp; - struct sock *sk =3D &msk->sk.icsk_inet.sk; + struct sock *sk =3D (struct sock *)msk; =20 if (likely(!READ_ONCE(msk->rcv_fastclose))) return; @@ -2616,7 +2616,7 @@ static void mptcp_do_fastclose(struct sock *sk) static void mptcp_worker(struct work_struct *work) { struct mptcp_sock *msk =3D container_of(work, struct mptcp_sock, work); - struct sock *sk =3D &msk->sk.icsk_inet.sk; + struct sock *sk =3D (struct sock *)msk; unsigned long fail_tout; int state; =20 diff --git a/net/mptcp/sockopt.c b/net/mptcp/sockopt.c index f85e9bbfe86f..f62f6483ef77 100644 --- a/net/mptcp/sockopt.c +++ b/net/mptcp/sockopt.c @@ -987,7 +987,7 @@ static int mptcp_getsockopt_tcpinfo(struct mptcp_sock *= msk, char __user *optval, int __user *optlen) { struct mptcp_subflow_context *subflow; - struct sock *sk =3D &msk->sk.icsk_inet.sk; + struct sock *sk =3D (struct sock *)msk; unsigned int sfcount =3D 0, copied =3D 0; struct mptcp_subflow_data sfd; char __user *infoptr; @@ -1078,8 +1078,8 @@ static void mptcp_get_sub_addrs(const struct sock *sk= , struct mptcp_subflow_addr static int mptcp_getsockopt_subflow_addrs(struct mptcp_sock *msk, char __u= ser *optval, int __user *optlen) { - struct sock *sk =3D &msk->sk.icsk_inet.sk; struct mptcp_subflow_context *subflow; + struct sock *sk =3D (struct sock *)msk; unsigned int sfcount =3D 0, copied =3D 0; struct mptcp_subflow_data sfd; char __user *addrptr; --=20 2.38.1 From nobody Thu Apr 18 08:05:15 2024 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 E78681E9F8 for ; Thu, 10 Nov 2022 23:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668122612; x=1699658612; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=K5WFNYmzwEU6n6c2Iik7W5YdAFUW2w/26+1Z+wYlPJk=; b=lmLyQhaOPDHVV/5e2cqjGLdw1S2l5oda60chEQJArj2c2jF2QGIU9hxn l75RCDf0sheD1R6WoVZRorE9AInSyjbxY+nZk0GH7n/WeppWkl288o5+v akdgBZoGKnH342DrdEEwsntRH6FvdGRdWk2CHwDRsOR6VDZNYEmz3+zB6 BH2mlDG8wmqKm3pdRc5qdE5zBbdwNOkadAfQYs9m8B49QH0l3Wb5KkU59 TydUANzIwqqt1Su34F6exaAyrsjz1TbzfhpHWf81oduMNEjZU935kK9K9 c0XoHME/VSWeMvEAzaFPgDm62ax6s4VcXMceI5HpmjSIR6cmXn1FOYkCW A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373594076" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373594076" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="637367375" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="637367375" Received: from jsandova-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.81.89]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Geliang Tang , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev, Mat Martineau Subject: [PATCH net-next 4/5] selftests: mptcp: use max_time instead of time Date: Thu, 10 Nov 2022 15:23:21 -0800 Message-Id: <20221110232322.125068-5-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110232322.125068-1-mathew.j.martineau@linux.intel.com> References: <20221110232322.125068-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: Geliang Tang 'time' is the local variable of run_test() function, while 'max_time' is the local variable of do_transfer() function. So in do_transfer(), $max_time should be used, not $time. Please note that here $time =3D=3D $max_time so the behaviour is not changed but the right variable is used. Reviewed-by: Mat Martineau Signed-off-by: Geliang Tang Signed-off-by: Mat Martineau --- tools/testing/selftests/net/mptcp/simult_flows.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/net/mptcp/simult_flows.sh b/tools/test= ing/selftests/net/mptcp/simult_flows.sh index ffa13a957a36..af70c14e0bf9 100755 --- a/tools/testing/selftests/net/mptcp/simult_flows.sh +++ b/tools/testing/selftests/net/mptcp/simult_flows.sh @@ -173,7 +173,7 @@ do_transfer() =20 timeout ${timeout_test} \ ip netns exec ${ns3} \ - ./mptcp_connect -jt ${timeout_poll} -l -p $port -T $time \ + ./mptcp_connect -jt ${timeout_poll} -l -p $port -T $max_time \ 0.0.0.0 < "$sin" > "$sout" & local spid=3D$! =20 @@ -181,7 +181,7 @@ do_transfer() =20 timeout ${timeout_test} \ ip netns exec ${ns1} \ - ./mptcp_connect -jt ${timeout_poll} -p $port -T $time \ + ./mptcp_connect -jt ${timeout_poll} -p $port -T $max_time \ 10.0.3.3 < "$cin" > "$cout" & local cpid=3D$! =20 --=20 2.38.1 From nobody Thu Apr 18 08:05:15 2024 Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) (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 D8CFE1EA0C for ; Thu, 10 Nov 2022 23:23:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668122612; x=1699658612; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=xvk3tuG4Q6CxP2j8xPqItoatn5Nmz7kyPpuaoZ8mcA8=; b=MP1fPmQjaeUiFTK3x7MCYCGHbsuDBQxCTU+G5tvTH3NdhEOCnqgnU905 wgi0ied6Nz4dNbiQjS2vdEY90WHmjSA9MDenG1GnmRqGm6mGW+MtKN/Vc STHTbzZfbeFQvm2phejbWty6MiMn4mzPUqZgmEAMyNsjTTKqPhqGPUhJc N3fPw2ymJv5jJmFClnA7KJHauPiY4XX9Cl0hNgq8WSyLcMh3saILRykOy BeDPaa5LihrYvV3D8gdq3PX7vMCXa1NC2DDyXywdu29J92aA2lImZKi6q ZRSvot7yyCUcM/EQ1dSpz1AftWv0y4TtyvWS5js9ybzekPkrOjFMbCUkG A==; X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="373594078" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="373594078" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10527"; a="637367376" X-IronPort-AV: E=Sophos;i="5.96,155,1665471600"; d="scan'208";a="637367376" Received: from jsandova-mobl1.amr.corp.intel.com (HELO mjmartin-desk2.intel.com) ([10.209.81.89]) by orsmga002-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Nov 2022 15:23:29 -0800 From: Mat Martineau To: netdev@vger.kernel.org Cc: Mat Martineau , davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, matthieu.baerts@tessares.net, mptcp@lists.linux.dev Subject: [PATCH net-next 5/5] mptcp: Fix grammar in a comment Date: Thu, 10 Nov 2022 15:23:22 -0800 Message-Id: <20221110232322.125068-6-mathew.j.martineau@linux.intel.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221110232322.125068-1-mathew.j.martineau@linux.intel.com> References: <20221110232322.125068-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" We kept getting initial patches from new contributors to remove a duplicate 'the' (since grammar checking scripts flag it), but submitters never followed up after code review. Reviewed-by: Matthieu Baerts Signed-off-by: Mat Martineau --- net/mptcp/token.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/mptcp/token.c b/net/mptcp/token.c index f52ee7b26aed..65430f314a68 100644 --- a/net/mptcp/token.c +++ b/net/mptcp/token.c @@ -287,8 +287,8 @@ EXPORT_SYMBOL_GPL(mptcp_token_get_sock); * This function returns the first mptcp connection structure found inside= the * token container starting from the specified position, or NULL. * - * On successful iteration, the iterator is move to the next position and = the - * the acquires a reference to the returned socket. + * On successful iteration, the iterator is moved to the next position and + * a reference to the returned socket is acquired. */ struct mptcp_sock *mptcp_token_iter_next(const struct net *net, long *s_sl= ot, long *s_num) --=20 2.38.1