iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipv{4,6}/tcp: simplify procfs registration

Browse Source 
Avoid most of the afinfo indirections and just call the proc helpers
directly.

Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Christoph Hellwig 2018-04-11 09:31:28 +02:00
parent a3d2599b24
commit 37d849bb42
3 changed files with 53 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/net/tcp.h
View File

@ -1747,27 +1747,22 @@ enum tcp_seq_states {
TCP_SEQ_STATE_ESTABLISHED, TCP_SEQ_STATE_ESTABLISHED,
}; };
int tcp_seq_open(struct inode *inode, struct file *file); void *tcp_seq_start(struct seq_file *seq, loff_t *pos);
void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos);
void tcp_seq_stop(struct seq_file *seq, void *v);
struct tcp_seq_afinfo { struct tcp_seq_afinfo {
char *name;
sa_family_t family; sa_family_t family;
const struct file_operations *seq_fops;
struct seq_operations seq_ops;
}; };
struct tcp_iter_state { struct tcp_iter_state {
struct seq_net_private p; struct seq_net_private p;
sa_family_t family;
enum tcp_seq_states state; enum tcp_seq_states state;
struct sock *syn_wait_sk; struct sock *syn_wait_sk;
int bucket, offset, sbucket, num; int bucket, offset, sbucket, num;
loff_t last_pos; loff_t last_pos;
}; };
int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo);
void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo);
extern struct request_sock_ops tcp_request_sock_ops; extern struct request_sock_ops tcp_request_sock_ops;
extern struct request_sock_ops tcp6_request_sock_ops; extern struct request_sock_ops tcp6_request_sock_ops;

85
net/ipv4/tcp_ipv4.c
View File

@ -1961,6 +1961,7 @@ EXPORT_SYMBOL(tcp_v4_destroy_sock);
*/ */
static void *listening_get_next(struct seq_file *seq, void *cur) static void *listening_get_next(struct seq_file *seq, void *cur)
{ {
struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
struct tcp_iter_state *st = seq->private; struct tcp_iter_state *st = seq->private;
struct net *net = seq_file_net(seq); struct net *net = seq_file_net(seq);
struct inet_listen_hashbucket *ilb; struct inet_listen_hashbucket *ilb;
@ -1983,7 +1984,7 @@ get_sk:
sk_for_each_from(sk) { sk_for_each_from(sk) {
if (!net_eq(sock_net(sk), net)) if (!net_eq(sock_net(sk), net))
continue; continue;
if (sk->sk_family == st->family) if (sk->sk_family == afinfo->family)
return sk; return sk;
} }
spin_unlock(&ilb->lock); spin_unlock(&ilb->lock);
@ -2020,6 +2021,7 @@ static inline bool empty_bucket(const struct tcp_iter_state *st)
*/ */
static void *established_get_first(struct seq_file *seq) static void *established_get_first(struct seq_file *seq)
{ {
struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
struct tcp_iter_state *st = seq->private; struct tcp_iter_state *st = seq->private;
struct net *net = seq_file_net(seq); struct net *net = seq_file_net(seq);
void *rc = NULL; void *rc = NULL;
@ -2036,7 +2038,7 @@ static void *established_get_first(struct seq_file *seq)
spin_lock_bh(lock); spin_lock_bh(lock);
sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
if (sk->sk_family != st->family || if (sk->sk_family != afinfo->family ||
!net_eq(sock_net(sk), net)) { !net_eq(sock_net(sk), net)) {
continue; continue;
} }
@ -2051,6 +2053,7 @@ out:
static void *established_get_next(struct seq_file *seq, void *cur) static void *established_get_next(struct seq_file *seq, void *cur)
{ {
struct tcp_seq_afinfo *afinfo = PDE_DATA(file_inode(seq->file));
struct sock *sk = cur; struct sock *sk = cur;
struct hlist_nulls_node *node; struct hlist_nulls_node *node;
struct tcp_iter_state *st = seq->private; struct tcp_iter_state *st = seq->private;
@ -2062,7 +2065,8 @@ static void *established_get_next(struct seq_file *seq, void *cur)
sk = sk_nulls_next(sk); sk = sk_nulls_next(sk);
sk_nulls_for_each_from(sk, node) { sk_nulls_for_each_from(sk, node) {
if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) if (sk->sk_family == afinfo->family &&
net_eq(sock_net(sk), net))
return sk; return sk;
} }
@ -2135,7 +2139,7 @@ static void *tcp_seek_last_pos(struct seq_file *seq)
return rc; return rc;
} }
static void *tcp_seq_start(struct seq_file *seq, loff_t *pos) void *tcp_seq_start(struct seq_file *seq, loff_t *pos)
{ {
struct tcp_iter_state *st = seq->private; struct tcp_iter_state *st = seq->private;
void *rc; void *rc;
@ -2156,8 +2160,9 @@ out:
st->last_pos = *pos; st->last_pos = *pos;
return rc; return rc;
} }
EXPORT_SYMBOL(tcp_seq_start);
static void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos) void *tcp_seq_next(struct seq_file *seq, void *v, loff_t *pos)
{ {
struct tcp_iter_state *st = seq->private; struct tcp_iter_state *st = seq->private;
void *rc = NULL; void *rc = NULL;
@ -2186,8 +2191,9 @@ out:
st->last_pos = *pos; st->last_pos = *pos;
return rc; return rc;
} }
EXPORT_SYMBOL(tcp_seq_next);
static void tcp_seq_stop(struct seq_file *seq, void *v) void tcp_seq_stop(struct seq_file *seq, void *v)
{ {
struct tcp_iter_state *st = seq->private; struct tcp_iter_state *st = seq->private;
@ -2202,47 +2208,7 @@ static void tcp_seq_stop(struct seq_file *seq, void *v)
break; break;
} }
} }
EXPORT_SYMBOL(tcp_seq_stop);
int tcp_seq_open(struct inode *inode, struct file *file)
{
struct tcp_seq_afinfo *afinfo = PDE_DATA(inode);
struct tcp_iter_state *s;
int err;
err = seq_open_net(inode, file, &afinfo->seq_ops,
sizeof(struct tcp_iter_state));
if (err < 0)
return err;
s = ((struct seq_file *)file->private_data)->private;
s->family = afinfo->family;
s->last_pos = 0;
return 0;
}
EXPORT_SYMBOL(tcp_seq_open);
int tcp_proc_register(struct net *net, struct tcp_seq_afinfo *afinfo)
{
int rc = 0;
struct proc_dir_entry *p;
afinfo->seq_ops.start = tcp_seq_start;
afinfo->seq_ops.next = tcp_seq_next;
afinfo->seq_ops.stop = tcp_seq_stop;
p = proc_create_data(afinfo->name, 0444, net->proc_net,
afinfo->seq_fops, afinfo);
if (!p)
rc = -ENOMEM;
return rc;
}
EXPORT_SYMBOL(tcp_proc_register);
void tcp_proc_unregister(struct net *net, struct tcp_seq_afinfo *afinfo)
{
remove_proc_entry(afinfo->name, net->proc_net);
}
EXPORT_SYMBOL(tcp_proc_unregister);
static void get_openreq4(const struct request_sock *req, static void get_openreq4(const struct request_sock *req,
struct seq_file *f, int i) struct seq_file *f, int i)
@ -2377,6 +2343,19 @@ out:
return 0; return 0;
} }
static const struct seq_operations tcp4_seq_ops = {
.show = tcp4_seq_show,
.start = tcp_seq_start,
.next = tcp_seq_next,
.stop = tcp_seq_stop,
};
static int tcp_seq_open(struct inode *inode, struct file *file)
{
return seq_open_net(inode, file, &tcp4_seq_ops,
sizeof(struct tcp_iter_state));
}
static const struct file_operations tcp_afinfo_seq_fops = { static const struct file_operations tcp_afinfo_seq_fops = {
.open = tcp_seq_open, .open = tcp_seq_open,
.read = seq_read, .read = seq_read,
@ -2385,22 +2364,20 @@ static const struct file_operations tcp_afinfo_seq_fops = {
}; };
static struct tcp_seq_afinfo tcp4_seq_afinfo = { static struct tcp_seq_afinfo tcp4_seq_afinfo = {
.name = "tcp",
.family = AF_INET, .family = AF_INET,
.seq_fops = &tcp_afinfo_seq_fops,
.seq_ops = {
.show = tcp4_seq_show,
},
}; };
static int __net_init tcp4_proc_init_net(struct net *net) static int __net_init tcp4_proc_init_net(struct net *net)
{ {
return tcp_proc_register(net, &tcp4_seq_afinfo); if (!proc_create_data("tcp", 0444, net->proc_net,
&tcp_afinfo_seq_fops, &tcp4_seq_afinfo))
return -ENOMEM;
return 0;
} }
static void __net_exit tcp4_proc_exit_net(struct net *net) static void __net_exit tcp4_proc_exit_net(struct net *net)
{ {
tcp_proc_unregister(net, &tcp4_seq_afinfo); remove_proc_entry("tcp", net->proc_net);
} }
static struct pernet_operations tcp4_net_ops = { static struct pernet_operations tcp4_net_ops = {

27
net/ipv6/tcp_ipv6.c
View File

@ -1909,30 +1909,41 @@ out:
return 0; return 0;
} }
static const struct seq_operations tcp6_seq_ops = {
.show = tcp6_seq_show,
.start = tcp_seq_start,
.next = tcp_seq_next,
.stop = tcp_seq_stop,
};
static int tcp6_seq_open(struct inode *inode, struct file *file)
{
return seq_open_net(inode, file, &tcp6_seq_ops,
sizeof(struct tcp_iter_state));
}
static const struct file_operations tcp6_afinfo_seq_fops = { static const struct file_operations tcp6_afinfo_seq_fops = {
.open = tcp_seq_open, .open = tcp6_seq_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = seq_release_net .release = seq_release_net
}; };
static struct tcp_seq_afinfo tcp6_seq_afinfo = { static struct tcp_seq_afinfo tcp6_seq_afinfo = {
.name = "tcp6",
.family = AF_INET6, .family = AF_INET6,
.seq_fops = &tcp6_afinfo_seq_fops,
.seq_ops = {
.show = tcp6_seq_show,
},
}; };
int __net_init tcp6_proc_init(struct net *net) int __net_init tcp6_proc_init(struct net *net)
{ {
return tcp_proc_register(net, &tcp6_seq_afinfo); if (!proc_create_data("tcp6", 0444, net->proc_net,
&tcp6_afinfo_seq_fops, &tcp6_seq_afinfo))
return -ENOMEM;
return 0;
} }
void tcp6_proc_exit(struct net *net) void tcp6_proc_exit(struct net *net)
{ {
tcp_proc_unregister(net, &tcp6_seq_afinfo); remove_proc_entry("tcp6", net->proc_net);
} }
#endif #endif