Unverified Commit 79a0ead7 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8809 MPTCP Upstream part 1 

Merge Pull Request from: @geliangtang 
 
后续的MPTCP提交会依赖这三个补丁。
同时添加了两个针对第三个补丁的fixes。 
 
Link:https://gitee.com/openeuler/kernel/pulls/8809

 

Reviewed-by: default avatarYue Haibing <yuehaibing@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents b8efcd22 4ebe7cb5

include/net/ip.h

+9 −6
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static inline u8 ip_sendmsg_scope(const struct inet_sock *inet, 


static inline __u8 get_rttos(struct ipcm_cookie* ipc, struct inet_sock *inet)

{

	return (ipc->tos != -1) ? RT_TOS(ipc->tos) : RT_TOS(inet->tos);

	return (ipc->tos != -1) ? RT_TOS(ipc->tos) : RT_TOS(READ_ONCE(inet->tos));

}



/* datagram.c */
@@ -434,19 +434,22 @@ int ip_dont_fragment(const struct sock *sk, const struct dst_entry *dst) 


static inline bool ip_sk_accept_pmtu(const struct sock *sk)

{

	return inet_sk(sk)->pmtudisc != IP_PMTUDISC_INTERFACE &&

	       inet_sk(sk)->pmtudisc != IP_PMTUDISC_OMIT;

	u8 pmtudisc = READ_ONCE(inet_sk(sk)->pmtudisc);



	return pmtudisc != IP_PMTUDISC_INTERFACE &&

	       pmtudisc != IP_PMTUDISC_OMIT;

}



static inline bool ip_sk_use_pmtu(const struct sock *sk)

{

	return inet_sk(sk)->pmtudisc < IP_PMTUDISC_PROBE;

	return READ_ONCE(inet_sk(sk)->pmtudisc) < IP_PMTUDISC_PROBE;

}



static inline bool ip_sk_ignore_df(const struct sock *sk)

{

	return inet_sk(sk)->pmtudisc < IP_PMTUDISC_DO ||

	       inet_sk(sk)->pmtudisc == IP_PMTUDISC_OMIT;

	u8 pmtudisc = READ_ONCE(inet_sk(sk)->pmtudisc);



	return pmtudisc < IP_PMTUDISC_DO || pmtudisc == IP_PMTUDISC_OMIT;

}



static inline unsigned int ip_dst_mtu_maybe_forward(const struct dst_entry *dst,

include/net/route.h

+2 −2
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 


#define RTO_ONLINK	0x01



#define RT_CONN_FLAGS(sk)   (RT_TOS(inet_sk(sk)->tos) | sock_flag(sk, SOCK_LOCALROUTE))

#define RT_CONN_FLAGS(sk)   (RT_TOS(READ_ONCE(inet_sk(sk)->tos)) | sock_flag(sk, SOCK_LOCALROUTE))

#define RT_CONN_FLAGS_TOS(sk,tos)   (RT_TOS(tos) | sock_flag(sk, SOCK_LOCALROUTE))



static inline __u8 ip_sock_rt_scope(const struct sock *sk)
@@ -50,7 +50,7 @@ static inline __u8 ip_sock_rt_scope(const struct sock *sk) 


static inline __u8 ip_sock_rt_tos(const struct sock *sk)

{

	return RT_TOS(inet_sk(sk)->tos);

	return RT_TOS(READ_ONCE(inet_sk(sk)->tos));

}



struct ip_tunnel_info;

net/dccp/ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static int dccp_v4_send_response(const struct sock *sk, struct request_sock *req 
		err = ip_build_and_send_pkt(skb, sk, ireq->ir_loc_addr,

					    ireq->ir_rmt_addr,

					    rcu_dereference(ireq->ireq_opt),

					    inet_sk(sk)->tos);

					    READ_ONCE(inet_sk(sk)->tos));

		rcu_read_unlock();

		err = net_xmit_eval(err);

	}

net/ipv4/inet_diag.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ int inet_diag_msg_attrs_fill(struct sock *sk, struct sk_buff *skb, 
	 * hence this needs to be included regardless of socket family.

	 */

	if (ext & (1 << (INET_DIAG_TOS - 1)))

		if (nla_put_u8(skb, INET_DIAG_TOS, inet->tos) < 0)

		if (nla_put_u8(skb, INET_DIAG_TOS, READ_ONCE(inet->tos)) < 0)

			goto errout;



#if IS_ENABLED(CONFIG_IPV6)

net/ipv4/ip_output.c

+7 −6
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ EXPORT_SYMBOL(__ip_queue_xmit); 


int ip_queue_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl)

{

	return __ip_queue_xmit(sk, skb, fl, inet_sk(sk)->tos);

	return __ip_queue_xmit(sk, skb, fl, READ_ONCE(inet_sk(sk)->tos));

}

EXPORT_SYMBOL(ip_queue_xmit);
@@ -1389,8 +1389,8 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	struct ip_options *opt = NULL;

	struct rtable *rt = (struct rtable *)cork->dst;

	struct iphdr *iph;

	u8 pmtudisc, ttl;

	__be16 df = 0;

	__u8 ttl;



	skb = __skb_dequeue(queue);

	if (!skb)
@@ -1420,8 +1420,9 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	/* DF bit is set when we want to see DF on outgoing frames.

	 * If ignore_df is set too, we still allow to fragment this frame

	 * locally. */

	if (inet->pmtudisc == IP_PMTUDISC_DO ||

	    inet->pmtudisc == IP_PMTUDISC_PROBE ||

	pmtudisc = READ_ONCE(inet->pmtudisc);

	if (pmtudisc == IP_PMTUDISC_DO ||

	    pmtudisc == IP_PMTUDISC_PROBE ||

	    (skb->len <= dst_mtu(&rt->dst) &&

	     ip_dont_fragment(sk, &rt->dst)))

		df = htons(IP_DF);
@@ -1432,14 +1433,14 @@ struct sk_buff *__ip_make_skb(struct sock *sk, 
	if (cork->ttl != 0)

		ttl = cork->ttl;

	else if (rt->rt_type == RTN_MULTICAST)

		ttl = inet->mc_ttl;

		ttl = READ_ONCE(inet->mc_ttl);

	else

		ttl = ip_select_ttl(inet, &rt->dst);



	iph = ip_hdr(skb);

	iph->version = 4;

	iph->ihl = 5;

	iph->tos = (cork->tos != -1) ? cork->tos : inet->tos;

	iph->tos = (cork->tos != -1) ? cork->tos : READ_ONCE(inet->tos);

	iph->frag_off = df;

	iph->ttl = ttl;

	iph->protocol = sk->sk_protocol;