commits November 2016

commits@lists.open-mesh.org

1 participants
42 discussions

[alfred] master: alfred: Move tx finish functionality in extra function (08a2de7)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 08a2de792eee543df06ac3253d59941391a3f2af Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Nov 12 10:25:19 2016 +0100 alfred: Move tx finish functionality in extra function The process_alfred_status_txend has two main functionalities. It first tries to find a transaction to be able to get its status. When it was found then it either commits the data or just cleans it up. The latter will be used by later by process_alfred_push_data to implement out-of-order txend packets. Thus split process_alfred_status_txend now into two functions to avoid code duplication. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 08a2de792eee543df06ac3253d59941391a3f2af recv.c | 67 ++++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 39 insertions(+), 28 deletions(-) diff --git a/recv.c b/recv.c index b6b6eab..6878e5e 100644 --- a/recv.c +++ b/recv.c @@ -160,6 +160,44 @@ struct transaction_head *transaction_clean(struct globals *globals, return head; } +static int finish_alfred_transaction(struct globals *globals, + struct transaction_head *head, + struct ether_addr mac, + uint16_t num_packets) +{ + struct transaction_packet *transaction_packet, *safe; + + /* this transaction was already finished/dropped */ + if (head->finished != 0) + return -1; + + /* missing packets -> cleanup everything */ + if (head->num_packet == num_packets) + head->finished = -1; + else + head->finished = 1; + + list_for_each_entry_safe(transaction_packet, safe, &head->packet_list, + list) { + if (head->finished == 1) + finish_alfred_push_data(globals, mac, + transaction_packet->push); + + list_del(&transaction_packet->list); + free(transaction_packet->push); + free(transaction_packet); + } + + transaction_clean(globals, head); + + if (head->client_socket < 0) + free(head); + else + unix_sock_req_data_finish(globals, head); + + return 1; +} + static int process_alfred_push_data(struct globals *globals, struct in6_addr *source, struct alfred_push_data_v0 *push) @@ -313,7 +351,6 @@ static int process_alfred_status_txend(struct globals *globals, struct alfred_status_v0 *request) { struct transaction_head search, *head; - struct transaction_packet *transaction_packet, *safe; struct ether_addr mac; int len, ret; @@ -336,33 +373,7 @@ static int process_alfred_status_txend(struct globals *globals, if (!head) return -1; - /* this transaction was already finished/dropped */ - if (head->finished != 0) - return -1; - - /* missing packets -> cleanup everything */ - if (head->num_packet != ntohs(request->tx.seqno)) - head->finished = -1; - else - head->finished = 1; - - list_for_each_entry_safe(transaction_packet, safe, &head->packet_list, - list) { - if (head->finished == 1) - finish_alfred_push_data(globals, mac, - transaction_packet->push); - - list_del(&transaction_packet->list); - free(transaction_packet->push); - free(transaction_packet); - } - - transaction_clean(globals, head); - - if (head->client_socket < 0) - free(head); - else - unix_sock_req_data_finish(globals, head); + finish_alfred_transaction(globals, head, mac, ntohs(request->tx.seqno)); return 0; }

6 years, 4 months

[alfred] master: alfred: Remove checks for committed/dropped transaction (df93eb1)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit df93eb154a4f33c75a7d269b00d2af12d23d456d Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Nov 12 10:25:20 2016 +0100 alfred: Remove checks for committed/dropped transaction Transactions will be removed from the transaction has when they were committed. Thus is is not necessary to check in the push_data/txend packet processing functions for committed/dropped transactions. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- df93eb154a4f33c75a7d269b00d2af12d23d456d recv.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/recv.c b/recv.c index 6878e5e..21ea539 100644 --- a/recv.c +++ b/recv.c @@ -167,10 +167,6 @@ static int finish_alfred_transaction(struct globals *globals, { struct transaction_packet *transaction_packet, *safe; - /* this transaction was already finished/dropped */ - if (head->finished != 0) - return -1; - /* missing packets -> cleanup everything */ if (head->num_packet == num_packets) head->finished = -1; @@ -233,10 +229,6 @@ static int process_alfred_push_data(struct globals *globals, } clock_gettime(CLOCK_MONOTONIC, &head->last_rx_time); - /* this transaction was already finished/dropped */ - if (head->finished != 0) - return -1; - found = 0; list_for_each_entry(transaction_packet, &head->packet_list, list) { if (transaction_packet->push->tx.seqno == push->tx.seqno) {

6 years, 4 months

[alfred] master: alfred: Avoid hash search for transaction cleanup (323c1ed)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 323c1eda95badc893e53c351223bd88c4a63d0d8 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Nov 12 10:25:18 2016 +0100 alfred: Avoid hash search for transaction cleanup A transaction can either be cleaned up on timeout or on TXEND. alfred has in both situations already the head of the transaction list. An extra search in the transaction hash is therefore not needed. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 323c1eda95badc893e53c351223bd88c4a63d0d8 alfred.h | 3 --- recv.c | 16 +--------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/alfred.h b/alfred.h index b2b08b0..7e7811b 100644 --- a/alfred.h +++ b/alfred.h @@ -159,9 +159,6 @@ int recv_alfred_packet(struct globals *globals, struct interface *interface, int recv_sock); struct transaction_head * transaction_add(struct globals *globals, struct ether_addr mac, uint16_t id); -struct transaction_head * -transaction_clean_hash(struct globals *globals, - struct transaction_head *search); struct transaction_head *transaction_clean(struct globals *globals, struct transaction_head *head); /* send.c */ diff --git a/recv.c b/recv.c index 98539cb..b6b6eab 100644 --- a/recv.c +++ b/recv.c @@ -160,18 +160,6 @@ struct transaction_head *transaction_clean(struct globals *globals, return head; } -struct transaction_head * -transaction_clean_hash(struct globals *globals, struct transaction_head *search) -{ - struct transaction_head *head; - - head = hash_find(globals->transaction_hash, search); - if (!head) - return head; - - return transaction_clean(globals, head); -} - static int process_alfred_push_data(struct globals *globals, struct in6_addr *source, struct alfred_push_data_v0 *push) @@ -369,9 +357,7 @@ static int process_alfred_status_txend(struct globals *globals, free(transaction_packet); } - head = transaction_clean_hash(globals, &search); - if (!head) - return -1; + transaction_clean(globals, head); if (head->client_socket < 0) free(head);

6 years, 4 months

[linux-merge]linux integration; annotated tag, v4.9-rc5, created. v4.9-rc5

by postmaster＠open-mesh.org

The annotated tag, v4.9-rc5 has been created at 9d4d32609e7bb04693ab7bf313cd5856b5298c1f (tag) tagging a25f0944ba9b1d8a6813fd6f1a86f1bd59ac25a6 (commit) replaces v4.9-rc4 tagged by Linus Torvalds on Sun Nov 13 10:32:39 2016 -0800 - Shortlog ------------------------------------------------------------ Linux 4.9-rc5 -----BEGIN PGP SIGNATURE----- iQEcBAABAgAGBQJYKLHHAAoJEHm+PkMAQRiGOqoH/iTmywTeevTpx4jbEb8u3LAR Bi1ACuBjJKJgYemRPdnH9e1/6nHRkw8EhwUIb2Jv4pyRb+pV2ssxy5sRinY8k9qw 9pRf+DS9158c5Mc5lZTc3wnRMs49+zowgGpzUjw2HIFoq3E3H0bYpsCl144e4Y8z 0R6jDKL/YXa9tzVVDTjHG9aG/l0Anc2VzFnWSalNhX5W2PSKc2QtticR3+kTVnA3 oP4q5UCymdwrZ33XLVldmHqE3n9m8wKGn+gBUMCoJwt5DVRSjqXeT+IkmLdESHEH 2GyFBE120coYLxTN8CAB4Wa/Woyr0VG6OJvX+Lq3zbnehjteAGOXHzBwYrIOsGc= =EwHz -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

6 years, 4 months

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20161108-v2, deleted. v4.8-14865-g93bbaab

by postmaster＠open-mesh.org

The annotated tag, batadv-next-for-davem-20161108-v2 has been deleted was e315c7e9edcfb6a078f0894f9531173b65fa2869 ----------------------------------------------------------------------- tag batadv-next-for-davem-20161108-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) -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdBQJYI6GFFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS nqHyEw/9GkYNRQJOk1JMuW0cDvj9uWqoendvXRNPVkCvqh4gjX4o+aQaeyumv1/v eYqpslQWmSsrIlGQ6UGCegzyzZ7jXo6ZijM7wvz2bWwB2C0NzUGlBBCzOeA6Bui/ 3Fq+Xmx0Xcf5+c82YmrLor/yYp4FIFTao4+a80vHzQeI/Hg8RuJTOFJdtVNV3JPP VrfzMAPLLXJPPKHjt1PN3lfANWqX6nWLUMhHBNkMpYB+mMdyaCve6X+MxPF+WYBH wBO8spU35chW7dp8HOncof5nRDv2xVHWs6TN2kdJ762YrZ1oL0GXwWXViKhWskSQ QEeOLboyj3IuwPsxOQOLQEbAMrp6jqj3L/6lYWRkV2U6Bbi8EYdozW8L3utxMcvA Dft8D2U5JAD5ja0VUFyGhwNaBFien2B9JSEwsyOLtUbaQSASNyvym75WrN2Ey/d7 JhBzUt6Iwh8RNJylY3nG5OkoNnyXYv3VrQLsIW4QTHc8Um9eaiOeFHtuAi6WNBtI HgMwPcdErNbmPd3w9OM6kk6aBQ/DTUK/7CNUKYVoGDayGxKYGDwqhoog9zm18wrt wc/TtdIY+q95hgm8fDCJefrnkaIxDJrVtChs30N/pJ24MeKcHuibop3HzxIngze2 zPZTuXRKA2VSt79+EV4KORAutexi1WQIN7nRH1a8zMsYfyMKG8Y= =1xrj -----END PGP SIGNATURE----- 93bbaab455f30fd43911e0881a02107a17150a62 batman-adv: Reject unicast packet with zero/mcast dst address ----------------------------------------------------------------------- -- linux integration

6 years, 4 months

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20161108, deleted. v4.8-14865-g33581ce

by postmaster＠open-mesh.org

The annotated tag, batadv-next-for-davem-20161108 has been deleted was 993cf46d7e4e6559be44d7e97f34f10a2593f3de ----------------------------------------------------------------------- tag batadv-next-for-davem-20161108 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) -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdBQJYIf/PFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS nqHEQRAAgRUuv9K7JPDNCnAEU8E/HgnatnsohlNlZ3ltpfOdVu07pmQmCwmJq99I /Gei+2yF2AXGUNUuVglKcaslzudMkaiZIgAQ8QwpwFoYFWOUP93O2eeNk9ELjlNI eHUpYt0Iw1wkn7HVBkzcq57ROMHbuj/DnLRgwEu0kDHOWrGJWxFvABtEA+R1/mBa BsZ61J211YR1NHGyUUDUI8ZvBUIiN5qYhkLE+ZAkTR/y30kFeN2nFe9emCS7jDjo v1wU3nSfYV+7riQTCPvSZTUDY/5Y3V8Y/CZ72kQdf5gurAv5MIX1YzQxW2+S7byI nMYf4vCRhL8SZcDmcQh4Xo8fRuAuuLBU7KZzFUvXW9AtmYQbONdW+0rQ2knpCfmq g1AVzvVkZfcFE7HFKMhC4DG1cv6TlUGuXZ3DJuHpkcN6Ed7h+IqFWU8d1yDLKWUd DJF0dczbGfMFCEZV12hh0Briv+rXe4eKN0ik0ham0XLbcgWiZ68EtZ8Ulp0X991O nEXkGuyWtjaEuo1/UjvgI3rEZljr1kIThf962sQC45WB5gwtUsXtI5NlKRz20zFu 2fJEO2H4FcOp7IftMBF0qwaWaYt0UQ8T7UYrRqBswyhbuYTXFF1VPhncnRXp/8jZ M/ri2/3VmWiOv2B4Acj5VETY5PRgt2CyUPwdu9V0luFwI51RaxM= =oC0V -----END PGP SIGNATURE----- 33581cefe4d182d99e9f8a66156507b06e7c9265 batman-adv: Reject unicast packet with zero/mcast dst address ----------------------------------------------------------------------- -- linux integration

6 years, 4 months

[linux-merge]linux integration; branch, batadv/net-next2, deleted. v4.8-14873-g9b4aec6

by postmaster＠open-mesh.org

The branch, batadv/net-next2 has been deleted was 9b4aec647a92a2464337db10507348aecf0f0fd7 ----------------------------------------------------------------------- 9b4aec647a92a2464337db10507348aecf0f0fd7 batman-adv: fix rare race conditions on interface removal ----------------------------------------------------------------------- -- linux integration

6 years, 4 months

[batman-adv] master: batman-adv: Consume dropped packets with kfree_skb (7c21738)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 7c21738fdfbdb50996e518cbf6bb4b30d8c04519 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Nov 8 18:59:05 2016 +0100 batman-adv: Consume dropped packets with kfree_skb The dropped skbs were previously free'd using kfree_skb in batadv_batman_skb_recv with kfree_skb. This has to be done again directly in the functions which also consume the skb on success. Reported-by: Eric Dumazet <eric.dumazet(a)gmail.com> Fixes: 83fef820ecdb ("batman-adv: Consume skb in receive handlers") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 7c21738fdfbdb50996e518cbf6bb4b30d8c04519 net/batman-adv/bat_iv_ogm.c | 5 ++++- net/batman-adv/bat_v_elp.c | 7 +++++-- net/batman-adv/bat_v_ogm.c | 5 ++++- net/batman-adv/routing.c | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 36a1b3d..f00f666 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -1851,7 +1851,10 @@ static int batadv_iv_ogm_receive(struct sk_buff *skb, ret = NET_RX_SUCCESS; free_skb: - consume_skb(skb); + if (ret == NET_RX_SUCCESS) + consume_skb(skb); + else + kfree_skb(skb); return ret; } diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 6376240..f2fb2f0 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -498,7 +498,7 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb, struct batadv_hard_iface *primary_if; struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb); bool res; - int ret; + int ret = NET_RX_DROP; res = batadv_check_management_packet(skb, if_incoming, BATADV_ELP_HLEN); if (!res) @@ -531,7 +531,10 @@ int batadv_v_elp_packet_recv(struct sk_buff *skb, batadv_hardif_put(primary_if); free_skb: - consume_skb(skb); + if (ret == NET_RX_SUCCESS) + consume_skb(skb); + else + kfree_skb(skb); return ret; } diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index ef3a88d..38b9aab 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -844,7 +844,10 @@ int batadv_v_ogm_packet_recv(struct sk_buff *skb, ret = NET_RX_SUCCESS; free_skb: - consume_skb(skb); + if (ret == NET_RX_SUCCESS) + consume_skb(skb); + else + kfree_skb(skb); return ret; } diff --git a/net/batman-adv/routing.c b/net/batman-adv/routing.c index 7d9ae4b..6713bdf 100644 --- a/net/batman-adv/routing.c +++ b/net/batman-adv/routing.c @@ -1066,7 +1066,7 @@ int batadv_recv_unicast_tvlv(struct sk_buff *skb, } free_skb: - consume_skb(skb); + kfree_skb(skb); return ret; }

6 years, 4 months

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20161108-v2, created. batadv-next-for-davem-20161108-v2

by postmaster＠open-mesh.org

The annotated tag, batadv-next-for-davem-20161108-v2 has been created at e315c7e9edcfb6a078f0894f9531173b65fa2869 (tag) tagging 93bbaab455f30fd43911e0881a02107a17150a62 (commit) replaces v4.8 tagged by Simon Wunderlich on Wed Nov 9 23:18:45 2016 +0100 - Shortlog ------------------------------------------------------------ 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) -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdBQJYI6GFFhxzd0BzaW1vbnd1bmRlcmxpY2guZGUACgkQoSvjmEKS nqHyEw/9GkYNRQJOk1JMuW0cDvj9uWqoendvXRNPVkCvqh4gjX4o+aQaeyumv1/v eYqpslQWmSsrIlGQ6UGCegzyzZ7jXo6ZijM7wvz2bWwB2C0NzUGlBBCzOeA6Bui/ 3Fq+Xmx0Xcf5+c82YmrLor/yYp4FIFTao4+a80vHzQeI/Hg8RuJTOFJdtVNV3JPP VrfzMAPLLXJPPKHjt1PN3lfANWqX6nWLUMhHBNkMpYB+mMdyaCve6X+MxPF+WYBH wBO8spU35chW7dp8HOncof5nRDv2xVHWs6TN2kdJ762YrZ1oL0GXwWXViKhWskSQ QEeOLboyj3IuwPsxOQOLQEbAMrp6jqj3L/6lYWRkV2U6Bbi8EYdozW8L3utxMcvA Dft8D2U5JAD5ja0VUFyGhwNaBFien2B9JSEwsyOLtUbaQSASNyvym75WrN2Ey/d7 JhBzUt6Iwh8RNJylY3nG5OkoNnyXYv3VrQLsIW4QTHc8Um9eaiOeFHtuAi6WNBtI HgMwPcdErNbmPd3w9OM6kk6aBQ/DTUK/7CNUKYVoGDayGxKYGDwqhoog9zm18wrt wc/TtdIY+q95hgm8fDCJefrnkaIxDJrVtChs30N/pJ24MeKcHuibop3HzxIngze2 zPZTuXRKA2VSt79+EV4KORAutexi1WQIN7nRH1a8zMsYfyMKG8Y= =1xrj -----END PGP SIGNATURE----- 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. IV bat_gw_dump implementations batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink batman-adv: Indicate netlink socket can be used with netns. Antonio Quartulli (5): batman-adv: make the GW selection class algorithm specific batman-adv: make GW election code protocol specific batman-adv: B.A.T.M.A.N. V - implement GW selection logic batman-adv: disable sysfs knobs when GW-mode is not implemented batman-adv: remove unsed argument from batadv_dbg_arp() function David S. Miller (2): Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net Merge tag 'batadv-next-for-davem-20161027' of git://git.open-mesh.org/linux-merge Jarod Wilson (1): net: use core MTU range checking in misc drivers Johannes Berg (3): genetlink: no longer support using static family IDs genetlink: statically initialize families genetlink: mark families as __ro_after_init Linus Lüssing (10): batman-adv: Remove unused primary_if and bat_priv variables batman-adv: Introduce forward packet creation helper batman-adv: Use bitwise instead of arithmetic operator for flags batman-adv: fix batadv_forw_packet kerneldoc for list attribute batman-adv: Allow selecting BATMAN V if CFG80211 is not built batman-adv: Add wrapper for ARP reply creation batman-adv: Remove unnecessary lockdep in batadv_mcast_mla_list_free batman-adv: Remove unused skb_reset_mac_header() batman-adv: Use own timer for multicast TT and TVLV updates batman-adv: Simple (re)broadcast avoidance Markus Elfring (1): batman-adv: Less function calls in batadv_is_ap_isolated() after error detection Markus Pargmann (1): batman-adv: iv_ogm, Reduce code duplication Masahiro Yamada (1): treewide: remove redundant #include <linux/kconfig.h> 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 (3): batman-adv: Start new development cycle batman-adv: add backbone table netlink support batman-adv: Start new development cycle Sven Eckelmann (53): batman-adv: Document optional batadv_algo_ops batman-adv: Define module rtnl link name batman-adv: Modify mesh_iface outside sysfs context batman-adv: Revert "postpone sysfs removal when unregistering" batman-adv: Avoid sysfs name collision for netns moves batman-adv: use kmem_cache for translation table batman-adv: Remove orig_node reference handling from send_skb_unicast batman-adv: Fix consistency of update route messages batman-adv: Provide TTVN in the mesh_info netlink msg batman-adv: netlink: add gateway table queries batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations batman-adv: Provide bla group in the mesh_info netlink msg batman-adv: Place kref_get for orig_node_vlan near use batman-adv: Place kref_get for orig_ifinfo near use batman-adv: Place kref_get for tt_orig_list_entry near use batman-adv: Place kref_get for neigh_ifinfo near use batman-adv: Place kref_get for neigh_node near use batman-adv: Place kref_get for orig_node near use batman-adv: Place kref_get for tt_local_entry near use batman-adv: Place kref_get for tt_common near use batman-adv: Place kref_get for bla_claim near use batman-adv: Place kref_get for bla_backbone_gw near use batman-adv: Place kref_get for dat_entry near use batman-adv: Place kref_get for gw_node near use batman-adv: Place kref_get for hard_iface near use batman-adv: Place kref_get for softif_vlan near use batman-adv: Place kref_get for nc_node near use batman-adv: Place kref_get for nc_path near use batman-adv: Place kref_get for tvlv_container near use batman-adv: Place kref_get for tvlv_handler near use batman-adv: Keep batadv netdev when hardif disappears batman-adv: Allow to disable debugfs support batman-adv: Remove unused function batadv_hash_delete batman-adv: Move batadv_sum_counter to soft-interface.c batman-adv: Remove unused batadv_icmp_user_cmd_type batman-adv: Remove needless init of variables on stack batman-adv: Use proper name for fragments list head batman-adv: Use proper name for gateway list head batman-adv: Use octal permissions instead of macros batman-adv: Avoid precedence issues in macros batman-adv: Revert "use core MTU range checking in misc drivers" batman-adv: Introduce missing headers for genetlink restructure batman-adv: Mark batadv_netlink_ops as const batman-adv: Close two alignment holes in batadv_hard_iface batman-adv: use consume_skb for non-dropped packets batman-adv: Count all non-success TX packets as dropped batman-adv: Consume skb in batadv_frag_send_packet batman-adv: Consume skb in batadv_send_skb_to_orig batman-adv: Consume skb in receive handlers batman-adv: Remove dev_queue_xmit return code exception batman-adv: Disallow mcast src address for data frames batman-adv: Disallow zero and mcast src address for mgmt frames batman-adv: Reject unicast packet with zero/mcast dst address kbuild test robot (1): batman-adv: fix boolreturn.cocci warnings stephen hemminger (1): batman: make netlink attributes const ----------------------------------------------------------------------- -- linux integration

6 years, 4 months

[linux-merge]linux integration; branch, batadv/net-next2, created. v4.8-14873-g5dc14ec

by postmaster＠open-mesh.org

The branch, batadv/net-next2 has been created at 5dc14eca2d6135e584d7f82051600ee3dad645b6 (commit) - Shortlog ------------------------------------------------------------ commit 5dc14eca2d6135e584d7f82051600ee3dad645b6 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Nov 1 09:44:44 2016 +0100 batman-adv: fix rare race conditions on interface removal In rare cases during shutdown the following general protection fault can happen: general protection fault: 0000 [#1] SMP Modules linked in: batman_adv(O-) [...] CPU: 3 PID: 1714 Comm: rmmod Tainted: G O 4.6.0-rc6+ #1 [...] Call Trace: [<ffffffffa0363294>] batadv_hardif_disable_interface+0x29a/0x3a6 [batman_adv] [<ffffffffa0373db4>] batadv_softif_destroy_netlink+0x4b/0xa4 [batman_adv] [<ffffffff813b52f3>] __rtnl_link_unregister+0x48/0x92 [<ffffffff813b9240>] rtnl_link_unregister+0xc1/0xdb [<ffffffff8108547c>] ? bit_waitqueue+0x87/0x87 [<ffffffffa03850d2>] batadv_exit+0x1a/0xf48 [batman_adv] [<ffffffff810c26f9>] SyS_delete_module+0x136/0x1b0 [<ffffffff8144dc65>] entry_SYSCALL_64_fastpath+0x18/0xa8 [<ffffffff8108aaca>] ? trace_hardirqs_off_caller+0x37/0xa6 Code: 89 f7 e8 21 bd 0d e1 4d 85 e4 75 0e 31 f6 48 c7 c7 50 d7 3b a0 e8 50 16 f2 e0 49 8b 9c 24 28 01 00 00 48 85 db 0f 84 b2 00 00 00 <48> 8b 03 4d 85 ed 48 89 45 c8 74 09 4c 39 ab f8 00 00 00 75 1c RIP [<ffffffffa0371852>] batadv_purge_outstanding_packets+0x1c8/0x291 [batman_adv] RSP <ffff88001da5fd78> ---[ end trace 803b9bdc6a4a952b ]--- Kernel panic - not syncing: Fatal exception in interrupt Kernel Offset: disabled ---[ end Kernel panic - not syncing: Fatal exception in interrupt It does not happen often, but may potentially happen when frequently shutting down and reinitializing an interface. With some carefully placed msleep()s/mdelay()s it can be reproduced easily. The issue is, that on interface removal, any still running worker thread of a forwarding packet will race with the interface purging routine to free a forwarding packet. Temporarily giving up a spin-lock to be able to sleep in the purging routine is not safe. Furthermore, there is a potential general protection fault not just for the purging side shown above, but also on the worker side: Temporarily removing a forw_packet from the according forw_{bcast,bat}_list will make it impossible for the purging routine to catch and cancel it. # How this patch tries to fix it: With this patch we split the queue purging into three steps: Step 1), removing forward packets from the queue of an interface and by that claim it as our responsibility to free. Step 2), we are either lucky to cancel a pending worker before it starts to run. Or if it is already running, we wait and let it do its thing, except two things: Through the claiming in step 1) we prevent workers from a) re-arming themselves. And b) prevent workers from freeing packets which we still hold in the interface purging routine. Finally, step 3, we are sure that no forwarding packets are pending or even running anymore on the interface to remove. We can then safely free the claimed forwarding packets. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit d3f02fbf62d76b8d5e86262a327a9940b53f518b Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Oct 29 13:56:23 2016 +0200 batman-adv: Add module alias for batadv netlink family The batman-adv module has to be loaded to fulfill genl request by the userspace. When it is not loaded then requests will fail. It is therefore useful to get the module automatically loaded when such a request is made. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit ebbf81dfba957760366567c28b6a4a79e8c1efdc Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Fri Sep 30 15:21:06 2016 +0200 batman-adv: Update wifi flags on upper link change Things like VLANs don't have their link set when they are created. Thus the wifi flags have to be evaluated later to fix their contents for the link interface. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit 5000765467207c8beecb587ebb9c2bd0c991fac9 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Sep 30 15:21:05 2016 +0200 batman-adv: retrieve B.A.T.M.A.N. V WiFi neighbor stats from real interface Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> [sven.eckelmann(a)open-mesh.com: re-add batadv_get_real_netdev to take rtnl semaphore for batadv_get_real_netdevice] Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit d9bdcb4b1962244a2a1a12803ed150809983074b Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Sep 30 15:21:04 2016 +0200 batman-adv: additional checks for virtual interfaces on top of WiFi In a few situations batman-adv tries to determine whether a given interface is a WiFi interface to enable specific WiFi optimizations. If the interface batman-adv has been configured with is a virtual interface (e.g. VLAN) it would not be properly detected as WiFi interface and thus not benefit from the special WiFi treatment. This patch changes that by peeking under the hood whenever a virtual interface is in play. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> [sven.eckelmann(a)open-mesh.com: integrate in wifi_flags caching, retrieve namespace of link interface] Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit dc25ca1b24b9e7b24be5d6897677681098e83f44 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Fri Sep 30 15:21:03 2016 +0200 batman-adv: Cache the type of wifi device for each hardif batman-adv is requiring the type of wifi device in different contexts. Some of them can take the rtnl semaphore and some of them already have the semaphore taken. But even others don't allow that the semaphore will be taken. The data has to be retrieved when the hardif is added to batman-adv because some of the wifi information for an hardif will only be available with rtnl lock. It can then be cached in the batadv_hard_iface and the functions is_wifi_netdev and is_cfg80211_netdev can just compare the correct bits without imposing extra locking requirements. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit 17681fb14d85c5b54fe869944f7ed29b244ded40 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Sep 30 15:21:02 2016 +0200 batman-adv: refactor wifi interface detection The ELP protocol requires cfg80211 to auto-detect the WiFi througput to a given neighbor. Use batadv_is_cfg80211_netdev() to determine whether or not an interface is eligible. Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit a1a400c20220736cff514c1de065e66c574b5ec4 Author: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Date: Fri Sep 30 15:21:00 2016 +0200 batman-adv: Return non-const ptr in batadv_getlink_net The returned net_namespace of batadv_getlink_net may be used with functions that potentially modify the struct. Thus it must return the pointer as non-const like rtnl_link_ops::get_link_net does. Signed-off-by: Sven Eckelmann <sven.eckelmann(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit cbec72d8b8ced43135b2e9375f658172ff326caa 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> commit 4597f37c8bdf269c77d66f4571f8a4a6ec7e66be Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Aug 6 17:04:22 2016 +0200 batman-adv: Disallow zero and mcast src address for mgmt frames The routing check for management frames is validating the source mac address in the outer ethernet header. It rejects every source mac address which is a broadcast address. But it also has to reject the zero-mac address and multicast mac addresses. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> commit 26290f96a668de47f3234f33f9ba8169f19265ab 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> commit 4a0260755e12bbc490e2d2ad0b5c5abc1e54471a 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> ----------------------------------------------------------------------- -- linux integration

6 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2016