diff options
author | David S. Miller <davem@davemloft.net> | 2010-12-01 21:09:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-12-01 21:09:13 -0500 |
commit | ccb7c410ddc054b8c1ae780319bc98ae092d3854 (patch) | |
tree | 6a363c7232121d2390c091b232ee758fa10e4446 | |
parent | 4399ce402c7c837dec80bf9fb40d079b39b9265a (diff) |
timewait_sock: Create and use getpeer op.
The only thing AF-specific about remembering the timestamp
for a time-wait TCP socket is getting the peer.
Abstract that behind a new timewait_sock_ops vector.
Support for real IPV6 sockets is not filled in yet, but
curiously this makes timewait recycling start to work
for v4-mapped ipv6 sockets.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/net/tcp.h | 1 | ||||
-rw-r--r-- | include/net/timewait_sock.h | 8 | ||||
-rw-r--r-- | net/ipv4/tcp_ipv4.c | 33 | ||||
-rw-r--r-- | net/ipv4/tcp_minisocks.c | 32 | ||||
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 26 |
5 files changed, 63 insertions, 37 deletions
diff --git a/include/net/tcp.h b/include/net/tcp.h index 3e239641d4ee..4097320caa25 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h | |||
@@ -313,6 +313,7 @@ extern void tcp_shutdown (struct sock *sk, int how); | |||
313 | extern int tcp_v4_rcv(struct sk_buff *skb); | 313 | extern int tcp_v4_rcv(struct sk_buff *skb); |
314 | 314 | ||
315 | extern struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it); | 315 | extern struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it); |
316 | extern void *tcp_v4_tw_get_peer(struct sock *sk); | ||
316 | extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw); | 317 | extern int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw); |
317 | extern int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, | 318 | extern int tcp_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, |
318 | size_t size); | 319 | size_t size); |
diff --git a/include/net/timewait_sock.h b/include/net/timewait_sock.h index 97c3b14da55d..053b3cf2c66a 100644 --- a/include/net/timewait_sock.h +++ b/include/net/timewait_sock.h | |||
@@ -21,6 +21,7 @@ struct timewait_sock_ops { | |||
21 | int (*twsk_unique)(struct sock *sk, | 21 | int (*twsk_unique)(struct sock *sk, |
22 | struct sock *sktw, void *twp); | 22 | struct sock *sktw, void *twp); |
23 | void (*twsk_destructor)(struct sock *sk); | 23 | void (*twsk_destructor)(struct sock *sk); |
24 | void *(*twsk_getpeer)(struct sock *sk); | ||
24 | }; | 25 | }; |
25 | 26 | ||
26 | static inline int twsk_unique(struct sock *sk, struct sock *sktw, void *twp) | 27 | static inline int twsk_unique(struct sock *sk, struct sock *sktw, void *twp) |
@@ -39,4 +40,11 @@ static inline void twsk_destructor(struct sock *sk) | |||
39 | sk->sk_prot->twsk_prot->twsk_destructor(sk); | 40 | sk->sk_prot->twsk_prot->twsk_destructor(sk); |
40 | } | 41 | } |
41 | 42 | ||
43 | static inline void *twsk_getpeer(struct sock *sk) | ||
44 | { | ||
45 | if (sk->sk_prot->twsk_prot->twsk_getpeer) | ||
46 | return sk->sk_prot->twsk_prot->twsk_getpeer(sk); | ||
47 | return NULL; | ||
48 | } | ||
49 | |||
42 | #endif /* _TIMEWAIT_SOCK_H */ | 50 | #endif /* _TIMEWAIT_SOCK_H */ |
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 0ddf819cfb5d..dd555051ec8b 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
@@ -1210,12 +1210,6 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = { | |||
1210 | }; | 1210 | }; |
1211 | #endif | 1211 | #endif |
1212 | 1212 | ||
1213 | static struct timewait_sock_ops tcp_timewait_sock_ops = { | ||
1214 | .twsk_obj_size = sizeof(struct tcp_timewait_sock), | ||
1215 | .twsk_unique = tcp_twsk_unique, | ||
1216 | .twsk_destructor= tcp_twsk_destructor, | ||
1217 | }; | ||
1218 | |||
1219 | int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) | 1213 | int tcp_v4_conn_request(struct sock *sk, struct sk_buff *skb) |
1220 | { | 1214 | { |
1221 | struct tcp_extend_values tmp_ext; | 1215 | struct tcp_extend_values tmp_ext; |
@@ -1783,25 +1777,20 @@ struct inet_peer *tcp_v4_get_peer(struct sock *sk, bool *release_it) | |||
1783 | } | 1777 | } |
1784 | EXPORT_SYMBOL(tcp_v4_get_peer); | 1778 | EXPORT_SYMBOL(tcp_v4_get_peer); |
1785 | 1779 | ||
1786 | int tcp_v4_tw_remember_stamp(struct inet_timewait_sock *tw) | 1780 | void *tcp_v4_tw_get_peer(struct sock *sk) |
1787 | { | 1781 | { |
1788 | struct inet_peer *peer = inet_getpeer_v4(tw->tw_daddr, 1); | 1782 | struct inet_timewait_sock *tw = inet_twsk(sk); |
1789 | |||
1790 | if (peer) { | ||
1791 | const struct tcp_timewait_sock *tcptw = tcp_twsk((struct sock *)tw); | ||
1792 | |||
1793 | if ((s32)(peer->tcp_ts - tcptw->tw_ts_recent) <= 0 || | ||
1794 | ((u32)get_seconds() - peer->tcp_ts_stamp > TCP_PAWS_MSL && | ||
1795 | peer->tcp_ts_stamp <= (u32)tcptw->tw_ts_recent_stamp)) { | ||
1796 | peer->tcp_ts_stamp = (u32)tcptw->tw_ts_recent_stamp; | ||
1797 | peer->tcp_ts = tcptw->tw_ts_recent; | ||
1798 | } | ||
1799 | inet_putpeer(peer); | ||
1800 | return 1; | ||
1801 | } | ||
1802 | 1783 | ||
1803 | return 0; | 1784 | return inet_getpeer_v4(tw->tw_daddr, 1); |
1804 | } | 1785 | } |
1786 | EXPORT_SYMBOL(tcp_v4_tw_get_peer); | ||
1787 | |||
1788 | static struct timewait_sock_ops tcp_timewait_sock_ops = { | ||
1789 | .twsk_obj_size = sizeof(struct tcp_timewait_sock), | ||
1790 | .twsk_unique = tcp_twsk_unique, | ||
1791 | .twsk_destructor= tcp_twsk_destructor, | ||
1792 | .twsk_getpeer = tcp_v4_tw_get_peer, | ||
1793 | }; | ||
1805 | 1794 | ||
1806 | const struct inet_connection_sock_af_ops ipv4_specific = { | 1795 | const struct inet_connection_sock_af_ops ipv4_specific = { |
1807 | .queue_xmit = ip_queue_xmit, | 1796 | .queue_xmit = ip_queue_xmit, |
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index 059082c873cf..3527b51d6159 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
@@ -78,6 +78,27 @@ static int tcp_remember_stamp(struct sock *sk) | |||
78 | return 0; | 78 | return 0; |
79 | } | 79 | } |
80 | 80 | ||
81 | static int tcp_tw_remember_stamp(struct inet_timewait_sock *tw) | ||
82 | { | ||
83 | struct sock *sk = (struct sock *) tw; | ||
84 | struct inet_peer *peer; | ||
85 | |||
86 | peer = twsk_getpeer(sk); | ||
87 | if (peer) { | ||
88 | const struct tcp_timewait_sock *tcptw = tcp_twsk(sk); | ||
89 | |||
90 | if ((s32)(peer->tcp_ts - tcptw->tw_ts_recent) <= 0 || | ||
91 | ((u32)get_seconds() - peer->tcp_ts_stamp > TCP_PAWS_MSL && | ||
92 | peer->tcp_ts_stamp <= (u32)tcptw->tw_ts_recent_stamp)) { | ||
93 | peer->tcp_ts_stamp = (u32)tcptw->tw_ts_recent_stamp; | ||
94 | peer->tcp_ts = tcptw->tw_ts_recent; | ||
95 | } | ||
96 | inet_putpeer(peer); | ||
97 | return 1; | ||
98 | } | ||
99 | return 0; | ||
100 | } | ||
101 | |||
81 | static __inline__ int tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win) | 102 | static __inline__ int tcp_in_window(u32 seq, u32 end_seq, u32 s_win, u32 e_win) |
82 | { | 103 | { |
83 | if (seq == s_win) | 104 | if (seq == s_win) |
@@ -178,14 +199,9 @@ kill_with_rst: | |||
178 | tcptw->tw_ts_recent = tmp_opt.rcv_tsval; | 199 | tcptw->tw_ts_recent = tmp_opt.rcv_tsval; |
179 | } | 200 | } |
180 | 201 | ||
181 | /* I am shamed, but failed to make it more elegant. | 202 | if (tcp_death_row.sysctl_tw_recycle && |
182 | * Yes, it is direct reference to IP, which is impossible | 203 | tcptw->tw_ts_recent_stamp && |
183 | * to generalize to IPv6. Taking into account that IPv6 | 204 | tcp_tw_remember_stamp(tw)) |
184 | * do not understand recycling in any case, it not | ||
185 | * a big problem in practice. --ANK */ | ||
186 | if (tw->tw_family == AF_INET && | ||
187 | tcp_death_row.sysctl_tw_recycle && tcptw->tw_ts_recent_stamp && | ||
188 | tcp_v4_tw_remember_stamp(tw)) | ||
189 | inet_twsk_schedule(tw, &tcp_death_row, tw->tw_timeout, | 205 | inet_twsk_schedule(tw, &tcp_death_row, tw->tw_timeout, |
190 | TCP_TIMEWAIT_LEN); | 206 | TCP_TIMEWAIT_LEN); |
191 | else | 207 | else |
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index e394d0029d8d..5f73a1808e36 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c | |||
@@ -906,12 +906,6 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = { | |||
906 | }; | 906 | }; |
907 | #endif | 907 | #endif |
908 | 908 | ||
909 | static struct timewait_sock_ops tcp6_timewait_sock_ops = { | ||
910 | .twsk_obj_size = sizeof(struct tcp6_timewait_sock), | ||
911 | .twsk_unique = tcp_twsk_unique, | ||
912 | .twsk_destructor= tcp_twsk_destructor, | ||
913 | }; | ||
914 | |||
915 | static void __tcp_v6_send_check(struct sk_buff *skb, | 909 | static void __tcp_v6_send_check(struct sk_buff *skb, |
916 | struct in6_addr *saddr, struct in6_addr *daddr) | 910 | struct in6_addr *saddr, struct in6_addr *daddr) |
917 | { | 911 | { |
@@ -1818,12 +1812,30 @@ do_time_wait: | |||
1818 | goto discard_it; | 1812 | goto discard_it; |
1819 | } | 1813 | } |
1820 | 1814 | ||
1821 | struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it) | 1815 | static struct inet_peer *tcp_v6_get_peer(struct sock *sk, bool *release_it) |
1816 | { | ||
1817 | /* Alas, not yet... */ | ||
1818 | return NULL; | ||
1819 | } | ||
1820 | |||
1821 | static void *tcp_v6_tw_get_peer(struct sock *sk) | ||
1822 | { | 1822 | { |
1823 | struct inet_timewait_sock *tw = inet_twsk(sk); | ||
1824 | |||
1825 | if (tw->tw_family == AF_INET) | ||
1826 | return tcp_v4_tw_get_peer(sk); | ||
1827 | |||
1823 | /* Alas, not yet... */ | 1828 | /* Alas, not yet... */ |
1824 | return NULL; | 1829 | return NULL; |
1825 | } | 1830 | } |
1826 | 1831 | ||
1832 | static struct timewait_sock_ops tcp6_timewait_sock_ops = { | ||
1833 | .twsk_obj_size = sizeof(struct tcp6_timewait_sock), | ||
1834 | .twsk_unique = tcp_twsk_unique, | ||
1835 | .twsk_destructor= tcp_twsk_destructor, | ||
1836 | .twsk_getpeer = tcp_v6_tw_get_peer, | ||
1837 | }; | ||
1838 | |||
1827 | static const struct inet_connection_sock_af_ops ipv6_specific = { | 1839 | static const struct inet_connection_sock_af_ops ipv6_specific = { |
1828 | .queue_xmit = inet6_csk_xmit, | 1840 | .queue_xmit = inet6_csk_xmit, |
1829 | .send_check = tcp_v6_send_check, | 1841 | .send_check = tcp_v6_send_check, |