Commit b7aade15 authored by Hannes Frederic Sowa's avatar Hannes Frederic Sowa Committed by David S. Miller
Browse files

vxlan: break dependency with netdev drivers 



Currently all drivers depend and autoload the vxlan module because how
vxlan_get_rx_port is linked into them. Remove this dependency:

By using a new event type in the netdevice notifier call chain we proxy
the request from the drivers to flush and resetup the vxlan ports not
directly via function call but by the already existing netdevice
notifier call chain.

I added a separate new event type, NETDEV_OFFLOAD_PUSH_VXLAN, to do so.
We don't need to save those ids, as the event type field is an unsigned
long and using specialized event types for this purpose seemed to be a
more elegant way. This also comes in beneficial if in future we want to
add offloading knobs for vxlan.

Cc: Jesse Gross <jesse@kernel.org>
Signed-off-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 50d65d78

drivers/net/vxlan.c

+9 −5
Original line number Diff line number Diff line
@@ -2527,7 +2527,7 @@ static struct device_type vxlan_type = { 
 * supply the listening VXLAN udp ports. Callers are expected

 * to implement the ndo_add_vxlan_port.

 */

void vxlan_get_rx_port(struct net_device *dev)

static void vxlan_push_rx_ports(struct net_device *dev)

{

	struct vxlan_sock *vs;

	struct net *net = dev_net(dev);
@@ -2536,6 +2536,9 @@ void vxlan_get_rx_port(struct net_device *dev) 
	__be16 port;

	unsigned int i;



	if (!dev->netdev_ops->ndo_add_vxlan_port)

		return;



	spin_lock(&vn->sock_lock);

	for (i = 0; i < PORT_HASH_SIZE; ++i) {

		hlist_for_each_entry_rcu(vs, &vn->sock_list[i], hlist) {
@@ -2547,7 +2550,6 @@ void vxlan_get_rx_port(struct net_device *dev) 
	}

	spin_unlock(&vn->sock_lock);

}

EXPORT_SYMBOL_GPL(vxlan_get_rx_port);



/* Initialize the device structure. */

static void vxlan_setup(struct net_device *dev)
@@ -3283,7 +3285,7 @@ static void vxlan_handle_lowerdev_unregister(struct vxlan_net *vn, 
	unregister_netdevice_many(&list_kill);

}



static int vxlan_lowerdev_event(struct notifier_block *unused,

static int vxlan_netdevice_event(struct notifier_block *unused,

				 unsigned long event, void *ptr)

{

	struct net_device *dev = netdev_notifier_info_to_dev(ptr);
@@ -3291,12 +3293,14 @@ static int vxlan_lowerdev_event(struct notifier_block *unused, 


	if (event == NETDEV_UNREGISTER)

		vxlan_handle_lowerdev_unregister(vn, dev);

	else if (event == NETDEV_OFFLOAD_PUSH_VXLAN)

		vxlan_push_rx_ports(dev);



	return NOTIFY_DONE;

}



static struct notifier_block vxlan_notifier_block __read_mostly = {

	.notifier_call = vxlan_lowerdev_event,

	.notifier_call = vxlan_netdevice_event,

};



static __net_init int vxlan_init_net(struct net *net)

include/linux/netdevice.h

+1 −0
Original line number Diff line number Diff line
@@ -2244,6 +2244,7 @@ struct netdev_lag_lower_state_info { 
#define NETDEV_BONDING_INFO	0x0019

#define NETDEV_PRECHANGEUPPER	0x001A

#define NETDEV_CHANGELOWERSTATE	0x001B

#define NETDEV_OFFLOAD_PUSH_VXLAN	0x001C



int register_netdevice_notifier(struct notifier_block *nb);

int unregister_netdevice_notifier(struct notifier_block *nb);

include/net/vxlan.h

+2 −4
Original line number Diff line number Diff line
@@ -390,13 +390,11 @@ static inline __be32 vxlan_compute_rco(unsigned int start, unsigned int offset) 
	return vni_field;

}



#if IS_ENABLED(CONFIG_VXLAN)

void vxlan_get_rx_port(struct net_device *netdev);

#else

static inline void vxlan_get_rx_port(struct net_device *netdev)

{

	ASSERT_RTNL();

	call_netdevice_notifiers(NETDEV_OFFLOAD_PUSH_VXLAN, netdev);

}

#endif



static inline unsigned short vxlan_get_sk_family(struct vxlan_sock *vs)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE