korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-01 08:04:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

sctp: check for dst and pathmtu update in sctp_packet_config

Browse Source 
This patch is to move sctp_transport_dst_check into sctp_packet_config
from sctp_packet_transmit and add pathmtu check in sctp_packet_config.

With this fix, sctp can update dst or pathmtu before appending chunks,
which can void dropping packets in sctp_packet_transmit when dst is
obsolete or dst's mtu is changed.

This patch is also to improve some other codes in sctp_packet_config.
It updates packet max_size with gso_max_size, checks for dst and
pathmtu, and appends ecne chunk only when packet is empty and asoc
is not NULL.

It makes sctp flush work better, as we only need to set up them once
for one flush schedule. It's also safe, since asoc is NULL only when
the packet is created by sctp_ootb_pkt_new in which it just gets the
new dst, no need to do more things for it other than set packet with
transport's pathmtu.

Signed-off-by: Xin Long <lucien.xin@gmail.com>
Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Xin Long 2017-04-01 17:15:59 +08:00 committed by David S. Miller
parent ac6a3722fe
commit df2729c323
2 changed files with 50 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/net/sctp/sctp.h
View File

@ -596,12 +596,23 @@ static inline void sctp_v4_map_v6(union sctp_addr *addr)
*/ */
static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t) static inline struct dst_entry *sctp_transport_dst_check(struct sctp_transport *t)
{ {
if (t->dst && (!dst_check(t->dst, t->dst_cookie) || if (t->dst && !dst_check(t->dst, t->dst_cookie))
t->pathmtu != max_t(size_t, SCTP_TRUNC4(dst_mtu(t->dst)),
SCTP_DEFAULT_MINSEGMENT)))
sctp_transport_dst_release(t); sctp_transport_dst_release(t);
return t->dst; return t->dst;
} }
static inline bool sctp_transport_pmtu_check(struct sctp_transport *t)
{
__u32 pmtu = max_t(size_t, SCTP_TRUNC4(dst_mtu(t->dst)),
SCTP_DEFAULT_MINSEGMENT);
if (t->pathmtu == pmtu)
return true;
t->pathmtu = pmtu;
return false;
}
#endif /* __net_sctp_h__ */ #endif /* __net_sctp_h__ */

67
net/sctp/output.c
View File

@ -86,43 +86,53 @@ void sctp_packet_config(struct sctp_packet *packet, __u32 vtag,
{ {
struct sctp_transport *tp = packet->transport; struct sctp_transport *tp = packet->transport;
struct sctp_association *asoc = tp->asoc; struct sctp_association *asoc = tp->asoc;
struct sock *sk;
pr_debug("%s: packet:%p vtag:0x%x\n", __func__, packet, vtag); pr_debug("%s: packet:%p vtag:0x%x\n", __func__, packet, vtag);
packet->vtag = vtag; packet->vtag = vtag;
if (asoc && tp->dst) { /* do the following jobs only once for a flush schedule */
struct sock *sk = asoc->base.sk; if (!sctp_packet_empty(packet))
return;
rcu_read_lock(); /* set packet max_size with pathmtu */
if (__sk_dst_get(sk) != tp->dst) { packet->max_size = tp->pathmtu;
dst_hold(tp->dst); if (!asoc)
sk_setup_caps(sk, tp->dst); return;
}
if (sk_can_gso(sk)) { /* update dst or transport pathmtu if in need */
struct net_device *dev = tp->dst->dev; sk = asoc->base.sk;
if (!sctp_transport_dst_check(tp)) {
packet->max_size = dev->gso_max_size; sctp_transport_route(tp, NULL, sctp_sk(sk));
} else { if (asoc->param_flags & SPP_PMTUD_ENABLE)
packet->max_size = asoc->pathmtu; sctp_assoc_sync_pmtu(sk, asoc);
} } else if (!sctp_transport_pmtu_check(tp)) {
rcu_read_unlock(); if (asoc->param_flags & SPP_PMTUD_ENABLE)
sctp_assoc_sync_pmtu(sk, asoc);
} else {
packet->max_size = tp->pathmtu;
} }
if (ecn_capable && sctp_packet_empty(packet)) { /* If there a is a prepend chunk stick it on the list before
struct sctp_chunk *chunk; * any other chunks get appended.
*/
if (ecn_capable) {
struct sctp_chunk *chunk = sctp_get_ecne_prepend(asoc);
/* If there a is a prepend chunk stick it on the list before
* any other chunks get appended.
*/
chunk = sctp_get_ecne_prepend(asoc);
if (chunk) if (chunk)
sctp_packet_append_chunk(packet, chunk); sctp_packet_append_chunk(packet, chunk);
} }
if (!tp->dst)
return;
/* set packet max_size with gso_max_size if gso is enabled*/
rcu_read_lock();
if (__sk_dst_get(sk) != tp->dst) {
dst_hold(tp->dst);
sk_setup_caps(sk, tp->dst);
}
packet->max_size = sk_can_gso(sk) ? tp->dst->dev->gso_max_size
: asoc->pathmtu;
rcu_read_unlock();
} }
/* Initialize the packet structure. */ /* Initialize the packet structure. */
@ -582,12 +592,7 @@ int sctp_packet_transmit(struct sctp_packet *packet, gfp_t gfp)
sh->vtag = htonl(packet->vtag); sh->vtag = htonl(packet->vtag);
sh->checksum = 0; sh->checksum = 0;
/* update dst if in need */ /* drop packet if no dst */
if (!sctp_transport_dst_check(tp)) {
sctp_transport_route(tp, NULL, sctp_sk(sk));
if (asoc && asoc->param_flags & SPP_PMTUD_ENABLE)
sctp_assoc_sync_pmtu(sk, asoc);
}
dst = dst_clone(tp->dst); dst = dst_clone(tp->dst);
if (!dst) { if (!dst) {
IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES); IP_INC_STATS(sock_net(sk), IPSTATS_MIB_OUTNOROUTES);