redonkable
/
remarkable-linux
1
0
Fork 0
Code Releases Activity

[NETNS]: separate af_packet netns data 

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
wifi-calibration
Denis V. Lunev 2007-12-11 04:19:54 -08:00 committed by David S. Miller
parent a0a53c8ba9
commit 2aaef4e47f
3 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/net/net_namespace.h
View File

@ -9,6 +9,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <net/netns/unix.h> #include <net/netns/unix.h>
#include <net/netns/packet.h>
struct proc_dir_entry; struct proc_dir_entry;
struct net_device; struct net_device;
@ -43,10 +44,7 @@ struct net {
struct ctl_table_header *sysctl_core_hdr; struct ctl_table_header *sysctl_core_hdr;
int sysctl_somaxconn; int sysctl_somaxconn;
/* List of all packet sockets. */ struct netns_packet packet;
rwlock_t packet_sklist_lock;
struct hlist_head packet_sklist;
struct netns_unix unx; struct netns_unix unx;
}; };

15
include/net/netns/packet.h 100644
View File

@ -0,0 +1,15 @@
/*
* Packet network namespace
*/
#ifndef __NETNS_PACKET_H__
#define __NETNS_PACKET_H__
#include <linux/list.h>
#include <linux/spinlock.h>
struct netns_packet {
rwlock_t sklist_lock;
struct hlist_head sklist;
};
#endif /* __NETNS_PACKET_H__ */

28
net/packet/af_packet.c
View File

@ -803,9 +803,9 @@ static int packet_release(struct socket *sock)
net = sk->sk_net; net = sk->sk_net;
po = pkt_sk(sk); po = pkt_sk(sk);
write_lock_bh(&net->packet_sklist_lock); write_lock_bh(&net->packet.sklist_lock);
sk_del_node_init(sk); sk_del_node_init(sk);
write_unlock_bh(&net->packet_sklist_lock); write_unlock_bh(&net->packet.sklist_lock);
/* /*
* Unhook packet receive handler. * Unhook packet receive handler.
@ -1015,9 +1015,9 @@ static int packet_create(struct net *net, struct socket *sock, int protocol)
po->running = 1; po->running = 1;
} }
write_lock_bh(&net->packet_sklist_lock); write_lock_bh(&net->packet.sklist_lock);
sk_add_node(sk, &net->packet_sklist); sk_add_node(sk, &net->packet.sklist);
write_unlock_bh(&net->packet_sklist_lock); write_unlock_bh(&net->packet.sklist_lock);
return(0); return(0);
out: out:
return err; return err;
@ -1452,8 +1452,8 @@ static int packet_notifier(struct notifier_block *this, unsigned long msg, void
struct net_device *dev = data; struct net_device *dev = data;
struct net *net = dev->nd_net; struct net *net = dev->nd_net;
read_lock(&net->packet_sklist_lock); read_lock(&net->packet.sklist_lock);
sk_for_each(sk, node, &net->packet_sklist) { sk_for_each(sk, node, &net->packet.sklist) {
struct packet_sock *po = pkt_sk(sk); struct packet_sock *po = pkt_sk(sk);
switch (msg) { switch (msg) {
@ -1492,7 +1492,7 @@ static int packet_notifier(struct notifier_block *this, unsigned long msg, void
break; break;
} }
} }
read_unlock(&net->packet_sklist_lock); read_unlock(&net->packet.sklist_lock);
return NOTIFY_DONE; return NOTIFY_DONE;
} }
@ -1862,7 +1862,7 @@ static inline struct sock *packet_seq_idx(struct net *net, loff_t off)
struct sock *s; struct sock *s;
struct hlist_node *node; struct hlist_node *node;
sk_for_each(s, node, &net->packet_sklist) { sk_for_each(s, node, &net->packet.sklist) {
if (!off--) if (!off--)
return s; return s;
} }
@ -1872,7 +1872,7 @@ static inline struct sock *packet_seq_idx(struct net *net, loff_t off)
static void *packet_seq_start(struct seq_file *seq, loff_t *pos) static void *packet_seq_start(struct seq_file *seq, loff_t *pos)
{ {
struct net *net = seq_file_net(seq); struct net *net = seq_file_net(seq);
read_lock(&net->packet_sklist_lock); read_lock(&net->packet.sklist_lock);
return *pos ? packet_seq_idx(net, *pos - 1) : SEQ_START_TOKEN; return *pos ? packet_seq_idx(net, *pos - 1) : SEQ_START_TOKEN;
} }
@ -1881,14 +1881,14 @@ static void *packet_seq_next(struct seq_file *seq, void *v, loff_t *pos)
struct net *net = seq->private; struct net *net = seq->private;
++*pos; ++*pos;
return (v == SEQ_START_TOKEN) return (v == SEQ_START_TOKEN)
? sk_head(&net->packet_sklist) ? sk_head(&net->packet.sklist)
: sk_next((struct sock*)v) ; : sk_next((struct sock*)v) ;
} }
static void packet_seq_stop(struct seq_file *seq, void *v) static void packet_seq_stop(struct seq_file *seq, void *v)
{ {
struct net *net = seq->private; struct net *net = seq->private;
read_unlock(&net->packet_sklist_lock); read_unlock(&net->packet.sklist_lock);
} }
static int packet_seq_show(struct seq_file *seq, void *v) static int packet_seq_show(struct seq_file *seq, void *v)
@ -1940,8 +1940,8 @@ static const struct file_operations packet_seq_fops = {
static int packet_net_init(struct net *net) static int packet_net_init(struct net *net)
{ {
rwlock_init(&net->packet_sklist_lock); rwlock_init(&net->packet.sklist_lock);
INIT_HLIST_HEAD(&net->packet_sklist); INIT_HLIST_HEAD(&net->packet.sklist);
if (!proc_net_fops_create(net, "packet", 0, &packet_seq_fops)) if (!proc_net_fops_create(net, "packet", 0, &packet_seq_fops))
return -ENOMEM; return -ENOMEM;