B.A.T.M.A.N

b.a.t.m.a.n@lists.open-mesh.org

15 participants
4308 discussions

[B.A.T.M.A.N.] question regarding batmand convergence time
by Thomas Tiotto 22 Jun '16

22 Jun '16

Good day, I'm currently finishing writing my bachelor thesis whose topic is mesh networks. I have been running batmand and comparing it in performance to olsrd; one metric I can't seem to be able to measure, though, is network convergence time, i.e., the time it takes for a new node to be discovered when connected and forgotten when disconnected from the network. This is due to the fact that batmand doesn't seem to display updated information in the same way that olsrd does (with DebugLevel=2). I've tried looking at the routing tables but these also aren't updated when a host disconnects and get purged after some time has passed. Is there any way I can get a real time view of the network to calculate the time it takes for a host to be discovered/forgotten? Thanks, Thomas Tiotto Università degli Studi di Milano

2 1

[B.A.T.M.A.N.] Non-batman Clients
by Jonathan Haws 20 Jun '16

20 Jun '16

I've followed the quick start guide, but apparently I'm missing something when it comes to non-batman clients. I've set all this up using vagrant and VirtualBox. The mesh seems to work perfectly, however when I put in non-batman clients they cannot communicate one with another. I would expect that they would be able to ping one another. I've given IP addresses to the bridge adapters on the 192.168.1.0/24 subnet. The clients I've given IP addresses on that same subnet (192.168.1.121 and 192.168.1.142). When I tried pinging, I don't get anything back. Sniffing packets in tcpdump shows that it is never getting anything back, though I did get an ARP back once with the correct MAC address, but still couldn't ping. Never got an ARP back again... I can ping from each client to the IP address of the bridge they are connecting to, but cannot ping anything else on the network. Any thoughts? Hopefully someone has seen this before and can point me in the right direction! Also, is there a separate list for alfred, or should I use this list for alfred questions? Thanks! Jon Here are the commands I used to setup: batctl if add eth0 (eth0 already up) ip link add name br0 type bridge ip link set dev eth1 master br0 ip link set dev bat0 master br0 ip link set up dev eth1 ip link set up dev bat0 ip addr replace dev br0 192.168.1.102/24 (and 104 on the other node) Here is what batadv-vis shows for my setup (I changed the labels "TT" for the two clients to "CLI<IP>"). digraph { subgraph "cluster_08:00:27:2c:10:05" { "08:00:27:2c:10:05" } "08:00:27:2c:10:05" -> "08:00:27:6b:86:2e" [label="1.016"] "08:00:27:2c:10:05" -> "0a:00:27:00:00:06" [label="TT"] "08:00:27:2c:10:05" -> "1e:8d:d3:23:ab:d4" [label="TT"] "08:00:27:2c:10:05" -> "08:00:27:b1:38:03" [label="CLI142"] "08:00:27:2c:10:05" -> "1e:8d:d3:23:ab:d4" [label="TT"] "08:00:27:2c:10:05" -> "08:00:27:1c:9b:14" [label="TT"] subgraph "cluster_08:00:27:a2:8c:62" { "08:00:27:a2:8c:62" } "08:00:27:a2:8c:62" -> "08:00:27:83:dd:41" [label="1.000"] "08:00:27:a2:8c:62" -> "08:00:27:38:31:55" [label="1.000"] "08:00:27:a2:8c:62" -> "08:00:27:f6:78:1a" [label="TT"] "08:00:27:a2:8c:62" -> "d6:f4:e6:bd:22:fb" [label="TT"] "08:00:27:a2:8c:62" -> "d6:f4:e6:bd:22:fb" [label="TT"] "08:00:27:a2:8c:62" -> "0a:00:27:00:00:05" [label="TT"] subgraph "cluster_08:00:27:38:31:55" { "08:00:27:38:31:55" } "08:00:27:38:31:55" -> "08:00:27:83:dd:41" [label="1.000"] "08:00:27:38:31:55" -> "08:00:27:a2:8c:62" [label="1.000"] "08:00:27:38:31:55" -> "52:98:12:67:6b:06" [label="TT"] "08:00:27:38:31:55" -> "0a:00:27:00:00:04" [label="TT"] "08:00:27:38:31:55" -> "08:00:27:08:ee:90" [label="CLI121"] "08:00:27:38:31:55" -> "52:98:12:67:6b:06" [label="TT"] "08:00:27:38:31:55" -> "08:00:27:17:21:9d" [label="TT"] subgraph "cluster_08:00:27:6b:86:2e" { "08:00:27:6b:86:2e" "08:00:27:83:dd:41" [peripheries=2] } "08:00:27:6b:86:2e" -> "08:00:27:2c:10:05" [label="1.000"] "08:00:27:83:dd:41" -> "08:00:27:38:31:55" [label="1.000"] "08:00:27:83:dd:41" -> "08:00:27:a2:8c:62" [label="1.016"] "08:00:27:6b:86:2e" -> "a6:f4:5c:fa:06:cd" [label="TT"] "08:00:27:6b:86:2e" -> "0a:00:27:00:00:03" [label="TT"] "08:00:27:6b:86:2e" -> "08:00:27:9c:bb:a3" [label="TT"] "08:00:27:6b:86:2e" -> "a6:f4:5c:fa:06:cd" [label="TT"] }

3 8

[B.A.T.M.A.N.] [PATCH next] batman-adv: Avoid skb free for batadv_send_skb_to_orig < -1
by Sven Eckelmann 20 Jun '16

20 Jun '16

The tp_meter code frees the skb when the batadv_send_skb_to_orig returns < 0. But the batadv_send_skb_to_orig only defines -1 as return code for failed submits with still valid skbs. Fixes: 98d7a766b645 ("batman-adv: throughput meter implementation") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Interesting because a patch was submitted to net next to remove NET_XMIT_POLICED and return -EINPROGRESS instead. I will maybe later send more patches because the current way of handling DROPPED/free'd skb/not-freed skb is quite confusing. net/batman-adv/tp_meter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/tp_meter.c b/net/batman-adv/tp_meter.c index ed99afb..bf6bffb 100644 --- a/net/batman-adv/tp_meter.c +++ b/net/batman-adv/tp_meter.c @@ -615,7 +615,7 @@ static int batadv_tp_send_msg(struct batadv_tp_vars *tp_vars, const u8 *src, batadv_tp_fill_prerandom(tp_vars, data, data_len); r = batadv_send_skb_to_orig(skb, orig_node, NULL); - if (r < 0) + if (r == -1) kfree_skb(skb); if (r == NET_XMIT_SUCCESS)

3 6

[B.A.T.M.A.N.] [PATCHv3] batman-adv: Introduce forward packet creation helper
by Linus Lüssing 20 Jun '16

20 Jun '16

This patch abstracts the forward packet creation into the new function batadv_forw_packet_alloc(). The queue counting and interface reference counters are now handled internally within batadv_forw_packet_alloc() and its batadv_forw_packet_free() counterpart. This should reduce the risk of having reference/queue counting bugs again and should increase code readibility. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- Changelog v3: * Fixed kernel doc for batadv_forw_packet_alloc() * New title / some more adjustments to commit message Changelog v2: * Rebase to current master * Fixed typo: "ressources" vs. "resources" * Moved forw_packet->num_packets initialization into forw_packet_alloc(), too * Adjusted commit message net/batman-adv/bat_iv_ogm.c | 34 ++++----------- net/batman-adv/send.c | 102 ++++++++++++++++++++++++++++++++------------ net/batman-adv/send.h | 6 +++ net/batman-adv/types.h | 2 + 4 files changed, 91 insertions(+), 53 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 19b0abd..9763986 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -685,19 +685,12 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, struct batadv_forw_packet *forw_packet_aggr; unsigned char *skb_buff; unsigned int skb_size; + atomic_t *queue_left = own_packet ? NULL : &bat_priv->batman_queue_left; - /* own packet should always be scheduled */ - if (!own_packet) { - if (!batadv_atomic_dec_not_zero(&bat_priv->batman_queue_left)) { - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "batman packet queue full\n"); - return; - } - } - - forw_packet_aggr = kmalloc(sizeof(*forw_packet_aggr), GFP_ATOMIC); + forw_packet_aggr = batadv_forw_packet_alloc(if_incoming, if_outgoing, + queue_left, bat_priv); if (!forw_packet_aggr) - goto out_nomem; + return; if (atomic_read(&bat_priv->aggregated_ogms) && packet_len < BATADV_MAX_AGGREGATION_BYTES) @@ -709,7 +702,8 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, forw_packet_aggr->skb = netdev_alloc_skb_ip_align(NULL, skb_size); if (!forw_packet_aggr->skb) - goto out_free_forw_packet; + goto packet_free; + forw_packet_aggr->skb->priority = TC_PRIO_CONTROL; skb_reserve(forw_packet_aggr->skb, ETH_HLEN); @@ -717,12 +711,7 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, forw_packet_aggr->packet_len = packet_len; memcpy(skb_buff, packet_buff, packet_len); - kref_get(&if_incoming->refcount); - kref_get(&if_outgoing->refcount); forw_packet_aggr->own = own_packet; - forw_packet_aggr->if_incoming = if_incoming; - forw_packet_aggr->if_outgoing = if_outgoing; - forw_packet_aggr->num_packets = 0; forw_packet_aggr->direct_link_flags = BATADV_NO_FLAGS; forw_packet_aggr->send_time = send_time; @@ -743,11 +732,8 @@ static void batadv_iv_ogm_aggregate_new(const unsigned char *packet_buff, send_time - jiffies); return; -out_free_forw_packet: - kfree(forw_packet_aggr); -out_nomem: - if (!own_packet) - atomic_inc(&bat_priv->batman_queue_left); +packet_free: + batadv_forw_packet_free(forw_packet_aggr); } /* aggregate a new packet into the existing ogm packet */ @@ -1830,10 +1816,6 @@ static void batadv_iv_send_outstanding_bat_ogm_packet(struct work_struct *work) batadv_iv_ogm_schedule(forw_packet->if_incoming); out: - /* don't count own packet */ - if (!forw_packet->own) - atomic_inc(&bat_priv->batman_queue_left); - batadv_forw_packet_free(forw_packet); } diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 49836da..fdeea3b 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -430,6 +430,13 @@ int batadv_send_skb_via_gw(struct batadv_priv *bat_priv, struct sk_buff *skb, orig_node, vid); } +/** + * batadv_forw_packet_free - free a forwarding packet + * @forw_packet: The packet to free + * + * This frees a forwarding packet and releases any resources it might + * have claimed. + */ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) { kfree_skb(forw_packet->skb); @@ -437,9 +444,70 @@ void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet) batadv_hardif_put(forw_packet->if_incoming); if (forw_packet->if_outgoing) batadv_hardif_put(forw_packet->if_outgoing); + if (forw_packet->queue_left) + atomic_inc(forw_packet->queue_left); kfree(forw_packet); } +/** + * batadv_forw_packet_alloc - Allocate a forwarding packet + * @if_incoming: The (optional) if_incoming to be grabbed + * @if_outgoing: The (optional) if_outgoing to be grabbed + * @queue_left: The (optional) queue counter to decrease + * @bat_priv: The bat_priv for the mesh of this forw_packet + * + * Allocates a forwarding packet and tries to get a reference to the + * (optional) if_incoming, if_outgoing and queue_left. If queue_left + * is NULL then bat_priv is optional, too. + * + * Return: An allocated forwarding packet on success, NULL otherwise. + */ +struct batadv_forw_packet * +batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming, + struct batadv_hard_iface *if_outgoing, + atomic_t *queue_left, + struct batadv_priv *bat_priv) +{ + struct batadv_forw_packet *forw_packet = NULL; + + if (queue_left && !batadv_atomic_dec_not_zero(queue_left)) { + if (queue_left == &bat_priv->bcast_queue_left) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "bcast queue full\n"); + else if (queue_left == &bat_priv->batman_queue_left) + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "batman queue full\n"); + else + batadv_dbg(BATADV_DBG_BATMAN, bat_priv, + "a mysterious queue is full\n"); + goto out; + } + + forw_packet = kmalloc(sizeof(*forw_packet), GFP_ATOMIC); + if (!forw_packet) + goto err; + + if (if_incoming) + kref_get(&if_incoming->refcount); + + if (if_outgoing) + kref_get(&if_outgoing->refcount); + + forw_packet->skb = NULL; + forw_packet->queue_left = queue_left; + forw_packet->if_incoming = if_incoming; + forw_packet->if_outgoing = if_outgoing; + forw_packet->num_packets = 0; + + goto out; + +err: + if (queue_left) + atomic_inc(queue_left); +out: + return forw_packet; +} + static void _batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, struct batadv_forw_packet *forw_packet, @@ -478,20 +546,16 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, struct batadv_bcast_packet *bcast_packet; struct sk_buff *newskb; - if (!batadv_atomic_dec_not_zero(&bat_priv->bcast_queue_left)) { - batadv_dbg(BATADV_DBG_BATMAN, bat_priv, - "bcast packet queue full\n"); - goto out; - } - primary_if = batadv_primary_if_get_selected(bat_priv); if (!primary_if) - goto out_and_inc; - - forw_packet = kmalloc(sizeof(*forw_packet), GFP_ATOMIC); + goto out; + forw_packet = batadv_forw_packet_alloc(primary_if, NULL, + &bat_priv->bcast_queue_left, + bat_priv); + batadv_hardif_put(primary_if); if (!forw_packet) - goto out_and_inc; + goto out; newskb = skb_copy(skb, GFP_ATOMIC); if (!newskb) @@ -504,11 +568,6 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, skb_reset_mac_header(newskb); forw_packet->skb = newskb; - forw_packet->if_incoming = primary_if; - forw_packet->if_outgoing = NULL; - - /* how often did we send the bcast packet ? */ - forw_packet->num_packets = 0; INIT_DELAYED_WORK(&forw_packet->delayed_work, batadv_send_outstanding_bcast_packet); @@ -517,12 +576,8 @@ int batadv_add_bcast_packet_to_list(struct batadv_priv *bat_priv, return NETDEV_TX_OK; packet_free: - kfree(forw_packet); -out_and_inc: - atomic_inc(&bat_priv->bcast_queue_left); + batadv_forw_packet_free(forw_packet); out: - if (primary_if) - batadv_hardif_put(primary_if); return NETDEV_TX_BUSY; } @@ -583,7 +638,6 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work) out: batadv_forw_packet_free(forw_packet); - atomic_inc(&bat_priv->bcast_queue_left); } void @@ -624,9 +678,6 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); - if (!forw_packet->own) - atomic_inc(&bat_priv->bcast_queue_left); - batadv_forw_packet_free(forw_packet); } } @@ -654,9 +705,6 @@ batadv_purge_outstanding_packets(struct batadv_priv *bat_priv, if (pending) { hlist_del(&forw_packet->list); - if (!forw_packet->own) - atomic_inc(&bat_priv->batman_queue_left); - batadv_forw_packet_free(forw_packet); } } diff --git a/net/batman-adv/send.h b/net/batman-adv/send.h index 7cecb75..999f786 100644 --- a/net/batman-adv/send.h +++ b/net/batman-adv/send.h @@ -28,6 +28,12 @@ struct sk_buff; void batadv_forw_packet_free(struct batadv_forw_packet *forw_packet); +struct batadv_forw_packet * +batadv_forw_packet_alloc(struct batadv_hard_iface *if_incoming, + struct batadv_hard_iface *if_outgoing, + atomic_t *queue_left, + struct batadv_priv *bat_priv); + int batadv_send_skb_to_orig(struct sk_buff *skb, struct batadv_orig_node *orig_node, struct batadv_hard_iface *recv_if); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 0eeb68f..125def2 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -1375,6 +1375,7 @@ struct batadv_skb_cb { * locally generated packet * @if_outgoing: packet where the packet should be sent to, or NULL if * unspecified + * @queue_left: The queue (counter) this packet was applied to */ struct batadv_forw_packet { struct hlist_node list; @@ -1387,6 +1388,7 @@ struct batadv_forw_packet { struct delayed_work delayed_work; struct batadv_hard_iface *if_incoming; struct batadv_hard_iface *if_outgoing; + atomic_t *queue_left; }; /** -- 2.1.4

2 3

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Remove unused primary_if and bat_priv variables
by Linus Lüssing 20 Jun '16

20 Jun '16

Acked-by: Simon Wunderlich <sw(a)simonwunderlich.de> Fixes: 29b9256e6631 ("batman-adv: consider outgoing interface in OGM sending") Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> --- v2: * Remove now unused bat_priv variable, too net/batman-adv/bat_iv_ogm.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 19b0abd..6af4462 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -528,36 +528,25 @@ static void batadv_iv_ogm_send_to_if(struct batadv_forw_packet *forw_packet, static void batadv_iv_ogm_emit(struct batadv_forw_packet *forw_packet) { struct net_device *soft_iface; - struct batadv_priv *bat_priv; - struct batadv_hard_iface *primary_if = NULL; if (!forw_packet->if_incoming) { pr_err("Error - can't forward packet: incoming iface not specified\n"); - goto out; + return; } soft_iface = forw_packet->if_incoming->soft_iface; - bat_priv = netdev_priv(soft_iface); if (WARN_ON(!forw_packet->if_outgoing)) - goto out; + return; if (WARN_ON(forw_packet->if_outgoing->soft_iface != soft_iface)) - goto out; + return; if (forw_packet->if_incoming->if_status != BATADV_IF_ACTIVE) - goto out; - - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto out; + return; /* only for one specific outgoing interface */ batadv_iv_ogm_send_to_if(forw_packet, forw_packet->if_outgoing); - -out: - if (primary_if) - batadv_hardif_put(primary_if); } /** -- 2.1.4

3 2

[B.A.T.M.A.N.] [PATCH v5 1/4] Revert "batman-adv: Fix hardif remove/add race"
by Sven Eckelmann 20 Jun '16

20 Jun '16

The description given in the commit is misleading and is at least not true for sysfs. The sysfs file structure should instead be deleted immediately on rtnl notifications and be underlying objects should be removed later when all kobject_put were done for the object. This reverts commit 6b0485c758be ("batman-adv: Fix hardif remove/add race") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v5: - add this revert --- net/batman-adv/debugfs.c | 23 ----------------------- net/batman-adv/debugfs.h | 1 - net/batman-adv/hard-interface.c | 19 ------------------- net/batman-adv/sysfs.c | 17 ----------------- net/batman-adv/sysfs.h | 2 -- 5 files changed, 62 deletions(-) diff --git a/net/batman-adv/debugfs.c b/net/batman-adv/debugfs.c index aea4133..1d68b6e 100644 --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@ -44,7 +44,6 @@ #include "translation-table.h" static struct dentry *batadv_debugfs; -static atomic_t batadv_rename = ATOMIC_INIT(0); static int batadv_algorithms_open(struct inode *inode, struct file *file) { @@ -348,28 +347,6 @@ void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface) } } -/** - * batadv_debugfs_rename_hardif - rename the base directory - * @hard_iface: hard interface which is renamed. - * - * The interface may be removed and then quickly added back - * again. Rename the old instance to something temporary and unique, - * so avoiding a name space clash if it does reappear before the deferred - * work completes the removal. - */ -void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface) -{ - char new_name[32]; - - snprintf(new_name, sizeof(*new_name) - 1, "tmp-%d", - atomic_inc_return(&batadv_rename)); - - if (batadv_debugfs && hard_iface->debug_dir) { - debugfs_rename(batadv_debugfs, hard_iface->debug_dir, - batadv_debugfs, new_name); - } -} - int batadv_debugfs_add_meshif(struct net_device *dev) { struct batadv_priv *bat_priv = netdev_priv(dev); diff --git a/net/batman-adv/debugfs.h b/net/batman-adv/debugfs.h index e7d19c1..1ab4e2e 100644 --- a/net/batman-adv/debugfs.h +++ b/net/batman-adv/debugfs.h @@ -34,7 +34,6 @@ int batadv_debugfs_add_meshif(struct net_device *dev); void batadv_debugfs_del_meshif(struct net_device *dev); int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface); void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface); -void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface); #else diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index ccc7641..1f90808 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -706,23 +706,6 @@ out: return NULL; } -/** - * batadv_hardif_rename - rename the sysfs and debugfs - * @hard_iface: The hard interface to rename - * - * The sysfs and debugfs files cannot be removed until all users close - * them. So the removal is deferred into a work queue. This however - * means if the interface comes back before the work queue runs, the - * files are still there, and so the create gives an EEXISTS error. To - * avoid this, rename them to a tempory name. - */ -static void batadv_hardif_rename(struct batadv_hard_iface *hard_iface) -{ - batadv_sysfs_rename_hardif(&hard_iface->hardif_obj, - hard_iface->net_dev); - batadv_debugfs_rename_hardif(hard_iface); -} - static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) { ASSERT_RTNL(); @@ -736,8 +719,6 @@ static void batadv_hardif_remove_interface(struct batadv_hard_iface *hard_iface) return; hard_iface->if_status = BATADV_IF_TO_BE_REMOVED; - batadv_hardif_rename(hard_iface); - queue_work(batadv_event_workqueue, &hard_iface->cleanup_work); } diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 9b2c28f..fe9ca94 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -48,8 +48,6 @@ #include "packet.h" #include "soft-interface.h" -static atomic_t batadv_rename = ATOMIC_INIT(0); - static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) { struct device *dev = container_of(obj->parent, struct device, kobj); @@ -1048,21 +1046,6 @@ out: return -ENOMEM; } -void batadv_sysfs_rename_hardif(struct kobject **hardif_obj, - struct net_device *dev) -{ - char new_name[32]; - int err; - - snprintf(new_name, sizeof(*new_name) - 1, "tmp-%d", - atomic_inc_return(&batadv_rename)); - - err = kobject_rename(*hardif_obj, new_name); - if (err) - batadv_err(dev, "Can't rename sysfs dir: %s/%s: %d\n", - dev->name, new_name, err); -} - void batadv_sysfs_del_hardif(struct kobject **hardif_obj) { kobject_put(*hardif_obj); diff --git a/net/batman-adv/sysfs.h b/net/batman-adv/sysfs.h index 64d3722..c76021b 100644 --- a/net/batman-adv/sysfs.h +++ b/net/batman-adv/sysfs.h @@ -48,8 +48,6 @@ void batadv_sysfs_del_meshif(struct net_device *dev); int batadv_sysfs_add_hardif(struct kobject **hardif_obj, struct net_device *dev); void batadv_sysfs_del_hardif(struct kobject **hardif_obj); -void batadv_sysfs_rename_hardif(struct kobject **hardif_obj, - struct net_device *dev); int batadv_sysfs_add_vlan(struct net_device *dev, struct batadv_softif_vlan *vlan); void batadv_sysfs_del_vlan(struct batadv_priv *bat_priv, -- 2.8.1

2 7

[B.A.T.M.A.N.] [PATCH next] batman-adv: remove NET_XMIT_POLICED
by Sven Eckelmann 14 Jun '16

14 Jun '16

From: Florian Westphal <fw(a)strlen.de> BATMAN uses it as an intermediate return value to signal forwarding vs. buffering, but it did not return POLICED to callers outside of BATMAN. Signed-off-by: Florian Westphal <fw(a)strlen.de> Signed-off-by: David S. Miller <davem(a)davemloft.net> [sven(a)narfation.org: rebased on top of TX path rewrite] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- Taken from upstream commit 99860208bc62 ("sched: remove NET_XMIT_POLICED"). Please make sure you first apply * https://patchwork.open-mesh.org/patch/16362/ * https://patchwork.open-mesh.org/patch/16363/ * https://patchwork.open-mesh.org/patch/16364/ --- net/batman-adv/send.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 49836da..729deec 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -20,6 +20,7 @@ #include <linux/atomic.h> #include <linux/byteorder/generic.h> +#include <linux/errno.h> #include <linux/etherdevice.h> #include <linux/fs.h> #include <linux/if.h> @@ -156,7 +157,7 @@ int batadv_send_unicast_skb(struct sk_buff *skb, * host, NULL can be passed as recv_if and no interface alternating is * attempted. * - * Return: -1 on failure (and the skb is not consumed), NET_XMIT_POLICED if the + * Return: -1 on failure (and the skb is not consumed), -EINPROGRESS if the * skb is buffered for later transmit or the NET_XMIT status returned by the * lower routine if the packet has been passed down. * @@ -191,7 +192,7 @@ int batadv_send_skb_to_orig(struct sk_buff *skb, * network coding fails, then send the packet as usual. */ if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) - ret = NET_XMIT_POLICED; + ret = -EINPROGRESS; else ret = batadv_send_unicast_skb(skb, neigh_node); -- 2.8.1

1 0

Re: [B.A.T.M.A.N.] [PATCH 3.16 046/114] batman-adv: Fix broadcast/ogm queue limit on a removed interface
by Linus Lüssing 13 Jun '16

13 Jun '16

On Mon, Jun 13, 2016 at 07:36:37PM +0100, Ben Hutchings wrote: > 3.16.36-rc1 review patch. If anyone has any objections, please let me know. > Hi Ben, This one looks weird. The version you added for 3.2.81-rc1 looked better. Cheers, Linus > ------------------ > > From: Linus Lüssing <linus.luessing(a)c0d3.blue> > > commit c4fdb6cff2aa0ae740c5f19b6f745cbbe786d42f upstream. > > When removing a single interface while a broadcast or ogm packet is > still pending then we will free the forward packet without releasing the > queue slots again. > > This patch is supposed to fix this issue. > > Fixes: 6d5808d4ae1b ("batman-adv: Add missing hardif_free_ref in forw_packet_free") > Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> > [sven(a)narfation.org: fix conflicts with current version] > Signed-off-by: Sven Eckelmann <sven(a)narfation.org> > Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> > Signed-off-by: Antonio Quartulli <a(a)unstable.cc> > Signed-off-by: Ben Hutchings <ben(a)decadent.org.uk> > --- > net/batman-adv/send.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > --- a/net/batman-adv/send.c > +++ b/net/batman-adv/send.c > @@ -638,6 +638,12 @@ batadv_purge_outstanding_packets(struct > > if (pending) { > hlist_del(&forw_packet->list); > + if (!forw_packet->own) > + atomic_inc(&bat_priv->bcast_queue_left); > + > + if (!forw_packet->own) > + atomic_inc(&bat_priv->batman_queue_left); > + > batadv_forw_packet_free(forw_packet); > } > } >

1 0

[B.A.T.M.A.N.] [PATCH v9 00/14] netns and netlink support
by Simon Wunderlich 13 Jun '16

13 Jun '16

This patchset completes netns support, by disabling debugfs entries when not in the default name space, and correctly handling interface stack loops when the parent is in a different name space. It additionally adds netlink support for most of the information found in debugfs, and is netns aware. This patchset is based on Andrews v7 series and contains an update/rebase of the v8 sent by myself on May 23rd, with the following changes: * removed useless initialization "struct net_device *soft_iface = NULL;" in: - batadv_tt_global_dump - batadv_hardif_neigh_dump - batadv_orig_dump - batadv_gw_dump - batadv_bla_claim_dump - batadv_bla_backbone_dump * add kerneldoc about rcu_read_lock requirement to: - batadv_tt_global_dump_entry - batadv_iv_ogm_neigh_dump_hardif - batadv_iv_ogm_orig_dump_entry - batadv_v_neigh_dump_hardif - batadv_v_orig_dump_entry * simplify code to add BATADV_ATTR_LAST_SEEN_MSECS in batadv_tt_local_dump_entry * rebased on top of current master and fix conflicts with batadv_algo_ops restructuring It should apply clean on todays master. The batctl patches will be sent separately. Cheers, Simon Andrew Lunn (5): batman-adv: Handle parent interfaces in a different netns batman-adv: Suppress debugfs entries for netns's batman-adv: add B.A.T.M.A.N. Dump gateways via netlink batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink batman-adv: Indicate netlink socket can be used with netns. Matthias Schiffer (6): batman-adv: netlink: add routing_algo query batman-adv: netlink: hardif query batman-adv: netlink: add translation table query batman-adv: netlink: add originator and neighbor table queries batman-adv: add B.A.T.M.A.N. IV bat_{orig, neigh}_dump implementations batman-adv: add B.A.T.M.A.N. V bat_{orig, neigh}_dump implementations Simon Wunderlich (1): batman-adv: add backbone table netlink support Sven Eckelmann (2): batman-adv: Provide TTVN in the mesh_info netlink msg batman-adv: Provide bla group in the mesh_info netlink msg compat-include/linux/netlink.h | 18 ++ compat.h | 7 + include/uapi/linux/batman_adv.h | 94 ++++++++ net/batman-adv/bat_algo.c | 68 ++++++ net/batman-adv/bat_algo.h | 3 + net/batman-adv/bat_iv_ogm.c | 366 ++++++++++++++++++++++++++++++++ net/batman-adv/bat_v.c | 341 +++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.c | 333 +++++++++++++++++++++++++++++ net/batman-adv/bridge_loop_avoidance.h | 17 +- net/batman-adv/debugfs.c | 18 ++ net/batman-adv/gateway_client.c | 148 +++++++++++++ net/batman-adv/gateway_client.h | 2 + net/batman-adv/hard-interface.c | 50 ++++- net/batman-adv/netlink.c | 217 ++++++++++++++++++- net/batman-adv/netlink.h | 6 + net/batman-adv/originator.c | 160 ++++++++++++++ net/batman-adv/originator.h | 4 + net/batman-adv/packet.h | 36 ---- net/batman-adv/translation-table.c | 377 +++++++++++++++++++++++++++++++++ net/batman-adv/translation-table.h | 4 + net/batman-adv/types.h | 9 + 21 files changed, 2230 insertions(+), 48 deletions(-) -- 2.8.1

2 15

[B.A.T.M.A.N.] [PATCH v4 1/5] batman-adv: Define module rtnl link name
by Sven Eckelmann 13 Jun '16

13 Jun '16

The batman-adv module can automatically be loaded when operations over the rtnl link are triggered. This requires only the correct rtnl link name in the module header. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> --- v4: - rebase on top of current master v3: - rebased on top of current master to fix conflicts with newest patches v2: - rebased on top of current master to fix conflicts with newest patches --- net/batman-adv/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/batman-adv/main.c b/net/batman-adv/main.c index fe4c5e2..f61479b 100644 --- a/net/batman-adv/main.c +++ b/net/batman-adv/main.c @@ -638,3 +638,4 @@ MODULE_AUTHOR(BATADV_DRIVER_AUTHOR); MODULE_DESCRIPTION(BATADV_DRIVER_DESC); MODULE_SUPPORTED_DEVICE(BATADV_DRIVER_DEVICE); MODULE_VERSION(BATADV_SOURCE_VERSION); +MODULE_ALIAS_RTNL_LINK("batadv"); -- 2.8.1

2 6

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N