Commit 9fd6452d authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso
Browse files

netfilter: conntrack: rename nf_ct_iterate_cleanup 



There are several places where we needlesly call nf_ct_iterate_cleanup,
we should instead iterate the full table at module unload time.

This is a leftover from back when the conntrack table got duplicated
per net namespace.

So rename nf_ct_iterate_cleanup to nf_ct_iterate_cleanup_net.
A later patch will then add a non-net variant.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent cad43944

include/net/netfilter/nf_conntrack.h

+3 −3
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ extern s32 (*nf_ct_nat_offset)(const struct nf_conn *ct, 
			       u32 seq);



/* Iterate over all conntracks: if iter returns true, it's deleted. */

void nf_ct_iterate_cleanup(struct net *net,

void nf_ct_iterate_cleanup_net(struct net *net,

			       int (*iter)(struct nf_conn *i, void *data),

			       void *data, u32 portid, int report);

net/ipv4/netfilter/nf_nat_masquerade_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ static int masq_device_event(struct notifier_block *this, 
		 */

		NF_CT_ASSERT(dev->ifindex != 0);



		nf_ct_iterate_cleanup(net, device_cmp,

		nf_ct_iterate_cleanup_net(net, device_cmp,

					  (void *)(long)dev->ifindex, 0, 0);

	}

net/ipv6/netfilter/nf_nat_masquerade_ipv6.c

+5 −5
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static int masq_device_event(struct notifier_block *this, 
	struct net *net = dev_net(dev);



	if (event == NETDEV_DOWN)

		nf_ct_iterate_cleanup(net, device_cmp,

		nf_ct_iterate_cleanup_net(net, device_cmp,

					  (void *)(long)dev->ifindex, 0, 0);



	return NOTIFY_DONE;
@@ -99,7 +99,7 @@ static void iterate_cleanup_work(struct work_struct *work) 
	w = container_of(work, struct masq_dev_work, work);



	index = w->ifindex;

	nf_ct_iterate_cleanup(w->net, device_cmp, (void *)index, 0, 0);

	nf_ct_iterate_cleanup_net(w->net, device_cmp, (void *)index, 0, 0);



	put_net(w->net);

	kfree(w);
@@ -110,12 +110,12 @@ static void iterate_cleanup_work(struct work_struct *work) 
/* ipv6 inet notifier is an atomic notifier, i.e. we cannot

 * schedule.

 *

 * Unfortunately, nf_ct_iterate_cleanup can run for a long

 * Unfortunately, nf_ct_iterate_cleanup_net can run for a long

 * time if there are lots of conntracks and the system

 * handles high softirq load, so it frequently calls cond_resched

 * while iterating the conntrack table.

 *

 * So we defer nf_ct_iterate_cleanup walk to the system workqueue.

 * So we defer nf_ct_iterate_cleanup_net walk to the system workqueue.

 *

 * As we can have 'a lot' of inet_events (depending on amount

 * of ipv6 addresses being deleted), we also need to add an upper

net/netfilter/nf_conntrack_core.c

+5 −5
Original line number Diff line number Diff line
@@ -1634,7 +1634,7 @@ found: 
	return ct;

}



void nf_ct_iterate_cleanup(struct net *net,

void nf_ct_iterate_cleanup_net(struct net *net,

			       int (*iter)(struct nf_conn *i, void *data),

			       void *data, u32 portid, int report)

{
@@ -1654,7 +1654,7 @@ void nf_ct_iterate_cleanup(struct net *net, 
		cond_resched();

	}

}

EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup);

EXPORT_SYMBOL_GPL(nf_ct_iterate_cleanup_net);



static int kill_all(struct nf_conn *i, void *data)

{
@@ -1723,7 +1723,7 @@ void nf_conntrack_cleanup_net_list(struct list_head *net_exit_list) 
i_see_dead_people:

	busy = 0;

	list_for_each_entry(net, net_exit_list, exit_list) {

		nf_ct_iterate_cleanup(net, kill_all, NULL, 0, 0);

		nf_ct_iterate_cleanup_net(net, kill_all, NULL, 0, 0);

		if (atomic_read(&net->ct.count) != 0)

			busy = 1;

	}

net/netfilter/nf_conntrack_netlink.c

+2 −2
Original line number Diff line number Diff line
@@ -1117,7 +1117,7 @@ static int ctnetlink_flush_conntrack(struct net *net, 
			return PTR_ERR(filter);

	}



	nf_ct_iterate_cleanup(net, ctnetlink_filter_match, filter,

	nf_ct_iterate_cleanup_net(net, ctnetlink_filter_match, filter,

				  portid, report);

	kfree(filter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE