Skip to contentSkip to conversation

create batman-adv interfaces with netlink v3

B.A.T.M.A.N. Applied Marek Lindner 2 participants 16 messages Feb 11, 2013 – Feb 16, 2013

lore
Share & tools
lore
#0 lore raw

Hi,

here the third patch series to get the netlink interface creation into shape. Changes since v2:
* Reference counting bugfix in batadv_add_slave() & batadv_del_slave()
* Master settings & compat support

Kudos to Antonio for providing the compat support and debugging the interface to the bitter end!

Cheers,
Marek

#1 lore raw

PATCH v3 1/6 batman-adv: Move soft-interface initialization to ndo_init

From: Sven Eckelmann <[email protected]>

The initialization of an net_device object should be done in the init/constructor function and not from the outside after the register_netdevice was done to avoid race conditions.

---
 hard-interface.c |    5 ++
 soft-interface.c |  169 ++++++++++++++++++++++++++----------------------------
 2 files changed, 86 insertions(+), 88 deletions(-)
hard-interface.c +5 -0
index 368219e..da000e9 100644
@@ -563,6 +563,11 @@ static int batadv_hard_if_event(struct notifier_block *this,
 	struct batadv_hard_iface *primary_if = NULL;
 	struct batadv_priv *bat_priv;
 
+	if (batadv_softif_is_valid(net_dev) && event == NETDEV_REGISTER) {
+		batadv_sysfs_add_meshif(net_dev);
+		return NOTIFY_DONE;
+	}
+
 	hard_iface = batadv_hardif_get_by_netdev(net_dev);
 	if (!hard_iface && event == NETDEV_REGISTER)
 		hard_iface = batadv_hardif_add_interface(net_dev);
soft-interface.c +81 -88

212 lines not on this page · raw message

Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v3 2/6 batman-adv: Move deinitialization of soft-interface to destructor

From: Sven Eckelmann <[email protected]>

The deinitialization of the soft-interface created in ndo_init/constructor should be done in the destructor and not directly before calling unregister_netdevice

---
 soft-interface.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
soft-interface.c +12 -3
index c5cb0a7..e889bfb 100644
@@ -417,7 +417,6 @@ static void batadv_softif_destroy_finish(struct work_struct *work)
 				cleanup_work);
 	soft_iface = bat_priv->soft_iface;
 
-	batadv_debugfs_del_meshif(soft_iface);
 	batadv_sysfs_del_meshif(soft_iface);
 
 	rtnl_lock();
@@ -522,6 +521,17 @@ static const struct net_device_ops batadv_netdev_ops = {
 };
 
 /**
+ * batadv_softif_free - Deconstructor of batadv_soft_interface
+ * @dev: Device to cleanup and remove
+ */
+static void batadv_softif_free(struct net_device *dev)
+{
+	batadv_debugfs_del_meshif(dev);
+	batadv_mesh_free(dev);
+	free_netdev(dev);
+}
+
+/**
  * batadv_softif_init_early - early stage initialization of soft interface
  * @dev: registered network device to modify
  */
@@ -532,7 +542,7 @@ static void batadv_softif_init_early(struct net_device *dev)
 	ether_setup(dev);
 
 	dev->netdev_ops = &batadv_netdev_ops;
-	dev->destructor = free_netdev;
+	dev->destructor = batadv_softif_free;
 	dev->tx_queue_len = 0;
 
 	/* can't call min_mtu, because the needed variables
@@ -575,7 +585,6 @@ void batadv_softif_destroy(struct net_device *soft_iface)
 {
 	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
 
-	batadv_mesh_free(soft_iface);
 	queue_work(batadv_event_workqueue, &bat_priv->cleanup_work);
 }
 
Signature · 1 line
1.7.10.4
author Applied
#3 lore raw

Re: [B.A.T.M.A.N.] [PATCHv3 2/6] batman-adv: Move deinitialization of soft-interface to destructor

Quoted 10 lines · On Monday, February 11, 2013 17:10:23 Marek Lindner wrote:

From: Sven Eckelmann <[email protected]>

The deinitialization of the soft-interface created in ndo_init/constructor should be done in the destructor and not directly before calling unregister_netdevice

---
 soft-interface.c |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

Applied in revision ab8f433.

Thanks,
Marek

#4 lore raw

PATCH v3 3/6 batman-adv: Don't always delete softif when last slave was removed

In reply to Marek Lindner

From: Sven Eckelmann <[email protected]>

batman-adv has an unusual way to manage softinterfaces. These will be created automatically when a user writes to the batman-adv/mesh_iface file in sysfs and removed when no slave device exists anymore.

This behaviour cannot be changed without breaking compatibility with existing code. Instead other interfaces should be able to slightly reduce this behaviour and provide a more common reaction to a removal of a slave interface.

---
 hard-interface.c |    8 +++++---
 hard-interface.h |   13 ++++++++++++-
 sysfs.c          |    6 ++++--
 3 files changed, 21 insertions(+), 6 deletions(-)
hard-interface.c +5 -3
index da000e9..74e3ec2 100644
@@ -408,7 +408,8 @@ err:
 	return ret;
 }
 
-void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)
+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
+				     enum batadv_hard_if_cleanup autodel)
 {
 	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
 	struct batadv_hard_iface *primary_if = NULL;
@@ -446,7 +447,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface)
 	dev_put(hard_iface->soft_iface);
 
 	/* nobody uses this interface anymore */
-	if (!bat_priv->num_ifaces)
+	if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO)
 		batadv_softif_destroy(hard_iface->soft_iface);
 
 	hard_iface->soft_iface = NULL;
@@ -533,7 +534,8 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface)
 
 	/* first deactivate interface */
 	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
-		batadv_hardif_disable_interface(hard_iface);
+		batadv_hardif_disable_interface(hard_iface,
+						BATADV_IF_CLEANUP_AUTO);
 
 	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
 		return;
hard-interface.h +12 -1
index 308437d..4989288 100644
@@ -29,13 +29,24 @@ enum batadv_hard_if_state {
 	BATADV_IF_I_WANT_YOU,
 };
 
+/**
+ * enum batadv_hard_if_cleanup - Cleanup modi for soft_iface after slave removal
+ * @BATADV_IF_CLEANUP_KEEP: Don't automatically delete soft-interface
+ * @BATADV_IF_CLEANUP_AUTO: Delete soft-interface after last slave was removed
+ */
+enum batadv_hard_if_cleanup {
+	BATADV_IF_CLEANUP_KEEP,
+	BATADV_IF_CLEANUP_AUTO,
+};
+
 extern struct notifier_block batadv_hard_if_notifier;
 
 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,
 				   const char *iface_name);
-void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface);
+void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
+				     enum batadv_hard_if_cleanup autodel);
 void batadv_hardif_remove_interfaces(void);
 int batadv_hardif_min_mtu(struct net_device *soft_iface);
 void batadv_update_min_mtu(struct net_device *soft_iface);
sysfs.c +4 -2
index ce39f62..15a22ef 100644
@@ -588,13 +588,15 @@ static ssize_t batadv_store_mesh_iface(struct kobject *kobj,
 	}
 
 	if (status_tmp == BATADV_IF_NOT_IN_USE) {
-		batadv_hardif_disable_interface(hard_iface);
+		batadv_hardif_disable_interface(hard_iface,
+						BATADV_IF_CLEANUP_AUTO);
 		goto unlock;
 	}
 
 	/* if the interface already is in use */
 	if (hard_iface->if_status != BATADV_IF_NOT_IN_USE)
-		batadv_hardif_disable_interface(hard_iface);
+		batadv_hardif_disable_interface(hard_iface,
+						BATADV_IF_CLEANUP_AUTO);
 
 	ret = batadv_hardif_enable_interface(hard_iface, buff);
 
Signature · 1 line
1.7.10.4
author Applied
#5 lore raw

Re: [B.A.T.M.A.N.] [PATCHv3 3/6] batman-adv: Don't always delete softif when last slave was removed

Quoted 11 lines · On Monday, February 11, 2013 17:10:24 Marek Lindner wrote:

From: Sven Eckelmann <[email protected]>

batman-adv has an unusual way to manage softinterfaces. These will be created automatically when a user writes to the batman-adv/mesh_iface file in sysfs and removed when no slave device exists anymore.

This behaviour cannot be changed without breaking compatibility with existing code. Instead other interfaces should be able to slightly reduce this behaviour and provide a more common reaction to a removal of a slave interface.

Quoted 6 lines
---
 hard-interface.c |    8 +++++---
 hard-interface.h |   13 ++++++++++++-
 sysfs.c          |    6 ++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

Applied in revision c3c7e74.

Thanks,
Marek

#6 lore raw

PATCH v3 4/6 batman-adv: rename batadv_softif_destroy to reflect sysfs use case

In reply to Marek Lindner
---
 hard-interface.c |    2 +-
 soft-interface.c |    6 +++++-
 soft-interface.h |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
hard-interface.c +1 -1
index 74e3ec2..6c32607 100644
@@ -448,7 +448,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
 
 	/* nobody uses this interface anymore */
 	if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO)
-		batadv_softif_destroy(hard_iface->soft_iface);
+		batadv_softif_destroy_sysfs(hard_iface->soft_iface);
 
 	hard_iface->soft_iface = NULL;
 	batadv_hardif_free_ref(hard_iface);
soft-interface.c +5 -1
index e889bfb..bc77a5b 100644
@@ -581,7 +581,11 @@ struct net_device *batadv_softif_create(const char *name)
 	return soft_iface;
 }
 
-void batadv_softif_destroy(struct net_device *soft_iface)
+/**
+ * batadv_softif_destroy_sysfs - deletion of batadv_soft_interface via sysfs
+ * @soft_iface: the to-be-removed batman-adv interface
+ */
+void batadv_softif_destroy_sysfs(struct net_device *soft_iface)
 {
 	struct batadv_priv *bat_priv = netdev_priv(soft_iface);
 
soft-interface.h +1 -1
index 43182e5..49bc66b 100644
@@ -25,7 +25,7 @@ void batadv_interface_rx(struct net_device *soft_iface,
 			 struct sk_buff *skb, struct batadv_hard_iface *recv_if,
 			 int hdr_size, struct batadv_orig_node *orig_node);
 struct net_device *batadv_softif_create(const char *name);
-void batadv_softif_destroy(struct net_device *soft_iface);
+void batadv_softif_destroy_sysfs(struct net_device *soft_iface);
 int batadv_softif_is_valid(const struct net_device *net_dev);
 
 #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
Signature · 1 line
1.7.10.4
author Applied
#7 lore raw

Re: [B.A.T.M.A.N.] [PATCHv3 4/6] batman-adv: rename batadv_softif_destroy to reflect sysfs use case

Quoted 7 lines · On Monday, February 11, 2013 17:10:25 Marek Lindner wrote:
---
 hard-interface.c |    2 +-
 soft-interface.c |    6 +++++-
 soft-interface.h |    2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

Applied in revision b047bd8.

Cheers,
Marek

#8 lore raw

PATCH v3 5/6 batman-adv: Allow to use rntl_link for device creation/deletion

In reply to Marek Lindner

From: Sven Eckelmann <[email protected]>

The sysfs configuration interface of batman-adv to add/remove soft-interfaces is not deadlock free and doesn't follow the currently common way to create new virtual interfaces.

An additional interface though rtnl_link is introduced which provides easy device creation/deletion with tools like "ip":

$ ip link add dev bat0 type batadv
$ ip link del dev bat0
---
 main.c           |    2 ++
 main.h           |    1 +
 soft-interface.c |   29 +++++++++++++++++++++++++++++
 soft-interface.h |    1 +
 4 files changed, 33 insertions(+)
main.c +2 -0
index bbb91a5..afccc3d 100644
@@ -71,6 +71,7 @@ static int __init batadv_init(void)
 	batadv_debugfs_init();
 
 	register_netdevice_notifier(&batadv_hard_if_notifier);
+	rtnl_link_register(&batadv_link_ops);
 
 	pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n",
 		BATADV_SOURCE_VERSION, BATADV_COMPAT_VERSION);
@@ -81,6 +82,7 @@ static int __init batadv_init(void)
 static void __exit batadv_exit(void)
 {
 	batadv_debugfs_destroy();
+	rtnl_link_unregister(&batadv_link_ops);
 	unregister_netdevice_notifier(&batadv_hard_if_notifier);
 	batadv_hardif_remove_interfaces();
 
main.h +1 -0
index 8a9caa0..140f008 100644
@@ -152,6 +152,7 @@ enum batadv_uev_type {
 #include <linux/percpu.h>
 #include <linux/slab.h>
 #include <net/sock.h>		/* struct sock */
+#include <net/rtnetlink.h>
 #include <linux/jiffies.h>
 #include <linux/seq_file.h>
 #include "compat.h"
soft-interface.c +29 -0
index bc77a5b..4ef1649 100644
@@ -570,6 +570,8 @@ struct net_device *batadv_softif_create(const char *name)
 	if (!soft_iface)
 		return NULL;
 
+	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",
@@ -592,6 +594,26 @@ void batadv_softif_destroy_sysfs(struct net_device *soft_iface)
 	queue_work(batadv_event_workqueue, &bat_priv->cleanup_work);
 }
 
+/**
+ * batadv_softif_destroy_netlink - deletion of batadv_soft_interface via netlink
+ * @soft_iface: the to-be-removed batman-adv interface
+ * @head: list pointer
+ */
+void batadv_softif_destroy_netlink(struct net_device *soft_iface,
+				   struct list_head *head)
+{
+	struct batadv_hard_iface *hard_iface;
+
+	list_for_each_entry(hard_iface, &batadv_hardif_list, list) {
+		if (hard_iface->soft_iface == soft_iface)
+			batadv_hardif_disable_interface(hard_iface,
+							BATADV_IF_CLEANUP_KEEP);
+	}
+
+	batadv_sysfs_del_meshif(soft_iface);
+	unregister_netdevice_queue(soft_iface, head);
+}
+
 int batadv_softif_is_valid(const struct net_device *net_dev)
 {
 	if (net_dev->netdev_ops->ndo_start_xmit == batadv_interface_tx)
@@ -600,6 +622,13 @@ int batadv_softif_is_valid(const struct net_device *net_dev)
 	return 0;
 }
 
+struct rtnl_link_ops batadv_link_ops __read_mostly = {
+	.kind		= "batadv",
+	.priv_size	= sizeof(struct batadv_priv),
+	.setup		= batadv_softif_init_early,
+	.dellink	= batadv_softif_destroy_netlink,
+};
+
 /* ethtool */
 static int batadv_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
 {
soft-interface.h +1 -0
index 49bc66b..2f2472c 100644
@@ -27,5 +27,6 @@ void batadv_interface_rx(struct net_device *soft_iface,
 struct net_device *batadv_softif_create(const char *name);
 void batadv_softif_destroy_sysfs(struct net_device *soft_iface);
 int batadv_softif_is_valid(const struct net_device *net_dev);
+extern struct rtnl_link_ops batadv_link_ops;
 
 #endif /* _NET_BATMAN_ADV_SOFT_INTERFACE_H_ */
Signature · 1 line
1.7.10.4
author Applied
#9 lore raw

Re: [B.A.T.M.A.N.] [PATCHv3 5/6] batman-adv: Allow to use rntl_link for device creation/deletion

Quoted 12 lines · On Monday, February 11, 2013 17:10:26 Marek Lindner wrote:

From: Sven Eckelmann <[email protected]>

The sysfs configuration interface of batman-adv to add/remove soft-interfaces is not deadlock free and doesn't follow the currently common way to create new virtual interfaces.

An additional interface though rtnl_link is introduced which provides easy device creation/deletion with tools like "ip":

$ ip link add dev bat0 type batadv
$ ip link del dev bat0
Quoted 7 lines
---
 main.c           |    2 ++
 main.h           |    1 +
 soft-interface.c |   29 +++++++++++++++++++++++++++++
 soft-interface.h |    1 +
 4 files changed, 33 insertions(+)

Applied in revision 5317331.

Thanks,
Marek

#10 lore raw

PATCH v3 6/6 batman-adv: Allow to modify slaves of soft-interfaces through rntl_link

In reply to Marek Lindner

From: Sven Eckelmann <[email protected]>

The sysfs configuration interface of batman-adv to add/remove slaves of an soft-iface is not deadlock free and doesn't follow the currently common way to modify slaves of an interface.

An additional configuration interface though rtnl_link is introduced which provides easy device adding/removing with tools like "ip":

$ ip link set dev eth0 master bat0
$ ip link set dev eth0 nomaster
---
 compat.h         |    3 +++
 hard-interface.c |   11 +++++++++--
 soft-interface.c |   56 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 67 insertions(+), 3 deletions(-)
compat.h +3 -0
index 48180e2..425b3d9 100644
@@ -212,6 +212,9 @@ static int batadv_interface_set_mac_addr(struct net_device *dev, void *p) \
 }\
 static int __batadv_interface_set_mac_addr(x, y)
 
+#define netdev_master_upper_dev_link netdev_set_master
+#define netdev_upper_dev_unlink(slave, master) netdev_set_master(slave, NULL)
+
 #endif /* < KERNEL_VERSION(3, 9, 0) */
 
 #endif /* _NET_BATMAN_ADV_COMPAT_H_ */
hard-interface.c +9 -2
index 6c32607..c08e39e 100644
@@ -350,9 +350,13 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
 	hard_iface->soft_iface = soft_iface;
 	bat_priv = netdev_priv(hard_iface->soft_iface);
 
+	ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface);
+	if (ret)
+		goto err_dev;
+
 	ret = bat_priv->bat_algo_ops->bat_iface_enable(hard_iface);
 	if (ret < 0)
-		goto err_dev;
+		goto err_upper;
 
 	hard_iface->if_num = bat_priv->num_ifaces;
 	bat_priv->num_ifaces++;
@@ -362,7 +366,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
 		bat_priv->bat_algo_ops->bat_iface_disable(hard_iface);
 		bat_priv->num_ifaces--;
 		hard_iface->if_status = BATADV_IF_NOT_IN_USE;
-		goto err_dev;
+		goto err_upper;
 	}
 
 	hard_iface->batman_adv_ptype.type = ethertype;
@@ -401,6 +405,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface,
 out:
 	return 0;
 
+err_upper:
+	netdev_upper_dev_unlink(hard_iface->net_dev, soft_iface);
 err_dev:
 	dev_put(soft_iface);
 err:
@@ -450,6 +456,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface,
 	if (!bat_priv->num_ifaces && autodel == BATADV_IF_CLEANUP_AUTO)
 		batadv_softif_destroy_sysfs(hard_iface->soft_iface);
 
+	netdev_upper_dev_unlink(hard_iface->net_dev, hard_iface->soft_iface);
 	hard_iface->soft_iface = NULL;
 	batadv_hardif_free_ref(hard_iface);
 
soft-interface.c +55 -1

68 lines not on this page · raw message

Signature · 1 line
1.7.10.4
author Applied
#11 lore raw

Re: [B.A.T.M.A.N.] [PATCHv3 6/6] batman-adv: Allow to modify slaves of soft-interfaces through rntl_link

Quoted 11 lines · On Monday, February 11, 2013 17:10:27 Marek Lindner wrote:

From: Sven Eckelmann <[email protected]>

The sysfs configuration interface of batman-adv to add/remove slaves of an soft-iface is not deadlock free and doesn't follow the currently common way to modify slaves of an interface.

An additional configuration interface though rtnl_link is introduced which provides easy device adding/removing with tools like "ip":

$ ip link set dev eth0 master bat0
$ ip link set dev eth0 nomaster
Quoted 7 lines
---
 compat.h         |    3 +++
 hard-interface.c |   11 +++++++++--
 soft-interface.c |   56

+++++++++++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 3 deletions(-)

Applied in revision edd0853.

Thanks,
Marek

author Applied
#12 lore raw

Re: [B.A.T.M.A.N.] [PATCHv3 1/6] batman-adv: Move soft-interface initialization to ndo_init

In reply to Marek Lindner
Quoted 6 lines · On Monday, February 11, 2013 17:10:22 Marek Lindner wrote:

From: Sven Eckelmann <[email protected]>

The initialization of an net_device object should be done in the init/constructor function and not from the outside after the register_netdevice was done to avoid race conditions.

Quoted 6 lines
---
 hard-interface.c |    5 ++
 soft-interface.c |  169

++++++++++++++++++++++++++---------------------------- 2 files changed, 86 insertions(+), 88 deletions(-)

Applied in revision 03522f0.

Thanks,
Marek

#13 lore raw
In reply to Marek Lindner
Quoted 10 lines · Marek Lindner

Hi,

here the third patch series to get the netlink interface creation into shape. Changes since v2:
* Reference counting bugfix in batadv_add_slave() & batadv_del_slave()
* Master settings & compat support

Kudos to Antonio for providing the compat support and debugging the interface to the bitter end!

But..has the patchset been rebased on top of the latest master? Git am is complaining and cannot apply the patches.

Cheers,

Signature · 4 lines
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara
#14 lore raw
Quoted 9 lines · On Tuesday, February 12, 2013 04:14:28 Antonio Quartulli wrote:
Quoted 6 lines

Changes since v2:
* Reference counting bugfix in batadv_add_slave() & batadv_del_slave()
* Master settings & compat support

Kudos to Antonio for providing the compat support and debugging the interface to the bitter end!

But..has the patchset been rebased on top of the latest master? Git am is complaining and cannot apply the patches.

Yes, it is based on master. You can check here:
http://git.open-mesh.org/batman-adv.git/shortlog/refs/heads/marek/netlink_if

Cheers,
Marek

#15 lore raw
In reply to Marek Lindner
Quoted 10 lines · Marek Lindner

Hi,

here the third patch series to get the netlink interface creation into shape. Changes since v2:
* Reference counting bugfix in batadv_add_slave() & batadv_del_slave()
* Master settings & compat support

Kudos to Antonio for providing the compat support and debugging the interface to the bitter end!

For the whole series:

Signature · 4 lines
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara