commits February 2016

commits@lists.open-mesh.org

1 participants
70 discussions

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

by postmaster＠open-mesh.org

The annotated tag, batman-adv-for-davem has been created at a1624699d0d3744f75086e67d805d04fdf8eb45b (tag) tagging 339895ffdf42413c5dcbe2442e779872098d302e (commit) replaces v4.5-rc2 tagged by Antonio Quartulli on Fri Feb 19 20:20:11 2016 +0800 - Shortlog ------------------------------------------------------------ This is a cleanup patchset: first the BATADV_BONDING_TQ_THRESHOLD constant gets removed as it was defined but not used anywhere, then all our *_free_ref functions are renamed to *_put in order to follow the kernel naming convention by Sven Eckelmann. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWx/QrAAoJENpFlCjNi1MRWjsQALn6HH25gbcRJEcdW4t/TR07 VL79XJuj6V1m5w8f4rTCOhopwq+9q6l9i7ate0ZcO5Gm/TEUT974QDRlcL4t4iKB FCGIxVQZ9KmDXge5imJWZPW8OheaLVRZifuze9wrevnCpulFhNQ79qiRYlc8vteo /Q/jDD1y218KsMo5cCF+MDHLNevQAlTHEDroTOEUpQAe6FECpFXqXlPXthaSBD6Q /CJxdvBE02yno3uvZFZ49XrYEwG9bpeK2M4ewYAKzW26zk2QKMYMR9TUJKzZTe7R ilhpqPKW8LhZz9XygmZuILC7mj4PoQPMhKGv5yK0QTp8NpZO712DIbamBRhN58a8 656U/+Cf88Cx9h1UaYZjz2kb5OrS5e25u9Bu3cO1Ufw/7gQipwUz3bq7eY2hxK5q Qm5YrWIwVrYDjyNp2VLE8jttAxD/V/t2qPi0eX5dXgFWI94/ZG7IOUxiOsvrmOM0 R/TnziiZx7C+4+M2oYp18FiTh7G+787lULqy99okBLKKMrfqQYEa7pP3PyT9v0cJ jfMC4P71GASWdIsiqxe89jaATGG8g/m6ncyjPHp8V46IBudUXAwiUYmFsx39dVIK TFmQdlR6ZofavWDrlc0IS/J7j9nDt4ktY7V5k3xsU5y1WsRJ8DmKcLNyP5PNchnb 0KhFs0bBborHbk88RGZp =wePc -----END PGP SIGNATURE----- Antonio Quartulli (4): 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 batman-adv: remove unused BATADV_BONDING_TQ_THRESHOLD constant 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 (49): 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 batman-adv: Rename batadv_orig_node *_free_ref function to *_put batman-adv: Rename batadv_hardif *_free_ref function to *_put batman-adv: Rename batadv_neigh_node *_free_ref function to *_put batman-adv: Rename batadv_neigh_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_orig_ifinfo *_free_ref function to *_put batman-adv: Rename batadv_hardif_neigh *_free_ref function to *_put batman-adv: Rename batadv_backbone_gw *_free_ref function to *_put batman-adv: Rename batadv_claim *_free_ref function to *_put batman-adv: Rename batadv_dat_entry *_free_ref function to *_put batman-adv: Rename batadv_gw_node *_free_ref function to *_put batman-adv: Rename batadv_tvlv_handler *_free_ref function to *_put batman-adv: Rename batadv_tvlv_container *_free_ref function to *_put batman-adv: Rename batadv_softif_vlan *_free_ref function to *_put batman-adv: Rename batadv_nc_node *_free_ref function to *_put batman-adv: Rename batadv_nc_path *_free_ref function to *_put batman-adv: Rename batadv_orig_node_vlan *_free_ref function to *_put batman-adv: Rename batadv_tt_local_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_global_entry *_free_ref function to *_put batman-adv: Rename batadv_tt_orig_list_entry *_free_ref function to *_put ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

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

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been updated to ca1c012f55481ea5d6d1c73f195c50bb6281bb00 (tag) from 904e3d8a3d989ea531d63f318b6e4f5b24595e90 (which is now obsolete) tagging 1bc4e2b000e7fa9773d6623bc8850561ce10a4fb (commit) replaces v4.5-rc3 tagged by Antonio Quartulli on Tue Feb 16 22:16:43 2016 +0800 - Shortlog ------------------------------------------------------------ Two of the fixes included in this patchset prevent wrong memory access - it was triggered when removing an object from a list after it was already free'd due to bad reference counting. This misbehaviour existed for both the gw_node and the orig_node_vlan object and has been fixed by Sven Eckelmann. The last patch fixes our interface feasibility check and prevents it from looping indefinitely when two net_device objects reference each other via iflink index (i.e. veth pair), by Andrew Lunn -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWwy9MAAoJENpFlCjNi1MRu+cQAMF7zYIlWggCWUEqaEIId4qi daGly3DNrXWH8FJta+NR399xXlTXNoyS8uZYt9YUZrXlwXDbDNBHJ8Jcmc5sslZr /06os5KUvNLlasup1GLBbynKUCTBSjVyo3DBwVCsiCL/iHdN1tFZXg3c2ET2U7Tk 4bFZO4h1JkpwCYeCjCJQSbPrjnAXYdxV01iarDJZgAoc290f92Ob4mTuTrQr1Vzi EH2fyrd3m/qmRb2YBj7jNdVeD2Q4XyMKY4vHHeBq9JR/kwINwUg38+gnvcwK+KeD VJilETdC686ZJKBSVvECQZqeXr4HaCINFNuepZLsg128IQ2ZjqPYC1yTq/qc1VF+ YGCunXhbbNgxeE1+QgXssgRAiUBx43m2osQegpHkyCzK8GPbv1gRIbTYaHgmqa4A Pn6WHdV2kcfGRFNOASST5+eWPe9ol8RvAbXT0yD2+6CNz6aijfbGITUTlB24X+f+ 6CsS3uCBsH8FI3hqjgULTqcyF14QbnLZ9AnkxYwt8B0Ge62LEfdwuXAh96mIhfyf cGi7DBnHAYapOPzz0jSBhW5myiPOioNLJfzokZrBq+RuRBYUIUvzGmz8QJQpy/GO EdnMOE/uWeZeSCsAGTE00pjqfHliK/vu4Wh0puGFWTQGCBbKWP5p4eNqRh4p+2GC Sg1f1EKDt2PRw9aZHNHm =CvI3 -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Avoid endless loop in bat-on-bat netdevice check Sven Eckelmann (2): batman-adv: Only put gw_node list reference when removed batman-adv: Only put orig_node_vlan list reference when removed ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

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

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been updated to 904e3d8a3d989ea531d63f318b6e4f5b24595e90 (tag) from 48d76333e016f36ed310319982d8543ae9373690 (which is now obsolete) tagging 92ecbabb9e9cc88bf1fac471bafe1eff212ebed0 (commit) replaces v4.5-rc3 tagged by Antonio Quartulli on Tue Feb 16 22:12:44 2016 +0800 - Shortlog ------------------------------------------------------------ Two of the fixes included in this patchset prevent wrong memory access - it was triggered when removing an object from a list after it was already free'd due to bad reference counting. This misbehaviour existed for both the gw_node and the orig_node_vlan object and has been fixed by Sven Eckelmann. The last patch fixes our interface feasibility check and prevents it from looping indefinitely when two net_device objects reference each other via iflink index (i.e. veth pair), by Andrew Lunn -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWwy5eAAoJENpFlCjNi1MRLOAP/3HiCg89l7KSo0faGLgwCCwF 99toVNvse5cUAKt4pQUMAHyihML3OZPNw2z1OIM+WQO5ZITRsbaTpBBcYrTJoNca k2YCb4yVEePNgoNxXMLbVOeqG/c8k0PHnv3SNQsWS5Li8hs6WcF5z/x1a4eRqLcF dIZLvRl/Gtdx9j3tlsYx/XDDYwdrlx28st1S+BqRmSXh0cNDhge0D5qHS4Y1t4In r47hypPgLLXZNH3VnJu0phv8hRweXqOJ/mq5H+51P9XuJg/AmwL0PomtHmvuJ5dr +Now1zCfW1YuJcfQ9zvSsMmicXAGnPUXx4Pfl3nmbT042ydYfnsci2RVhPMhIfUi YO//+ITNWm1BarQgb/IELZsB5XMsbNtqeOuiJDGTj5vJjSQOGyE3/3d2D2HhLoqC 640SrsuJMDKA129MWuyEXeiPdq1VVN1ioWrA0PKYa2LzXVn8RBX6S8jTR8Pk6seM +aJ7qgLjgfayrk7/Tn0iyTYLJPV9CtahaaJP0m1CKRikdpqCNBdIfLjVYlP3tq1H QEhnLO+mRwqjsZ5oUNGT0HNkluwn++ohx981MAGcE/4bfVJ0SS/1fIVed0boUFRf ScQvQycR65K4A/PS3pQIoqByI9KIO5+uHnEYaVv9OYpNoCPCVbUNw12nQGGeMbnz CC3meBmpcsPHWfWKHB9+ =wi93 -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Avoid endless loop in bat-on-bat netdevice check Sven Eckelmann (2): batman-adv: Only put gw_node list reference when removed batman-adv: Only put orig_node_vlan list reference when removed ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

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

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been created at 48d76333e016f36ed310319982d8543ae9373690 (tag) tagging 692532b693ca43cf23088d658f862d137a0cfd5f (commit) replaces v4.5-rc3 tagged by Antonio Quartulli on Tue Feb 16 18:12:34 2016 +0800 - Shortlog ------------------------------------------------------------ Two of the fixes included in this patchset prevent wrong memory access - it was triggered when removing an object from a list after it was already free'd due to bad reference counting. This misbehaviour existed for both the gw_node and the orig_node_vlan object and has been fixed by Sven Eckelmann. The last patch fixes our interface feasibility check and prevents it from looping indefinitely when two net_device objects reference each other via iflink index (i.e. veth pair), by Andrew Lunn -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWwy4OAAoJENpFlCjNi1MRoxQP/Ap7cqwI9TunE7rZOkq8QZmV UskmGojY4s0fQ9DSF6tB8DMJhjoSwxvb6Ghijrc7EDs9SF1yRL0hgaxD/g0HrYzH 0ZJgTmVS2XcEmUJDO4mRaahQR9EH48EJILaWahTPYviLTmwzuIOaxpt6K3rQNp28 kG90ekrbROSlsiwyh/iq2lUJh4zJMGVyXdnhXG7HBd8WClA/nc8Wl1PQLiUnINB/ Er0YYYW2SPlIwr82nTDLNQFZhuu8x5FO3o45L19CVsGgGvICIUJGW0Z+9Adk+py6 TiI5nOV39v17yd/YAGresDdRvdNJSMwVsR3OIb4Vz/gqMv99Wsa/Oj5O3s53OENj gvNaml3B+xy9dSPGAxeX45PvaUeHIklM/CaTiHZ/YKFNGHiF0LvMw1pg/18hKa4z z7a1U6USnoZ1PFOLUg3hZ1Lg4olzrck4lI9/eRPks/Rr94y9+tvyRHNU3MpDycyF cv6UHyM4TAaUHBkIJiqjDndoiKYt61WZaRxwLkIK1ugyQVju/vQoCFnVm1D4lZDO tEu4luWwmc8W0PhAiTAL2KyDajRlLDR1APLnz69jYZMljZbyBxoarOZqGa9JUn81 lydNB/ZbvB/EhkagdcNAVCP7KEB77i29xzGipgfOQeLiF1qwhRR9mVJOVP26rrsz 5a8Hf2RDykJlllX8/BJv =ftHX -----END PGP SIGNATURE----- Andrew Lunn (1): batman-adv: Avoid endless loop in bat-on-bat netdevice check Sven Eckelmann (2): batman-adv: Only put gw_node list reference when removed batman-adv: Only put orig_node_vlan list reference when removed ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, deleted. v4.4-6392-g42eff6a

by postmaster＠open-mesh.org

The annotated tag, batman-adv-fix-for-davem has been deleted was c708338bef40a3b4f21e4abf6dd0a97d5a43dde1 ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Included changes: - avoid recursive invocations of call_rcu() which would fool users waiting on rcu_barrier() - prevent immediate kfree of objects used in rcu protected contexts -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJWmwezAAoJENpFlCjNi1MRBcsP/3F4cOvbTw4inAVNkE3nSvrl lPP/z87pcMFs1uLOInR9vmpXnlZ9JCU5pef6nXOSs4TBMKoB9yU4vl1RnW6/kbw8 M5MsgMF7RiAnPQTxm/GRHwuYD3o/+4GwKXz5cquhIt6282c9a1JsjF01OlbRVooB FDbJIU5MNIXK/3RKznDQRPXiKYMXFaqBbRCDMOUf8SF4tzfybJJWScplGTdgH9Kh OcqLdAdzPmd6b+Vb4BRRcVPx/oT1uXA+G1Ktwu/QIHb6+mpqDJykVv3Z/tMexYvh jo2Xcs3qvWWdVRdxV4IQHgN4bfEhJwrpMGreX9QbV4aF9muGjnx9TU2/2/UFUT+2 T1gE5UFC88y2qDx1dF6/SaHA1fnZ5G97rAww+5OU0ntVRe8N+9lSfwejDOoYDgAH dFvc1ln1r1phqg548xKrH4y7ymnTv0MJuZ4t7x+TAZYhiPP91JNPwtoK1Eceu4sc mq86HqF+pmGMAoREdqQOdB7wfpZDEShcEoDj1lQekBiQp2uYtVOldseNFsYQ7aIU 59MdizN3hDDEJw4eOKEXvtZyEi78G0AqJgaww/Zd8GyJqcbhKuGwc3qCdQF/WzFX tvnIM3ChDluXejBy55Gc0jAkFVjBKyWG4g7VYCial6CIRx3VGSqjqlRU0iUTslzl I25ZqXkSSCsVQjw7bO5d =pdnx -----END PGP SIGNATURE----- 42eff6a617e23b691f8e4467f4687ed7245a92db batman-adv: Drop immediate orig_node free function ----------------------------------------------------------------------- -- linux integration

7 years, 1 month

[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 de6db08fd0a6a0f9a1a213b3e11b6b26acde46a0 Merge: 41d1e618f6afb197599689097363e8114786de55 ead9389a3a0af4de210c977a0b11d57180d7c941 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Feb 10 18:48:34 2016 +0800 Merge branch 'maint' into next diff --combined net/batman-adv/gateway_client.c index 346d5f7,c9b8b48..c59aff5 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@@ -1,4 -1,4 +1,4 @@@ -/* Copyright (C) 2009-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2016 B.A.T.M.A.N. contributors: * * Marek Lindner * @@@ -28,7 -28,6 +28,7 @@@ #include <linux/ip.h> #include <linux/ipv6.h> #include <linux/kernel.h> +#include <linux/kref.h> #include <linux/list.h> #include <linux/netdevice.h> #include <linux/rculist.h> @@@ -60,28 -59,12 +60,28 @@@ */ #define BATADV_DHCP_CHADDR_OFFSET 28 -static void batadv_gw_node_free_ref(struct batadv_gw_node *gw_node) +/** + * batadv_gw_node_release - release gw_node from lists and queue for free after + * rcu grace period + * @ref: kref pointer of the gw_node + */ +static void batadv_gw_node_release(struct kref *ref) { - if (atomic_dec_and_test(&gw_node->refcount)) { - batadv_orig_node_free_ref(gw_node->orig_node); - kfree_rcu(gw_node, rcu); - } + struct batadv_gw_node *gw_node; + + gw_node = container_of(ref, struct batadv_gw_node, refcount); + + batadv_orig_node_put(gw_node->orig_node); + kfree_rcu(gw_node, rcu); +} + +/** + * batadv_gw_node_put - decrement the gw_node refcounter and possibly release it + * @gw_node: gateway node to free + */ +static void batadv_gw_node_put(struct batadv_gw_node *gw_node) +{ + kref_put(&gw_node->refcount, batadv_gw_node_release); } static struct batadv_gw_node * @@@ -94,7 -77,7 +94,7 @@@ batadv_gw_get_selected_gw_node(struct b if (!gw_node) goto out; - if (!atomic_inc_not_zero(&gw_node->refcount)) + if (!kref_get_unless_zero(&gw_node->refcount)) gw_node = NULL; out: @@@ -117,14 -100,14 +117,14 @@@ batadv_gw_get_selected_orig(struct bata if (!orig_node) goto unlock; - if (!atomic_inc_not_zero(&orig_node->refcount)) + if (!kref_get_unless_zero(&orig_node->refcount)) orig_node = NULL; unlock: rcu_read_unlock(); out: if (gw_node) - batadv_gw_node_free_ref(gw_node); + batadv_gw_node_put(gw_node); return orig_node; } @@@ -135,14 -118,14 +135,14 @@@ static void batadv_gw_select(struct bat spin_lock_bh(&bat_priv->gw.list_lock); - if (new_gw_node && !atomic_inc_not_zero(&new_gw_node->refcount)) + if (new_gw_node && !kref_get_unless_zero(&new_gw_node->refcount)) new_gw_node = NULL; curr_gw_node = rcu_dereference_protected(bat_priv->gw.curr_gw, 1); rcu_assign_pointer(bat_priv->gw.curr_gw, new_gw_node); if (curr_gw_node) - batadv_gw_node_free_ref(curr_gw_node); + batadv_gw_node_put(curr_gw_node); spin_unlock_bh(&bat_priv->gw.list_lock); } @@@ -187,7 -170,7 +187,7 @@@ batadv_gw_get_best_gw_node(struct batad if (!router_ifinfo) goto next; - if (!atomic_inc_not_zero(&gw_node->refcount)) + if (!kref_get_unless_zero(&gw_node->refcount)) goto next; tq_avg = router_ifinfo->bat_iv.tq_avg; @@@ -203,9 -186,9 +203,9 @@@ ((tmp_gw_factor == max_gw_factor) && (tq_avg > max_tq))) { if (curr_gw) - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); curr_gw = gw_node; - atomic_inc(&curr_gw->refcount); + kref_get(&curr_gw->refcount); } break; @@@ -218,9 -201,9 +218,9 @@@ */ if (tq_avg > max_tq) { if (curr_gw) - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); curr_gw = gw_node; - atomic_inc(&curr_gw->refcount); + kref_get(&curr_gw->refcount); } break; } @@@ -231,12 -214,12 +231,12 @@@ if (tmp_gw_factor > max_gw_factor) max_gw_factor = tmp_gw_factor; - batadv_gw_node_free_ref(gw_node); + batadv_gw_node_put(gw_node); next: - batadv_neigh_node_free_ref(router); + batadv_neigh_node_put(router); if (router_ifinfo) - batadv_neigh_ifinfo_free_ref(router_ifinfo); + batadv_neigh_ifinfo_put(router_ifinfo); } rcu_read_unlock(); @@@ -272,7 -255,7 +272,7 @@@ void batadv_gw_check_client_stop(struc */ batadv_throw_uevent(bat_priv, BATADV_UEV_GW, BATADV_UEV_DEL, NULL); - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); } void batadv_gw_election(struct batadv_priv *bat_priv) @@@ -347,13 -330,13 +347,13 @@@ out: if (curr_gw) - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); if (next_gw) - batadv_gw_node_free_ref(next_gw); + batadv_gw_node_put(next_gw); if (router) - batadv_neigh_node_free_ref(router); + batadv_neigh_node_put(router); if (router_ifinfo) - batadv_neigh_ifinfo_free_ref(router_ifinfo); + batadv_neigh_ifinfo_put(router_ifinfo); } void batadv_gw_check_election(struct batadv_priv *bat_priv, @@@ -414,15 -397,15 +414,15 @@@ reselect batadv_gw_reselect(bat_priv); out: if (curr_gw_orig) - batadv_orig_node_free_ref(curr_gw_orig); + batadv_orig_node_put(curr_gw_orig); if (router_gw) - batadv_neigh_node_free_ref(router_gw); + batadv_neigh_node_put(router_gw); if (router_orig) - batadv_neigh_node_free_ref(router_orig); + batadv_neigh_node_put(router_orig); if (router_gw_tq) - batadv_neigh_ifinfo_free_ref(router_gw_tq); + batadv_neigh_ifinfo_put(router_gw_tq); if (router_orig_tq) - batadv_neigh_ifinfo_free_ref(router_orig_tq); + batadv_neigh_ifinfo_put(router_orig_tq); } /** @@@ -440,12 -423,12 +440,12 @@@ static void batadv_gw_node_add(struct b if (gateway->bandwidth_down == 0) return; - if (!atomic_inc_not_zero(&orig_node->refcount)) + if (!kref_get_unless_zero(&orig_node->refcount)) return; gw_node = kzalloc(sizeof(*gw_node), GFP_ATOMIC); if (!gw_node) { - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return; } @@@ -453,7 -436,7 +453,7 @@@ gw_node->orig_node = orig_node; gw_node->bandwidth_down = ntohl(gateway->bandwidth_down); gw_node->bandwidth_up = ntohl(gateway->bandwidth_up); - atomic_set(&gw_node->refcount, 1); + kref_init(&gw_node->refcount); spin_lock_bh(&bat_priv->gw.list_lock); hlist_add_head_rcu(&gw_node->list, &bat_priv->gw.list); @@@ -486,7 -469,7 +486,7 @@@ batadv_gw_node_get(struct batadv_priv * if (gw_node_tmp->orig_node != orig_node) continue; - if (!atomic_inc_not_zero(&gw_node_tmp->refcount)) + if (!kref_get_unless_zero(&gw_node_tmp->refcount)) continue; gw_node = gw_node_tmp; @@@ -544,22 -527,23 +544,23 @@@ void batadv_gw_node_update(struct batad * gets dereferenced. */ spin_lock_bh(&bat_priv->gw.list_lock); - hlist_del_init_rcu(&gw_node->list); + if (!hlist_unhashed(&gw_node->list)) { + hlist_del_init_rcu(&gw_node->list); - batadv_gw_node_free_ref(gw_node); ++ batadv_gw_node_put(gw_node); + } spin_unlock_bh(&bat_priv->gw.list_lock); - batadv_gw_node_put(gw_node); - curr_gw = batadv_gw_get_selected_gw_node(bat_priv); if (gw_node == curr_gw) batadv_gw_reselect(bat_priv); if (curr_gw) - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); } out: if (gw_node) - batadv_gw_node_free_ref(gw_node); + batadv_gw_node_put(gw_node); } void batadv_gw_node_delete(struct batadv_priv *bat_priv, @@@ -582,7 -566,7 +583,7 @@@ void batadv_gw_node_free(struct batadv_ hlist_for_each_entry_safe(gw_node, node_tmp, &bat_priv->gw.list, list) { hlist_del_init_rcu(&gw_node->list); - batadv_gw_node_free_ref(gw_node); + batadv_gw_node_put(gw_node); } spin_unlock_bh(&bat_priv->gw.list_lock); } @@@ -619,12 -603,12 +620,12 @@@ static int batadv_write_buffer_text(str ret = seq_has_overflowed(seq) ? -1 : 0; if (curr_gw) - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); out: if (router_ifinfo) - batadv_neigh_ifinfo_free_ref(router_ifinfo); + batadv_neigh_ifinfo_put(router_ifinfo); if (router) - batadv_neigh_node_free_ref(router); + batadv_neigh_node_put(router); return ret; } @@@ -661,7 -645,7 +662,7 @@@ int batadv_gw_client_seq_print_text(str out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); return 0; } @@@ -855,7 -839,7 +856,7 @@@ bool batadv_gw_out_of_range(struct bata goto out; curr_tq_avg = curr_ifinfo->bat_iv.tq_avg; - batadv_neigh_ifinfo_free_ref(curr_ifinfo); + batadv_neigh_ifinfo_put(curr_ifinfo); break; case BATADV_GW_MODE_OFF: @@@ -873,18 -857,18 +874,18 @@@ if ((curr_tq_avg - old_ifinfo->bat_iv.tq_avg) > BATADV_GW_THRESHOLD) out_of_range = true; - batadv_neigh_ifinfo_free_ref(old_ifinfo); + batadv_neigh_ifinfo_put(old_ifinfo); out: if (orig_dst_node) - batadv_orig_node_free_ref(orig_dst_node); + batadv_orig_node_put(orig_dst_node); if (curr_gw) - batadv_gw_node_free_ref(curr_gw); + batadv_gw_node_put(curr_gw); if (gw_node) - batadv_gw_node_free_ref(gw_node); + batadv_gw_node_put(gw_node); if (neigh_old) - batadv_neigh_node_free_ref(neigh_old); + batadv_neigh_node_put(neigh_old); if (neigh_curr) - batadv_neigh_node_free_ref(neigh_curr); + batadv_neigh_node_put(neigh_curr); return out_of_range; } diff --combined net/batman-adv/translation-table.c index 2fd5b28,7301a92..0b43e86 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@@ -1,4 -1,4 +1,4 @@@ -/* Copyright (C) 2007-2015 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2016 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * @@@ -31,7 -31,6 +31,7 @@@ #include <linux/jhash.h> #include <linux/jiffies.h> #include <linux/kernel.h> +#include <linux/kref.h> #include <linux/list.h> #include <linux/lockdep.h> #include <linux/netdevice.h> @@@ -142,7 -141,7 +142,7 @@@ batadv_tt_hash_find(struct batadv_hasht if (tt->vid != vid) continue; - if (!atomic_inc_not_zero(&tt->refcount)) + if (!kref_get_unless_zero(&tt->refcount)) continue; tt_tmp = tt; @@@ -203,59 -202,25 +203,59 @@@ batadv_tt_global_hash_find(struct batad return tt_global_entry; } +/** + * batadv_tt_local_entry_release - release tt_local_entry from lists and queue + * for free after rcu grace period + * @ref: kref pointer of the nc_node + */ +static void batadv_tt_local_entry_release(struct kref *ref) +{ + struct batadv_tt_local_entry *tt_local_entry; + + tt_local_entry = container_of(ref, struct batadv_tt_local_entry, + common.refcount); + + kfree_rcu(tt_local_entry, common.rcu); +} + +/** + * batadv_tt_local_entry_put - decrement the tt_local_entry refcounter and + * possibly release it + * @tt_local_entry: tt_local_entry to be free'd + */ static void -batadv_tt_local_entry_free_ref(struct batadv_tt_local_entry *tt_local_entry) +batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry) +{ + kref_put(&tt_local_entry->common.refcount, + batadv_tt_local_entry_release); +} + +/** + * batadv_tt_global_entry_release - release tt_global_entry from lists and queue + * for free after rcu grace period + * @ref: kref pointer of the nc_node + */ +static void batadv_tt_global_entry_release(struct kref *ref) { - if (atomic_dec_and_test(&tt_local_entry->common.refcount)) - kfree_rcu(tt_local_entry, common.rcu); + struct batadv_tt_global_entry *tt_global_entry; + + tt_global_entry = container_of(ref, struct batadv_tt_global_entry, + common.refcount); + + batadv_tt_global_del_orig_list(tt_global_entry); + kfree_rcu(tt_global_entry, common.rcu); } /** - * batadv_tt_global_entry_free_ref - decrement the refcounter for a - * tt_global_entry and possibly free it - * @tt_global_entry: the object to free + * batadv_tt_global_entry_put - decrement the tt_global_entry refcounter and + * possibly release it + * @tt_global_entry: tt_global_entry to be free'd */ static void -batadv_tt_global_entry_free_ref(struct batadv_tt_global_entry *tt_global_entry) +batadv_tt_global_entry_put(struct batadv_tt_global_entry *tt_global_entry) { - if (atomic_dec_and_test(&tt_global_entry->common.refcount)) { - batadv_tt_global_del_orig_list(tt_global_entry); - kfree_rcu(tt_global_entry, common.rcu); - } + kref_put(&tt_global_entry->common.refcount, + batadv_tt_global_entry_release); } /** @@@ -278,7 -243,7 +278,7 @@@ int batadv_tt_global_hash_count(struct return 0; count = atomic_read(&tt_global_entry->orig_list_count); - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); return count; } @@@ -301,7 -266,7 +301,7 @@@ static void batadv_tt_local_size_mod(st atomic_add(v, &vlan->tt.num_entries); - batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_put(vlan); } /** @@@ -346,12 -311,14 +346,14 @@@ static void batadv_tt_global_size_mod(s if (atomic_add_return(v, &vlan->tt.num_entries) == 0) { spin_lock_bh(&orig_node->vlan_list_lock); - hlist_del_init_rcu(&vlan->list); + if (!hlist_unhashed(&vlan->list)) { + hlist_del_init_rcu(&vlan->list); - batadv_orig_node_vlan_free_ref(vlan); ++ batadv_orig_node_vlan_put(vlan); + } spin_unlock_bh(&orig_node->vlan_list_lock); - batadv_orig_node_vlan_put(vlan); } - batadv_orig_node_vlan_free_ref(vlan); + batadv_orig_node_vlan_put(vlan); } /** @@@ -381,28 -348,22 +383,28 @@@ static void batadv_tt_global_size_dec(s /** * batadv_tt_orig_list_entry_release - release tt orig entry from lists and * queue for free after rcu grace period - * @orig_entry: tt orig entry to be free'd + * @ref: kref pointer of the tt orig entry */ -static void -batadv_tt_orig_list_entry_release(struct batadv_tt_orig_list_entry *orig_entry) +static void batadv_tt_orig_list_entry_release(struct kref *ref) { - batadv_orig_node_free_ref(orig_entry->orig_node); + struct batadv_tt_orig_list_entry *orig_entry; + + orig_entry = container_of(ref, struct batadv_tt_orig_list_entry, + refcount); + + batadv_orig_node_put(orig_entry->orig_node); kfree_rcu(orig_entry, rcu); } +/** + * batadv_tt_orig_list_entry_put - decrement the tt orig entry refcounter and + * possibly release it + * @orig_entry: tt orig entry to be free'd + */ static void -batadv_tt_orig_list_entry_free_ref(struct batadv_tt_orig_list_entry *orig_entry) +batadv_tt_orig_list_entry_put(struct batadv_tt_orig_list_entry *orig_entry) { - if (!atomic_dec_and_test(&orig_entry->refcount)) - return; - - batadv_tt_orig_list_entry_release(orig_entry); + kref_put(&orig_entry->refcount, batadv_tt_orig_list_entry_release); } /** @@@ -559,7 -520,7 +561,7 @@@ static void batadv_tt_global_free(struc batadv_hash_remove(bat_priv->tt.global_hash, batadv_compare_tt, batadv_choose_tt, &tt_global->common); - batadv_tt_global_entry_free_ref(tt_global); + batadv_tt_global_entry_put(tt_global); } /** @@@ -667,8 -628,7 +669,8 @@@ bool batadv_tt_local_add(struct net_dev tt_local->common.vid = vid; if (batadv_is_wifi_netdev(in_dev)) tt_local->common.flags |= BATADV_TT_CLIENT_WIFI; - atomic_set(&tt_local->common.refcount, 2); + kref_init(&tt_local->common.refcount); + kref_get(&tt_local->common.refcount); tt_local->last_seen = jiffies; tt_local->common.added_at = tt_local->last_seen; @@@ -685,8 -645,8 +687,8 @@@ if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ - batadv_tt_local_entry_free_ref(tt_local); - batadv_softif_vlan_free_ref(vlan); + batadv_tt_local_entry_put(tt_local); + batadv_softif_vlan_put(vlan); goto out; } @@@ -752,9 -712,9 +754,9 @@@ out if (in_dev) dev_put(in_dev); if (tt_local) - batadv_tt_local_entry_free_ref(tt_local); + batadv_tt_local_entry_put(tt_local); if (tt_global) - batadv_tt_global_entry_free_ref(tt_global); + batadv_tt_global_entry_put(tt_global); return ret; } @@@ -1052,13 -1012,13 +1054,13 @@@ int batadv_tt_local_seq_print_text(stru no_purge ? 0 : last_seen_msecs, vlan->tt.crc); - batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_put(vlan); } rcu_read_unlock(); } out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); return 0; } @@@ -1135,19 -1095,19 +1137,19 @@@ u16 batadv_tt_local_remove(struct batad goto out; /* extra call to free the local tt entry */ - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); /* decrease the reference held for this vlan */ vlan = batadv_softif_vlan_get(bat_priv, vid); if (!vlan) goto out; - batadv_softif_vlan_free_ref(vlan); - batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_put(vlan); + batadv_softif_vlan_put(vlan); out: if (tt_local_entry) - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); return curr_flags; } @@@ -1243,11 -1203,11 +1245,11 @@@ static void batadv_tt_local_table_free( vlan = batadv_softif_vlan_get(bat_priv, tt_common_entry->vid); if (vlan) { - batadv_softif_vlan_free_ref(vlan); - batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_put(vlan); + batadv_softif_vlan_put(vlan); } - batadv_tt_local_entry_free_ref(tt_local); + batadv_tt_local_entry_put(tt_local); } spin_unlock_bh(list_lock); } @@@ -1312,7 -1272,7 +1314,7 @@@ batadv_tt_global_orig_entry_find(const hlist_for_each_entry_rcu(tmp_orig_entry, head, list) { if (tmp_orig_entry->orig_node != orig_node) continue; - if (!atomic_inc_not_zero(&tmp_orig_entry->refcount)) + if (!kref_get_unless_zero(&tmp_orig_entry->refcount)) continue; orig_entry = tmp_orig_entry; @@@ -1343,7 -1303,7 +1345,7 @@@ batadv_tt_global_entry_has_orig(const s orig_entry = batadv_tt_global_orig_entry_find(entry, orig_node); if (orig_entry) { found = true; - batadv_tt_orig_list_entry_free_ref(orig_entry); + batadv_tt_orig_list_entry_put(orig_entry); } return found; @@@ -1369,12 -1329,11 +1371,12 @@@ batadv_tt_global_orig_entry_add(struct goto out; INIT_HLIST_NODE(&orig_entry->list); - atomic_inc(&orig_node->refcount); + kref_get(&orig_node->refcount); batadv_tt_global_size_inc(orig_node, tt_global->common.vid); orig_entry->orig_node = orig_node; orig_entry->ttvn = ttvn; - atomic_set(&orig_entry->refcount, 2); + kref_init(&orig_entry->refcount); + kref_get(&orig_entry->refcount); spin_lock_bh(&tt_global->list_lock); hlist_add_head_rcu(&orig_entry->list, @@@ -1384,7 -1343,7 +1386,7 @@@ out: if (orig_entry) - batadv_tt_orig_list_entry_free_ref(orig_entry); + batadv_tt_orig_list_entry_put(orig_entry); } /** @@@ -1450,8 -1409,7 +1452,8 @@@ static bool batadv_tt_global_add(struc */ if (flags & BATADV_TT_CLIENT_ROAM) tt_global_entry->roam_at = jiffies; - atomic_set(&common->refcount, 2); + kref_init(&common->refcount); + kref_get(&common->refcount); common->added_at = jiffies; INIT_HLIST_HEAD(&tt_global_entry->orig_list); @@@ -1465,7 -1423,7 +1467,7 @@@ if (unlikely(hash_added != 0)) { /* remove the reference for the hash */ - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); goto out_remove; } } else { @@@ -1551,9 -1509,9 +1553,9 @@@ out_remove out: if (tt_global_entry) - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); if (tt_local_entry) - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); return ret; } @@@ -1584,20 -1542,20 +1586,20 @@@ batadv_transtable_best_orig(struct bata if (best_router && bao->bat_neigh_cmp(router, BATADV_IF_DEFAULT, best_router, BATADV_IF_DEFAULT) <= 0) { - batadv_neigh_node_free_ref(router); + batadv_neigh_node_put(router); continue; } /* release the refcount for the "old" best */ if (best_router) - batadv_neigh_node_free_ref(best_router); + batadv_neigh_node_put(best_router); best_entry = orig_entry; best_router = router; } if (best_router) - batadv_neigh_node_free_ref(best_router); + batadv_neigh_node_put(best_router); return best_entry; } @@@ -1650,7 -1608,7 +1652,7 @@@ batadv_tt_global_print_entry(struct bat ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); - batadv_orig_node_vlan_free_ref(vlan); + batadv_orig_node_vlan_put(vlan); } print_list: @@@ -1682,7 -1640,7 +1684,7 @@@ ((flags & BATADV_TT_CLIENT_ISOLA) ? 'I' : '.'), ((flags & BATADV_TT_CLIENT_TEMP) ? 'T' : '.')); - batadv_orig_node_vlan_free_ref(vlan); + batadv_orig_node_vlan_put(vlan); } } @@@ -1723,7 -1681,7 +1725,7 @@@ int batadv_tt_global_seq_print_text(str } out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); return 0; } @@@ -1751,7 -1709,7 +1753,7 @@@ _batadv_tt_global_del_orig_entry(struc * being part of a list */ hlist_del_rcu(&orig_entry->list); - batadv_tt_orig_list_entry_free_ref(orig_entry); + batadv_tt_orig_list_entry_put(orig_entry); } /* deletes the orig list of a tt_global_entry */ @@@ -1907,9 -1865,9 +1909,9 @@@ static void batadv_tt_global_del(struc out: if (tt_global_entry) - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); if (local_entry) - batadv_tt_local_entry_free_ref(local_entry); + batadv_tt_local_entry_put(local_entry); } /** @@@ -1963,7 -1921,7 +1965,7 @@@ void batadv_tt_global_del_orig(struct b tt_global->common.addr, BATADV_PRINT_VID(vid), message); hlist_del_rcu(&tt_common_entry->hash_entry); - batadv_tt_global_entry_free_ref(tt_global); + batadv_tt_global_entry_put(tt_global); } } spin_unlock_bh(list_lock); @@@ -2026,7 -1984,7 +2028,7 @@@ static void batadv_tt_global_purge(stru hlist_del_rcu(&tt_common->hash_entry); - batadv_tt_global_entry_free_ref(tt_global); + batadv_tt_global_entry_put(tt_global); } spin_unlock_bh(list_lock); } @@@ -2058,7 -2016,7 +2060,7 @@@ static void batadv_tt_global_table_free tt_global = container_of(tt_common_entry, struct batadv_tt_global_entry, common); - batadv_tt_global_entry_free_ref(tt_global); + batadv_tt_global_entry_put(tt_global); } spin_unlock_bh(list_lock); } @@@ -2133,15 -2091,15 +2135,15 @@@ struct batadv_orig_node *batadv_transta /* found anything? */ if (best_entry) orig_node = best_entry->orig_node; - if (orig_node && !atomic_inc_not_zero(&orig_node->refcount)) + if (orig_node && !kref_get_unless_zero(&orig_node->refcount)) orig_node = NULL; rcu_read_unlock(); out: if (tt_global_entry) - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); if (tt_local_entry) - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); return orig_node; } @@@ -2501,7 -2459,7 +2503,7 @@@ static bool batadv_tt_global_check_crc( return false; crc = vlan->tt.crc; - batadv_orig_node_vlan_free_ref(vlan); + batadv_orig_node_vlan_put(vlan); if (crc != ntohl(tt_vlan_tmp->crc)) return false; @@@ -2636,7 -2594,7 +2638,7 @@@ static int batadv_send_tt_request(struc out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); if (ret && tt_req_node) { spin_lock_bh(&bat_priv->tt.req_list_lock); /* hlist_del_init() verifies tt_req_node still is in the list */ @@@ -2774,9 -2732,9 +2776,9 @@@ unlock out: if (res_dst_orig_node) - batadv_orig_node_free_ref(res_dst_orig_node); + batadv_orig_node_put(res_dst_orig_node); if (req_dst_orig_node) - batadv_orig_node_free_ref(req_dst_orig_node); + batadv_orig_node_put(req_dst_orig_node); kfree(tvlv_tt_data); return ret; } @@@ -2891,9 -2849,9 +2893,9 @@@ unlock out: spin_unlock_bh(&bat_priv->tt.commit_lock); if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); kfree(tvlv_tt_data); /* The packet was for this host, so it doesn't need to be re-routed */ return true; @@@ -2979,7 -2937,7 +2981,7 @@@ static void batadv_tt_fill_gtable(struc out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } static void batadv_tt_update_changes(struct batadv_priv *bat_priv, @@@ -3021,7 -2979,7 +3023,7 @@@ bool batadv_is_my_client(struct batadv_ ret = true; out: if (tt_local_entry) - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); return ret; } @@@ -3085,7 -3043,7 +3087,7 @@@ static void batadv_handle_tt_response(s spin_unlock_bh(&bat_priv->tt.req_list_lock); out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); } static void batadv_tt_roam_list_free(struct batadv_priv *bat_priv) @@@ -3216,7 -3174,7 +3218,7 @@@ static void batadv_send_roam_adv(struc out: if (primary_if) - batadv_hardif_free_ref(primary_if); + batadv_hardif_put(primary_if); } static void batadv_tt_purge(struct work_struct *work) @@@ -3340,11 -3298,11 +3342,11 @@@ static void batadv_tt_local_purge_pendi /* decrease the reference held for this vlan */ vlan = batadv_softif_vlan_get(bat_priv, tt_common->vid); if (vlan) { - batadv_softif_vlan_free_ref(vlan); - batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_put(vlan); + batadv_softif_vlan_put(vlan); } - batadv_tt_local_entry_free_ref(tt_local); + batadv_tt_local_entry_put(tt_local); } spin_unlock_bh(list_lock); } @@@ -3427,11 -3385,11 +3429,11 @@@ bool batadv_is_ap_isolated(struct batad ret = true; out: - batadv_softif_vlan_free_ref(vlan); + batadv_softif_vlan_put(vlan); if (tt_global_entry) - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); if (tt_local_entry) - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); return ret; } @@@ -3541,7 -3499,7 +3543,7 @@@ bool batadv_tt_global_client_is_roaming goto out; ret = tt_global_entry->common.flags & BATADV_TT_CLIENT_ROAM; - batadv_tt_global_entry_free_ref(tt_global_entry); + batadv_tt_global_entry_put(tt_global_entry); out: return ret; } @@@ -3567,7 -3525,7 +3569,7 @@@ bool batadv_tt_local_client_is_roaming( goto out; ret = tt_local_entry->common.flags & BATADV_TT_CLIENT_ROAM; - batadv_tt_local_entry_free_ref(tt_local_entry); + batadv_tt_local_entry_put(tt_local_entry); out: return ret; } @@@ -3800,7 -3758,7 +3802,7 @@@ static int batadv_roam_tvlv_unicast_han out: if (orig_node) - batadv_orig_node_free_ref(orig_node); + batadv_orig_node_put(orig_node); return NET_RX_SUCCESS; } @@@ -3861,7 -3819,7 +3863,7 @@@ bool batadv_tt_global_is_isolated(struc ret = tt->common.flags & BATADV_TT_CLIENT_ISOLA; - batadv_tt_global_entry_free_ref(tt); + batadv_tt_global_entry_put(tt); return ret; } -- linux integration

7 years, 1 month

[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 ead9389a3a0af4de210c977a0b11d57180d7c941 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 31 13:28:00 2016 +0100 batman-adv: Only put orig_node_vlan list reference when removed The batadv_orig_node_vlan reference counter in batadv_tt_global_size_mod can only be reduced when the list entry was actually removed. Otherwise the reference counter may reach zero when batadv_tt_global_size_mod is called from two different contexts for the same orig_node_vlan but only one context is actually removing the entry from the list. The release function for this orig_node_vlan is not called inside the vlan_list_lock spinlock protected region because the function batadv_tt_global_size_mod still holds a orig_node_vlan reference for the object pointer on the stack. Thus the actual release function (when required) will be called only at the end of the function. Fixes: 21a57f6e7a3b ("batman-adv: make the TT CRC logic VLAN specific") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/translation-table.c b/net/batman-adv/translation-table.c index 9fcf6bf..7301a92 100644 --- a/net/batman-adv/translation-table.c +++ b/net/batman-adv/translation-table.c @@ -311,9 +311,11 @@ static void batadv_tt_global_size_mod(struct batadv_orig_node *orig_node, if (atomic_add_return(v, &vlan->tt.num_entries) == 0) { spin_lock_bh(&orig_node->vlan_list_lock); - hlist_del_init_rcu(&vlan->list); + if (!hlist_unhashed(&vlan->list)) { + hlist_del_init_rcu(&vlan->list); + batadv_orig_node_vlan_free_ref(vlan); + } spin_unlock_bh(&orig_node->vlan_list_lock); - batadv_orig_node_vlan_free_ref(vlan); } batadv_orig_node_vlan_free_ref(vlan); -- linux integration

7 years, 1 month

[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 c215e4e249753acec3e4b8614623132a2f28671f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Jan 31 13:27:59 2016 +0100 batman-adv: Only put gw_node list reference when removed The batadv_gw_node reference counter in batadv_gw_node_update can only be reduced when the list entry was actually removed. Otherwise the reference counter may reach zero when batadv_gw_node_update is called from two different contexts for the same gw_node but only one context is actually removing the entry from the list. The release function for this gw_node is not called inside the list_lock spinlock protected region because the function batadv_gw_node_update still holds a gw_node reference for the object pointer on the stack. Thus the actual release function (when required) will be called only at the end of the function. Fixes: 0511575c4d03 ("batman-adv: remove obsolete deleted attribute for gateway node") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> diff --git a/net/batman-adv/gateway_client.c b/net/batman-adv/gateway_client.c index 8350775..c9b8b48 100644 --- a/net/batman-adv/gateway_client.c +++ b/net/batman-adv/gateway_client.c @@ -527,11 +527,12 @@ void batadv_gw_node_update(struct batadv_priv *bat_priv, * gets dereferenced. */ spin_lock_bh(&bat_priv->gw.list_lock); - hlist_del_init_rcu(&gw_node->list); + if (!hlist_unhashed(&gw_node->list)) { + hlist_del_init_rcu(&gw_node->list); + batadv_gw_node_free_ref(gw_node); + } spin_unlock_bh(&bat_priv->gw.list_lock); - batadv_gw_node_free_ref(gw_node); - curr_gw = batadv_gw_get_selected_gw_node(bat_priv); if (gw_node == curr_gw) batadv_gw_reselect(bat_priv); -- linux integration

7 years, 1 month

[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 41d1e618f6afb197599689097363e8114786de55 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Feb 1 14:34:34 2016 +0800 batman-adv: fix misleading default throughput warning BATADV_THROUGHPUT_DEFAULT_VALUE is expressed in multiples of 100kbps. Make sure the warning text converts it properly. 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 0b82c6a..e94b4a0 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -129,9 +129,10 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) default_throughput: if (!(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT)) { batadv_info(hard_iface->soft_iface, - "WiFi driver or ethtool info does not provide information about link speeds on interface %s, therefore defaulting to hardcoded throughput values of %d kbit/s. Consider overriding the throughput manually or checking your driver.\n", + "WiFi driver or ethtool info does not provide information about link speeds on interface %s, therefore defaulting to hardcoded throughput values of %u.%1u Mbps. Consider overriding the throughput manually or checking your driver.\n", hard_iface->net_dev->name, - BATADV_THROUGHPUT_DEFAULT_VALUE / 10); + BATADV_THROUGHPUT_DEFAULT_VALUE / 10, + BATADV_THROUGHPUT_DEFAULT_VALUE % 10); hard_iface->bat_v.flags |= BATADV_WARNING_DEFAULT; } -- linux integration

7 years, 1 month

[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 c59b8c70002ec315742a7c4991e574822915f305 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Feb 1 14:34:33 2016 +0800 batman-adv: convert wifi driver throughput to multiples of 100kbps The expected throughout returned by the cfg80211 API is expressed in kbps while internally batman-adv stores multiples of 100kbps. Ensure the conversion is performed properly. 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 4654251..0b82c6a 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -100,7 +100,7 @@ static u32 batadv_v_elp_get_throughput(struct batadv_hardif_neigh_node *neigh) return 0; } if (!ret) - return sinfo.expected_throughput / 10; + return sinfo.expected_throughput / 100; } /* unsupported WiFi driver version */ -- linux integration

7 years, 1 month

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2016