Commit c5b39e26 authored by Geliang Tang's avatar Geliang Tang Committed by David S. Miller
Browse files

mptcp: send out checksum for DSS 



In mptcp_write_options, if the checksum is enabled, adjust the option
length and send out the data checksum with DSS suboption.

Co-developed-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarGeliang Tang <geliangtang@gmail.com>
Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c94b1f96

net/mptcp/options.c

+21 −7
Original line number Diff line number Diff line
@@ -478,6 +478,9 @@ static bool mptcp_established_options_mp(struct sock *sk, struct sk_buff *skb, 
		if (data_len > 0) {

			len = TCPOLEN_MPTCP_MPC_ACK_DATA;

			if (opts->csum_reqd) {

				/* we need to propagate more info to csum the pseudo hdr */

				opts->ext_copy.data_seq = mpext->data_seq;

				opts->ext_copy.subflow_seq = mpext->subflow_seq;

				opts->ext_copy.csum = mpext->csum;

				len += TCPOLEN_MPTCP_DSS_CHECKSUM;

			}
@@ -545,18 +548,21 @@ static bool mptcp_established_options_dss(struct sock *sk, struct sk_buff *skb, 
	bool ret = false;

	u64 ack_seq;



	opts->csum_reqd = READ_ONCE(msk->csum_enabled);

	mpext = skb ? mptcp_get_ext(skb) : NULL;



	if (!skb || (mpext && mpext->use_map) || snd_data_fin_enable) {

		unsigned int map_size;

		unsigned int map_size = TCPOLEN_MPTCP_DSS_BASE + TCPOLEN_MPTCP_DSS_MAP64;



		map_size = TCPOLEN_MPTCP_DSS_BASE + TCPOLEN_MPTCP_DSS_MAP64;

		if (mpext) {

			if (opts->csum_reqd)

				map_size += TCPOLEN_MPTCP_DSS_CHECKSUM;



		remaining -= map_size;

		dss_size = map_size;

		if (mpext)

			opts->ext_copy = *mpext;

		}



		remaining -= map_size;

		dss_size = map_size;

		if (skb && snd_data_fin_enable)

			mptcp_write_data_fin(subflow, skb, &opts->ext_copy);

		ret = true;
@@ -1346,6 +1352,9 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, 
			flags |= MPTCP_DSS_HAS_MAP | MPTCP_DSS_DSN64;

			if (mpext->data_fin)

				flags |= MPTCP_DSS_DATA_FIN;



			if (opts->csum_reqd)

				len += TCPOLEN_MPTCP_DSS_CHECKSUM;

		}



		*ptr++ = mptcp_option(MPTCPOPT_DSS, len, 0, flags);
@@ -1365,10 +1374,15 @@ void mptcp_write_options(__be32 *ptr, const struct tcp_sock *tp, 
			ptr += 2;

			put_unaligned_be32(mpext->subflow_seq, ptr);

			ptr += 1;

			if (opts->csum_reqd) {

				put_unaligned_be32(mpext->data_len << 16 |

						   mptcp_make_csum(mpext), ptr);

			} else {

				put_unaligned_be32(mpext->data_len << 16 |

						   TCPOPT_NOP << 8 | TCPOPT_NOP, ptr);

			}

		}

	}



	if (tp)

		mptcp_set_rwin(tp);