Commit 3404dfb5 authored by Geliang Tang's avatar Geliang Tang Committed by Geliang Tang
Browse files

mptcp: use plain bool instead of custom binary enum 

mainline inclusion
from mainline-v6.7-rc1
commit f1f26512a9bf18f7a4c0d59df113a49f39d7d4b6
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I9VYQ9
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?id=f1f26512a9bf18f7a4c0d59df113a49f39d7d4b6



--------------------------------

The 'data_avail' subflow field is already used as plain boolean,
drop the custom binary enum type and switch to bool.

No functional changed intended.

Reviewed-by: default avatarMat Martineau <martineau@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarMat Martineau <martineau@kernel.org>
Link: https://lore.kernel.org/r/20231023-send-net-next-20231023-2-v1-3-9dc60939d371@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Reviewed-by: default avatarJackie Liu <liuyun01@kylinos.cn>
Signed-off-by: default avatarGeliang Tang <tanggeliang@kylinos.cn>
parent 65e9f702

net/mptcp/protocol.h

+1 −6
Original line number Diff line number Diff line
@@ -438,11 +438,6 @@ mptcp_subflow_rsk(const struct request_sock *rsk) 
	return (struct mptcp_subflow_request_sock *)rsk;

}



enum mptcp_data_avail {

	MPTCP_SUBFLOW_NODATA,

	MPTCP_SUBFLOW_DATA_AVAIL,

};



struct mptcp_delegated_action {

	struct napi_struct napi;

	struct list_head head;
@@ -498,7 +493,7 @@ struct mptcp_subflow_context { 
		valid_csum_seen : 1,        /* at least one csum validated */

		is_mptfo : 1,	    /* subflow is doing TFO */

		__unused : 10;

	enum mptcp_data_avail data_avail;

	bool	data_avail;

	bool	scheduled;

	u32	remote_nonce;

	u64	thmac;

net/mptcp/subflow.c

+6 −6
Original line number Diff line number Diff line
@@ -1264,7 +1264,7 @@ static bool subflow_check_data_avail(struct sock *ssk) 
	struct sk_buff *skb;



	if (!skb_peek(&ssk->sk_receive_queue))

		WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);

		WRITE_ONCE(subflow->data_avail, false);

	if (subflow->data_avail)

		return true;
@@ -1298,7 +1298,7 @@ static bool subflow_check_data_avail(struct sock *ssk) 
			continue;

		}



		WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);

		WRITE_ONCE(subflow->data_avail, true);

		break;

	}

	return true;
@@ -1320,7 +1320,7 @@ static bool subflow_check_data_avail(struct sock *ssk) 
				goto reset;

			}

			mptcp_subflow_fail(msk, ssk);

			WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);

			WRITE_ONCE(subflow->data_avail, true);

			return true;

		}
@@ -1337,7 +1337,7 @@ static bool subflow_check_data_avail(struct sock *ssk) 
			while ((skb = skb_peek(&ssk->sk_receive_queue)))

				sk_eat_skb(ssk, skb);

			tcp_send_active_reset(ssk, GFP_ATOMIC);

			WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);

			WRITE_ONCE(subflow->data_avail, false);

			return false;

		}
@@ -1349,7 +1349,7 @@ static bool subflow_check_data_avail(struct sock *ssk) 
	subflow->map_seq = READ_ONCE(msk->ack_seq);

	subflow->map_data_len = skb->len;

	subflow->map_subflow_seq = tcp_sk(ssk)->copied_seq - subflow->ssn_offset;

	WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_DATA_AVAIL);

	WRITE_ONCE(subflow->data_avail, true);

	return true;

}
@@ -1361,7 +1361,7 @@ bool mptcp_subflow_data_available(struct sock *sk) 
	if (subflow->map_valid &&

	    mptcp_subflow_get_map_offset(subflow) >= subflow->map_data_len) {

		subflow->map_valid = 0;

		WRITE_ONCE(subflow->data_avail, MPTCP_SUBFLOW_NODATA);

		WRITE_ONCE(subflow->data_avail, false);



		pr_debug("Done with mapping: seq=%u data_len=%u",

			 subflow->map_subflow_seq,