batman-adv: Drop implicit creation of batadv net_devices
Sven Eckelmann
maintainerPATCH 1/4 batman-adv: Drop implicit creation of batadv net_devices
The sysfs code in batman-adv was could create a new batadv interfaces on demand when a string (interface name) was written to the batman-adv/mesh_iface file. But the code no longer exists in the current batman-adv codebase. The helper code to implement this behavior must be considered as unused and can be dropped.
--- net/batman-adv/hard-interface.c | 12 ++---------- net/batman-adv/soft-interface.c | 34 +-------------------------------- net/batman-adv/soft-interface.h | 2 -- 3 files changed, 3 insertions(+), 45 deletions(-)
net/batman-adv/hard-interface.c +2 -10
@@ -725,17 +725,9 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,kref_get (&hard_iface->refcount); soft_iface =dev_get_by_name (net, iface_name); -if (!soft_iface) { - soft_iface =batadv_softif_create (net, iface_name); - -if (!soft_iface) { - ret = -ENOMEM ; - goto err; - } - -/* dev_get_by_name() increases the reference counter for us */ -dev_hold (soft_iface); + ret = -EINVAL ; + goto err; }if (!batadv_softif_is_valid (soft_iface)) {
net/batman-adv/soft-interface.c +1 -33
@@ -26,7 +26,6 @@#include <linux/netdevice.h> #include <linux/netlink.h> #include <linux/percpu.h> -#include <linux/printk.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h>
@@ -37,6 +36,7 @@#include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> +#include <net/net_namespace.h> #include <net/netlink.h> #include <uapi/linux/batadv_packet.h> #include <uapi/linux/batman_adv.h>
@@ -1086,38 +1086,6 @@ static int batadv_softif_newlink(struct net *src_net, struct net_device *dev,return register_netdevice (dev); } -/** -* batadv_softif_create() - Create and register soft interface -* @net: the applicable net namespace -* @name: name of the new soft interface -* -* Return: newly allocated soft_interface, NULL on errors -*/ -struct net_device *batadv_softif_create (struct net *net,const char *name) -{ -struct net_device *soft_iface; -int ret; - - soft_iface =alloc_netdev (sizeof (struct batadv_priv ), name, -NET_NAME_UNKNOWN , batadv_softif_init_early); -if (!soft_iface) -return NULL ; - -dev_net_set (soft_iface, net); - - soft_iface->rtnl_link_ops = &batadv_link_ops; - - ret =register_netdevice (soft_iface); -if (ret <0 ) { -pr_err ("Unable to register the batman interface '%s': %i\n" , - name, ret); -free_netdev (soft_iface); -return NULL ; - } - -return soft_iface; -} -/** * batadv_softif_destroy_netlink() - deletion of batadv_soft_interface via * netlink
net/batman-adv/soft-interface.h +0 -2
@@ -12,14 +12,12 @@#include <linux/netdevice.h> #include <linux/skbuff.h> #include <linux/types.h> -#include <net/net_namespace.h> #include <net/rtnetlink.h> int batadv_skb_head_push (struct sk_buff *skb,unsigned int len);void batadv_interface_rx (struct net_device *soft_iface,struct sk_buff *skb,int hdr_size,struct batadv_orig_node *orig_node); -struct net_device *batadv_softif_create (struct net *net,const char *name);bool batadv_softif_is_valid (const struct net_device *net_dev);extern struct rtnl_link_ops batadv_link_ops;int batadv_softif_create_vlan (struct batadv_priv *bat_priv,unsigned short vid);
Signature · 1 line
2.30.2
Sven Eckelmann
maintainerPATCH 2/4 batman-adv: Avoid name based attaching of hard interfaces
The sysfs code for the batman-adv/mesh_iface file was receiving a string of the batadv interface. This interface name was then provided to the code which shared sysfs+rtnetlink code for attaching an hard-interface to an batadv interface. The rtnetlink code was also using the (extracted) interface name from the ndo_add_slave callback to increase the shared code
- even when it would have been more efficient to use the provided net_device object directly instead of searching it again (based on its name) in batadv_hardif_enable_interface.
But this indirect handling is no longer necessary because the sysfs code was dropped. There is now only a single code path which is using batadv_hardif_enable_interface.
--- net/batman-adv/hard-interface.c | 14 ++++---------- net/batman-adv/hard-interface.h | 3 +-- net/batman-adv/soft-interface.c | 3 +-- 3 files changed, 6 insertions(+), 14 deletions(-)
net/batman-adv/hard-interface.c +4 -10
@@ -705,16 +705,15 @@ static int batadv_master_del_slave(struct batadv_hard_iface *slave,/** * batadv_hardif_enable_interface() - Enslave hard interface to soft interface * @hard_iface: hard interface to add to soft interface -* @net: the applicable net namespace -* @iface_name: name of the soft interface +* @soft_iface: netdev struct of the mesh interface * * Return: 0 on success or negative error number in case of failure */ int batadv_hardif_enable_interface (struct batadv_hard_iface *hard_iface, -struct net *net,const char *iface_name) +struct net_device *soft_iface) {struct batadv_priv *bat_priv; -struct net_device *soft_iface, *master; +struct net_device *master;__be16 ethertype =htons (ETH_P_BATMAN );int max_header_len =batadv_max_header_len ();int ret;
@@ -724,11 +723,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,kref_get (&hard_iface->refcount); - soft_iface =dev_get_by_name (net, iface_name); -if (!soft_iface) { - ret = -EINVAL ; - goto err; - } +dev_hold (soft_iface);if (!batadv_softif_is_valid (soft_iface)) { pr_err("Can't create batman mesh interface %s: already exists as regular interface\n",
@@ -802,7 +797,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, err_dev: hard_iface->soft_iface =NULL ;dev_put (soft_iface); -err:batadv_hardif_put (hard_iface);return ret; }
net/batman-adv/hard-interface.h +1 -2
@@ -16,7 +16,6 @@#include <linux/rcupdate.h> #include <linux/stddef.h> #include <linux/types.h> -#include <net/net_namespace.h> /** * enum batadv_hard_if_state - State of a hard interface
@@ -75,7 +74,7 @@ bool batadv_is_wifi_hardif(struct batadv_hard_iface *hard_iface);struct batadv_hard_iface *batadv_hardif_get_by_netdev (const struct net_device *net_dev);int batadv_hardif_enable_interface (struct batadv_hard_iface *hard_iface, -struct net *net,const char *iface_name); +struct net_device *soft_iface);void batadv_hardif_disable_interface (struct batadv_hard_iface *hard_iface);int batadv_hardif_min_mtu (struct net_device *soft_iface);void batadv_update_min_mtu (struct net_device *soft_iface);
net/batman-adv/soft-interface.c +1 -2
@@ -842,14 +842,13 @@ static int batadv_softif_slave_add(struct net_device *dev, struct netlink_ext_ack *extack) {struct batadv_hard_iface *hard_iface; -struct net *net =dev_net (dev);int ret = -EINVAL ; hard_iface =batadv_hardif_get_by_netdev (slave_dev);if (!hard_iface || hard_iface->soft_iface) goto out; - ret =batadv_hardif_enable_interface (hard_iface, net, dev->name); + ret =batadv_hardif_enable_interface (hard_iface, dev); out:if (hard_iface)
Signature · 1 line
2.30.2
Sven Eckelmann
maintainerPATCH 3/4 batman-adv: Don't manually reattach hard-interface
In reply to Sven EckelmannThe batadv_hardif_enable_interface is now only called from the callback ndo_add_slave. This callback is only used by do_set_master in the rtnetlink code which only does two things:
1. remove the net_device from its old master
2. add the net_device to its new batadv master
The code to replicate the first step in batman-adv is therefore unused since the sysfs code was dropped.
--- net/batman-adv/hard-interface.c | 34 --------------------------------- 1 file changed, 34 deletions(-)
net/batman-adv/hard-interface.c +0 -34
@@ -677,31 +677,6 @@ batadv_hardif_deactivate_interface(struct batadv_hard_iface *hard_iface)batadv_update_min_mtu (hard_iface->soft_iface); } -/** -* batadv_master_del_slave() - remove hard_iface from the current master iface -* @slave: the interface enslaved in another master -* @master: the master from which slave has to be removed -* -* Invoke ndo_del_slave on master passing slave as argument. In this way the -* slave is free'd and the master can correctly change its internal state. -* -* Return: 0 on success, a negative value representing the error otherwise -*/ -static int batadv_master_del_slave (struct batadv_hard_iface *slave, -struct net_device *master) -{ -int ret; - -if (!master) -return 0 ; - - ret = -EBUSY ; -if (master->netdev_ops->ndo_del_slave) - ret = master->netdev_ops->ndo_del_slave (master, slave->net_dev); - -return ret; -} -/** * batadv_hardif_enable_interface() - Enslave hard interface to soft interface * @hard_iface: hard interface to add to soft interface
@@ -713,7 +688,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, struct net_device *soft_iface) {struct batadv_priv *bat_priv; -struct net_device *master;__be16 ethertype =htons (ETH_P_BATMAN );int max_header_len =batadv_max_header_len ();int ret;
@@ -732,14 +706,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, goto err_dev; } -/* check if the interface is enslaved in another virtual one and -* in that case unlink it first -*/ - master =netdev_master_upper_dev_get (hard_iface->net_dev); - ret =batadv_master_del_slave (hard_iface, master); -if (ret) - goto err_dev; - hard_iface->soft_iface = soft_iface; bat_priv =netdev_priv (hard_iface->soft_iface);
Signature · 1 line
2.30.2
Sven Eckelmann
maintainerPATCH 4/4 batman-adv: Drop reduntant batadv interface check
In reply to Sven EckelmannIf batadv_hardif_enable_interface is called then its called from its callback ndo_add_slave. It is therefore not necessary to check if it is a batadv interface.
--- net/batman-adv/hard-interface.c | 9 --------- 1 file changed, 9 deletions(-)
net/batman-adv/hard-interface.c +0 -9
@@ -9,7 +9,6 @@#include <linux/atomic.h> #include <linux/byteorder/generic.h> -#include <linux/errno.h> #include <linux/gfp.h> #include <linux/if.h> #include <linux/if_arp.h>
@@ -698,14 +697,6 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,kref_get (&hard_iface->refcount);dev_hold (soft_iface); - -if (!batadv_softif_is_valid (soft_iface)) { -pr_err ("Can't create batman mesh interface %s: already exists as regular interface\n" , - soft_iface->name); - ret = -EINVAL ; - goto err_dev; - } - hard_iface->soft_iface = soft_iface; bat_priv =netdev_priv (hard_iface->soft_iface);
Signature · 1 line
2.30.2