mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: Batch inet_twsk_purge

Browse source 
This function walks the whole hashtable so there is no point in
passing it a network namespace.  Instead I purge all timewait
sockets from dead network namespaces that I find.  If the namespace
is one of the once I am trying to purge I am guaranteed no new timewait
sockets can be formed so this will get them all.  If the namespace
is one I am not acting for it might form a few more but I will
call inet_twsk_purge again and  shortly to get rid of them.  In
any even if the network namespace is dead timewait sockets are
useless.

Move the calls of inet_twsk_purge into batch_exit routines so
that if I am killing a bunch of namespaces at once I will just
call inet_twsk_purge once and save a lot of redundant unnecessary
work.

My simple 4k network namespace exit test the cleanup time dropped from
roughly 8.2s to 1.6s.  While the time spent running inet_twsk_purge fell
to about 2ms.  1ms for ipv4 and 1ms for ipv6.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric W. Biederman 2009-12-03 02:29:09 +00:00 committed by David S. Miller
parent 575f4cd5a5
commit b099ce2602
4 changed files with 24 additions and 14 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
include/net/inet_timewait_sock.h
View file

@ -212,14 +212,14 @@ extern void inet_twsk_schedule(struct inet_timewait_sock *tw,
extern void inet_twsk_deschedule(struct inet_timewait_sock *tw, extern void inet_twsk_deschedule(struct inet_timewait_sock *tw,
struct inet_timewait_death_row *twdr); struct inet_timewait_death_row *twdr);
extern void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo, extern void inet_twsk_purge(struct inet_hashinfo *hashinfo,
struct inet_timewait_death_row *twdr, int family); struct inet_timewait_death_row *twdr, int family);
static inline static inline
struct net *twsk_net(const struct inet_timewait_sock *twsk) struct net *twsk_net(const struct inet_timewait_sock *twsk)
{ {
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
return twsk->tw_net; return rcu_dereference(twsk->tw_net);
#else #else
return &init_net; return &init_net;
#endif #endif
@ -229,7 +229,7 @@ static inline
void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net) void twsk_net_set(struct inet_timewait_sock *twsk, struct net *net)
{ {
#ifdef CONFIG_NET_NS #ifdef CONFIG_NET_NS
twsk->tw_net = net; rcu_assign_pointer(twsk->tw_net, net);
#endif #endif
} }
#endif /* _INET_TIMEWAIT_SOCK_ */ #endif /* _INET_TIMEWAIT_SOCK_ */

10
net/ipv4/inet_timewait_sock.c
View file

@ -421,7 +421,7 @@ void inet_twdr_twcal_tick(unsigned long data)
EXPORT_SYMBOL_GPL(inet_twdr_twcal_tick); EXPORT_SYMBOL_GPL(inet_twdr_twcal_tick);
void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo, void inet_twsk_purge(struct inet_hashinfo *hashinfo,
struct inet_timewait_death_row *twdr, int family) struct inet_timewait_death_row *twdr, int family)
{ {
struct inet_timewait_sock *tw; struct inet_timewait_sock *tw;
@ -436,15 +436,15 @@ void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo,
restart: restart:
sk_nulls_for_each_rcu(sk, node, &head->twchain) { sk_nulls_for_each_rcu(sk, node, &head->twchain) {
tw = inet_twsk(sk); tw = inet_twsk(sk);
if (!net_eq(twsk_net(tw), net) || if ((tw->tw_family != family) ||
tw->tw_family != family) atomic_read(&twsk_net(tw)->count))
continue; continue;
if (unlikely(!atomic_inc_not_zero(&tw->tw_refcnt))) if (unlikely(!atomic_inc_not_zero(&tw->tw_refcnt)))
continue; continue;
if (unlikely(!net_eq(twsk_net(tw), net) || if (unlikely((tw->tw_family != family) ||
tw->tw_family != family)) { atomic_read(&twsk_net(tw)->count))) {
inet_twsk_put(tw); inet_twsk_put(tw);
goto restart; goto restart;
} }

11
net/ipv4/tcp_ipv4.c
View file

@ -2529,12 +2529,17 @@ static int __net_init tcp_sk_init(struct net *net)
static void __net_exit tcp_sk_exit(struct net *net) static void __net_exit tcp_sk_exit(struct net *net)
{ {
inet_ctl_sock_destroy(net->ipv4.tcp_sock); inet_ctl_sock_destroy(net->ipv4.tcp_sock);
inet_twsk_purge(net, &tcp_hashinfo, &tcp_death_row, AF_INET); }
static void __net_exit tcp_sk_exit_batch(struct list_head *net_exit_list)
{
inet_twsk_purge(&tcp_hashinfo, &tcp_death_row, AF_INET);
} }
static struct pernet_operations __net_initdata tcp_sk_ops = { static struct pernet_operations __net_initdata tcp_sk_ops = {
.init = tcp_sk_init, .init = tcp_sk_init,
.exit = tcp_sk_exit, .exit = tcp_sk_exit,
.exit_batch = tcp_sk_exit_batch,
}; };
void __init tcp_v4_init(void) void __init tcp_v4_init(void)

11
net/ipv6/tcp_ipv6.c
View file

@ -2184,12 +2184,17 @@ static int tcpv6_net_init(struct net *net)
static void tcpv6_net_exit(struct net *net) static void tcpv6_net_exit(struct net *net)
{ {
inet_ctl_sock_destroy(net->ipv6.tcp_sk); inet_ctl_sock_destroy(net->ipv6.tcp_sk);
inet_twsk_purge(net, &tcp_hashinfo, &tcp_death_row, AF_INET6); }
static void tcpv6_net_exit_batch(struct list_head *net_exit_list)
{
inet_twsk_purge(&tcp_hashinfo, &tcp_death_row, AF_INET6);
} }
static struct pernet_operations tcpv6_net_ops = { static struct pernet_operations tcpv6_net_ops = {
.init = tcpv6_net_init, .init = tcpv6_net_init,
.exit = tcpv6_net_exit, .exit = tcpv6_net_exit,
.exit_batch = tcpv6_net_exit_batch,
}; };
int __init tcpv6_init(void) int __init tcpv6_init(void)