sctp: Adjust PMTU updates to accomodate route invalidation.

davem330 · davem330 · commit 02f3d4ce9e81 · 2012-07-16T03:57:14.000-07:00
This adjusts the call to dst_ops-&gt;update_pmtu() so that we can
transparently handle the fact that, in the future, the dst itself can
be invalidated by the PMTU update (when we have non-host routes cached
in sockets).

Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/sctp/sctp.h b/include/net/sctp/sctp.h
@@ -519,10 +519,10 @@ static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu)
 	return frag;
 }
 
-static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)
+static inline void sctp_assoc_pending_pmtu(struct sock *sk, struct sctp_association *asoc)
 {
 
-	sctp_assoc_sync_pmtu(asoc);
+	sctp_assoc_sync_pmtu(sk, asoc);
 	asoc->pmtu_pending = 0;
 }
 
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h
@@ -1091,7 +1091,7 @@ void sctp_transport_burst_limited(struct sctp_transport *);
 void sctp_transport_burst_reset(struct sctp_transport *);
 unsigned long sctp_transport_timeout(struct sctp_transport *);
 void sctp_transport_reset(struct sctp_transport *);
-void sctp_transport_update_pmtu(struct sctp_transport *, u32);
+void sctp_transport_update_pmtu(struct sock *, struct sctp_transport *, u32);
 void sctp_transport_immediate_rtx(struct sctp_transport *);
 
 
@@ -2003,7 +2003,7 @@ void sctp_assoc_update(struct sctp_association *old,
 
 __u32 sctp_association_get_next_tsn(struct sctp_association *);
 
-void sctp_assoc_sync_pmtu(struct sctp_association *);
+void sctp_assoc_sync_pmtu(struct sock *, struct sctp_association *);
 void sctp_assoc_rwnd_increase(struct sctp_association *, unsigned int);
 void sctp_assoc_rwnd_decrease(struct sctp_association *, unsigned int);
 void sctp_assoc_set_primary(struct sctp_association *,
diff --git a/net/sctp/associola.c b/net/sctp/associola.c
@@ -1360,7 +1360,7 @@ struct sctp_transport *sctp_assoc_choose_alter_transport(
 /* Update the association's pmtu and frag_point by going through all the
  * transports. This routine is called when a transport's PMTU has changed.
  */
-void sctp_assoc_sync_pmtu(struct sctp_association *asoc)
+void sctp_assoc_sync_pmtu(struct sock *sk, struct sctp_association *asoc)
 {
 	struct sctp_transport *t;
 	__u32 pmtu = 0;
@@ -1372,7 +1372,7 @@ void sctp_assoc_sync_pmtu(struct sctp_association *asoc)
 	list_for_each_entry(t, &asoc->peer.transport_addr_list,
 				transports) {
 		if (t->pmtu_pending && t->dst) {
-			sctp_transport_update_pmtu(t, dst_mtu(t->dst));
+			sctp_transport_update_pmtu(sk, t, dst_mtu(t->dst));
 			t->pmtu_pending = 0;
 		}
 		if (!pmtu || (t->pathmtu < pmtu))
diff --git a/net/sctp/input.c b/net/sctp/input.c
@@ -408,10 +408,10 @@ void sctp_icmp_frag_needed(struct sock *sk, struct sctp_association *asoc,
 
 	if (t->param_flags & SPP_PMTUD_ENABLE) {
 		/* Update transports view of the MTU */
-		sctp_transport_update_pmtu(t, pmtu);
+		sctp_transport_update_pmtu(sk, t, pmtu);
 
 		/* Update association pmtu. */
-		sctp_assoc_sync_pmtu(asoc);
+		sctp_assoc_sync_pmtu(sk, asoc);
 	}
 
 	/* Retransmit with the new pmtu setting.
diff --git a/net/sctp/output.c b/net/sctp/output.c
@@ -410,7 +410,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)
 	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(asoc);
+			sctp_assoc_sync_pmtu(sk, asoc);
 		}
 	}
 	dst = dst_clone(tp->dst);
diff --git a/net/sctp/socket.c b/net/sctp/socket.c
@@ -1853,7 +1853,7 @@ SCTP_STATIC int sctp_sendmsg(struct kiocb *iocb, struct sock *sk,
 	}
 
 	if (asoc->pmtu_pending)
-		sctp_assoc_pending_pmtu(asoc);
+		sctp_assoc_pending_pmtu(sk, asoc);
 
 	/* If fragmentation is disabled and the message length exceeds the
 	 * association fragmentation point, return EMSGSIZE.  The I-D
@@ -2365,7 +2365,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
 	if ((params->spp_flags & SPP_PMTUD_DISABLE) && params->spp_pathmtu) {
 		if (trans) {
 			trans->pathmtu = params->spp_pathmtu;
-			sctp_assoc_sync_pmtu(asoc);
+			sctp_assoc_sync_pmtu(sctp_opt2sk(sp), asoc);
 		} else if (asoc) {
 			asoc->pathmtu = params->spp_pathmtu;
 			sctp_frag_point(asoc, params->spp_pathmtu);
@@ -2382,7 +2382,7 @@ static int sctp_apply_peer_addr_params(struct sctp_paddrparams *params,
 				(trans->param_flags & ~SPP_PMTUD) | pmtud_change;
 			if (update) {
 				sctp_transport_pmtu(trans, sctp_opt2sk(sp));
-				sctp_assoc_sync_pmtu(asoc);
+				sctp_assoc_sync_pmtu(sctp_opt2sk(sp), asoc);
 			}
 		} else if (asoc) {
 			asoc->param_flags =
diff --git a/net/sctp/transport.c b/net/sctp/transport.c
@@ -228,7 +228,7 @@ void sctp_transport_pmtu(struct sctp_transport *transport, struct sock *sk)
 		transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT;
 }
 
-void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
+void sctp_transport_update_pmtu(struct sock *sk, struct sctp_transport *t, u32 pmtu)
 {
 	struct dst_entry *dst;
 
@@ -245,8 +245,16 @@ void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)
 	}
 
 	dst = sctp_transport_dst_check(t);
-	if (dst)
+	if (!dst)
+		t->af_specific->get_dst(t, &t->saddr, &t->fl, sk);
+
+	if (dst) {
 		dst->ops->update_pmtu(dst, pmtu);
+
+		dst = sctp_transport_dst_check(t);
+		if (!dst)
+			t->af_specific->get_dst(t, &t->saddr, &t->fl, sk);
+	}
 }
 
 /* Caches the dst entry and source address for a transport's destination

Original file line number	Diff line number	Diff line change
`@@ -519,10 +519,10 @@ static inline int sctp_frag_point(const struct sctp_association *asoc, int pmtu)`
`519`	`519`	`return frag;`
`520`	`520`	`}`
`521`	`521`
`522`		`-static inline void sctp_assoc_pending_pmtu(struct sctp_association *asoc)`
	`522`	`+static inline void sctp_assoc_pending_pmtu(struct sock sk, struct sctp_association asoc)`
`523`	`523`	`{`
`524`	`524`
`525`		`- sctp_assoc_sync_pmtu(asoc);`
	`525`	`+ sctp_assoc_sync_pmtu(sk, asoc);`
`526`	`526`	`asoc->pmtu_pending = 0;`
`527`	`527`	`}`
`528`	`528`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ int sctp_packet_transmit(struct sctp_packet *packet)`
`410`	`410`	`if (!sctp_transport_dst_check(tp)) {`
`411`	`411`	`sctp_transport_route(tp, NULL, sctp_sk(sk));`
`412`	`412`	`if (asoc && (asoc->param_flags & SPP_PMTUD_ENABLE)) {`
`413`		`- sctp_assoc_sync_pmtu(asoc);`
	`413`	`+ sctp_assoc_sync_pmtu(sk, asoc);`
`414`	`414`	`}`
`415`	`415`	`}`
`416`	`416`	`dst = dst_clone(tp->dst);`
Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,7 @@ void sctp_transport_pmtu(struct sctp_transport transport, struct sock sk)`
`228`	`228`	`transport->pathmtu = SCTP_DEFAULT_MAXSEGMENT;`
`229`	`229`	`}`
`230`	`230`
`231`		`-void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)`
	`231`	`+void sctp_transport_update_pmtu(struct sock sk, struct sctp_transport t, u32 pmtu)`
`232`	`232`	`{`
`233`	`233`	`struct dst_entry *dst;`
`234`	`234`
`@@ -245,8 +245,16 @@ void sctp_transport_update_pmtu(struct sctp_transport *t, u32 pmtu)`
`245`	`245`	`}`
`246`	`246`
`247`	`247`	`dst = sctp_transport_dst_check(t);`
`248`		`- if (dst)`
	`248`	`+ if (!dst)`
	`249`	`+ t->af_specific->get_dst(t, &t->saddr, &t->fl, sk);`
	`250`	`+`
	`251`	`+ if (dst) {`
`249`	`252`	`dst->ops->update_pmtu(dst, pmtu);`
	`253`	`+`
	`254`	`+ dst = sctp_transport_dst_check(t);`
	`255`	`+ if (!dst)`
	`256`	`+ t->af_specific->get_dst(t, &t->saddr, &t->fl, sk);`
	`257`	`+ }`
`250`	`258`	`}`
`251`	`259`
`252`	`260`	`/* Caches the dst entry and source address for a transport's destination`