Commit 0e42c721 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'netconf-delnetconf' 



David Ahern says:

====================
netconf: Add support for RTM_DELNETCONF

netconf notifications are sent as devices register but not when they
are deleted leaving userspace caches out of sync. Add support for
RTM_DELNETCONF to ipv4, ipv6 and mpls.

MPLS is missing RTM_NEWNETCONF as devices are created, so add it as well.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 50c0add5 1182e4d0

include/linux/inetdevice.h

+2 −2
Original line number Diff line number Diff line
@@ -153,8 +153,8 @@ struct in_ifaddr { 
int register_inetaddr_notifier(struct notifier_block *nb);

int unregister_inetaddr_notifier(struct notifier_block *nb);



void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,

				 struct ipv4_devconf *devconf);

void inet_netconf_notify_devconf(struct net *net, int event, int type,

				 int ifindex, struct ipv4_devconf *devconf);



struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref);

static inline struct net_device *ip_dev_find(struct net *net, __be32 addr)

include/net/addrconf.h

+2 −2
Original line number Diff line number Diff line
@@ -262,8 +262,8 @@ int register_inet6addr_notifier(struct notifier_block *nb); 
int unregister_inet6addr_notifier(struct notifier_block *nb);

int inet6addr_notifier_call_chain(unsigned long val, void *v);



void inet6_netconf_notify_devconf(struct net *net, int type, int ifindex,

				  struct ipv6_devconf *devconf);

void inet6_netconf_notify_devconf(struct net *net, int event, int type,

				  int ifindex, struct ipv6_devconf *devconf);



/**

 * __in6_dev_get - get inet6_dev pointer from netdevice

include/uapi/linux/rtnetlink.h

+2 −0
Original line number Diff line number Diff line
@@ -122,6 +122,8 @@ enum { 


	RTM_NEWNETCONF = 80,

#define RTM_NEWNETCONF RTM_NEWNETCONF

	RTM_DELNETCONF,

#define RTM_DELNETCONF RTM_DELNETCONF

	RTM_GETNETCONF = 82,

#define RTM_GETNETCONF RTM_GETNETCONF

net/ipv4/devinet.c

+41 −23
Original line number Diff line number Diff line
@@ -1802,6 +1802,9 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex, 
	if (nla_put_s32(skb, NETCONFA_IFINDEX, ifindex) < 0)

		goto nla_put_failure;



	if (!devconf)

		goto out;



	if ((all || type == NETCONFA_FORWARDING) &&

	    nla_put_s32(skb, NETCONFA_FORWARDING,

			IPV4_DEVCONF(*devconf, FORWARDING)) < 0)
@@ -1823,6 +1826,7 @@ static int inet_netconf_fill_devconf(struct sk_buff *skb, int ifindex, 
			IPV4_DEVCONF(*devconf, IGNORE_ROUTES_WITH_LINKDOWN)) < 0)

		goto nla_put_failure;



out:

	nlmsg_end(skb, nlh);

	return 0;
@@ -1831,8 +1835,8 @@ nla_put_failure: 
	return -EMSGSIZE;

}



void inet_netconf_notify_devconf(struct net *net, int type, int ifindex,

				 struct ipv4_devconf *devconf)

void inet_netconf_notify_devconf(struct net *net, int event, int type,

				 int ifindex, struct ipv4_devconf *devconf)

{

	struct sk_buff *skb;

	int err = -ENOBUFS;
@@ -1842,7 +1846,7 @@ void inet_netconf_notify_devconf(struct net *net, int type, int ifindex, 
		goto errout;



	err = inet_netconf_fill_devconf(skb, ifindex, devconf, 0, 0,

					RTM_NEWNETCONF, 0, type);

					event, 0, type);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in inet_netconf_msgsize_devconf() */

		WARN_ON(err == -EMSGSIZE);
@@ -2021,10 +2025,12 @@ static void inet_forward_change(struct net *net) 


	IPV4_DEVCONF_ALL(net, ACCEPT_REDIRECTS) = !on;

	IPV4_DEVCONF_DFLT(net, FORWARDING) = on;

	inet_netconf_notify_devconf(net, NETCONFA_FORWARDING,

	inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

				    NETCONFA_FORWARDING,

				    NETCONFA_IFINDEX_ALL,

				    net->ipv4.devconf_all);

	inet_netconf_notify_devconf(net, NETCONFA_FORWARDING,

	inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

				    NETCONFA_FORWARDING,

				    NETCONFA_IFINDEX_DEFAULT,

				    net->ipv4.devconf_dflt);
@@ -2037,7 +2043,8 @@ static void inet_forward_change(struct net *net) 
		in_dev = __in_dev_get_rtnl(dev);

		if (in_dev) {

			IN_DEV_CONF_SET(in_dev, FORWARDING, on);

			inet_netconf_notify_devconf(net, NETCONFA_FORWARDING,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_FORWARDING,

						    dev->ifindex, &in_dev->cnf);

		}

	}
@@ -2082,19 +2089,22 @@ static int devinet_conf_proc(struct ctl_table *ctl, int write, 
		if (i == IPV4_DEVCONF_RP_FILTER - 1 &&

		    new_value != old_value) {

			ifindex = devinet_conf_ifindex(net, cnf);

			inet_netconf_notify_devconf(net, NETCONFA_RP_FILTER,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_RP_FILTER,

						    ifindex, cnf);

		}

		if (i == IPV4_DEVCONF_PROXY_ARP - 1 &&

		    new_value != old_value) {

			ifindex = devinet_conf_ifindex(net, cnf);

			inet_netconf_notify_devconf(net, NETCONFA_PROXY_NEIGH,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_PROXY_NEIGH,

						    ifindex, cnf);

		}

		if (i == IPV4_DEVCONF_IGNORE_ROUTES_WITH_LINKDOWN - 1 &&

		    new_value != old_value) {

			ifindex = devinet_conf_ifindex(net, cnf);

			inet_netconf_notify_devconf(net, NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_IGNORE_ROUTES_WITH_LINKDOWN,

						    ifindex, cnf);

		}

	}
@@ -2129,7 +2139,7 @@ static int devinet_sysctl_forward(struct ctl_table *ctl, int write, 
					container_of(cnf, struct in_device, cnf);

				if (*valp)

					dev_disable_lro(idev->dev);

				inet_netconf_notify_devconf(net,

				inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

							    NETCONFA_FORWARDING,

							    idev->dev->ifindex,

							    cnf);
@@ -2137,7 +2147,8 @@ static int devinet_sysctl_forward(struct ctl_table *ctl, int write, 
			rtnl_unlock();

			rt_cache_flush(net);

		} else

			inet_netconf_notify_devconf(net, NETCONFA_FORWARDING,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_FORWARDING,

						    NETCONFA_IFINDEX_DEFAULT,

						    net->ipv4.devconf_dflt);

	}
@@ -2259,7 +2270,8 @@ static int __devinet_sysctl_register(struct net *net, char *dev_name, 


	p->sysctl = t;



	inet_netconf_notify_devconf(net, NETCONFA_ALL, ifindex, p);

	inet_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_ALL,

				    ifindex, p);

	return 0;



free:
@@ -2268,18 +2280,20 @@ out: 
	return -ENOBUFS;

}



static void __devinet_sysctl_unregister(struct ipv4_devconf *cnf)

static void __devinet_sysctl_unregister(struct net *net,

					struct ipv4_devconf *cnf, int ifindex)

{

	struct devinet_sysctl_table *t = cnf->sysctl;



	if (!t)

		return;



	if (t) {

		cnf->sysctl = NULL;

		unregister_net_sysctl_table(t->sysctl_header);

		kfree(t);

	}



	inet_netconf_notify_devconf(net, RTM_DELNETCONF, 0, ifindex, NULL);

}



static int devinet_sysctl_register(struct in_device *idev)

{

	int err;
@@ -2299,7 +2313,9 @@ static int devinet_sysctl_register(struct in_device *idev) 


static void devinet_sysctl_unregister(struct in_device *idev)

{

	__devinet_sysctl_unregister(&idev->cnf);

	struct net *net = dev_net(idev->dev);



	__devinet_sysctl_unregister(net, &idev->cnf, idev->dev->ifindex);

	neigh_sysctl_unregister(idev->arp_parms);

}
@@ -2374,9 +2390,9 @@ static __net_init int devinet_init_net(struct net *net) 


#ifdef CONFIG_SYSCTL

err_reg_ctl:

	__devinet_sysctl_unregister(dflt);

	__devinet_sysctl_unregister(net, dflt, NETCONFA_IFINDEX_DEFAULT);

err_reg_dflt:

	__devinet_sysctl_unregister(all);

	__devinet_sysctl_unregister(net, all, NETCONFA_IFINDEX_ALL);

err_reg_all:

	if (tbl != ctl_forward_entry)

		kfree(tbl);
@@ -2398,8 +2414,10 @@ static __net_exit void devinet_exit_net(struct net *net) 


	tbl = net->ipv4.forw_hdr->ctl_table_arg;

	unregister_net_sysctl_table(net->ipv4.forw_hdr);

	__devinet_sysctl_unregister(net->ipv4.devconf_dflt);

	__devinet_sysctl_unregister(net->ipv4.devconf_all);

	__devinet_sysctl_unregister(net, net->ipv4.devconf_dflt,

				    NETCONFA_IFINDEX_DEFAULT);

	__devinet_sysctl_unregister(net, net->ipv4.devconf_all,

				    NETCONFA_IFINDEX_ALL);

	kfree(tbl);

#endif

	kfree(net->ipv4.devconf_dflt);

net/ipv4/ipmr.c

+7 −5
Original line number Diff line number Diff line
@@ -631,7 +631,7 @@ static int vif_delete(struct mr_table *mrt, int vifi, int notify, 
	in_dev = __in_dev_get_rtnl(dev);

	if (in_dev) {

		IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)--;

		inet_netconf_notify_devconf(dev_net(dev),

		inet_netconf_notify_devconf(dev_net(dev), RTM_NEWNETCONF,

					    NETCONFA_MC_FORWARDING,

					    dev->ifindex, &in_dev->cnf);

		ip_rt_multicast_event(in_dev);
@@ -820,8 +820,8 @@ static int vif_add(struct net *net, struct mr_table *mrt, 
		return -EADDRNOTAVAIL;

	}

	IPV4_DEVCONF(in_dev->cnf, MC_FORWARDING)++;

	inet_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING, dev->ifindex,

				    &in_dev->cnf);

	inet_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_MC_FORWARDING,

				    dev->ifindex, &in_dev->cnf);

	ip_rt_multicast_event(in_dev);



	/* Fill in the VIF structures */
@@ -1282,7 +1282,8 @@ static void mrtsock_destruct(struct sock *sk) 
	ipmr_for_each_table(mrt, net) {

		if (sk == rtnl_dereference(mrt->mroute_sk)) {

			IPV4_DEVCONF_ALL(net, MC_FORWARDING)--;

			inet_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_MC_FORWARDING,

						    NETCONFA_IFINDEX_ALL,

						    net->ipv4.devconf_all);

			RCU_INIT_POINTER(mrt->mroute_sk, NULL);
@@ -1344,7 +1345,8 @@ int ip_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, 
		if (ret == 0) {

			rcu_assign_pointer(mrt->mroute_sk, sk);

			IPV4_DEVCONF_ALL(net, MC_FORWARDING)++;

			inet_netconf_notify_devconf(net, NETCONFA_MC_FORWARDING,

			inet_netconf_notify_devconf(net, RTM_NEWNETCONF,

						    NETCONFA_MC_FORWARDING,

						    NETCONFA_IFINDEX_ALL,

						    net->ipv4.devconf_all);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE