[MPTCP][PATCH mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

[MPTCP][PATCH mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

[Geliang Tang]

Drop the csum_replace2 trunk as Mat suggested.

mptcp_make_csum() hasn't been called yet so the pseudoheader has not been
included in the checksum.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
Apply the patch (Squash to "mptcp: generate the data checksum") first.
---
 net/mptcp/options.c | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index cce90c16e47d..6b737ba1f941 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -547,11 +547,6 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow,
 		 */
 		ext->data_fin = 1;
 		ext->data_len++;
-
-		/* the pseudo header has changed, update the csum accordingly */
-		if (ext->csum_reqd)
-			csum_replace2(&ext->csum, htons(ext->data_len - 1),
-				      htons(ext->data_len));
 	}
 }
 
-- 
2.31.1

Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

[Mat Martineau]

On Wed, 12 May 2021, Geliang Tang wrote:

> Drop the csum_replace2 trunk as Mat suggested.
>
> mptcp_make_csum() hasn't been called yet so the pseudoheader has not been
> included in the checksum.
>
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>
> ---
> Apply the patch (Squash to "mptcp: generate the data checksum") first.
> ---
> net/mptcp/options.c | 5 -----
> 1 file changed, 5 deletions(-)

Thanks Geliang.

Matthieu, all the pending squash-to patches from Geliang are ok to merge.


-Mat


>
> diff --git a/net/mptcp/options.c b/net/mptcp/options.c
> index cce90c16e47d..6b737ba1f941 100644
> --- a/net/mptcp/options.c
> +++ b/net/mptcp/options.c
> @@ -547,11 +547,6 @@ static void mptcp_write_data_fin(struct mptcp_subflow_context *subflow,
> 		 */
> 		ext->data_fin = 1;
> 		ext->data_len++;
> -
> -		/* the pseudo header has changed, update the csum accordingly */
> -		if (ext->csum_reqd)
> -			csum_replace2(&ext->csum, htons(ext->data_len - 1),
> -				      htons(ext->data_len));
> 	}
> }
>
> -- 
> 2.31.1
>
>
>

--
Mat Martineau
Intel

Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

[Matthieu Baerts]

Hi Geliang, Mat,

On 12/05/2021 06:16, Geliang Tang wrote:
> Drop the csum_replace2 trunk as Mat suggested.
> 
> mptcp_make_csum() hasn't been called yet so the pseudoheader has not been
> included in the checksum.
> 
> Signed-off-by: Geliang Tang <geliangtang@gmail.com>

Thank you for the patch and the review!

Now in our tree:

- 54133a0eca73: "squashed" in "mptcp: receive checksum for MP_CAPABLE
with data"
- 54133a0eca73: Squash to "mptcp: receive checksum for MP_CAPABLE with data"
- Results: f8de7f4600ea..655ba588ab88

Builds and tests are now in progress:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210513T074617
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210513T074617

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

Re: [MPTCP][PATCH mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

[Matthieu Baerts]

Hi Geliang,

On 07/05/2021 04:42, Geliang Tang wrote:
> Drop useless braces '{}'.

Good catch!

(I thought CheckPatch was looking at that)

- 020b96ad5730: "squashed" in "mptcp: receive checksum for MP_CAPABLE
with data"

Builds and tests are now queued:

https://cirrus-ci.com/github/multipath-tcp/mptcp_net-next/export/20210507T155221
https://github.com/multipath-tcp/mptcp_net-next/actions/workflows/build-validation.yml?query=branch:export/20210507T155221

Cheers,
Matt
-- 
Tessares | Belgium | Hybrid Access Solutions
www.tessares.net

[MPTCP][PATCH mptcp-next] Squash to "mptcp: receive checksum for MP_CAPABLE with data"

[Geliang Tang]

Drop useless braces '{}'.

Signed-off-by: Geliang Tang <geliangtang@gmail.com>
---
 net/mptcp/options.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net/mptcp/options.c b/net/mptcp/options.c
index 5424fa6326ff..cce90c16e47d 100644
--- a/net/mptcp/options.c
+++ b/net/mptcp/options.c
@@ -34,11 +34,10 @@ static void mptcp_parse_option(const struct sk_buff *skb,
 	case MPTCPOPT_MP_CAPABLE:
 		/* strict size checking */
 		if (!(TCP_SKB_CB(skb)->tcp_flags & TCPHDR_SYN)) {
-			if (skb->len > tcp_hdr(skb)->doff << 2) {
+			if (skb->len > tcp_hdr(skb)->doff << 2)
 				expected_opsize = TCPOLEN_MPTCP_MPC_ACK_DATA;
-			} else {
+			else
 				expected_opsize = TCPOLEN_MPTCP_MPC_ACK;
-			}
 		} else {
 			if (TCP_SKB_CB(skb)->tcp_flags & TCPHDR_ACK)
 				expected_opsize = TCPOLEN_MPTCP_MPC_SYNACK;
-- 
2.31.1