Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd4e7b50 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[IPV4][NETNS]: Display per-net info in sockstat file. 



Besides, now we can see per-net fragments statistics in the
same file, since this stats is already per-net.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0538ca3

net/ipv4/proc.c

+34 −7
Original line number Original line Diff line number Diff line
@@ -51,27 +51,54 @@ 
 */

 */

static int sockstat_seq_show(struct seq_file *seq, void *v)

static int sockstat_seq_show(struct seq_file *seq, void *v)

{

{

	struct net *net = seq->private;



	socket_seq_show(seq);

	socket_seq_show(seq);

	seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n",

	seq_printf(seq, "TCP: inuse %d orphan %d tw %d alloc %d mem %d\n",

		   sock_prot_inuse_get(&init_net, &tcp_prot),

		   sock_prot_inuse_get(net, &tcp_prot),

		   atomic_read(&tcp_orphan_count),

		   atomic_read(&tcp_orphan_count),

		   tcp_death_row.tw_count, atomic_read(&tcp_sockets_allocated),

		   tcp_death_row.tw_count, atomic_read(&tcp_sockets_allocated),

		   atomic_read(&tcp_memory_allocated));

		   atomic_read(&tcp_memory_allocated));

	seq_printf(seq, "UDP: inuse %d mem %d\n",

	seq_printf(seq, "UDP: inuse %d mem %d\n",

		   sock_prot_inuse_get(&init_net, &udp_prot),

		   sock_prot_inuse_get(net, &udp_prot),

		   atomic_read(&udp_memory_allocated));

		   atomic_read(&udp_memory_allocated));

	seq_printf(seq, "UDPLITE: inuse %d\n",

	seq_printf(seq, "UDPLITE: inuse %d\n",

		   sock_prot_inuse_get(&init_net, &udplite_prot));

		   sock_prot_inuse_get(net, &udplite_prot));

	seq_printf(seq, "RAW: inuse %d\n",

	seq_printf(seq, "RAW: inuse %d\n",

		   sock_prot_inuse_get(&init_net, &raw_prot));

		   sock_prot_inuse_get(net, &raw_prot));

	seq_printf(seq,  "FRAG: inuse %d memory %d\n",

	seq_printf(seq,  "FRAG: inuse %d memory %d\n",

			ip_frag_nqueues(&init_net), ip_frag_mem(&init_net));

			ip_frag_nqueues(net), ip_frag_mem(net));

	return 0;

	return 0;

}

}





static int sockstat_seq_open(struct inode *inode, struct file *file)

static int sockstat_seq_open(struct inode *inode, struct file *file)

{

{

	return single_open(file, sockstat_seq_show, NULL);

	int err;

	struct net *net;



	err = -ENXIO;

	net = get_proc_net(inode);

	if (net == NULL)

		goto err_net;



	err = single_open(file, sockstat_seq_show, net);

	if (err < 0)

		goto err_open;



	return 0;



err_open:

	put_net(net);

err_net:

	return err;

}



static int sockstat_seq_release(struct inode *inode, struct file *file)

{

	struct net *net = ((struct seq_file *)file->private_data)->private;



	put_net(net);

	return single_release(inode, file);

}

}





static const struct file_operations sockstat_seq_fops = {

static const struct file_operations sockstat_seq_fops = {
@@ -79,7 +106,7 @@ static const struct file_operations sockstat_seq_fops = { 
	.open	 = sockstat_seq_open,

	.open	 = sockstat_seq_open,

	.read	 = seq_read,

	.read	 = seq_read,

	.llseek	 = seq_lseek,

	.llseek	 = seq_lseek,

	.release = single_release,

	.release = sockstat_seq_release,

};

};





/* snmp items */

/* snmp items */