ipvs network name space aware
Subsystems (5)
RFC PATCH 2/9 ipvs network name space aware
This part contains the include files
where include/net/netns/ip_vs.h is new and contains all moved vars.
SUMMARY
include/net/ip_vs.h | 136 ++++--- include/net/net_namespace.h | 2 + include/net/netns/ip_vs.h | 112 +++++
---
include/net/ip_vs.h +82 -54
@@ -288,6 +288,7 @@ struct iphdr;struct ip_vs_conn ;struct ip_vs_app ;struct sk_buff ; +struct ip_vs_proto_data ;struct ip_vs_protocol {struct ip_vs_protocol *next;
@@ -302,6 +303,10 @@ struct ip_vs_protocol {void (*exit)(struct ip_vs_protocol *pp); +void (*init_netns)(struct net *net,struct ip_vs_proto_data *pd); + +void (*exit_netns)(struct net *net,struct ip_vs_proto_data *pd); +int (*conn_schedule)(int af,struct sk_buff *skb,struct ip_vs_protocol *pp,int *verdict,struct ip_vs_conn **cpp);
@@ -337,11 +342,11 @@ struct ip_vs_protocol {const struct sk_buff *skb, struct ip_vs_protocol *pp); -int (*register_app)(struct ip_vs_app *inc); +int (*register_app)(struct net *net,struct ip_vs_app *inc); -void (*unregister_app)(struct ip_vs_app *inc); +void (*unregister_app)(struct net *net,struct ip_vs_app *inc); -int (*app_conn_bind)(struct ip_vs_conn *cp); +int (*app_conn_bind)(struct net *net,struct ip_vs_conn *cp); void (*debug_packet)(struct ip_vs_protocol *pp, const struct sk_buff *skb,
@@ -350,10 +355,24 @@ struct ip_vs_protocol {void (*timeout_change)(struct ip_vs_protocol *pp,int flags); -int (*set_state_timeout)(struct ip_vs_protocol *pp,char *sname,int to); +/* +int (*set_state_timeout)(struct ip_vs_protocol *pp, +char *sname, +int to); Not used -Hans S */ +}; +/* +* protocol data per netns +*/ +struct ip_vs_proto_data { +struct ip_vs_proto_data *next; +struct ip_vs_protocol *pp; +int *timeout_table;/* protocol timeout table */ +atomic_t appcnt;/* counter of proto app incs. */ }; -extern struct ip_vs_protocol *ip_vs_proto_get (unsigned short proto); +extern struct ip_vs_protocol *ip_vs_proto_get (unsigned short proto); +extern struct ip_vs_proto_data *ip_vs_proto_data_get (struct net *net, +unsigned short proto);/* * IP_VS structure allocated for each dynamically scheduled connection
@@ -398,6 +417,8 @@ struct ip_vs_conn {int (*packet_xmit)(struct sk_buff *skb,struct ip_vs_conn *cp,struct ip_vs_protocol *pp); +struct net *net;/* netns ptr needed in timer */ +/* Note: we can group the following members into a structure, in order to save more space, and the following members are only used in VS/NAT anyway */
@@ -628,29 +649,32 @@ enum { IP_VS_DIR_LAST, }; -extern struct ip_vs_conn *ip_vs_conn_in_get -(int af,int protocol,const union nf_inet_addr *s_addr,__be16 s_port, -const union nf_inet_addr *d_addr,__be16 d_port); +extern struct ip_vs_conn * +ip_vs_conn_in_get (struct net *net,int af,int protocol, +const union nf_inet_addr *s_addr,__be16 s_port, +const union nf_inet_addr *d_addr,__be16 d_port); -extern struct ip_vs_conn *ip_vs_ct_in_get -(int af,int protocol,const union nf_inet_addr *s_addr,__be16 s_port, -const union nf_inet_addr *d_addr,__be16 d_port); +extern struct ip_vs_conn * +ip_vs_ct_in_get (struct net *net,int af,int protocol, +const union nf_inet_addr *s_addr,__be16 s_port, +const union nf_inet_addr *d_addr,__be16 d_port); -struct ip_vs_conn *ip_vs_conn_in_get_proto (int af,const struct sk_buff *skb, -struct ip_vs_protocol *pp, -const struct ip_vs_iphdr *iph, -unsigned int proto_off, -int inverse); +struct ip_vs_conn * +ip_vs_conn_in_get_proto (int af,const struct sk_buff *skb, +struct ip_vs_protocol *pp, +const struct ip_vs_iphdr *iph, +unsigned int proto_off,int inverse); -extern struct ip_vs_conn *ip_vs_conn_out_get -(int af,int protocol,const union nf_inet_addr *s_addr,__be16 s_port, -const union nf_inet_addr *d_addr,__be16 d_port); +extern struct ip_vs_conn * +ip_vs_conn_out_get (struct net *net,int af,int protocol, +const union nf_inet_addr *s_addr,__be16 s_port, +const union nf_inet_addr *d_addr,__be16 d_port); -struct ip_vs_conn *ip_vs_conn_out_get_proto (int af,const struct sk_buff *skb, -struct ip_vs_protocol *pp, -const struct ip_vs_iphdr *iph, -unsigned int proto_off, -int inverse); +struct ip_vs_conn * +ip_vs_conn_out_get_proto (int af,const struct sk_buff *skb, +struct ip_vs_protocol *pp, +const struct ip_vs_iphdr *iph, +unsigned int proto_off,int inverse);/* put back the conn without restarting its timer */ static inline void __ip_vs_conn_put (struct ip_vs_conn *cp)
@@ -658,20 +682,22 @@ static inline void __ip_vs_conn_put(struct ip_vs_conn *cp)atomic_dec (&cp->refcnt); }extern void ip_vs_conn_put (struct ip_vs_conn *cp); -extern void ip_vs_conn_fill_cport (struct ip_vs_conn *cp,__be16 cport); +extern void +ip_vs_conn_fill_cport (struct net *net,struct ip_vs_conn *cp,__be16 cport);extern struct ip_vs_conn * -ip_vs_conn_new (int af,int proto,const union nf_inet_addr *caddr,__be16 cport, +ip_vs_conn_new (struct net *net,int af,int proto, +const union nf_inet_addr *caddr,__be16 cport,const union nf_inet_addr *vaddr,__be16 vport, -const union nf_inet_addr *daddr,__be16 dport,unsigned flags, -struct ip_vs_dest *dest); +const union nf_inet_addr *daddr,__be16 dport, +unsigned flags,struct ip_vs_dest *dest);extern void ip_vs_conn_expire_now (struct ip_vs_conn *cp);extern const char *ip_vs_state_name (__u16 proto,int state); -extern void ip_vs_tcp_conn_listen (struct ip_vs_conn *cp); -extern int ip_vs_check_template (struct ip_vs_conn *ct); -extern void ip_vs_random_dropentry (void ); +extern void ip_vs_tcp_conn_listen (struct net *net,struct ip_vs_conn *cp); +extern int ip_vs_check_template (struct net *net,struct ip_vs_conn *ct); +extern void ip_vs_random_dropentry (struct net *net);extern int ip_vs_conn_init (void );extern void ip_vs_conn_cleanup (void );
@@ -741,12 +767,15 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)* (from ip_vs_app.c) */ #define IP_VS_APP_MAX_PORTS 8 -extern int register_ip_vs_app (struct ip_vs_app *app); -extern void unregister_ip_vs_app (struct ip_vs_app *app); -extern int ip_vs_bind_app (struct ip_vs_conn *cp,struct ip_vs_protocol *pp); +extern int register_ip_vs_app (struct net *net,struct ip_vs_app *app); +extern void unregister_ip_vs_app (struct net *net,struct ip_vs_app *app); +extern int ip_vs_bind_app (struct net *net,struct ip_vs_conn *cp, +struct ip_vs_protocol *pp);extern void ip_vs_unbind_app (struct ip_vs_conn *cp); -extern int -register_ip_vs_app_inc (struct ip_vs_app *app,__u16 proto,__u16 port); +extern int register_ip_vs_app_inc (struct net *net, +struct ip_vs_app *app, +__u16 proto, +__u16 port);extern int ip_vs_app_inc_get (struct ip_vs_app *inc);extern void ip_vs_app_inc_put (struct ip_vs_app *inc);
@@ -762,7 +791,7 @@ extern void ip_vs_app_cleanup(void);extern int ip_vs_protocol_init (void );extern void ip_vs_protocol_cleanup (void );extern void ip_vs_protocol_timeout_change (int flags); -extern int *ip_vs_create_timeout_table (int *table,int size); +extern int *ip_vs_create_timeout_table (const int *table,int size);extern int ip_vs_set_state_timeout (int *table,int num,const char *const *names,const char *name,int to);
@@ -806,7 +835,7 @@ extern struct ip_vs_stats ip_vs_stats;extern const struct ctl_path net_vs_ctl_path[];extern struct ip_vs_service * -ip_vs_service_get (int af,__u32 fwmark,__u16 protocol, +ip_vs_service_get (struct net *net,int af,__u32 fwmark,__u16 protocol,const union nf_inet_addr *vaddr,__be16 vport);static inline void ip_vs_service_put (struct ip_vs_service *svc)
@@ -815,7 +844,7 @@ static inline void ip_vs_service_put(struct ip_vs_service *svc) }extern struct ip_vs_dest * -ip_vs_lookup_real_service (int af,__u16 protocol, +ip_vs_lookup_real_service (struct net *net,int af,__u16 protocol,const union nf_inet_addr *daddr,__be16 dport);extern int ip_vs_use_count_inc (void );
@@ -823,23 +852,22 @@ extern void ip_vs_use_count_dec(void);extern int ip_vs_control_init (void );extern void ip_vs_control_cleanup (void );extern struct ip_vs_dest * -ip_vs_find_dest (int af,const union nf_inet_addr *daddr,__be16 dport, +ip_vs_find_dest (struct net *net,int af, +const union nf_inet_addr *daddr,__be16 dport,const union nf_inet_addr *vaddr,__be16 vport,__u16 protocol); -extern struct ip_vs_dest *ip_vs_try_bind_dest (struct ip_vs_conn *cp); - +extern struct ip_vs_dest *ip_vs_try_bind_dest (struct net *net, +struct ip_vs_conn *cp);/* * IPVS sync daemon data and function prototypes * (from ip_vs_sync.c) */ -extern volatile int ip_vs_sync_state; -extern volatile int ip_vs_master_syncid; -extern volatile int ip_vs_backup_syncid; -extern char ip_vs_master_mcast_ifn[IP_VS_IFNAME_MAXLEN ]; -extern char ip_vs_backup_mcast_ifn[IP_VS_IFNAME_MAXLEN ]; -extern int start_sync_thread (int state,char *mcast_ifn,__u8 syncid); -extern int stop_sync_thread (int state); -extern void ip_vs_sync_conn (struct ip_vs_conn *cp); +extern int start_sync_thread (struct net *net,int state,char *mcast_ifn, +__u8 syncid); +extern int stop_sync_thread (struct net *net,int state); +extern void ip_vs_sync_conn (struct net *net,struct ip_vs_conn *cp); +extern int ip_vs_sync_init (void ); +extern void ip_vs_sync_cleanup (void );/*
@@ -847,8 +875,8 @@ extern void ip_vs_sync_conn(struct ip_vs_conn *cp);*/ extern int ip_vs_estimator_init (void );extern void ip_vs_estimator_cleanup (void ); -extern void ip_vs_new_estimator (struct ip_vs_stats *stats); -extern void ip_vs_kill_estimator (struct ip_vs_stats *stats); +extern void ip_vs_new_estimator (struct net *net,struct ip_vs_stats *stats); +extern void ip_vs_kill_estimator (struct net *net,struct ip_vs_stats *stats);extern void ip_vs_zero_estimator (struct ip_vs_stats *stats);/*
@@ -864,8 +892,8 @@ extern int ip_vs_tunnel_xmit (struct sk_buff *skb, struct ip_vs_conn *cp, struct ip_vs_protocol *pp);extern int ip_vs_dr_xmit (struct sk_buff *skb,struct ip_vs_conn *cp,struct ip_vs_protocol *pp); -extern int ip_vs_icmp_xmit -(struct sk_buff *skb,struct ip_vs_conn *cp,struct ip_vs_protocol *pp,int offset); +extern int ip_vs_icmp_xmit (struct sk_buff *skb,struct ip_vs_conn *cp, +struct ip_vs_protocol *pp,int offset);extern void ip_vs_dst_reset (struct ip_vs_dest *dest);#ifdef CONFIG_IP_VS_IPV6
include/net/net_namespace.h +2 -0
@@ -15,6 +15,7 @@#include <net/netns/ipv4.h> #include <net/netns/ipv6.h> #include <net/netns/dccp.h> +#include <net/netns/ip_vs.h> #include <net/netns/x_tables.h> #if defined(CONFIG_NF_CONNTRACK ) || defined(CONFIG_NF_CONNTRACK_MODULE )#include <net/netns/conntrack.h>
@@ -91,6 +92,7 @@ struct net {struct sk_buff_head wext_nlevents;#endif struct net_generic *gen; +struct netns_ipvs *ipvs; };
include/net/netns/ip_vs.h new file +112 -0
112 lines not on this page · raw message
Signature · 2 lines
Regards Hans Schillstrom <[email protected]>
Quoted 12 lines · Hans Schillstrom
This part contains the include files
whereinclude/net/netns/ip_vs.his new and contains all moved vars.SUMMARY
include/net/ip_vs.h | 136 ++++--- include/net/net_namespace.h | 2 + include/net/netns/ip_vs.h | 112 +++++Signed-off-by Hans Schillstrom<[email protected]>---
Why are patch 1 and 2 the same ?
Quoted 10 lines · On Tuesday 12 October 2010 16:30:20 Daniel Lezcano wrote:
Quoted 9 lines · Hans Schillstrom
This part contains the include files
whereinclude/net/netns/ip_vs.his new and contains all moved vars.SUMMARY
include/net/ip_vs.h | 136 ++++--- include/net/net_namespace.h | 2 + include/net/netns/ip_vs.h | 112 +++++
Quoted 7 lines
Quoted 3 lines
Signed-off-by Hans Schillstrom<[email protected]>---
Why are patch 1 and 2 the same ?
Cut & Paste error :-)
I'll resend patch 2
Signature · 2 lines
Regards Hans Schillstrom <[email protected]>
RFC PATCH 2/9 ipvs network name space aware (resend with right patch)
In reply to Daniel LezcanoThis is patch 2/9 previous was just a copy of patch 1/9
This patch just contains ip_vs_app.c
There is nothing special whith this file,
just the normal,
- moving to vars to struct ipvs
- adding per netns init and exit
net/netfilter/ipvs/ip_vs_app.c +59 -37
@@ -43,11 +43,6 @@ EXPORT_SYMBOL(register_ip_vs_app);EXPORT_SYMBOL (unregister_ip_vs_app);EXPORT_SYMBOL (register_ip_vs_app_inc); -/* ipvs application list head */ -static LIST_HEAD (ip_vs_app_list); -static DEFINE_MUTEX (__ip_vs_app_mutex); - -/* * Get an ip_vs_app object */
@@ -67,7 +62,8 @@ static inline void ip_vs_app_put(struct ip_vs_app *app)* Allocate/initialize app incarnation and register it in proto apps. */ static int -ip_vs_app_inc_new (struct ip_vs_app *app,__u16 proto,__u16 port) +ip_vs_app_inc_new (struct net *net,struct ip_vs_app *app,__u16 proto, +__u16 port) {struct ip_vs_protocol *pp;struct ip_vs_app *inc;
@@ -98,7 +94,7 @@ ip_vs_app_inc_new(struct ip_vs_app *app, __u16 proto, __u16 port) } } - ret = pp->register_app (inc); + ret = pp->register_app (net, inc);if (ret) goto out;
@@ -119,7 +115,7 @@ ip_vs_app_inc_new(struct ip_vs_app *app, __u16 proto, __u16 port)* Release app incarnation */ static void -ip_vs_app_inc_release (struct ip_vs_app *inc) +ip_vs_app_inc_release (struct net *net,struct ip_vs_app *inc) {struct ip_vs_protocol *pp;
@@ -127,7 +123,7 @@ ip_vs_app_inc_release(struct ip_vs_app *inc)return ;if (pp->unregister_app) - pp->unregister_app (inc); + pp->unregister_app (net, inc);IP_VS_DBG (9 ,"%s App %s:%u unregistered\n" , pp->name, inc->name, inc->port);
@@ -167,16 +163,16 @@ void ip_vs_app_inc_put(struct ip_vs_app *inc)/* * Register an application incarnation in protocol applications */ -int -register_ip_vs_app_inc (struct ip_vs_app *app,__u16 proto,__u16 port) +int register_ip_vs_app_inc (struct net *net,struct ip_vs_app *app,__u16 proto, +__u16 port) {int result; -mutex_lock (&__ip_vs_app_mutex); +mutex_lock (&net->ipvs->app_mutex); - result =ip_vs_app_inc_new (app, proto, port); + result =ip_vs_app_inc_new (net, app, proto, port); -mutex_unlock (&__ip_vs_app_mutex); +mutex_unlock (&net->ipvs->app_mutex);return result; }
@@ -185,16 +181,16 @@ register_ip_vs_app_inc(struct ip_vs_app *app, __u16 proto, __u16 port)/* * ip_vs_app registration routine */ -int register_ip_vs_app (struct ip_vs_app *app) +int register_ip_vs_app (struct net *net,struct ip_vs_app *app) {/* increase the module use count */ ip_vs_use_count_inc (); -mutex_lock (&__ip_vs_app_mutex); +mutex_lock (&net->ipvs->app_mutex); -list_add (&app->a_list, &ip_vs_app_list); +list_add (&app->a_list, &net->ipvs->app_list); -mutex_unlock (&__ip_vs_app_mutex); +mutex_unlock (&net->ipvs->app_mutex);return 0 ; }
@@ -204,19 +200,19 @@ int register_ip_vs_app(struct ip_vs_app *app)* ip_vs_app unregistration routine * We are sure there are no app incarnations attached to services */ -void unregister_ip_vs_app (struct ip_vs_app *app) +void unregister_ip_vs_app (struct net *net,struct ip_vs_app *app) {struct ip_vs_app *inc, *nxt; -mutex_lock (&__ip_vs_app_mutex); +mutex_lock (&net->ipvs->app_mutex);list_for_each_entry_safe (inc, nxt, &app->incs_list, a_list) { -ip_vs_app_inc_release (inc); +ip_vs_app_inc_release (net, inc); }list_del (&app->a_list); -mutex_unlock (&__ip_vs_app_mutex); +mutex_unlock (&net->ipvs->app_mutex);/* decrease the module use count */ ip_vs_use_count_dec ();
@@ -226,9 +222,9 @@ void unregister_ip_vs_app(struct ip_vs_app *app)/* * Bind ip_vs_conn to its ip_vs_app (called by cp constructor) */ -int ip_vs_bind_app (struct ip_vs_conn *cp,struct ip_vs_protocol *pp) +int ip_vs_bind_app (struct net *net,struct ip_vs_conn *cp,struct ip_vs_protocol *pp) { -return pp->app_conn_bind (cp); +return pp->app_conn_bind (net, cp); }
@@ -481,11 +477,12 @@ int ip_vs_app_pkt_in(struct ip_vs_conn *cp, struct sk_buff *skb)* /proc/net/ip_vs_app entry function */ -static struct ip_vs_app *ip_vs_app_idx (loff_t pos) +static struct ip_vs_app *ip_vs_app_idx (struct net *net,loff_t pos) {struct ip_vs_app *app, *inc; +struct netns_ipvs *ipvs = net->ipvs; -list_for_each_entry (app, &ip_vs_app_list, a_list) { +list_for_each_entry (app, &ipvs->app_list, a_list) {list_for_each_entry (inc, &app->incs_list, a_list) {if (pos-- ==0 )return inc;
@@ -497,19 +494,22 @@ static struct ip_vs_app *ip_vs_app_idx(loff_t pos)static void *ip_vs_app_seq_start (struct seq_file *seq,loff_t *pos) { -mutex_lock (&__ip_vs_app_mutex); +struct net *net =seq_file_net (seq); +mutex_lock (&net->ipvs->app_mutex); -return *pos ?ip_vs_app_idx (*pos -1 ) :SEQ_START_TOKEN ; +return *pos ?ip_vs_app_idx (net, *pos -1 ) :SEQ_START_TOKEN ; }static void *ip_vs_app_seq_next (struct seq_file *seq,void *v,loff_t *pos) {struct ip_vs_app *inc, *app;struct list_head *e; +struct net *net =seq_file_net (seq); +struct netns_ipvs *ipvs = net->ipvs; ++*pos;if (v ==SEQ_START_TOKEN ) -return ip_vs_app_idx (0 ); +return ip_vs_app_idx (net,0 ); inc = v; app = inc->app;
@@ -518,7 +518,7 @@ static void *ip_vs_app_seq_next(struct seq_file *seq, void *v, loff_t *pos) return list_entry(e, struct ip_vs_app, a_list);/* go on to next application */ -for (e = app->a_list.next; e != &ip_vs_app_list; e = e->next) { +for (e = app->a_list.next; e != &ipvs->app_list; e = e->next) { app = list_entry(e, struct ip_vs_app, a_list);list_for_each_entry (inc, &app->incs_list, a_list) {return inc;
@@ -529,7 +529,9 @@ static void *ip_vs_app_seq_next(struct seq_file *seq, void *v, loff_t *pos)static void ip_vs_app_seq_stop (struct seq_file *seq,void *v) { -mutex_unlock (&__ip_vs_app_mutex); +struct net *net =seq_file_net (seq); + +mutex_unlock (&net->ipvs->app_mutex); }static int ip_vs_app_seq_show (struct seq_file *seq,void *v)
@@ -557,7 +559,8 @@ static const struct seq_operations ip_vs_app_seq_ops = {static int ip_vs_app_open (struct inode *inode,struct file *file) { -return seq_open (file, &ip_vs_app_seq_ops); + +return seq_open_net (inode,file, &ip_vs_app_seq_ops,sizeof (struct seq_net_private )); }static const struct file_operations ip_vs_app_fops = {
@@ -565,19 +568,38 @@ static const struct file_operations ip_vs_app_fops = { .open = ip_vs_app_open, .read = seq_read, .llseek = seq_lseek, - .release = seq_release, + .release = seq_release_private, };#endif -int __init ip_vs_app_init (void ) +static int __net_init __ip_vs_app_init (struct net *net) { -/* we will replace it with proc_net_ipvs_create() soon */ -proc_net_fops_create (&init_net,"ip_vs_app" ,0 , &ip_vs_app_fops); +INIT_LIST_HEAD (&net->ipvs->app_list); +__mutex_init (&net->ipvs->app_mutex,"ipvs->app_mutex" , &net->ipvs->app_key); +proc_net_fops_create (net,"ip_vs_app" ,0 , &ip_vs_app_fops);return 0 ; } +static void __net_exit __ip_vs_app_cleanup(struct net *net) +{ +proc_net_remove (net,"ip_vs_app" ); +} + +static struct pernet_operations ip_vs_app_ops = { + .init = __ip_vs_app_init, + .exit = __ip_vs_app_cleanup, +}; + +int __init ip_vs_app_init (void ) +{ +int rv; + + rv =register_pernet_subsys (&ip_vs_app_ops); +return rv; +} +void ip_vs_app_cleanup (void ) { -proc_net_remove (&init_net,"ip_vs_app" ); +unregister_pernet_subsys (&ip_vs_app_ops); }
Signature · 2 lines
Regards Hans Schillstrom <[email protected]>