X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=include%2Fnet%2Fnet_namespace.h;h=ded434b032a44ec406a0fa8bcb11d688d95b7efa;hb=458adb8ba9b26bfc66593866013adbb62a1a3d2e;hp=b0cf07519b81eb4f1ac71d674fc56d817b51ec3c;hpb=d392e49756a99ba51577d265d6db83e3f01c6ac8;p=safe%2Fjmp%2Flinux-2.6 diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index b0cf075..ded434b 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h @@ -8,24 +8,43 @@ #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#include +#endif +#include + struct proc_dir_entry; struct net_device; struct sock; +struct ctl_table_header; +struct net_generic; + struct net { atomic_t count; /* To decided when the network * namespace should be freed. */ +#ifdef NETNS_REFCNT_DEBUG atomic_t use_count; /* To track references we * destroy on demand */ +#endif struct list_head list; /* list of network namespaces */ struct work_struct work; /* work struct for freeing */ struct proc_dir_entry *proc_net; struct proc_dir_entry *proc_net_stat; - struct proc_dir_entry *proc_net_root; - struct list_head sysctl_table_headers; +#ifdef CONFIG_SYSCTL + struct ctl_table_set sysctls; +#endif struct net_device *loopback_dev; /* The loopback */ @@ -33,35 +52,59 @@ struct net { struct hlist_head *dev_name_head; struct hlist_head *dev_index_head; - struct sock *rtnl; /* rtnetlink socket */ + /* core fib_rules */ + struct list_head rules_ops; + spinlock_t rules_mod_lock; - /* List of all packet sockets. */ - rwlock_t packet_sklist_lock; - struct hlist_head packet_sklist; + struct sock *rtnl; /* rtnetlink socket */ - /* unix sockets */ - int sysctl_unix_max_dgram_qlen; + struct netns_core core; + struct netns_mib mib; + struct netns_packet packet; + struct netns_unix unx; + struct netns_ipv4 ipv4; +#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE) + struct netns_ipv6 ipv6; +#endif +#if defined(CONFIG_IP_DCCP) || defined(CONFIG_IP_DCCP_MODULE) + struct netns_dccp dccp; +#endif +#ifdef CONFIG_NETFILTER + struct netns_xt xt; +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + struct netns_ct ct; +#endif +#endif +#ifdef CONFIG_XFRM + struct netns_xfrm xfrm; +#endif + struct net_generic *gen; }; -#ifdef CONFIG_NET + +#include + /* Init's network namespace */ extern struct net init_net; -#define INIT_NET_NS(net_ns) .net_ns = &init_net, -#else -#define INIT_NET_NS(net_ns) -#endif - -extern struct list_head net_namespace_list; #ifdef CONFIG_NET +#define INIT_NET_NS(net_ns) .net_ns = &init_net, + extern struct net *copy_net_ns(unsigned long flags, struct net *net_ns); -#else + +#else /* CONFIG_NET */ + +#define INIT_NET_NS(net_ns) + static inline struct net *copy_net_ns(unsigned long flags, struct net *net_ns) { /* There is nothing to copy so this is a noop */ return net_ns; } -#endif +#endif /* CONFIG_NET */ + + +extern struct list_head net_namespace_list; #ifdef CONFIG_NET_NS extern void __put_net(struct net *net); @@ -90,39 +133,76 @@ static inline void put_net(struct net *net) __put_net(net); } -static inline struct net *hold_net(struct net *net) +static inline +int net_eq(const struct net *net1, const struct net *net2) +{ + return net1 == net2; +} +#else + +static inline struct net *get_net(struct net *net) { - atomic_inc(&net->use_count); return net; } -static inline void release_net(struct net *net) +static inline void put_net(struct net *net) { - atomic_dec(&net->use_count); } -#else -static inline struct net *get_net(struct net *net) + +static inline struct net *maybe_get_net(struct net *net) { return net; } -static inline void put_net(struct net *net) +static inline +int net_eq(const struct net *net1, const struct net *net2) { + return 1; } +#endif + +#ifdef NETNS_REFCNT_DEBUG static inline struct net *hold_net(struct net *net) { + if (net) + atomic_inc(&net->use_count); return net; } static inline void release_net(struct net *net) { + if (net) + atomic_dec(&net->use_count); } - -static inline struct net *maybe_get_net(struct net *net) +#else +static inline struct net *hold_net(struct net *net) { return net; } + +static inline void release_net(struct net *net) +{ +} +#endif + +#ifdef CONFIG_NET_NS + +static inline void write_pnet(struct net **pnet, struct net *net) +{ + *pnet = net; +} + +static inline struct net *read_pnet(struct net * const *pnet) +{ + return *pnet; +} + +#else + +#define write_pnet(pnet, net) do { (void)(net);} while (0) +#define read_pnet(pnet) (&init_net) + #endif #define for_each_net(VAR) \ @@ -144,16 +224,40 @@ struct pernet_operations { void (*exit)(struct net *net); }; +/* + * Use these carefully. If you implement a network device and it + * needs per network namespace operations use device pernet operations, + * otherwise use pernet subsys operations. + * + * This is critically important. Most of the network code cleanup + * runs with the assumption that dev_remove_pack has been called so no + * new packets will arrive during and after the cleanup functions have + * been called. dev_remove_pack is not per namespace so instead the + * guarantee of no more packets arriving in a network namespace is + * provided by ensuring that all network devices and all sockets have + * left the network namespace before the cleanup methods are called. + * + * For the longest time the ipv4 icmp code was registered as a pernet + * device which caused kernel oops, and panics during network + * namespace cleanup. So please don't get this wrong. + */ extern int register_pernet_subsys(struct pernet_operations *); extern void unregister_pernet_subsys(struct pernet_operations *); +extern int register_pernet_gen_subsys(int *id, struct pernet_operations *); +extern void unregister_pernet_gen_subsys(int id, struct pernet_operations *); extern int register_pernet_device(struct pernet_operations *); extern void unregister_pernet_device(struct pernet_operations *); +extern int register_pernet_gen_device(int *id, struct pernet_operations *); +extern void unregister_pernet_gen_device(int id, struct pernet_operations *); struct ctl_path; struct ctl_table; struct ctl_table_header; + extern struct ctl_table_header *register_net_sysctl_table(struct net *net, const struct ctl_path *path, struct ctl_table *table); +extern struct ctl_table_header *register_net_sysctl_rotable( + const struct ctl_path *path, struct ctl_table *table); extern void unregister_net_sysctl_table(struct ctl_table_header *header); #endif /* __NET_NET_NAMESPACE_H */