commits February 2016

commits@lists.open-mesh.org

1 participants
70 discussions

[linux-merge]linux integration; branch, merge/master, updated. v4.5-rc1-2545-g6078ecd

by postmaster＠open-mesh.org

The following commit has been merged in the merge/master branch: commit ec7952f329c3e9fb8efc3945bb59ae2448c27612 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Feb 1 14:34:32 2016 +0800 batman-adv: add missing kernel doc Fixes: 5c324517 ("ELP - compute the metric based on the estimated throughput") Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index f257897..4654251 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -67,7 +67,8 @@ static void batadv_v_elp_start_timer(struct batadv_hard_iface *hard_iface) * batadv_v_elp_get_throughput - get the throughput towards a neighbour * @neigh: the neighbour for which the throughput has to be obtained * - * Return: the throughput towards the given neighbour. + * Return: The throughput towards the given neighbour in multiples of 100kpbs + * (a value of '1' equals to 0.1Mbps, '10' equals 1Mbps, etc). */ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) { diff --git a/net/batman-adv/main.h b/net/batman-adv/main.h index 7b05f68..db45336 100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@ -62,7 +62,7 @@ #define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1 /* B.A.T.M.A.N. V */ -#define BATADV_THROUGHPUT_DEFAULT_VALUE 10 +#define BATADV_THROUGHPUT_DEFAULT_VALUE 10 /* 1 Mbps */ #define BATADV_ELP_PROBES_PER_NODE 2 #define BATADV_ELP_MIN_PROBE_SIZE 200 /* bytes */ #define BATADV_ELP_PROBE_MAX_TX_DIFF 100 /* milliseconds */ -- linux integration

7 years, 1 month

[batman-adv] master's head updated: Merge branch 'next' (be7b6a0)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 2808f92 batman-adv: Avoid endless loop in bat-on-bat netdevice check 2a89d10 Merge branch 'maint' into next be7b6a0 Merge branch 'next'

7 years, 1 month

[batman-adv] master: Merge branch 'next' (be7b6a0)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit be7b6a05be9808567fc951bc43132153dcb4fd01 Merge: ef30ba9 2a89d10 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Feb 16 17:22:54 2016 +0800 Merge branch 'next' >--------------------------------------------------------------- be7b6a05be9808567fc951bc43132153dcb4fd01 net/batman-adv/hard-interface.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)

7 years, 1 month

[batman-adv] next's head updated: Merge branch 'maint' into next (2a89d10)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 2808f92 batman-adv: Avoid endless loop in bat-on-bat netdevice check 2a89d10 Merge branch 'maint' into next

7 years, 1 month

[batman-adv] next: Merge branch 'maint' into next (2a89d10)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 2a89d102d9033ef2d30a8e0dc350afaa36fd36c5 Merge: de6db08 2808f92 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Tue Feb 16 17:22:39 2016 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 2a89d102d9033ef2d30a8e0dc350afaa36fd36c5 net/batman-adv/hard-interface.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)

7 years, 1 month

[batman-adv] maint: batman-adv: Avoid endless loop in bat-on-bat netdevice check (2808f92)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 2808f92a9e3e3a920ac2c40710a0fedf9f7a4525 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Thu Feb 11 22:15:57 2016 +0100 batman-adv: Avoid endless loop in bat-on-bat netdevice check batman-adv checks in different situation if a new device is already on top of a different batman-adv device. This is done by getting the iflink of a device and all its parent. It assumes that this iflink is always a parent device in an acyclic graph. But this assumption is broken by devices like veth which are actually a pair of two devices linked to each other. The recursive check would therefore get veth0 when calling dev_get_iflink on veth1. And it gets veth0 when calling dev_get_iflink with veth1. Creating a veth pair and loading batman-adv freezes parts of the system ip link add veth0 type veth peer name veth1 modprobe batman-adv An RCU stall will be detected on the system which cannot be fixed. INFO: rcu_sched self-detected stall on CPU 1: (5264 ticks this GP) idle=3e9/140000000000001/0 softirq=144683/144686 fqs=5249 (t=5250 jiffies g=46 c=45 q=43) Task dump for CPU 1: insmod R running task 0 247 245 0x00000008 ffffffff8151f140 ffffffff8107888e ffff88000fd141c0 ffffffff8151f140 0000000000000000 ffffffff81552df0 ffffffff8107b420 0000000000000001 ffff88000e3fa700 ffffffff81540b00 ffffffff8107d667 0000000000000001 Call Trace: <IRQ> [<ffffffff8107888e>] ? rcu_dump_cpu_stacks+0x7e/0xd0 [<ffffffff8107b420>] ? rcu_check_callbacks+0x3f0/0x6b0 [<ffffffff8107d667>] ? hrtimer_run_queues+0x47/0x180 [<ffffffff8107cf9d>] ? update_process_times+0x2d/0x50 [<ffffffff810873fb>] ? tick_handle_periodic+0x1b/0x60 [<ffffffff810290ae>] ? smp_trace_apic_timer_interrupt+0x5e/0x90 [<ffffffff813bbae2>] ? apic_timer_interrupt+0x82/0x90 <EOI> [<ffffffff812c3fd7>] ? __dev_get_by_index+0x37/0x40 [<ffffffffa0031f3e>] ? batadv_hard_if_event+0xee/0x3a0 [batman_adv] [<ffffffff812c5801>] ? register_netdevice_notifier+0x81/0x1a0 [...] This can be avoided by checking if two devices are each others parent and stopping the check in this situation. Fixes: 3d48811b27f5 ("batman-adv: prevent using any virtual device created on batman-adv as hard-interface") Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> [sven(a)narfation.org: rewritten description, extracted fix] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2808f92a9e3e3a920ac2c40710a0fedf9f7a4525 net/batman-adv/hard-interface.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index aea4d06..730cfa8 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -79,6 +79,28 @@ out: } /** + * batadv_mutual_parents - check if two devices are each others parent + * @dev1: 1st net_device + * @dev2: 2nd net_device + * + * veth devices come in pairs and each is the parent of the other! + * + * Return: true if the devices are each others parent, otherwise false + */ +static bool batadv_mutual_parents(const struct net_device *dev1, + const struct net_device *dev2) +{ + int dev1_parent_iflink = dev_get_iflink(dev1); + int dev2_parent_iflink = dev_get_iflink(dev2); + + if (!dev1_parent_iflink || !dev2_parent_iflink) + return false; + + return (dev1_parent_iflink == dev2->ifindex) && + (dev2_parent_iflink == dev1->ifindex); +} + +/** * batadv_is_on_batman_iface - check if a device is a batman iface descendant * @net_dev: the device to check * @@ -111,6 +133,9 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) if (WARN(!parent_dev, "Cannot find parent device")) return false; + if (batadv_mutual_parents(net_dev, parent_dev)) + return false; + ret = batadv_is_on_batman_iface(parent_dev); return ret;

7 years, 1 month

[batman-adv] master: batman-adv: fix logic error in batadv_v_ogm_forward (ef30ba9)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ef30ba92e5bba3a1c63f837814b6bcb28559d315 Author: Simon Wunderlich <simon.wunderlich(a)open-mesh.com> Date: Fri Feb 12 11:35:35 2016 +0100 batman-adv: fix logic error in batadv_v_ogm_forward The latest restructure attempt of the B.A.T.M.A.N. V forward function introduced a regression, causing kernel crashes when an OGM is forwarded. This patch fixes it. Fixes: 30c96bc787 ("batman-adv: move and restructure batadv_v_ogm_forward") Reported-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon.wunderlich(a)open-mesh.com> Tested-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- ef30ba92e5bba3a1c63f837814b6bcb28559d315 net/batman-adv/bat_v_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 1b2399e..4155fa5 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -309,7 +309,7 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, u16 tvlv_len; /* only forward for specific interfaces, not for the default one. */ - if (if_outgoing != BATADV_IF_DEFAULT) + if (if_outgoing == BATADV_IF_DEFAULT) goto out; orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing);

7 years, 1 month

[linux-merge]linux integration; annotated tag, v4.5-rc4, created. v4.5-rc4

by postmaster＠open-mesh.org

The annotated tag, v4.5-rc4 has been created at b726a6ccc1f4d80f1dcdb7ec93c466027dc9f6a8 (tag) tagging 18558cae0272f8fd9647e69d3fec1565a7949865 (commit) replaces v4.5-rc3 tagged by Linus Torvalds on Sun Feb 14 13:05:28 2016 -0800 - Shortlog ------------------------------------------------------------ Linux 4.5-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJWwOwYAAoJEHm+PkMAQRiGjQMH/jy+GLa3KSe/dgdh3IMnhV1Q kAFJ6n7o9n7iYtlbrDeDj4eulktuMpsCjFP3nubG35GvnFPyKMg3BlMhx1oZUQcB NiN8ulMXZQepmSjART1SxCgMkE7uRg9j61tEDjjSzCX4PbpbjSm50mjefjqI2pAh bkjHiepQ4maKlHqCf5S4rtofML0FTt1HXtUIPwlEMlB0pVrRO7yNLp6QuK43caft hAn/jZq/c5m7ykggLJOb3EBTlZD7TdTm9KduTqZUBLebwYbwbZLuXLZq3S5IvcHm 01+MNwD7VsW4p0R+p3WBP0+MdgPo3zlifCQRnUP22DSboXiDVAAsukrj/DiN+DA= =qnLX -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, deleted. v4.5-rc2-317-g92dcdf0

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been deleted was 47c8a238d1f480f149f746e5b251380e372175ad ----------------------------------------------------------------------- tag batman-adv-for-davem Here you have a batch of patches by Sven Eckelmann that drops our private reference counting implementation and substitutes it with the kref objects/functions. Then you have a patch, by Simon Wunderlich, that makes the broadcast protection window code more generic so that it can be re-used in the future by other components with different requirements. Lastly, Sven is also introducing two lockdep asserts in functions operating on our TVLV container list, to make sure that the proper lock is always acquired by the users. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWu1z7AAoJENpFlCjNi1MRD5YP+weJeSek2q9A7Of9BXAGFhjn YaqPxj0jAEeYLD3MUPoAUD+gkfHwD1bBxgXTXbK5mYYvnkkbXpl/Rm1jr+YFCGYp q8v/ks3Ncm5EbGXv2GzuC6BEzSlHQfLOnK+5MjPMxw5c/iQlgG2Oa25SVbHPRehk mv2NS7n6jhm4TdDIcBMcmxz+kJjgJqEIakmKzOG4NLOFKJytVmcnU246eJ3hST1+ jRzVdxyZ5yNrNvc46/LbmLvRs7y0R7WktkX9s3xB02z37Xarrx4GVX12j30yu4/P 5nhoKXuiz3Ravr1ZvZiJ5eP9m+uFtMSG6PztEvbwwABLn/GTJnu8GZO5BpfcNl6x DZEG4JRqx4nWmeZ32WnQcGLs2fJzkYhakILkJuFA3627mXNtVHTCZurEjGi3LTIr FiURbn/LRVAtJ+0wmdVKj4pAL6AucR0EdGnPNFAOMS4LHwZDqkUI6UDCypLiGXUD YT/7GOKzUTd0l6nh1bici20mjrUeQXoZK1P4pkwXovq7S+S1D7H8EalGlzVDaDZy hwEVwkQupN9R6gkKOJ5J4Tbk+uF2+kS7BDgOUObYk0csGxa59eApT/lG3rsdHutn 2fsC6JCZ/daLqy4YleK4s507eyKukTTnpfluWZRg/wEuMrxWAEcFn+fC6oIXoH4Y C4CTHpsaOncZhGC4Vmoc =Qo6q -----END PGP SIGNATURE----- 92dcdf09a139e51b7b043b9443b8fd69de298dff batman-adv: Convert batadv_tt_common_entry to kref ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, updated. batman-adv-for-davem

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been updated to 47c8a238d1f480f149f746e5b251380e372175ad (tag) from 854aab63b9a42293ef950da1567f2d524a50175a (which is now obsolete) tagging 92dcdf09a139e51b7b043b9443b8fd69de298dff (commit) replaces v4.5-rc2 tagged by Antonio Quartulli on Wed Feb 10 23:48:45 2016 +0800 - Shortlog ------------------------------------------------------------ Here you have a batch of patches by Sven Eckelmann that drops our private reference counting implementation and substitutes it with the kref objects/functions. Then you have a patch, by Simon Wunderlich, that makes the broadcast protection window code more generic so that it can be re-used in the future by other components with different requirements. Lastly, Sven is also introducing two lockdep asserts in functions operating on our TVLV container list, to make sure that the proper lock is always acquired by the users. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWu1z7AAoJENpFlCjNi1MRD5YP+weJeSek2q9A7Of9BXAGFhjn YaqPxj0jAEeYLD3MUPoAUD+gkfHwD1bBxgXTXbK5mYYvnkkbXpl/Rm1jr+YFCGYp q8v/ks3Ncm5EbGXv2GzuC6BEzSlHQfLOnK+5MjPMxw5c/iQlgG2Oa25SVbHPRehk mv2NS7n6jhm4TdDIcBMcmxz+kJjgJqEIakmKzOG4NLOFKJytVmcnU246eJ3hST1+ jRzVdxyZ5yNrNvc46/LbmLvRs7y0R7WktkX9s3xB02z37Xarrx4GVX12j30yu4/P 5nhoKXuiz3Ravr1ZvZiJ5eP9m+uFtMSG6PztEvbwwABLn/GTJnu8GZO5BpfcNl6x DZEG4JRqx4nWmeZ32WnQcGLs2fJzkYhakILkJuFA3627mXNtVHTCZurEjGi3LTIr FiURbn/LRVAtJ+0wmdVKj4pAL6AucR0EdGnPNFAOMS4LHwZDqkUI6UDCypLiGXUD YT/7GOKzUTd0l6nh1bici20mjrUeQXoZK1P4pkwXovq7S+S1D7H8EalGlzVDaDZy hwEVwkQupN9R6gkKOJ5J4Tbk+uF2+kS7BDgOUObYk0csGxa59eApT/lG3rsdHutn 2fsC6JCZ/daLqy4YleK4s507eyKukTTnpfluWZRg/wEuMrxWAEcFn+fC6oIXoH4Y C4CTHpsaOncZhGC4Vmoc =Qo6q -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix kerneldoc for DAT functions batman-adv: fix kerneldoc for TT functions batman-adv: add kernel doc for AP isolation attributes in bat_priv Marek Lindner (1): batman-adv: kernel doc readability updates Simon Wunderlich (3): batman-adv: Update/repair bridge loop avoidance kerneldoc batman-adv: add kerneldoc for batadv_iv_ogm_aggr_packet batman-adv: add seqno maximum age and protection start flag parameters Sven Eckelmann (30): batman-adv: Fix kerneldoc parsing of structs/enums batman-adv: Remove kerneldoc for missing parameters batman-adv: Fix names in kerneldoc of functions batman-adv: Drop invalid kerneldoc for variable batadv_vlan_attrs batman-adv: Fix kerneldoc parsing of return description batman-adv: Fix kerneldoc of main functions batman-adv: Fix kerneldoc of network-coding functions batman-adv: Fix kernel-doc for batadv_claim_free_ref batman-adv: update copyright years for 2016 batman-adv: Switch to HTTPS version of links batman-adv: Drop reference to netdevice on last reference batman-adv: Add lockdep assert for container_list_lock batman-adv: Convert batadv_hardif_neigh_node to kref batman-adv: Convert batadv_gw_node to kref batman-adv: Convert batadv_softif_vlan to kref batman-adv: Convert batadv_bla_backbone_gw to kref batman-adv: Convert batadv_bla_claim to kref batman-adv: Convert batadv_nc_node to kref batman-adv: Convert batadv_nc_path to kref batman-adv: Convert batadv_dat_entry to kref batman-adv: Convert batadv_tvlv_container to kref batman-adv: Convert batadv_tvlv_handler to kref batman-adv: Convert batadv_tt_orig_list_entry to kref batman-adv: Convert batadv_neigh_ifinfo to kref batman-adv: Convert batadv_orig_ifinfo to kref batman-adv: Convert batadv_neigh_node to kref batman-adv: Convert batadv_hard_iface to kref batman-adv: Convert batadv_orig_node_vlan to kref batman-adv: Convert batadv_orig_node to kref batman-adv: Convert batadv_tt_common_entry to kref ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2016