diff options
author | David S. Miller <davem@davemloft.net> | 2011-02-07 23:38:06 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-02-10 16:33:41 -0500 |
commit | 6431cbc25fa21635ee04eb0516ba6c51389fbfac (patch) | |
tree | 515deede7292fce41c019e7bd72b58cab34ecb9c /net/ipv4/route.c | |
parent | ddd4aa424b866a08ceba7ddf38e61542c91b93a0 (diff) |
inet: Create a mechanism for upward inetpeer propagation into routes.
If we didn't have a routing cache, we would not be able to properly
propagate certain kinds of dynamic path attributes, for example
PMTU information and redirects.
The reason is that if we didn't have a routing cache, then there would
be no way to lookup all of the active cached routes hanging off of
sockets, tunnels, IPSEC bundles, etc.
Consider the case where we created a cached route, but no inetpeer
entry existed and also we were not asked to pre-COW the route metrics
and therefore did not force the creation a new inetpeer entry.
If we later get a PMTU message, or a redirect, and store this
information in a new inetpeer entry, there is no way to teach that
cached route about the newly existing inetpeer entry.
The facilities implemented here handle this problem.
First we create a generation ID. When we create a cached route of any
kind, we remember the generation ID at the time of attachment. Any
time we force-create an inetpeer entry in response to new path
information, we bump that generation ID.
The dst_ops->check() callback is where the knowledge of this event
is propagated. If the global generation ID does not equal the one
stored in the cached route, and the cached route has not attached
to an inetpeer yet, we look it up and attach if one is found. Now
that we've updated the cached route's information, we update the
route's generation ID too.
This clears the way for implementing PMTU and redirects directly in
the inetpeer cache. There is absolutely no need to consult cached
route information in order to maintain this information.
At this point nothing bumps the inetpeer genids, that comes in the
later changes which handle PMTUs and redirects using inetpeers.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/route.c')
-rw-r--r-- | net/ipv4/route.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 0455af851751..0979e039104a 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -1308,6 +1308,13 @@ skip_hashing: | |||
1308 | return 0; | 1308 | return 0; |
1309 | } | 1309 | } |
1310 | 1310 | ||
1311 | static atomic_t __rt_peer_genid = ATOMIC_INIT(0); | ||
1312 | |||
1313 | static u32 rt_peer_genid(void) | ||
1314 | { | ||
1315 | return atomic_read(&__rt_peer_genid); | ||
1316 | } | ||
1317 | |||
1311 | void rt_bind_peer(struct rtable *rt, int create) | 1318 | void rt_bind_peer(struct rtable *rt, int create) |
1312 | { | 1319 | { |
1313 | struct inet_peer *peer; | 1320 | struct inet_peer *peer; |
@@ -1316,6 +1323,8 @@ void rt_bind_peer(struct rtable *rt, int create) | |||
1316 | 1323 | ||
1317 | if (peer && cmpxchg(&rt->peer, NULL, peer) != NULL) | 1324 | if (peer && cmpxchg(&rt->peer, NULL, peer) != NULL) |
1318 | inet_putpeer(peer); | 1325 | inet_putpeer(peer); |
1326 | else | ||
1327 | rt->rt_peer_genid = rt_peer_genid(); | ||
1319 | } | 1328 | } |
1320 | 1329 | ||
1321 | /* | 1330 | /* |
@@ -1767,8 +1776,16 @@ static void ip_rt_update_pmtu(struct dst_entry *dst, u32 mtu) | |||
1767 | 1776 | ||
1768 | static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie) | 1777 | static struct dst_entry *ipv4_dst_check(struct dst_entry *dst, u32 cookie) |
1769 | { | 1778 | { |
1770 | if (rt_is_expired((struct rtable *)dst)) | 1779 | struct rtable *rt = (struct rtable *) dst; |
1780 | |||
1781 | if (rt_is_expired(rt)) | ||
1771 | return NULL; | 1782 | return NULL; |
1783 | if (rt->rt_peer_genid != rt_peer_genid()) { | ||
1784 | if (!rt->peer) | ||
1785 | rt_bind_peer(rt, 0); | ||
1786 | |||
1787 | rt->rt_peer_genid = rt_peer_genid(); | ||
1788 | } | ||
1772 | return dst; | 1789 | return dst; |
1773 | } | 1790 | } |
1774 | 1791 | ||