ipvs network name space aware
Subsystems (4)
RFC PATCH 8/9 ipvs network name space aware
This patch contains all proto files
All timeouts are moved to ipvs struct.
Global "timeout tables" are used as default values only.
Signed-off-by Hans Schillstrom <[email protected]>
net/netfilter/ipvs/ip_vs_proto.c +104 -4
@@ -38,7 +38,6 @@* ipvs protocol table. */ -#define IP_VS_PROTO_TAB_SIZE 32/* must be power of 2 */ #define IP_VS_PROTO_HASH (proto) ((proto) & (IP_VS_PROTO_TAB_SIZE-1))static struct ip_vs_protocol *ip_vs_proto_table[IP_VS_PROTO_TAB_SIZE ];
@@ -60,6 +59,30 @@ static int __used __init register_ip_vs_protocol(struct ip_vs_protocol *pp)return 0 ; } +/* +* register an ipvs protocols netns related data +*/ +static int +register_ip_vs_proto_netns (struct net *net,struct ip_vs_protocol *pp ) +{ +unsigned hash =IP_VS_PROTO_HASH (pp->protocol); +struct ip_vs_proto_data *pd = +kzalloc (sizeof (struct ip_vs_proto_data ),GFP_ATOMIC ); + +if (!pd) { +pr_err ("%s(): no memory.\n" , __func__); +return -ENOMEM ; + } + pd->pp=pp;/* For speed issues */ + pd->next = net->ipvs->proto_data_table[hash]; + net->ipvs->proto_data_table[hash] = pd; +atomic_set (&pd->appcnt,0 );/* Init app counter */ + +if (pp->init_netns !=NULL ) + pp->init_netns (net, pd); + +return 0 ; +}/* * unregister an ipvs protocol
@@ -81,6 +104,28 @@ static int unregister_ip_vs_protocol(struct ip_vs_protocol *pp)return -ESRCH ; } +/* +* unregister an ipvs protocols netns data +*/ +static int +unregister_ip_vs_proto_netns (struct net *net,struct ip_vs_proto_data *pd) +{ +struct ip_vs_proto_data **pd_p; +unsigned hash =IP_VS_PROTO_HASH (pd->pp->protocol); + + pd_p = &net->ipvs->proto_data_table[hash]; +for (; *pd_p; pd_p = &(*pd_p)->next) { +if (*pd_p == pd) { + *pd_p = pd->next; +if (pd->pp->exit_netns !=NULL ) + pd->pp->exit_netns (net, pd); +kfree (pd); +return 0 ; + } + } + +return -ESRCH ; +}/*
@@ -100,6 +145,24 @@ struct ip_vs_protocol * ip_vs_proto_get(unsigned short proto) }EXPORT_SYMBOL (ip_vs_proto_get); +/* +* get ip_vs_protocol object data by netns and proto +*/ +struct ip_vs_proto_data * +ip_vs_proto_data_get (struct net *net,unsigned short proto) +{ +struct ip_vs_proto_data *pd; +unsigned hash =IP_VS_PROTO_HASH (proto); +struct netns_ipvs *ipvs = net->ipvs; + +for (pd = ipvs->proto_data_table[hash]; pd; pd = pd->next) { +if (pd->pp->protocol == proto) +return pd; + } + +return NULL ; +} +EXPORT_SYMBOL (ip_vs_proto_data_get);/* * Propagate event for state change to all protocols
@@ -118,8 +181,7 @@ void ip_vs_protocol_timeout_change(int flags) } -int * -ip_vs_create_timeout_table (int *table,int size) +int *ip_vs_create_timeout_table (const int *table,int size) {return kmemdup (table, size,GFP_ATOMIC ); }
@@ -235,7 +297,44 @@ ip_vs_tcpudp_debug_packet(struct ip_vs_protocol *pp,#endif ip_vs_tcpudp_debug_packet_v4 (pp, skb, offset, msg); } +static int __net_init __ip_vs_protocol_init (struct net *net) +{ +#ifdef CONFIG_IP_VS_PROTO_TCP +register_ip_vs_proto_netns (net, &ip_vs_protocol_tcp); +#endif +#ifdef CONFIG_IP_VS_PROTO_UDP +register_ip_vs_proto_netns (net, &ip_vs_protocol_udp); +#endif +#ifdef CONFIG_IP_VS_PROTO_SCTP +register_ip_vs_proto_netns (net, &ip_vs_protocol_sctp); +#endif +#ifdef CONFIG_IP_VS_PROTO_AH +register_ip_vs_proto_netns (net, &ip_vs_protocol_ah); +#endif +#ifdef CONFIG_IP_VS_PROTO_ESP +register_ip_vs_proto_netns (net, &ip_vs_protocol_esp); +#endif +return 0 ; +} + +static void __net_exit __ip_vs_protocol_cleanup(struct net *net) +{ +struct ip_vs_proto_data *pd; +int i; +struct netns_ipvs *ipvs = net->ipvs; + +/* unregister all the ipvs proto data for this netns */ +for (i =0 ; i <IP_VS_PROTO_TAB_SIZE ; i++) { +while ((pd = ipvs->proto_data_table[i]) !=NULL ) +unregister_ip_vs_proto_netns (net, pd); + } +} + +static struct pernet_operations ipvs_proto_ops = { + .init = __ip_vs_protocol_init, + .exit = __ip_vs_protocol_cleanup, +};int __init ip_vs_protocol_init (void ) {
@@ -266,7 +365,7 @@ int __init ip_vs_protocol_init(void)#endif pr_info ("Registered protocols (%s)\n" , &protocols[2 ]); -return 0 ; +return register_pernet_subsys (&ipvs_proto_ops); }
@@ -275,6 +374,7 @@ void ip_vs_protocol_cleanup(void)struct ip_vs_protocol *pp;int i; +unregister_pernet_subsys (&ipvs_proto_ops);/* unregister all the ipvs protocols */ for (i =0 ; i <IP_VS_PROTO_TAB_SIZE ; i++) {while ((pp = ip_vs_proto_table[i]) !=NULL )
net/netfilter/ipvs/ip_vs_proto_ah_esp.c +12 -22
@@ -47,15 +47,17 @@ ah_esp_conn_in_get(int af, const struct sk_buff *skb, struct ip_vs_protocol *pp, int inverse) {struct ip_vs_conn *cp; +struct net *net =dev_net (skb->dev); +BUG_ON (!net);if (likely (!inverse)) { - cp =ip_vs_conn_in_get (af,IPPROTO_UDP , + cp =ip_vs_conn_in_get (net, af,IPPROTO_UDP , &iph->saddr,htons (PORT_ISAKMP ), &iph->daddr,htons (PORT_ISAKMP )); }else { - cp = ip_vs_conn_in_get(af, IPPROTO_UDP, + cp = ip_vs_conn_in_get(net, af, IPPROTO_UDP, &iph->daddr, htons(PORT_ISAKMP), &iph->saddr,
@@ -87,15 +89,17 @@ ah_esp_conn_out_get(int af, const struct sk_buff *skb, int inverse) {struct ip_vs_conn *cp; +struct net *net =dev_net (skb->dev); +BUG_ON (!net);if (likely (!inverse)) { - cp =ip_vs_conn_out_get (af,IPPROTO_UDP , + cp =ip_vs_conn_out_get (net, af,IPPROTO_UDP , &iph->saddr,htons (PORT_ISAKMP ), &iph->daddr,htons (PORT_ISAKMP )); }else { - cp = ip_vs_conn_out_get(af, IPPROTO_UDP, + cp = ip_vs_conn_out_get(net, af, IPPROTO_UDP, &iph->daddr, htons(PORT_ISAKMP), &iph->saddr,
@@ -173,27 +177,14 @@ ah_esp_debug_packet(struct ip_vs_protocol *pp, const struct sk_buff *skb,ah_esp_debug_packet_v4 (pp, skb, offset, msg); } - -static void ah_esp_init (struct ip_vs_protocol *pp) -{ -/* nothing to do now */ -} - - -static void ah_esp_exit (struct ip_vs_protocol *pp) -{ -/* nothing to do now */ -} - -#ifdef CONFIG_IP_VS_PROTO_AH struct ip_vs_protocol ip_vs_protocol_ah = { .name ="AH" , .protocol =IPPROTO_AH , .num_states =1 , .dont_defrag =1 , - .init = ah_esp_init, - .exit = ah_esp_exit, + .init =NULL , + .exit =NULL , .conn_schedule = ah_esp_conn_schedule, .conn_in_get = ah_esp_conn_in_get, .conn_out_get = ah_esp_conn_out_get,
@@ -206,7 +197,6 @@ struct ip_vs_protocol ip_vs_protocol_ah = { .app_conn_bind = NULL, .debug_packet = ah_esp_debug_packet, .timeout_change = NULL, /* ISAKMP */ - .set_state_timeout = NULL, };#endif
@@ -216,8 +206,8 @@ struct ip_vs_protocol ip_vs_protocol_esp = { .protocol = IPPROTO_ESP, .num_states = 1, .dont_defrag = 1, - .init = ah_esp_init, - .exit = ah_esp_exit, + .init = NULL, + .exit = NULL, .conn_schedule = ah_esp_conn_schedule, .conn_in_get = ah_esp_conn_in_get, .conn_out_get = ah_esp_conn_out_get,
net/netfilter/ipvs/ip_vs_proto_sctp.c +69 -57
241 lines not on this page · raw message
net/netfilter/ipvs/ip_vs_proto_tcp.c +66 -46
257 lines not on this page · raw message
net/netfilter/ipvs/ip_vs_proto_udp.c +64 -43
218 lines not on this page · raw message
Signature · 2 lines
Regards Hans Schillstrom <[email protected]>