linux-merge November 2016

linux-merge@lists.open-mesh.org

3 participants
80 discussions

Build check errors found: 2016-11-17

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 104 Tested Linux versions: 27 Tested configs: 69 maint ----- Failed tests: 1 Started build tests: 117 Tested Linux versions: 27 Tested configs: 78

6 years, 4 months

Build check errors found: 2016-11-16

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 107 Tested Linux versions: 27 Tested configs: 73 maint ----- Failed tests: 1 Started build tests: 117 Tested Linux versions: 26 Tested configs: 74

6 years, 4 months

Build check errors found: 2016-11-15

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 109 Tested Linux versions: 26 Tested configs: 76 maint ----- Failed tests: 1 Started build tests: 121 Tested Linux versions: 27 Tested configs: 77

6 years, 4 months

Build check errors found: 2016-11-14

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 109 Tested Linux versions: 27 Tested configs: 77 maint ----- Failed tests: 1 Started build tests: 109 Tested Linux versions: 27 Tested configs: 82

6 years, 4 months

Build check errors found: 2016-11-13

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 103 Tested Linux versions: 27 Tested configs: 74 maint ----- Failed tests: 1 Started build tests: 102 Tested Linux versions: 27 Tested configs: 72

6 years, 4 months

Build check errors found: 2016-11-12

by postmaster＠open-mesh.org

Name of failed tests ==================== master ------ * difference between net-next and batadv master maint ----- * difference between net and batadv maint Output of different failed tests ================================ maint: difference between net and batadv maint ---------------------------------------------- net/net/batman-adv/hard-interface.c | 1 - net/net/batman-adv/tp_meter.c | 1 - 2 files changed, 2 deletions(-) master: difference between net-next and batadv master ----------------------------------------------------- netnext/net/batman-adv/bat_iv_ogm.c | 21 - netnext/net/batman-adv/bat_v_elp.c | 41 +- netnext/net/batman-adv/hard-interface.c | 174 ------------ netnext/net/batman-adv/hard-interface.h | 5 netnext/net/batman-adv/main.c | 3 netnext/net/batman-adv/send.c | 283 ++++---------------- netnext/net/batman-adv/send.h | 5 netnext/net/batman-adv/tp_meter.c | 1 netnext/net/batman-adv/translation-table.c | 10 netnext/net/batman-adv/types.h | 19 - 10 files changed, 115 insertions(+), 447 deletions(-) Statistics ========== master ------ Failed tests: 1 Started build tests: 100 Tested Linux versions: 27 Tested configs: 66 maint ----- Failed tests: 1 Started build tests: 110 Tested Linux versions: 27 Tested configs: 69

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161111

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 93bbaab455f30fd43911e0881a02107a17150a62 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 6 17:04:23 2016 +0200 batman-adv: Reject unicast packet with zero/mcast dst address An unicast batman-adv packet cannot be transmitted to a multicast or zero mac address. So reject incoming packets which still have these classes of addresses as destination mac address in the outer ethernet header. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 4f034df..6713bdf 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -364,8 +364,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, ethhdr = eth_hdr(skb); - /* packet with unicast indication but broadcast recipient */ - if (is_broadcast_ether_addr(ethhdr->h_dest)) + /* packet with unicast indication but non-unicast recipient */ + if (!is_valid_ether_addr(ethhdr->h_dest)) goto free_skb; /* packet with broadcast/multicast sender address */ @@ -462,8 +462,8 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, ethhdr = eth_hdr(skb); - /* packet with unicast indication but broadcast recipient */ - if (is_broadcast_ether_addr(ethhdr->h_dest)) + /* packet with unicast indication but non-unicast recipient */ + if (!is_valid_ether_addr(ethhdr->h_dest)) return -EBADR; /* packet with broadcast/multicast sender address */ -- LinuxNextTracking

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161111

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit d401c1d1e824f8238c4da5f432151fad0945aeab Merge: a6dfdb4e1cd8ea0cf3e8588b97a0c33f8ad3fa4b 93bbaab455f30fd43911e0881a02107a17150a62 Author: David S. Miller <davem(a)davemloft.net> Date: Wed Nov 9 22:15:28 2016 -0500 Merge tag 'batadv-next-for-davem-20161108-v2' of git://git.open-mesh.org/linux-merge Simon Wunderlich says: ==================== pull request for net-next: batman-adv 2016-11-08 v2 This feature and cleanup patchset includes the following changes: - netlink and code cleanups by Sven Eckelmann (3 patches) - Cleanup and minor fixes by Linus Luessing (3 patches) - Speed up multicast update intervals, by Linus Luessing - Avoid (re)broadcast in meshes for some easy cases, by Linus Luessing - Clean up tx return state handling, by Sven Eckelmann (6 patches) - Fix some special mac address handling cases, by Sven Eckelmann (3 patches) ==================== Signed-off-by: David S. Miller <davem(a)davemloft.net> diff --combined net/batman-adv/hard-interface.c index e034afb,a7a462e..dc1816e --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@@ -228,6 -228,58 +228,58 @@@ bool batadv_is_wifi_netdev(struct net_d return false; } + /** + * batadv_hardif_no_broadcast - check whether (re)broadcast is necessary + * @if_outgoing: the outgoing interface checked and considered for (re)broadcast + * @orig_addr: the originator of this packet + * @orig_neigh: originator address of the forwarder we just got the packet from + * (NULL if we originated) + * + * Checks whether a packet needs to be (re)broadcasted on the given interface. + * + * Return: + * BATADV_HARDIF_BCAST_NORECIPIENT: No neighbor on interface + * BATADV_HARDIF_BCAST_DUPFWD: Just one neighbor, but it is the forwarder + * BATADV_HARDIF_BCAST_DUPORIG: Just one neighbor, but it is the originator + * BATADV_HARDIF_BCAST_OK: Several neighbors, must broadcast + */ + int batadv_hardif_no_broadcast(struct batadv_hard_iface *if_outgoing, + u8 *orig_addr, u8 *orig_neigh) + { + struct batadv_hardif_neigh_node *hardif_neigh; + struct hlist_node *first; + int ret = BATADV_HARDIF_BCAST_OK; + + rcu_read_lock(); + + /* 0 neighbors -> no (re)broadcast */ + first = rcu_dereference(hlist_first_rcu(&if_outgoing->neigh_list)); + if (!first) { + ret = BATADV_HARDIF_BCAST_NORECIPIENT; + goto out; + } + + /* >1 neighbors -> (re)brodcast */ + if (rcu_dereference(hlist_next_rcu(first))) + goto out; + + hardif_neigh = hlist_entry(first, struct batadv_hardif_neigh_node, + list); + + /* 1 neighbor, is the originator -> no rebroadcast */ + if (orig_addr && batadv_compare_eth(hardif_neigh->orig, orig_addr)) { + ret = BATADV_HARDIF_BCAST_DUPORIG; + /* 1 neighbor, is the one we received from -> no rebroadcast */ + } else if (orig_neigh && + batadv_compare_eth(hardif_neigh->orig, orig_neigh)) { + ret = BATADV_HARDIF_BCAST_DUPFWD; + } + + out: + rcu_read_unlock(); + return ret; + } + static struct batadv_hard_iface * batadv_hardif_get_active(const struct net_device *soft_iface) { @@@ -652,6 -704,7 +704,6 @@@ void batadv_hardif_disable_interface(st batadv_softif_destroy_sysfs(hard_iface->soft_iface); } - hard_iface->soft_iface = NULL; batadv_hardif_put(hard_iface); out: diff --combined net/batman-adv/originator.c index c6e7e1e,ad26559..8f3b296 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@@ -512,12 -512,14 +512,14 @@@ batadv_neigh_node_get(const struct bata * batadv_hardif_neigh_create - create a hardif neighbour node * @hard_iface: the interface this neighbour is connected to * @neigh_addr: the interface address of the neighbour to retrieve + * @orig_node: originator object representing the neighbour * * Return: the hardif neighbour node if found or created or NULL otherwise. */ static struct batadv_hardif_neigh_node * batadv_hardif_neigh_create(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr) + const u8 *neigh_addr, + struct batadv_orig_node *orig_node) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hardif_neigh_node *hardif_neigh; @@@ -536,6 -538,7 +538,7 @@@ kref_get(&hard_iface->refcount); INIT_HLIST_NODE(&hardif_neigh->list); ether_addr_copy(hardif_neigh->addr, neigh_addr); + ether_addr_copy(hardif_neigh->orig, orig_node->orig); hardif_neigh->if_incoming = hard_iface; hardif_neigh->last_seen = jiffies; @@@ -544,7 -547,7 +547,7 @@@ if (bat_priv->algo_ops->neigh.hardif_init) bat_priv->algo_ops->neigh.hardif_init(hardif_neigh); - hlist_add_head(&hardif_neigh->list, &hard_iface->neigh_list); + hlist_add_head_rcu(&hardif_neigh->list, &hard_iface->neigh_list); out: spin_unlock_bh(&hard_iface->neigh_list_lock); @@@ -556,12 -559,14 +559,14 @@@ * node * @hard_iface: the interface this neighbour is connected to * @neigh_addr: the interface address of the neighbour to retrieve + * @orig_node: originator object representing the neighbour * * Return: the hardif neighbour node if found or created or NULL otherwise. */ static struct batadv_hardif_neigh_node * batadv_hardif_neigh_get_or_create(struct batadv_hard_iface *hard_iface, - const u8 *neigh_addr) + const u8 *neigh_addr, + struct batadv_orig_node *orig_node) { struct batadv_hardif_neigh_node *hardif_neigh; @@@ -570,7 -575,7 +575,7 @@@ if (hardif_neigh) return hardif_neigh; - return batadv_hardif_neigh_create(hard_iface, neigh_addr); + return batadv_hardif_neigh_create(hard_iface, neigh_addr, orig_node); } /** @@@ -630,7 -635,7 +635,7 @@@ batadv_neigh_node_create(struct batadv_ goto out; hardif_neigh = batadv_hardif_neigh_get_or_create(hard_iface, - neigh_addr); + neigh_addr, orig_node); if (!hardif_neigh) goto out; -- LinuxNextTracking

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161111

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 7d72d174c7b6e3641bf13d1816f672051f6480b4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jul 17 21:04:05 2016 +0200 batman-adv: Remove dev_queue_xmit return code exception No caller of batadv_send_skb_to_orig is expecting the results to be -1 (-EPERM) anymore when the skbuff was not consumed. They will instead expect that the skbuff is always consumed. Having such return code filter is therefore not needed anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index b00aac7..9ea272e 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -64,8 +64,11 @@ static void batadv_send_outstanding_bcast_packet(struct work_struct *work); * If neigh_node is NULL, then the packet is broadcasted using hard_iface, * otherwise it is sent as unicast to the given neighbor. * - * Return: NET_TX_DROP in case of error or the result of dev_queue_xmit(skb) - * otherwise + * Regardless of the return value, the skb is consumed. + * + * Return: A negative errno code is returned on a failure. A success does not + * guarantee the frame will be transmitted as it may be dropped due + * to congestion or traffic shaping. */ int batadv_send_skb_packet(struct sk_buff *skb, struct batadv_hard_iface *hard_iface, @@ -73,7 +76,6 @@ int batadv_send_skb_packet(struct sk_buff *skb, { struct batadv_priv *bat_priv; struct ethhdr *ethhdr; - int ret; bat_priv = netdev_priv(hard_iface->soft_iface); @@ -111,15 +113,8 @@ int batadv_send_skb_packet(struct sk_buff *skb, /* dev_queue_xmit() returns a negative result on error. However on * congestion and traffic shaping, it drops and returns NET_XMIT_DROP * (which is > 0). This will not be treated as an error. - * - * a negative value cannot be returned because it could be interepreted - * as not consumed skb by callers of batadv_send_skb_to_orig. */ - ret = dev_queue_xmit(skb); - if (ret < 0) - ret = NET_XMIT_DROP; - - return ret; + return dev_queue_xmit(skb); send_skb_err: kfree_skb(skb); return NET_XMIT_DROP; -- LinuxNextTracking

6 years, 4 months

[linux-next] LinuxNextTracking branch, master, updated. next-20161111

by batman＠open-mesh.org

The following commit has been merged in the master branch: commit 9f75c8e1c8cc868645f34152df5ffd3fe97d1620 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 6 17:04:21 2016 +0200 batman-adv: Disallow mcast src address for data frames The routing checks are validating the source mac address of the outer ethernet header. They reject every source mac address which is a broadcast address. But they also have to reject any multicast mac addresses. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> [sw(a)simonwunderlich.de: fix commit message typo] Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 105d4fc..c02897b 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -368,8 +368,8 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, if (is_broadcast_ether_addr(ethhdr->h_dest)) goto free_skb; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with broadcast/multicast sender address */ + if (is_multicast_ether_addr(ethhdr->h_source)) goto free_skb; /* not for me */ @@ -466,8 +466,8 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv, if (is_broadcast_ether_addr(ethhdr->h_dest)) return -EBADR; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with broadcast/multicast sender address */ + if (is_multicast_ether_addr(ethhdr->h_source)) return -EBADR; /* not for me */ @@ -1159,8 +1159,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, if (!is_broadcast_ether_addr(ethhdr->h_dest)) goto free_skb; - /* packet with broadcast sender address */ - if (is_broadcast_ether_addr(ethhdr->h_source)) + /* packet with broadcast/multicast sender address */ + if (is_multicast_ether_addr(ethhdr->h_source)) goto free_skb; /* ignore broadcasts sent by myself */ -- LinuxNextTracking

6 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge November 2016