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

Commit 8e9df801 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Patrick McHardy
Browse files

netfilter: netns nf_conntrack: per-netns /proc/net/stat/nf_conntrack, /proc/net/stat/ip_conntrack 



Show correct conntrack count, while I'm at it.

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarPatrick McHardy <kaber@trash.net>
parent 0d55af87

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -285,6 +285,7 @@ static const struct file_operations ip_exp_file_ops = { 




static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)

static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)

{

{

	struct net *net = seq_file_net(seq);

	int cpu;

	int cpu;





	if (*pos == 0)

	if (*pos == 0)
@@ -294,7 +295,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) 
		if (!cpu_possible(cpu))

		if (!cpu_possible(cpu))

			continue;

			continue;

		*pos = cpu+1;

		*pos = cpu+1;

		return per_cpu_ptr(init_net.ct.stat, cpu);

		return per_cpu_ptr(net->ct.stat, cpu);

	}

	}





	return NULL;

	return NULL;
@@ -302,13 +303,14 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) 




static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)

static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)

{

{

	struct net *net = seq_file_net(seq);

	int cpu;

	int cpu;





	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

		if (!cpu_possible(cpu))

		if (!cpu_possible(cpu))

			continue;

			continue;

		*pos = cpu+1;

		*pos = cpu+1;

		return per_cpu_ptr(init_net.ct.stat, cpu);

		return per_cpu_ptr(net->ct.stat, cpu);

	}

	}





	return NULL;

	return NULL;
@@ -320,7 +322,8 @@ static void ct_cpu_seq_stop(struct seq_file *seq, void *v) 




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

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

{

{

	unsigned int nr_conntracks = atomic_read(&init_net.ct.count);

	struct net *net = seq_file_net(seq);

	unsigned int nr_conntracks = atomic_read(&net->ct.count);

	const struct ip_conntrack_stat *st = v;

	const struct ip_conntrack_stat *st = v;





	if (v == SEQ_START_TOKEN) {

	if (v == SEQ_START_TOKEN) {
@@ -360,7 +363,8 @@ static const struct seq_operations ct_cpu_seq_ops = { 




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

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

{

{

	return seq_open(file, &ct_cpu_seq_ops);

	return seq_open_net(inode, file, &ct_cpu_seq_ops,

			    sizeof(struct seq_net_private));

}

}





static const struct file_operations ct_cpu_seq_fops = {

static const struct file_operations ct_cpu_seq_fops = {
@@ -368,7 +372,7 @@ static const struct file_operations ct_cpu_seq_fops = { 
	.open    = ct_cpu_seq_open,

	.open    = ct_cpu_seq_open,

	.read    = seq_read,

	.read    = seq_read,

	.llseek  = seq_lseek,

	.llseek  = seq_lseek,

	.release = seq_release,

	.release = seq_release_net,

};

};





static int __net_init ip_conntrack_net_init(struct net *net)

static int __net_init ip_conntrack_net_init(struct net *net)

net/netfilter/nf_conntrack_standalone.c

+9 −5
Original line number Original line Diff line number Diff line
@@ -194,6 +194,7 @@ static const struct file_operations ct_file_ops = { 




static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)

static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos)

{

{

	struct net *net = seq_file_net(seq);

	int cpu;

	int cpu;





	if (*pos == 0)

	if (*pos == 0)
@@ -203,7 +204,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) 
		if (!cpu_possible(cpu))

		if (!cpu_possible(cpu))

			continue;

			continue;

		*pos = cpu + 1;

		*pos = cpu + 1;

		return per_cpu_ptr(init_net.ct.stat, cpu);

		return per_cpu_ptr(net->ct.stat, cpu);

	}

	}





	return NULL;

	return NULL;
@@ -211,13 +212,14 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) 




static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)

static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos)

{

{

	struct net *net = seq_file_net(seq);

	int cpu;

	int cpu;





	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

		if (!cpu_possible(cpu))

		if (!cpu_possible(cpu))

			continue;

			continue;

		*pos = cpu + 1;

		*pos = cpu + 1;

		return per_cpu_ptr(init_net.ct.stat, cpu);

		return per_cpu_ptr(net->ct.stat, cpu);

	}

	}





	return NULL;

	return NULL;
@@ -229,7 +231,8 @@ static void ct_cpu_seq_stop(struct seq_file *seq, void *v) 




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

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

{

{

	unsigned int nr_conntracks = atomic_read(&init_net.ct.count);

	struct net *net = seq_file_net(seq);

	unsigned int nr_conntracks = atomic_read(&net->ct.count);

	const struct ip_conntrack_stat *st = v;

	const struct ip_conntrack_stat *st = v;





	if (v == SEQ_START_TOKEN) {

	if (v == SEQ_START_TOKEN) {
@@ -269,7 +272,8 @@ static const struct seq_operations ct_cpu_seq_ops = { 




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

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

{

{

	return seq_open(file, &ct_cpu_seq_ops);

	return seq_open_net(inode, file, &ct_cpu_seq_ops,

			    sizeof(struct seq_net_private));

}

}





static const struct file_operations ct_cpu_seq_fops = {

static const struct file_operations ct_cpu_seq_fops = {
@@ -277,7 +281,7 @@ static const struct file_operations ct_cpu_seq_fops = { 
	.open	 = ct_cpu_seq_open,

	.open	 = ct_cpu_seq_open,

	.read	 = seq_read,

	.read	 = seq_read,

	.llseek	 = seq_lseek,

	.llseek	 = seq_lseek,

	.release = seq_release,

	.release = seq_release_net,

};

};





static int nf_conntrack_standalone_init_proc(struct net *net)

static int nf_conntrack_standalone_init_proc(struct net *net)